feat: user menu + jwt certs + UI fixes

This commit is contained in:
Nicolas Giard
2018-12-02 21:42:43 -05:00
parent 74aa09f39c
commit f856da074e
25 changed files with 327 additions and 194 deletions

View File

@@ -67,7 +67,7 @@
)
v-tab-item(v-for='(strategy, n) in activeStrategies', :key='strategy.key', :transition='false', :reverse-transition='false')
v-card.pa-3(flat, tile)
v-card.wiki-form.pa-3(flat, tile)
v-form
.authlogo
img(:src='strategy.logo', :alt='strategy.title')

View File

@@ -27,7 +27,7 @@
v-radio-group(v-model='selectedEditor')
v-radio(v-for='(editor, n) in editors', :key='n', :label='editor.text', :value='editor.value', color='primary')
v-tab-item(key='code', :transition='false', :reverse-transition='false')
v-card.pa-3(flat, tile)
v-card.wiki-form.pa-3(flat, tile)
v-form
v-subheader Editor Configuration
.body-1.ml-3 This editor has no configuration options you can modify.

View File

@@ -15,7 +15,7 @@
v-layout(row wrap)
v-flex(lg6 xs12)
v-form
v-card
v-card.wiki-form
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading {{ $t('admin:general.siteInfo') }}
@@ -23,7 +23,6 @@
.px-3.pb-3
v-text-field(
outline
background-color='grey lighten-2'
label='Site Title'
required
:counter='50'
@@ -35,21 +34,18 @@
.px-3.pb-3
v-text-field(
outline
background-color='grey lighten-2'
label='Site Description'
:counter='255'
prepend-icon='public'
)
v-text-field(
outline
background-color='grey lighten-2'
label='Site Keywords'
:counter='255'
prepend-icon='public'
)
v-select(
outline
background-color='grey lighten-2'
label='Meta Robots'
chips
tags
@@ -62,7 +58,6 @@
.px-3.pb-3
v-text-field(
outline
background-color='grey lighten-2'
label='Google Analytics ID'
:counter='255'
prepend-icon='public'
@@ -74,7 +69,6 @@
.px-3.pb-3
v-text-field(
outline
background-color='grey lighten-2'
label='Company / Organization Name'
v-model='company'
:counter='255'
@@ -83,7 +77,7 @@
hint='Name to use when displaying copyright notice in the footer. Leave empty to hide.'
)
v-flex(lg6 xs12)
v-card
v-card.wiki-form
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading {{ $t('admin:general.siteBranding') }}
@@ -116,7 +110,7 @@
hint='Uncheck this box if you don\'t want Henry, Wiki.js mascot, to be displayed on client-facing pages.'
)
v-card.mt-3
v-card.wiki-form.mt-3
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading Features
@@ -141,7 +135,7 @@
<script>
import { sync } from 'vuex-pathify'
import { get, sync } from 'vuex-pathify'
export default {
data() {
@@ -155,6 +149,7 @@ export default {
}
},
computed: {
darkMode: get('site/dark'),
siteTitle: sync('site/title'),
company: sync('site/company')
},

View File

@@ -14,14 +14,13 @@
v-form.pt-3
v-layout(row wrap)
v-flex(lg6 xs12)
v-card
v-card.wiki-form
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading {{ $t('admin:locale.settings') }}
v-card-text
v-select(
outline
background-color='grey lighten-2'
:items='installedLocales'
prepend-icon='language'
v-model='selectedLocale'
@@ -49,7 +48,7 @@
:hint='namespacing ? $t("admin:locale.autoUpdate.hintWithNS") : $t("admin:locale.autoUpdate.hint")'
)
v-card.mt-3
v-card.wiki-form.mt-3
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading {{ $t('admin:locale.namespacing') }}
@@ -71,6 +70,7 @@
.caption.grey--text {{ $t('admin:locale.namespacingPrefixWarning.subtitle') }}
v-divider.mt-3.mb-4
v-select(
outline
:disabled='!namespacing'
:items='installedLocales'
prepend-icon='language'

View File

@@ -37,7 +37,7 @@
)
v-tab-item(v-for='(logger, n) in activeLoggers', :key='logger.key', :transition='false', :reverse-transition='false')
v-card.pa-3(flat, tile)
v-card.wiki-form.pa-3(flat, tile)
v-form
.loggerlogo
img(:src='logger.logo', :alt='logger.title')

View File

@@ -61,40 +61,51 @@
v-list-tile-avatar: v-icon power_input
v-list-tile-title {{$t('navigation.divider')}}
v-flex
v-card(v-if='current.kind === "link"')
v-card.wiki-form(v-if='current.kind === "link"')
v-toolbar(dense, color='blue', flat, dark)
.subheading {{$t('navigation.edit', { kind: $t('navigation.link') })}}
v-card-text
v-text-field(
outline
background-color='grey lighten-2'
:label='$t("navigation.label")'
prepend-icon='title'
v-model='current.label'
)
v-text-field(
outline
background-color='grey lighten-2'
:label='$t("navigation.icon")'
prepend-icon='casino'
v-model='current.icon'
)
v-select(
outline
background-color='grey lighten-2'
:label='$t("navigation.targetType")'
prepend-icon='near_me'
:items='navTypes'
v-model='current.targetType'
)
v-text-field(
v-if='current.targetType === "external"'
v-if='current.targetType === `external`'
outline
background-color='grey lighten-2'
:label='$t("navigation.target")'
prepend-icon='near_me'
v-model='current.target'
)
v-btn(
v-else-if='current.targetType === "page"'
color='indigo'
dark
)
v-icon(left) search
span Select Page...
v-text-field(
v-else-if='current.targetType === `search`'
outline
:label='$t("navigation.navType.searchQuery")'
prepend-icon='search'
v-model='current.target'
)
v-card-chin
v-spacer
v-btn(color='red', outline, @click='deleteItem(current)')

View File

@@ -60,7 +60,7 @@
v-divider.my-0(v-if='n < core.children.length - 1')
v-flex(lg9, xs12)
v-card
v-card.wiki-form
v-toolbar(
color='grey darken-1'
dark
@@ -84,7 +84,6 @@
v-select(
v-if='cfg.value.type === "string" && cfg.value.enum'
outline
background-color='grey lighten-2'
:items='cfg.value.enum'
:key='cfg.key'
:label='cfg.value.title'
@@ -105,7 +104,6 @@
v-text-field(
v-else
outline
background-color='grey lighten-2'
:key='cfg.key'
:label='cfg.value.title'
v-model='cfg.value.value'

View File

@@ -14,7 +14,7 @@
v-form.pt-3
v-layout(row wrap)
v-flex(lg6 xs12)
v-card
v-card.wiki-form
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading Theme
@@ -43,7 +43,7 @@
persistent-hint
hint='Not recommended for accessibility. May not be supported by all themes.'
)
v-card.mt-3
v-card.wiki-form.mt-3
v-toolbar(color='primary', dark, dense, flat)
v-toolbar-title
.subheading Code Injection