diff --git a/client/components/admin.vue b/client/components/admin.vue index dd8d1f52..eed8483c 100644 --- a/client/components/admin.vue +++ b/client/components/admin.vue @@ -86,8 +86,8 @@ v-list-item(to='/mail', color='primary', v-if='hasPermission(`manage:system`)') v-list-item-avatar(size='24'): v-icon mdi-email-multiple-outline v-list-item-title {{ $t('admin:mail.title') }} - v-list-item(to='/ssl', v-if='hasPermission(`manage:system`)', disabled) - v-list-item-avatar(size='24'): v-icon(color='grey lighten-2') mdi-cloud-lock-outline + v-list-item(to='/ssl', v-if='hasPermission(`manage:system`)') + v-list-item-avatar(size='24'): v-icon mdi-cloud-lock-outline v-list-item-title {{ $t('admin:ssl.title') }} v-list-item(to='/system', color='primary', v-if='hasPermission(`manage:system`)') v-list-item-avatar(size='24'): v-icon mdi-tune @@ -270,6 +270,10 @@ export default { color: mc('theme', 'primary'); } } + + .v-list-group > .v-list-item { + padding-left: 0; + } } .theme--dark { diff --git a/client/components/setup.vue b/client/components/setup.vue index f253bf57..5b44835d 100644 --- a/client/components/setup.vue +++ b/client/components/setup.vue @@ -5,6 +5,10 @@ v-layout v-flex(xs12, lg6, offset-lg3) v-card.elevation-20.radius-7.animated.fadeInUp + v-alert(v-if='isDevMode', tile, dark, color='red darken-3', icon='mdi-alert', prominent) + .body-2 You are running an unstable, unreleased development version. This code base is #[strong NOT] for production use! + .body-2.mt-3 Cloning the master branch directly from GitHub is #[strong NOT] the proper way to install Wiki.js! + .body-2 Read the #[a(href='https://docs.requarks.io/install', style='color: #FFF;') documentation] on correctly installing the latest stable version. .text-center img.setup-logo.animated.fadeInUp.wait-p2s(src='/svg/logo-wikijs-full.svg', alt='Wiki.js Logo') v-alert(v-model='error', type='error', icon='mdi-alert', tile, dismissible) {{ errorMessage }} @@ -101,6 +105,8 @@ import _ from 'lodash' import validate from 'validate.js' import { BreedingRhombusSpinner } from 'epic-spinners' +/* global siteConfig */ + export default { components: { BreedingRhombusSpinner @@ -125,13 +131,15 @@ export default { telemetry: true }, pwdMode: true, - pwdConfirmMode: true + pwdConfirmMode: true, + isDevMode: false } }, mounted() { _.delay(() => { this.$refs.adminEmailInput.focus() }, 500) + this.isDevMode = siteConfig.devMode === true }, methods: { async install () { diff --git a/dev/templates/setup.pug b/dev/templates/setup.pug index d004281b..75b1b99b 100644 --- a/dev/templates/setup.pug +++ b/dev/templates/setup.pug @@ -21,6 +21,11 @@ html script. var siteConfig = !{JSON.stringify({ title: config.title })} + //- Dev Mode Warning + if devMode + script. + siteConfig.devMode = true + //- CSS <% for (var index in htmlWebpackPlugin.files.css) { %> link( diff --git a/server/setup.js b/server/setup.js index d6e144f9..c3f168bb 100644 --- a/server/setup.js +++ b/server/setup.js @@ -50,6 +50,7 @@ module.exports = () => { app.locals.config = WIKI.config app.locals.data = WIKI.data app.locals._ = require('lodash') + app.locals.devMode = WIKI.devMode // ---------------------------------------- // HMR (Dev Mode Only)