Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add element-ui library, carve out interface for adding segments and c… #13

Merged
merged 1 commit into from
Oct 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions browser/flagr-ui/config/operators.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"operators": [
{"value": "AND", "label": "AND"},
{"value": "OR", "label": "OR"},
{"value": "EQ", "label": "="},
{"value": "NEQ", "label": "!="},
{"value": "LT", "label": "<"},
{"value": "LTE", "label": "<="},
{"value": "GT", "label": ">"},
{"value": "GTE", "label": ">="},
{"value": "NAND", "label": "NAND"},
{"value": "XOR", "label": "XOR"},
{"value": "EREG", "label": "=~"},
{"value": "NEREG", "label": "!~"},
{"value": "IN", "label": "IN"},
{"value": "NOTIN", "label": "NOT IN"},
{"value": "CONTAINS", "label": "CONTAINS"},
{"value": "NOTCONTAINS", "label": "NOT CONTAINS"}
]
}
2 changes: 1 addition & 1 deletion browser/flagr-ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>flagr-ui</title>
<title>Flagr</title>
</head>
<body>
<div id="app"></div>
Expand Down
2 changes: 2 additions & 0 deletions browser/flagr-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
},
"dependencies": {
"element-ui": "^1.4.6",
"lodash.clone": "^4.5.0",
"vue": "^2.4.2",
"vue-router": "^2.7.0",
"vuex": "^2.4.1"
Expand Down
79 changes: 74 additions & 5 deletions browser/flagr-ui/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,29 +1,98 @@
<template>
<div id="app">
<img src="./assets/logo.png">
<router-view></router-view>
<el-menu theme="light" mode="horizontal" class="navbar">
<img src="./assets/logo.png">
</el-menu>
<div class="router-view-container">
<router-view></router-view>
</div>
</div>
</template>

<script>
import {
Menu,
MenuItem
} from 'element-ui'

export default {
name: 'app'
name: 'app',
components: {
'el-menu': Menu,
'el-menu-item': MenuItem
}
}
</script>

<style lang="scss">
body {
background-color: #f7f7f7;
margin: 0;
padding: 0;
}

h1, h2 {
font-weight: normal;
}

ol {
margin: 0;
padding-left: 20px;
}

ul {
list-style-type: none;
margin: 0;
padding: 0;
li {
margin: 0;
padding: 0;
}
}

#app {
font-family: 'Avenir', Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;
margin-top: 60px;

.navbar {
background-color: #74E5E0;
}

.flex-row {
display: flex;
align-items: center;
justify-content: center;
&-right {
margin-left: auto;
}
&.equal-width {
> * {
flex: 1;
}
}
}

.router-view-container {
width: 500px;
margin: 0 auto;
margin-top: 20px;
}

img {
width: 400px;
height: 60px;
}

.card--empty {
box-sizing: border-box;
background-color: #eee;
padding: 10px;
text-align: center;
color: #777;
border: 1px solid #ccc;
border-radius: 3px;
width: 100%;
}
}
</style>
Binary file modified browser/flagr-ui/src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading