From a88f8e6b9c6e0d7eea72392f2a0c55adfbdd7702 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 1 Apr 2018 02:06:55 -0400 Subject: [PATCH] feat: admin utilities + telemetry UI, criterias-item component --- client/components/admin/admin-general.vue | 9 -- client/components/admin/admin-utilities.vue | 97 ++++++++++++++++++++- client/components/common/criterias-item.vue | 9 ++ 3 files changed, 102 insertions(+), 13 deletions(-) diff --git a/client/components/admin/admin-general.vue b/client/components/admin/admin-general.vue index de986d7f..88a7284f 100644 --- a/client/components/admin/admin-general.vue +++ b/client/components/admin/admin-general.vue @@ -30,15 +30,6 @@ v-toolbar-title .subheading Site Branding v-card-text --- - v-card.mt-3 - v-toolbar(color='primary', dark, dense, flat) - v-toolbar-title - .subheading Maintenance Mode - v-card-text - .body-1 Maintenance mode restrict access to the site to administrators only, regarless of current permissions. - v-btn.mt-3(color='orange darken-2', dark) - icon-home-alert.mr-2(fillColor='#FFFFFF') - | Turn On Maintenance Mode diff --git a/client/components/admin/admin-utilities.vue b/client/components/admin/admin-utilities.vue index 8a8cea16..76c55a95 100644 --- a/client/components/admin/admin-utilities.vue +++ b/client/components/admin/admin-utilities.vue @@ -1,15 +1,104 @@ diff --git a/client/components/common/criterias-item.vue b/client/components/common/criterias-item.vue index 098fa83b..d2a26f6b 100644 --- a/client/components/common/criterias-item.vue +++ b/client/components/common/criterias-item.vue @@ -21,12 +21,18 @@ v-select(v-if='item.type === "country"', solo, :items='countries', v-model='item.value', placeholder='Countries...', multiple, item-text='name', item-value='code') v-text-field(v-else-if='item.type === "path"', solo, v-model='item.value', label='Path (e.g. /section)') v-text-field(v-else-if='item.type === "date"', solo, @click.native.stop='dateActivator = true', v-model='item.value', label='YYYY-MM-DD', readonly) + v-text-field(v-else-if='item.type === "time"', solo, @click.native.stop='timeActivator = true', v-model='item.value', label='HH:MM', readonly) + v-select(v-else-if='item.type === "group"', solo, :items='groups', v-model='item.value', placeholder='Group...', item-text='name', item-value='id') v-text-field.blue-grey.lighten-4(v-else, solo, disabled) v-dialog(lazy, v-model='dateActivator', width='290px', ref='dateDialog') v-date-picker(v-model='item.value', scrollable, color='primary') v-btn(flat, color='primary' @click='$refs.dateDialog.save(date)', block) ok + v-dialog(lazy, v-model='timeActivator', width='300px', ref='timeDialog') + v-time-picker(v-model='item.value', scrollable, color='primary') + v-btn(flat, color='primary' @click='$refs.timeDialog.save(time)', block) ok + v-btn(icon, @click='remove'): v-icon(color='blue-grey') clear @@ -60,7 +66,10 @@ export default { }, dateActivator: false, dateDialog: false, + timeActivator: false, + timeDialog: false, countries: [], + groups: [], criteriaTypes: [ { text: 'Path', value: 'path', icon: 'space_bar', color: 'blue', description: 'Match the path of the document being viewed.' }, { text: 'Date', value: 'date', icon: 'date_range', color: 'blue', description: 'Match the current calendar day.' },