From d36bc1bdcb933c9f5e3c08a17d7c931613e4fb48 Mon Sep 17 00:00:00 2001
From: slavas490 <slavas490@gmail.com>
Date: Wed, 31 Jan 2024 22:16:52 +0200
Subject: [PATCH] revert dynamic-config

---
 demo/restore-demo.sh                          |   2 +-
 ui/core/public/static/dynamic-config/index.js |  80 -------------
 ui/core/src/App.vue                           |   2 +-
 ui/core/src/DocumentApp.vue                   |   2 +-
 ui/core/src/FrontendApp.vue                   |  12 +-
 ui/core/src/InitialApp.vue                    |   2 +-
 ui/core/src/assets/styles/sidebar.scss        |  52 +--------
 ui/core/src/baseApp.js                        | 107 ++++++------------
 .../components/frontend/FrontendNavbar.vue    |   7 +-
 ui/core/src/main.js                           |   6 +-
 ui/core/src/views/Home.vue                    |  12 +-
 .../views/appDependentComponents/Sidebar.vue  |  23 ++--
 .../appDependentComponents/SidebarUser.vue    |   8 +-
 13 files changed, 60 insertions(+), 255 deletions(-)
 delete mode 100644 ui/core/public/static/dynamic-config/index.js

diff --git a/demo/restore-demo.sh b/demo/restore-demo.sh
index cacc5d809..927981831 100755
--- a/demo/restore-demo.sh
+++ b/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}
diff --git a/ui/core/public/static/dynamic-config/index.js b/ui/core/public/static/dynamic-config/index.js
deleted file mode 100644
index 7088a0761..000000000
--- a/ui/core/public/static/dynamic-config/index.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-*** DYNAMIC CONFIG ***
-
-Use this file to make dynamic configuration for the application.
-
-How to use:
-
-1) Pass VUE_APP_USE_DYNAMIC_CONFIG variable while build pipeline. Like this:
-$ export VUE_APP_USE_DYNAMIC_CONFIG=true
-2) Place this file into ui/core/dist/static/dynamic-config directory. You can mount Docker volume directry into this path. Any extra files can be placed as well.
-
-Example of this configuration file:
-
-export default {
-  "apply": true, // Allow or deny this config (even with VUE_APP_USE_DYNAMIC_CONFIG value)
-  "company": {
-    "logo": {
-      "lightTheme": {
-        "path": "/static/dynamic-config/..."
-      },
-      "darkTheme": {
-        "path": "/static/dynamic-config/..."
-      },
-      "style": {
-        "home": {
-          ... css styles ...
-        },
-        "adminDashboard": {
-          "full": {
-            ... css styles ...
-          },
-          "small": {
-            ... css styles ...
-          }
-        },
-        "userDashboard": {
-          "full": {
-            ... css styles ...
-          },
-          "small": {
-            ... css styles ...
-          }
-        }
-      }
-    },
-    "copyrightText": {
-      "lang": {
-        "en": "..."
-        ... another languages ...
-      },
-      "logo": {
-        "style": {
-          ... css styles ...
-        }
-      },
-      "link": "..."
-    }
-  },
-  "homePage": {
-    "platformTitle": {
-      "lang": {
-        "en": "..."
-        ... another languages ...
-      }
-    },
-    "platformDescription": {
-      "lang": {
-        "en": "..."
-        ... another languages ...
-      }
-    }
-  }
-}
-
-*/
-
-export default {
-  "apply": false
-}
diff --git a/ui/core/src/App.vue b/ui/core/src/App.vue
index d73694d21..52d9a9456 100644
--- a/ui/core/src/App.vue
+++ b/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')"
diff --git a/ui/core/src/DocumentApp.vue b/ui/core/src/DocumentApp.vue
index 0e1f0d7a2..9e220f31c 100644
--- a/ui/core/src/DocumentApp.vue
+++ b/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')"
diff --git a/ui/core/src/FrontendApp.vue b/ui/core/src/FrontendApp.vue
index 15b70f6f4..2d35dd4b5 100644
--- a/ui/core/src/FrontendApp.vue
+++ b/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>
diff --git a/ui/core/src/InitialApp.vue b/ui/core/src/InitialApp.vue
index 5a02f7b7f..bbc5fb283 100644
--- a/ui/core/src/InitialApp.vue
+++ b/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>
diff --git a/ui/core/src/assets/styles/sidebar.scss b/ui/core/src/assets/styles/sidebar.scss
index 50d779099..2cb30c355 100644
--- a/ui/core/src/assets/styles/sidebar.scss
+++ b/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;
-    }
-  }
-}
diff --git a/ui/core/src/baseApp.js b/ui/core/src/baseApp.js
index 7a6c26706..240b8b2a8 100644
--- a/ui/core/src/baseApp.js
+++ b/ui/core/src/baseApp.js
@@ -1,10 +1,7 @@
 import WalletInterface from './libs/WalletAdapter'
-import {
-  get as getLodash
-} from 'lodash'
 
 export default {
-  data () {
+  data() {
     return {
       me: null,
       meta: null,
@@ -15,13 +12,11 @@ export default {
       uiBlocked: false,
       intervalID: null,
       lastExportResults: null,
-      lastImportResults: null,
-      dynamicConfig: null,
-      isAppLoaded: false
+      lastImportResults: null
     }
   },
   methods: {
-    makeURL (uri) {
+    makeURL(uri) {
       let origin = location.origin
       if (/.*\/$/.test(origin)) {
         origin = origin.substring(0, origin.length - 1)
@@ -31,7 +26,7 @@ export default {
       }
       return origin + uri
     },
-    isLangAvailable (lang) {
+    isLangAvailable(lang) {
       if (this.meta && this.meta.activeLangs) {
         for (let i = 0; i < this.meta.activeLangs.length; i++) {
           if (this.meta.activeLangs[i] &&
@@ -42,37 +37,37 @@ export default {
       }
       return false
     },
-    userIsRoot () {
+    userIsRoot() {
       if (this.me) {
         return this.me.role === 100
       }
       return false
     },
-    userIsSuperAdmin () {
+    userIsSuperAdmin() {
       if (this.me) {
         return this.me.role > 10
       }
       return false
     },
-    userIsAdminOrHigher () {
+    userIsAdminOrHigher() {
       if (this.me) {
         return this.me.role >= 10
       }
       return false
     },
-    userIsCreatorOrHigher () {
+    userIsCreatorOrHigher() {
       if (this.me) {
         return this.me.role >= 7
       }
       return false
     },
-    userIsUserOrHigher () {
+    userIsUserOrHigher() {
       if (this.me) {
         return this.me.role >= 5
       }
       return false
     },
-    amIWriteGrantedFor (item) {
+    amIWriteGrantedFor(item) {
       try {
         // check authority
         if (this.me.role >= 100) {
@@ -115,7 +110,7 @@ export default {
       } catch (e) {}
       return false
     },
-    handleError (o) {
+    handleError(o) {
       if (this.isConToServerLostError(o)) {
         // couldn't reach the server
         if (!this.intervalID) {
@@ -124,7 +119,7 @@ export default {
         }
       }
     },
-    isConToServerLostError (o) {
+    isConToServerLostError(o) {
       let txt = ''
       try {
         txt = o.data || o.request.response || o.request.responseText
@@ -132,7 +127,7 @@ export default {
       return (o.request && !o.response) ||
         (window.webpackHotUpdate && /^.*\(ECONNREFUSED\)\.$/m.test(txt))
     },
-    pingService () {
+    pingService() {
       console.log('pingService')
       axios.get('/api/config').then((r) => {
         if (r.data) {
@@ -147,10 +142,10 @@ export default {
         this.handleError(err)
       })
     },
-    getSelectedLang () {
+    getSelectedLang() {
       return this.$cookie.get('lang') || this.fallbackLang()
     },
-    setSelectedLang (lang) {
+    setSelectedLang(lang) {
       if (lang) {
         this.$cookie.set('lang', lang, {
           expires: '1Y'
@@ -161,16 +156,16 @@ export default {
         this.$i18n.set(this.fallbackLang())
       }
     },
-    checkUserHasSession () {
+    checkUserHasSession() {
       return !!localStorage.getItem('userhassession')
     },
-    initUserHasSession () {
+    initUserHasSession() {
       localStorage.setItem('userhassession', true)
     },
-    deleteUserHasSession () {
+    deleteUserHasSession() {
       localStorage.removeItem('userhassession')
     },
-    loadMe (clb) {
+    loadMe(clb) {
       if (!this.checkUserHasSession()) {
         return
       }
@@ -190,7 +185,7 @@ export default {
         this.handleError(err)
       })
     },
-    loadLastExportResults (clb, delParams) {
+    loadLastExportResults(clb, delParams) {
       let url = '/api/export/results'
       if (delParams) {
         url += '?' + delParams
@@ -209,7 +204,7 @@ export default {
         this.handleError(err)
       })
     },
-    loadLastImportResults (clb, delParams) {
+    loadLastImportResults(clb, delParams) {
       let url = '/api/import/results'
       if (delParams) {
         url += '?' + delParams
@@ -228,7 +223,7 @@ export default {
         this.handleError(err)
       })
     },
-    exportData (params, cb, url, name) {
+    exportData(params, cb, url, name) {
       if (!url) {
         url = '/api/export?include=' + params
       } else {
@@ -283,7 +278,7 @@ export default {
         })
       })
     },
-    importData (file, skipExisting, cb) {
+    importData(file, skipExisting, cb) {
       if (!file) {
         return
       }
@@ -321,10 +316,10 @@ export default {
         this.handleError(err)
       })
     },
-    async validateSessionCookie () {
+    async validateSessionCookie() {
       return axios.get('/api/session/validate')
     },
-    loadMeta (clb) {
+    loadMeta(clb) {
       axios.get('/api/i18n/meta').then((response) => {
         this.meta = response.data
         if (this.meta && this.meta.langFallback) {
@@ -343,7 +338,7 @@ export default {
         this.handleError(err)
       })
     },
-    updateLangLabel () {
+    updateLangLabel() {
       if (this.meta && this.meta.activeLangs) {
         for (let i = 0; i < this.meta.activeLangs.length; i++) {
           this.meta.activeLangs[i].label = this.$t(
@@ -352,13 +347,13 @@ export default {
         return this.meta.activeLangs
       }
     },
-    fallbackLang () {
+    fallbackLang() {
       if (this.meta) {
         return this.meta.langFallback
       }
       return null
     },
-    getSelectedLangIndex () {
+    getSelectedLangIndex() {
       if (this.meta && this.meta.activeLangs) {
         for (let i = 0; i < this.meta.activeLangs.length; i++) {
           if (this.meta.activeLangs[i].Code === this.getSelectedLang()) {
@@ -368,7 +363,7 @@ export default {
       }
       return null
     },
-    reloadI18n () {
+    reloadI18n() {
       axios.get('/api/i18n/all').then(
         (response) => {
           this.$i18n.add(this.getSelectedLang(), response.data)
@@ -379,7 +374,7 @@ export default {
           this.handleError(err)
         })
     },
-    loadConfig () {
+    loadConfig() {
       axios.get('/api/config').then(r => {
         if (r.data) {
           this.setConfig(r.data)
@@ -388,7 +383,7 @@ export default {
         this.handleError(err)
       })
     },
-    async setConfig (d) {
+    async setConfig(d) {
       if (d.blockchainNet) {
         this.blockchainNet = d.blockchainNet
       }
@@ -404,63 +399,31 @@ export default {
         await this.wallet.validateUserNetwork(() => this.$root.$emit('service-off'), () => this.$root.$emit('service-on'))
       }
     },
-    acknowledgeFirstLogin () {
+    acknowledgeFirstLogin() {
       // Show the following overlays starting now (they can be delayed)
       localStorage.setItem('showFirstLoginMessageOn-documents', new Date())
       if (this.userIsCreatorOrHigher()) {
         localStorage.setItem('showFirstLoginMessageOn-admin', new Date())
       }
-    },
-    i18nDynamicConfigText (path) {
-      const lang = this.getSelectedLang()
-      const fullPath = path + '.lang'
-
-      const originalValue = getLodash(this.dynamicConfig, fullPath, undefined)
-
-      if (originalValue === undefined) {
-        throw new Error(`Unable to get DynamicConfig translate for path ${fullPath}`)
-      }
-
-      return originalValue ? originalValue[lang] : null
-    },
-    async loadDynamicConfig () {
-      if (process.env.VUE_APP_USE_DYNAMIC_CONFIG === undefined) {
-        return
-      }
-
-      try {
-        const {
-          default: config
-        } = await import(/* webpackIgnore: true */ '../../dynamic-config/index.js')
-
-        if (config.apply === true) {
-          this.dynamicConfig = config
-        }
-      } catch (error) {
-        console.error('Unable to load dynamic config')
-      }
     }
   },
   computed: {
     app: {
-      get () {
+      get() {
         return this.$root.$children[0]
       },
-      set (a) {}
+      set(a) {}
     }
   },
-  async created () {
+  created() {
     const tmpLangToPreventFromWarnings = 'en'
     this.$i18n.fallback(tmpLangToPreventFromWarnings)
     this.$i18n.set(tmpLangToPreventFromWarnings)
-    await this.loadDynamicConfig()
     this.validateSessionCookie()
     this.loadMeta()
     this.loadConfig()
     this.loadMe()
 
-    this.isAppLoaded = true
-
     // when accounts loaded register accountsChanged handler and reload page if user changes the account
     window.ethereum.on('accountsChanged', function () {
       window.location.reload()
diff --git a/ui/core/src/components/frontend/FrontendNavbar.vue b/ui/core/src/components/frontend/FrontendNavbar.vue
index 33cc411b3..34671f0fc 100644
--- a/ui/core/src/components/frontend/FrontendNavbar.vue
+++ b/ui/core/src/components/frontend/FrontendNavbar.vue
@@ -2,10 +2,7 @@
 <nav class="navbar navbar-expand-lg navbar-light bg-light" style="max-height: 60px;">
   <!--<wallet id="wallet-component"></wallet>-->
   <a href="/" class="navbar-brand">
-    <div v-if="this.app.dynamicConfig">
-      <img v-bind:src="this.app.dynamicConfig.company.logo.darkTheme.path" v-bind:style="this.app.dynamicConfig.company.logo.style" alt=""/>
-    </div>
-    <div v-else-if="this.$t('Logo url') === 'Logo url'">
+    <div v-if="this.$t('Logo url') === 'Logo url'">
       <!-- Default logo. Please set the 'Logo url' translation to either 'Proxeus' or an url where your logo is located -->
       {{this.$t('Your logo here')}}
     </div>
@@ -43,11 +40,9 @@
 
 <script>
 // import Wallet from '@/components/wallet/Wallet'
-import mafdc from '@/mixinApp'
 import TopRightProfile from '../user/TopRightProfile'
 
 export default {
-  mixins: [mafdc],
   name: 'frontend-navbar',
   components: {
     TopRightProfile
diff --git a/ui/core/src/main.js b/ui/core/src/main.js
index 318c05976..c22cc70fb 100644
--- a/ui/core/src/main.js
+++ b/ui/core/src/main.js
@@ -34,7 +34,9 @@ import store from './store'
  */
 
 import './global'
+
 import './legacy-imports'
+
 import VueScrollTo from 'vue-scrollto'
 import { events } from 'vue-notification/src/events' // eslint-disable-line no-unused-vars
 
@@ -83,8 +85,6 @@ const vm = new Vue({ // eslint-disable-line no-unused-vars
   el: '#app',
   router,
   store,
-  components: {
-    App
-  },
+  components: { App },
   template: '<App/>'
 })
diff --git a/ui/core/src/views/Home.vue b/ui/core/src/views/Home.vue
index 5a25fb16a..796f9ee8a 100644
--- a/ui/core/src/views/Home.vue
+++ b/ui/core/src/views/Home.vue
@@ -4,14 +4,8 @@
   <div class="container">
     <div class="row">
       <div class="col text-center">
-        <template v-if="this.app.dynamicConfig">
-          <h1 class="mb-3">{{this.app.i18nDynamicConfigText('homePage.platformTitle')}}</h1>
-          <p class="mb-3" v-html="this.app.i18nDynamicConfigText('homePage.platformDescription')"></p>
-        </template>
-        <template v-else>
-          <h1 class="mb-3">{{$t('Proxeus Platform Title', 'Proxeus Platform')}}</h1>
-          <p class="mb-3">{{$t('Proxeus Platform Description', 'Proxeus is all about document-centered processes that interact with the Blockchain. Our app lets you drag & drop a workflow in the wink of an eye. Proxeus workflows may comprise forms, document templates and conditions. Proxeus enables you to create tamper-proof and easily verifiable documents by registering them on the Ethereum Blockchain.')}}</p>
-        </template>
+        <h1 class="mb-3">{{$t('Proxeus Platform Title', 'Proxeus Platform')}}</h1>
+        <p class="mb-3">{{$t('Proxeus Platform Description', 'Proxeus is all about document-centered processes that interact with the Blockchain. Our app lets you drag & drop a workflow in the wink of an eye. Proxeus workflows may comprise forms, document templates and conditions. Proxeus enables you to create tamper-proof and easily verifiable documents by registering them on the Ethereum Blockchain.')}}</p>
         <a href="/register" class="btn btn-lg btn-primary" id="signupcontent">{{$t('Sign up', 'Sign up')}}</a>
       </div>
     </div>
@@ -37,11 +31,9 @@
 <script>
 // import FileDropBox from '@/components/template/FileDropBox'
 import Verification from '@/components/document/Verification'
-import mafdc from '@/mixinApp'
 // import FrontendNavbar from '@/components/frontend/FrontendNavbar'
 
 export default {
-  mixins: [mafdc],
   name: 'home',
   components: {
     // FileDropBox,
diff --git a/ui/core/src/views/appDependentComponents/Sidebar.vue b/ui/core/src/views/appDependentComponents/Sidebar.vue
index efe904444..9386c7043 100644
--- a/ui/core/src/views/appDependentComponents/Sidebar.vue
+++ b/ui/core/src/views/appDependentComponents/Sidebar.vue
@@ -4,20 +4,14 @@
     <tr>
       <td valign="top" style="vertical-align:top">
         <router-link :to="{name:'Workflows'}" class="navbar-brand mb-0 w-100 px-3 mx-0">
-          <template v-if="this.app.dynamicConfig">
-            <span class="custom-company-logo full-size" v-bind:style="{ 'background-image': 'url(' + this.app.dynamicConfig.company.logo.lightTheme.path + ')', ...this.app.dynamicConfig.company.logo.style.adminDashboard.full }"></span>
-            <span class="custom-company-logo small-size" v-bind:style="{ 'background-image': 'url(' + this.app.dynamicConfig.company.logo.lightTheme.path + ')', ...this.app.dynamicConfig.company.logo.style.adminDashboard.small }"></span>
-          </template>
-          <template v-else>
-            <svg width="140" viewBox="0 0 187 55" xmlns="http://www.w3.org/2000/svg"><title color="#fff">logo</title>
-              <g fill="none" fill-rule="evenodd">
-                <path d="M70 18.187h4.98c3.453 0 5.825 2.155 5.825 5.292 0 3.091-2.372 5.292-5.825 5.292h-2.255v6.042H70V18.187zm4.862 8.055c1.997 0 3.171-1.1 3.171-2.763 0-1.662-1.174-2.763-3.17-2.763h-2.138v5.526h2.137zm15.503 1.499h-1.574v7.072h-2.724V18.187h5.402c3.1 0 5.309 1.99 5.309 4.777 0 2.154-1.316 3.864-3.43 4.52l5.309 7.329h-3.265l-5.027-7.072zm.846-2.365c1.879 0 2.795-.913 2.795-2.318 0-1.429-.916-2.365-2.795-2.365h-2.42v4.683h2.42zm10.382 1.124c0-4.8 3.805-8.5 8.527-8.5 4.744 0 8.526 3.7 8.526 8.5s-3.782 8.5-8.526 8.5c-4.722 0-8.527-3.7-8.527-8.5zm14.282 0c0-3.325-2.467-5.924-5.755-5.924-3.289 0-5.755 2.599-5.755 5.924s2.466 5.924 5.755 5.924c3.288 0 5.755-2.599 5.755-5.924zm11.72-.117l-5.73 8.43h3.17l4.416-6.463 4.416 6.463h3.124l-5.708-8.43 5.38-8.196h-3.148l-4.087 6.159-4.087-6.159h-3.148l5.403 8.196zm14.517-8.196v16.626h9.889v-2.67h-7.164v-4.449h5.755v-2.622h-5.755v-4.215H152v-2.67h-9.889zm15.503 10.163c0 4.098 2.795 6.65 6.718 6.65s6.694-2.552 6.694-6.65V18.187h-2.724V28.42c0 2.576-1.598 4.004-3.97 4.004-2.373 0-3.993-1.428-3.993-4.004V18.187h-2.725V28.35zm18.462 3.817c1.058 1.709 3.101 2.833 5.614 2.833 3.218 0 5.309-1.92 5.309-4.73 0-2.318-1.55-3.77-3.829-4.753l-1.292-.586c-1.667-.702-2.42-1.475-2.42-2.552 0-1.148 1.081-1.803 2.209-1.803 1.198 0 1.95.445 2.819 1.475l1.879-1.944C185.144 18.656 183.618 18 181.69 18c-2.536 0-4.956 1.733-4.956 4.402 0 2.154 1.245 3.747 3.758 4.847l1.316.562c1.644.726 2.42 1.452 2.42 2.693 0 1.194-.94 1.92-2.561 1.92-1.456 0-2.748-.936-3.523-1.99l-2.068 1.733z"
-                      fill="#ebedf3"/>
-                <path d="M24.93 0c.394.072.824.109 1.218.253.43.145.86.29 1.253.507 6.09 3.546 12.214 7.056 18.268 10.638 2.042 1.194 3.08 3.076 3.116 5.428.036 7.056.036 14.111 0 21.131 0 2.352-1.074 4.234-3.08 5.428-6.09 3.582-12.179 7.092-18.268 10.674-.931.543-1.934.724-3.009.76 0-.108-.035-.217-.035-.326V0h.537zM0 16.174c.143-.506.25-1.013.43-1.483.25-.76.788-1.592 1.253-2.027v29.563c-.107-.145-.214-.253-.286-.362-.68-.904-1.146-1.918-1.29-3.04 0-.072-.035-.108-.071-.18C0 31.155 0 23.665 0 16.175zm22.029 38.247c-.574-.326-1.11-.615-1.648-.94-.036-.037-.072-.11-.108-.182V1.846c0-.325.072-.506.394-.65.43-.218.86-.471 1.362-.76V54.42zm-4.084-2.351c-.537-.327-1.074-.616-1.576-.906-.071-.036-.107-.18-.143-.289-.036-.072 0-.145 0-.217V4.198c0-.326.072-.507.358-.652.466-.217.896-.507 1.361-.796v49.32zM13.898 5.138v44.543c-.072-.036-.144-.036-.18-.072-.43-.254-.895-.507-1.325-.797-.107-.072-.143-.217-.215-.361-.035-.073 0-.145 0-.217V6.622c0-.362.108-.543.43-.724.394-.217.824-.507 1.29-.76zM9.779 47.329a30.57 30.57 0 0 1-1.577-.94c-.071-.037-.107-.146-.143-.218-.036-.072 0-.145 0-.217V8.937c0-.289.072-.47.323-.578.465-.254.895-.507 1.397-.796v39.766zM5.731 9.878v35.063c-.573-.326-1.11-.652-1.648-.941a.793.793 0 0 1-.107-.18V11.326c0-.29.107-.47.358-.615.466-.254.896-.543 1.397-.833z"
-                      fill-rule="nonzero" fill="#ebedf3"/>
-              </g>
-            </svg>
-          </template>
+          <svg width="140" viewBox="0 0 187 55" xmlns="http://www.w3.org/2000/svg"><title color="#fff">logo</title>
+            <g fill="none" fill-rule="evenodd">
+              <path d="M70 18.187h4.98c3.453 0 5.825 2.155 5.825 5.292 0 3.091-2.372 5.292-5.825 5.292h-2.255v6.042H70V18.187zm4.862 8.055c1.997 0 3.171-1.1 3.171-2.763 0-1.662-1.174-2.763-3.17-2.763h-2.138v5.526h2.137zm15.503 1.499h-1.574v7.072h-2.724V18.187h5.402c3.1 0 5.309 1.99 5.309 4.777 0 2.154-1.316 3.864-3.43 4.52l5.309 7.329h-3.265l-5.027-7.072zm.846-2.365c1.879 0 2.795-.913 2.795-2.318 0-1.429-.916-2.365-2.795-2.365h-2.42v4.683h2.42zm10.382 1.124c0-4.8 3.805-8.5 8.527-8.5 4.744 0 8.526 3.7 8.526 8.5s-3.782 8.5-8.526 8.5c-4.722 0-8.527-3.7-8.527-8.5zm14.282 0c0-3.325-2.467-5.924-5.755-5.924-3.289 0-5.755 2.599-5.755 5.924s2.466 5.924 5.755 5.924c3.288 0 5.755-2.599 5.755-5.924zm11.72-.117l-5.73 8.43h3.17l4.416-6.463 4.416 6.463h3.124l-5.708-8.43 5.38-8.196h-3.148l-4.087 6.159-4.087-6.159h-3.148l5.403 8.196zm14.517-8.196v16.626h9.889v-2.67h-7.164v-4.449h5.755v-2.622h-5.755v-4.215H152v-2.67h-9.889zm15.503 10.163c0 4.098 2.795 6.65 6.718 6.65s6.694-2.552 6.694-6.65V18.187h-2.724V28.42c0 2.576-1.598 4.004-3.97 4.004-2.373 0-3.993-1.428-3.993-4.004V18.187h-2.725V28.35zm18.462 3.817c1.058 1.709 3.101 2.833 5.614 2.833 3.218 0 5.309-1.92 5.309-4.73 0-2.318-1.55-3.77-3.829-4.753l-1.292-.586c-1.667-.702-2.42-1.475-2.42-2.552 0-1.148 1.081-1.803 2.209-1.803 1.198 0 1.95.445 2.819 1.475l1.879-1.944C185.144 18.656 183.618 18 181.69 18c-2.536 0-4.956 1.733-4.956 4.402 0 2.154 1.245 3.747 3.758 4.847l1.316.562c1.644.726 2.42 1.452 2.42 2.693 0 1.194-.94 1.92-2.561 1.92-1.456 0-2.748-.936-3.523-1.99l-2.068 1.733z"
+                    fill="#ebedf3"/>
+              <path d="M24.93 0c.394.072.824.109 1.218.253.43.145.86.29 1.253.507 6.09 3.546 12.214 7.056 18.268 10.638 2.042 1.194 3.08 3.076 3.116 5.428.036 7.056.036 14.111 0 21.131 0 2.352-1.074 4.234-3.08 5.428-6.09 3.582-12.179 7.092-18.268 10.674-.931.543-1.934.724-3.009.76 0-.108-.035-.217-.035-.326V0h.537zM0 16.174c.143-.506.25-1.013.43-1.483.25-.76.788-1.592 1.253-2.027v29.563c-.107-.145-.214-.253-.286-.362-.68-.904-1.146-1.918-1.29-3.04 0-.072-.035-.108-.071-.18C0 31.155 0 23.665 0 16.175zm22.029 38.247c-.574-.326-1.11-.615-1.648-.94-.036-.037-.072-.11-.108-.182V1.846c0-.325.072-.506.394-.65.43-.218.86-.471 1.362-.76V54.42zm-4.084-2.351c-.537-.327-1.074-.616-1.576-.906-.071-.036-.107-.18-.143-.289-.036-.072 0-.145 0-.217V4.198c0-.326.072-.507.358-.652.466-.217.896-.507 1.361-.796v49.32zM13.898 5.138v44.543c-.072-.036-.144-.036-.18-.072-.43-.254-.895-.507-1.325-.797-.107-.072-.143-.217-.215-.361-.035-.073 0-.145 0-.217V6.622c0-.362.108-.543.43-.724.394-.217.824-.507 1.29-.76zM9.779 47.329a30.57 30.57 0 0 1-1.577-.94c-.071-.037-.107-.146-.143-.218-.036-.072 0-.145 0-.217V8.937c0-.289.072-.47.323-.578.465-.254.895-.507 1.397-.796v39.766zM5.731 9.878v35.063c-.573-.326-1.11-.652-1.648-.941a.793.793 0 0 1-.107-.18V11.326c0-.29.107-.47.358-.615.466-.254.896-.543 1.397-.833z"
+                    fill-rule="nonzero" fill="#ebedf3"/>
+            </g>
+          </svg>
         </router-link>
         <nav class="collapse show sidebar-sticky">
           <nav class="nav main-nav flex-column main-nav-backend">
@@ -133,4 +127,5 @@ export default {
   .brand-name {
     letter-spacing: 2px;
   }
+
 </style>
diff --git a/ui/core/src/views/appDependentComponents/SidebarUser.vue b/ui/core/src/views/appDependentComponents/SidebarUser.vue
index b1fe6dcdc..c0562d86d 100644
--- a/ui/core/src/views/appDependentComponents/SidebarUser.vue
+++ b/ui/core/src/views/appDependentComponents/SidebarUser.vue
@@ -4,13 +4,7 @@
     <tr>
       <td valign="top" style="vertical-align:top">
         <a class="navbar-brand m-0 w-100 p-0 m-0" href="#">
-          <template v-if="this.app.dynamicConfig">
-            <span class="custom-company-logo full-size" v-bind:style="{ 'background-image': 'url(' + this.app.dynamicConfig.company.logo.darkTheme.path + ')', ...this.app.dynamicConfig.company.logo.style.userDashboard.full }"></span>
-            <span class="custom-company-logo small-size" v-bind:style="{ 'background-image': 'url(' + this.app.dynamicConfig.company.logo.darkTheme.path + ')', ...this.app.dynamicConfig.company.logo.style.userDashboard.small }"></span>
-          </template>
-          <template v-else>
-            <img :src="$t('Sidebar User Logo','/static/proxeus-logo.svg')" alt="" class="d-inline-block align-top">
-          </template>
+          <img :src="$t('Sidebar User Logo','/static/proxeus-logo.svg')" alt="" class="d-inline-block align-top">
         </a>
         <nav class="collapse show sidebar-sticky">
           <nav class="nav main-nav flex-column main-nav-frontend">