Merge from develop to preprod

demo/restore-demo.sh

@@ -7,7 +7,7 @@ destinationDataDir="/data/hosted/"
 
 echo "Removing $destinationDataDir"
 
-rm -R ${destinationDataDir}
+rm -R ${destinationDataDir}*
 
 echo "Resetting to initial status from $originDataDir.."
 cp -R ${originDataDir} ${destinationDataDir}

ui/core/src/App.vue

@@ -1,5 +1,5 @@
 <template>
-<div v-if="this.app.isAppLoaded === true" style="height:100%;">
+<div style="height:100%;">
   <notifications group="app" classes="alert" position="top center" :duration="6500" :width="400" style="z-index: 500000000000;"/>
   <router-view></router-view>
   <blocker :text1="$t('Common blocker text 1','JUST A MOMENT')" :text2="$t('Common blocker text 2','PROCESSING')"

ui/core/src/DocumentApp.vue

@@ -1,5 +1,5 @@
 <template>
-<div v-if="this.app.isAppLoaded === true" id="document-app">
+<div id="document-app">
   <notifications group="app" classes="alert" position="top center" :duration="4000" style="z-index: 500000000;"/>
   <router-view></router-view>
   <blocker :text1="$t('Common blocker text 1','JUST A MOMENT')" :text2="$t('Common blocker text 2','PROCESSING')"

ui/core/src/FrontendApp.vue

@@ -1,5 +1,5 @@
 <template>
-<div v-if="this.app.isAppLoaded === true" id="frontend-app" :class="{'frontend-headless' : showHeader === false}">
+<div id="frontend-app" :class="{'frontend-headless' : showHeader === false}">
   <header class="mb-4" v-if="showHeader === true">
     <frontend-navbar></frontend-navbar>
   </header>
@@ -21,13 +21,9 @@
           <a target="_blank" href="https://github.com/ProxeusApp/proxeus-core" class="footer-link ml-3">Source Code</a>
         </div>
         <div>
-          <a v-if="this.app.dynamicConfig" target="_blank" v-bind:href="this.app.dynamicConfig.company.copyrightText.link" class="footer-link ml-3 small">
-            {{this.i18nDynamicConfigText('company.copyrightText')}}
-            <img v-bind:src="this.app.dynamicConfig.company.logo.lightTheme.path" v-bind:style="this.app.dynamicConfig.company.copyrightText.logo.style.home" alt=""/>
-          </a>
-          <a v-else target="_blank" href="https://proxeus.org/" class="footer-link ml-3 small">
-            {{$t('Powered by')}} <img src="/static/proxeus-logo-white.svg" alt="" />
-          </a>
+            <a target="_blank" href="https://proxeus.org/" class="footer-link ml-3 small">
+              {{$t('Powered by')}} <img src="/static/proxeus-logo-white.svg" alt="" />
+            </a>
         </div>
       </div>
     </div>

ui/core/src/InitialApp.vue

@@ -1,5 +1,5 @@
 <template>
-<div v-if="this.app.isAppLoaded === true" id="initial-app">
+<div id="initial-app">
   <vue-headful :title="$t('Proxeus - Power up')"/>
   <h2 style="padding-top: 20px;position: relative;display: block;text-align: center;">
     <svg width="140" viewBox="0 0 187 55" xmlns="http://www.w3.org/2000/svg"><title color="#fff">logo</title>

ui/core/src/assets/styles/sidebar.scss

@@ -53,8 +53,7 @@ $nav-max-width: 265px;
     padding-left: 1.7rem;
     padding-top: math.div($spacer, 1.5);
     padding-bottom: math.div($spacer, 3);
-    text-align: center;
-
+    text-align:center;
     img {
       height: 3.75rem;
       margin: 1rem auto;
@@ -125,7 +124,6 @@ $nav-max-width: 265px;
   .navbar-brand {
     color: #e5efff;
   }
-
   .secondary-nav {
     bottom: 0;
     max-width: $nav-max-width;
@@ -144,15 +142,12 @@ $nav-max-width: 265px;
     }
 
   }
-
   .main-nav {
     height: 100%;
   }
-
   &.main-nav-backend {
     margin-top: -23px;
   }
-
   &.main-nav-frontend {
     margin-top: -8px;
   }
@@ -209,23 +204,18 @@ $nav-max-width: 265px;
     .navbar-brand {
       max-width: $nav-max-width !important;
     }
-
     .nav-item .nav-link {
       width: 100%;
     }
-
     .nav-link-title {
       display: inline;
     }
-
     .secondary-nav {
       width: 100%;
     }
-
     .secondary-nav .nav-item .nav-link {
       width: 100%;
     }
-
     .secondary-nav .nav-link-title {
       display: inline;
     }
@@ -254,43 +244,3 @@ $nav-max-width: 265px;
 .sidebar-close-btn:hover {
   color: $cyan;
 }
-
-.custom-company-logo {
-  background-position: left;
-  background-repeat: no-repeat;
-  background-size: cover;
-
-  &.full-size {
-    display: inline-block;
-  }
-
-  &.small-size {
-    display: none;
-
-  }
-}
-
-nav.toggled {
-  .custom-company-logo {
-    &.full-size {
-      display: none;
-    }
-
-    &.small-size {
-      display: inline-block;
-
-    }
-  }
-}
-
-@media (max-width: 979px) {
-  .custom-company-logo {
-    &.full-size {
-      display: none;
-    }
-
-    &.small-size {
-      display: inline-block;
-    }
-  }
-}