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.

Sign up for GitHub

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

Improve homepage UI #164

Merged
merged 1 commit into from
Sep 17, 2018
Merged

Improve homepage UI #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 8 additions & 27 deletions browser/flagr-ui/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<el-menu mode="horizontal" class="navbar">
<el-row>
<el-col :span="6">
<div class="img-frame">
<router-link :to="{name: 'home'}"><img src="./assets/logo.png"></router-link>
</div>
<router-link :to="{name: 'home'}">
<h3 class="logo">Flagr</h3>
</router-link>
</el-col>
<el-col :span="3" :offset="12">
<el-col :span="2" :offset="13">
<a href="https://checkr.github.io/flagr/api_docs" target="_blank"><h3>API</h3></a>
</el-col>
<el-col :span="2">
Expand All @@ -29,7 +29,6 @@ export default {

<style lang="less">
body {
background-color: #f7f7f7;
margin: 0;
padding: 0;
font-family: 'Avenir', Helvetica, Arial, sans-serif;
Expand Down Expand Up @@ -69,27 +68,9 @@ ul {

.navbar {
background-color: #74E5E0;
.img-frame {
height: 80px;
width: 150px;
position: relative;
}
img {
max-height: 100%;
max-width: 100%;
width: auto;
height: auto;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
margin: auto;
}
h3 {
color: white;
text-align: right;
margin-right: 1em;
margin-left: 2em;
&:hover {
color: #f7f7f7;
}
Expand Down Expand Up @@ -174,10 +155,10 @@ ul {
}

.jsoneditor{
border-color: #d8dce5;
border-color: #E4E7ED;
.jsoneditor-menu {
background-color: #74E5E0;
border-bottom-color: #74E5E0;
background-color: #E4E7ED;
border-bottom-color: #E4E7ED;
}
.jsoneditor-poweredBy {
display: none;
Expand Down
129 changes: 84 additions & 45 deletions browser/flagr-ui/src/components/Flag.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-row>
<el-col :span="14" :offset="5">
<el-col :span="20" :offset="2">
<div class="container flag-container">
<el-dialog
title="Delete feature flag"
Expand Down Expand Up @@ -90,7 +90,7 @@
<div v-if="loaded && flag">
<el-tabs>
<el-tab-pane label="Config">
<el-card>
<el-card class="flag-config-card">
<div slot="header" class="el-card-header">
<div class="flex-row">
<div class="flex-row-left">
Expand All @@ -110,7 +110,7 @@
</div>
</div>
</div>
<el-card>
<el-card shadow="hover">
<div class="flex-row id-row">
<div class="flex-row-left">
<el-tag type="primary" :disable-transitions="true">
Expand All @@ -127,7 +127,7 @@
:inactive-value="false">
</el-switch>
</el-tooltip>
<span size="small">Data Records</span>
<span size="small" class="data-records-label">Data Records</span>
<el-button size="small" @click="putFlag(flag)">
Save Flag
</el-button>
Expand Down Expand Up @@ -160,7 +160,7 @@
</div>
<div class="variants-container-inner" v-if="flag.variants.length">
<div v-for="variant in flag.variants" :key="variant.id">
<el-card>
<el-card shadow="hover">
<el-form label-position="left" label-width="100px">
<div class="flex-row id-row">
<div class="flex-row-left">
Expand All @@ -175,18 +175,24 @@
</el-button>
</div>
</div>
<el-input
size="small"
placeholder="Key"
v-model="variant.key">
<template slot="prepend">Key</template>
</el-input>
<el-input
size="small"
placeholder="{}"
v-model="variant.attachmentStr">
<template slot="prepend">Attachment </template>
</el-input>
<el-row :gutter="10">
<el-col :span="12">
<el-input
size="small"
placeholder="Key"
v-model="variant.key">
<template slot="prepend">Key</template>
</el-input>
</el-col>
<el-col :span="12">
<el-input
size="small"
placeholder="{}"
v-model="variant.attachmentStr">
<template slot="prepend">Attachment </template>
</el-input>
</el-col>
</el-row>
</el-form>
</el-card>
</div>
Expand Down Expand Up @@ -234,6 +240,7 @@
<draggable v-model="flag.segments" @start="drag=true" @end="drag=false">
<transition-group>
<el-card
shadow="hover"
v-for="segment in flag.segments"
:key="segment.id"
class="segment grabbable">
Expand All @@ -243,14 +250,14 @@
</div>
<div class="flex-row-right">
<el-button slot="append" size="small" @click="putSegment(segment)">
Save Segment
Save Segment Setting
</el-button>
<el-button @click="deleteSegment(segment)" size="small">
<span class="el-icon-delete"/>
</el-button>
</div>
</div>
<el-row :gutter="20" class="id-row">
<el-row :gutter="10" class="id-row">
<el-col :span="15">
<el-input
size="small"
Expand All @@ -275,7 +282,7 @@
</el-row>
<el-row>
<el-col :span="24">
<h4>Constraints (match ALL of them)</h4>
<h5>Constraints (match ALL of them)</h5>
<div class="constraints">
<div class="constraints-inner" v-if="segment.constraints.length">
<div
Expand Down Expand Up @@ -309,13 +316,13 @@
</el-input>
</el-col>
<el-col :span="2">
<el-button class="width--full" @click="putConstraint(segment, constraint)" size="small">
<span class="el-icon-check"/>
<el-button type="success" plain class="width--full" @click="putConstraint(segment, constraint)" size="small">
Save
</el-button>
</el-col>
<el-col :span="2">
<el-button class="width--full" @click="deleteConstraint(segment, constraint)" size="small">
<span class="el-icon-delete"/>
<el-button type="danger" plain class="width--full" @click="deleteConstraint(segment, constraint)" size="small">
<i class="el-icon-delete"></i>
</el-button>
</el-col>
</el-row>
Expand Down Expand Up @@ -354,6 +361,8 @@
<el-button
class="width--full"
size="small"
type="primary"
plain
:disabled="!segment.newConstraint.property || !segment.newConstraint.value"
@click.prevent="() => createConstraint(segment)">
<span class="el-icon-plus"/>
Expand All @@ -364,22 +373,33 @@
</div>
</el-col>
<el-col :span="24" class="segment-distributions">
<h4>Distribution</h4>
<ul class="segment-distributions-inner" v-if="segment.distributions.length">
<li v-for="distribution in segment.distributions" :key="distribution.id">
<el-tag type="gray" :disable-transitions="true">{{ distribution.variantKey }}</el-tag>
<span size="small">{{ distribution.percent }}%</span>
</li>
</ul>
<h5>
<span>Distribution</span>
<el-button round size="mini" @click="editDistribution(segment)">
<span class="el-icon-edit"></span> edit
</el-button>
</h5>
<el-row type="flex" v-if="segment.distributions.length" :gutter="20">
<el-col
v-for="distribution in segment.distributions" :key="distribution.id"
:span="6">
<el-card shadow="never" class="distribution-card">
<div>
<span size="small">{{distribution.variantKey}}</span>
</div>
<el-progress
type="circle"
color="#74E5E0"
width="70"
:percentage="distribution.percent">
</el-progress>
</el-card>
</el-col>
</el-row>

<div class="card--error" v-else>
No distribution yet
</div>
<div class="edit-distribution-button">
<el-button class="width--full" @click="editDistribution(segment)">
<span class="el-icon-edit"></span>
Edit distribution
</el-button>
</div>
</el-col>
</el-row>
</el-card>
Expand All @@ -395,7 +415,7 @@
<div slot="header" class="el-card-header">
<h2>Flag Settings</h2>
</div>
<el-button @click="dialogDeleteFlagVisible = true">
<el-button @click="dialogDeleteFlagVisible = true" type="danger" plain>
<span class="el-icon-delete"></span>
Delete Flag
</el-button>
Expand Down Expand Up @@ -714,9 +734,9 @@ export default {
</script>

<style lang="less">
h4 {
h5 {
padding: 0;
margin: 10px 0;
margin: 10px 0 5px;
}

.grabbable {
Expand All @@ -739,6 +759,19 @@ h4 {
background-color: #f6f6f6;
border-radius: 5px;
}
.distribution-card {
height: 110px;
text-align: center;
.el-card__body {
padding: 3px 10px 10px 10px;
}
font-size: 0.9em;
}
.distribution-card__edit {
button {
boarder-size: 0;
}
}
}

ol.constraints-inner {
Expand All @@ -764,7 +797,7 @@ ol.constraints-inner {
margin-bottom: 1em;
}
.el-input-group__prepend {
width: 8em;
width: 2em;
}
}

Expand Down Expand Up @@ -792,10 +825,16 @@ ol.constraints-inner {
margin-bottom: 8px;
}

.flag-content{
margin-top: 8px;
.el-input-group__prepend {
width: 8em;
.flag-config-card {
.flag-content {
margin-top: 8px;
.el-input-group__prepend {
width: 8em;
}
}
.data-records-label {
margin-right: 8px;
}
}

</style>
Loading