refactor: views consolidation + css fixes

Author: NGPixel

client/app.js

@@ -19,6 +19,7 @@ import Hammer from 'hammerjs'
 import moment from 'moment'
 import VueMoment from 'vue-moment'
 import VueTour from 'vue-tour'
+import VueTreeNavigation from 'vue-tree-navigation'
 import store from './store'
 
 // ====================================
@@ -100,6 +101,7 @@ Vue.use(VeeValidate, { events: '' })
 Vue.use(Vuetify)
 Vue.use(VueMoment, { moment })
 Vue.use(VueTour)
+Vue.use(VueTreeNavigation)
 
 Vue.prototype.Velocity = Velocity
 
@@ -136,7 +138,7 @@ let bootstrap = () => {
 
   const i18n = localization.init()
   window.WIKI = new Vue({
-    el: '#app',
+    el: '#root',
     components: {},
     mixins: [helpers],
     provide: apolloProvider.provide(),

client/components/admin.vue

@@ -80,12 +80,7 @@
 
 <script>
 import VueRouter from 'vue-router'
-
-import adminStore from '@/store/admin'
-
-/* global WIKI */
-
-WIKI.$store.registerModule('admin', adminStore)
+import { get } from 'vuex-pathify'
 
 const router = new VueRouter({
   mode: 'history',
@@ -121,6 +116,9 @@ export default {
       adminDrawerShown: true
     }
   },
+  computed: {
+    darkMode: get('site/dark')
+  },
   router
 }
 </script>

client/components/admin/admin-theme.vue

@@ -108,7 +108,7 @@ export default {
     }
   },
   computed: {
-    darkMode: sync('admin/theme@dark')
+    darkMode: sync('site/dark')
   },
   mounted() {
     this.darkModeInitial = this.darkMode

client/components/common/nav-footer.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  v-footer.justify-center(:color='darkMode ? "" : "grey lighten-3"', inset)
+  v-footer.justify-center(:color='color', inset)
     .caption.grey--text.text--darken-1
       span(v-if='company && company.length > 0') {{ $t('common:footer.copyright', { company: company, year: currentYear }) }} |&nbsp;
       span {{ $t('common:footer.poweredBy') }} Wiki.js
@@ -20,6 +20,12 @@
 import { get, sync } from 'vuex-pathify'
 
 export default {
+  props: {
+    altbg: {
+      type: Boolean,
+      default: false
+    }
+  },
   data() {
     return {
       currentYear: (new Date()).getFullYear()
@@ -29,7 +35,26 @@ export default {
     company: get('site/company'),
     notification: get('notification'),
     darkMode: get('site/dark'),
-    notificationState: sync('notification@isActive')
+    notificationState: sync('notification@isActive'),
+    color() {
+      if (this.altbg) {
+        return 'altbg'
+      } else if (!this.darkMode) {
+        return 'grey lighten-3'
+      } else {
+        return ''
+      }
+    }
   }
 }
 </script>
+
+<style lang="scss">
+  .v-footer.altbg {
+    background: mc('theme', 'primary');
+
+    span {
+      color: mc('blue', '300');
+    }
+  }
+</style>

client/components/login.vue

@@ -1,6 +1,5 @@
 <template lang="pug">
   v-app
-    nav-header
     .login
       .login-container(:class='{ "is-expanded": strategies.length > 1, "is-loading": isLoading }')
         .login-mascot
@@ -35,20 +34,7 @@
           input(type='text', ref='iptTFA', v-model='securityCode', :placeholder='$t("auth:tfa.placeholder")', @keyup.enter='verifySecurityCode')
           button.button.is-blue.is-fullwidth(@click='verifySecurityCode')
             span {{ $t('auth:tfa.verifyToken') }}
-      .login-copyright
-        span {{ $t('common:footer.poweredBy') }}
-        a(href='https://wiki.js.org', rel='external', title='Wiki.js') Wiki.js
-
-    v-snackbar(
-      :color='notification.style'
-      bottom,
-      right,
-      multi-line,
-      v-model='notificationState'
-    )
-      .text-xs-left
-        v-icon.mr-3(dark) {{ notification.icon }}
-        span {{ notification.message }}
+    nav-footer(altbg)
 </template>
 
 <script>
@@ -145,7 +131,7 @@ export default {
                 })
               } else {
                 this.$store.commit('showNotification', {
-                  message: 'Login successful!',
+                  message: 'Login Successful! Redirecting...',
                   style: 'success',
                   icon: 'check'
                 })
@@ -259,23 +245,22 @@ export default {
     &::before {
       content: '';
       position: absolute;
-      background-image: url('../static/svg/login-bg.svg');
-      background-position: center bottom;
+      background-color: #0d47a1;
+      background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100%25' height='100%25' viewBox='0 0 1600 800'%3E%3Cg %3E%3Cpath fill='%231356b1' d='M486 705.8c-109.3-21.8-223.4-32.2-335.3-19.4C99.5 692.1 49 703 0 719.8V800h843.8c-115.9-33.2-230.8-68.1-347.6-92.2C492.8 707.1 489.4 706.5 486 705.8z'/%3E%3Cpath fill='%231866c1' d='M1600 0H0v719.8c49-16.8 99.5-27.8 150.7-33.5c111.9-12.7 226-2.4 335.3 19.4c3.4 0.7 6.8 1.4 10.2 2c116.8 24 231.7 59 347.6 92.2H1600V0z'/%3E%3Cpath fill='%231c75d2' d='M478.4 581c3.2 0.8 6.4 1.7 9.5 2.5c196.2 52.5 388.7 133.5 593.5 176.6c174.2 36.6 349.5 29.2 518.6-10.2V0H0v574.9c52.3-17.6 106.5-27.7 161.1-30.9C268.4 537.4 375.7 554.2 478.4 581z'/%3E%3Cpath fill='%231f86e2' d='M0 0v429.4c55.6-18.4 113.5-27.3 171.4-27.7c102.8-0.8 203.2 22.7 299.3 54.5c3 1 5.9 2 8.9 3c183.6 62 365.7 146.1 562.4 192.1c186.7 43.7 376.3 34.4 557.9-12.6V0H0z'/%3E%3Cpath fill='%232196f3' d='M181.8 259.4c98.2 6 191.9 35.2 281.3 72.1c2.8 1.1 5.5 2.3 8.3 3.4c171 71.6 342.7 158.5 531.3 207.7c198.8 51.8 403.4 40.8 597.3-14.8V0H0v283.2C59 263.6 120.6 255.7 181.8 259.4z'/%3E%3Cpath fill='%2355a4f5' d='M1600 0H0v136.3c62.3-20.9 127.7-27.5 192.2-19.2c93.6 12.1 180.5 47.7 263.3 89.6c2.6 1.3 5.1 2.6 7.7 3.9c158.4 81.1 319.7 170.9 500.3 223.2c210.5 61 430.8 49 636.6-16.6V0z'/%3E%3Cpath fill='%2374b2f7' d='M454.9 86.3C600.7 177 751.6 269.3 924.1 325c208.6 67.4 431.3 60.8 637.9-5.3c12.8-4.1 25.4-8.4 38.1-12.9V0H288.1c56 21.3 108.7 50.6 159.7 82C450.2 83.4 452.5 84.9 454.9 86.3z'/%3E%3Cpath fill='%238ec0f8' d='M1600 0H498c118.1 85.8 243.5 164.5 386.8 216.2c191.8 69.2 400 74.7 595 21.1c40.8-11.2 81.1-25.2 120.3-41.7V0z'/%3E%3Cpath fill='%23a5cffa' d='M1397.5 154.8c47.2-10.6 93.6-25.3 138.6-43.8c21.7-8.9 43-18.8 63.9-29.5V0H643.4c62.9 41.7 129.7 78.2 202.1 107.4C1020.4 178.1 1214.2 196.1 1397.5 154.8z'/%3E%3Cpath fill='%23bbdefb' d='M1315.3 72.4c75.3-12.6 148.9-37.1 216.8-72.4h-723C966.8 71 1144.7 101 1315.3 72.4z'/%3E%3C/g%3E%3C/svg%3E");
+      background-attachment: fixed;
       background-size: cover;
+      /* background by SVGBackgrounds.com */
+      opacity: .5;
       top: 0;
       left: 0;
       width: 100vw;
       height: 100vh;
-
-      @include until($tablet) {
-        display: none;
-      }
     }
 
     &::after {
       content: '';
       position: absolute;
-      background-image: linear-gradient(to bottom, rgba(mc('blue', '800'), 1) 0%, rgba(mc('blue', '800'), 0) 100%);
+      background-image: linear-gradient(to bottom, rgba(mc('blue', '800'), .9) 0%, rgba(mc('blue', '800'), 0) 100%);
       top: 0;
       left: 0;
       width: 100vw;
@@ -332,11 +317,11 @@ export default {
       }
 
       @include until($tablet) {
-        width: 100%;
+        width: 95vw;
         border-radius: 0;
 
         &.is-expanded {
-          width: 100%;
+          width: 95vw;
         }
       }
     }
@@ -365,7 +350,6 @@ export default {
         // border-top: 1px solid rgba(mc('light-blue', '900'), .5);
         background: linear-gradient(to right, rgba(0,0,0, .5), rgba(0,0,0, .7));
         border-top: 1px solid rgba(0,0,0, .2);
-        font-family: $core-font-standard;
         font-weight: 600;
         text-align: left;
         min-height: 40px;

client/scss/app.scss

@@ -1,18 +1,19 @@
 @import "global";
 
 @import "base/base";
-@import 'base/icons';
 
 @import "../libs/animate/animate";
 
 @import 'components/markdown-content';
-@import 'components/btn';
-@import 'components/data-table';
-@import 'components/dialog';
+@import 'components/v-btn';
+@import 'components/v-data-table';
+@import 'components/v-dialog';
+@import 'components/vue-tree-navigation';
 
 // @import '../libs/twemoji/twemoji-awesome';
 @import '../libs/prism/prism.css';
 @import '~vue-tour/dist/vue-tour.css';
+@import '~vue-status-indicator/styles.css';
 // @import 'node_modules/diff2html/dist/diff2html.min';
 
 @import 'pages/welcome';

client/scss/base/base.scss

@@ -1,6 +1,5 @@
 html {
   box-sizing: border-box;
-  font-family: $core-font-standard;
   height: 100%;
 }
 *, *:before, *:after {
@@ -11,75 +10,11 @@ html {
   display: none;
 }
 
-#app {
+#root {
   position: relative;
   min-height: 100%;
 
   &.is-fullscreen {
     height: 100vh;
   }
 }
-
-// Container
-
-.container {
-  position: relative;
-}
-
-.content {
-	padding: 20px;
-}
-
-.datatable {
-  th, td {
-    vertical-align: middle;
-  }
-}
-
-// Visibility
-
-.is-hidden {
-  display: none !important;
-}
-
-.is-hidden-mobile {
-  @include mobile {
-    display: none !important;
-  }
-}
-
-.is-hidden-tablet {
-  @include tablet {
-    display: none !important;
-  }
-}
-
-.is-hidden-tablet-only {
-  @include tablet-only {
-    display: none !important;
-  }
-}
-
-.is-hidden-touch {
-  @include touch {
-    display: none !important;
-  }
-}
-
-.is-hidden-desktop {
-  @include desktop {
-    display: none !important;
-  }
-}
-
-.is-hidden-desktop-only {
-  @include desktop-only {
-    display: none !important;
-  }
-}
-
-.is-hidden-widescreen {
-  @include widescreen {
-    display: none !important;
-  }
-}