From c98de8d7a97dffbd36b805beeafc18848b3906a0 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 13 Sep 2019 02:54:56 +0530
Subject: [PATCH] cleanup code, refactor locales and bootstrapping

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/src/assets/icons/bx-analyse.svg     |  1 -
 ui/src/config/settings.js              |  2 +-
 ui/src/core/lazy_lib/components_use.js |  2 --
 ui/src/locales/index.js                | 23 +++++++++++++++++++++++
 ui/src/main.js                         | 25 ++-----------------------
 ui/src/permission.js                   |  1 -
 ui/src/router/index.js                 |  2 +-
 7 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 ui/src/assets/icons/bx-analyse.svg
 create mode 100644 ui/src/locales/index.js

diff --git a/ui/src/assets/icons/bx-analyse.svg b/ui/src/assets/icons/bx-analyse.svg
deleted file mode 100644
index b02a8d66b42..00000000000
--- a/ui/src/assets/icons/bx-analyse.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1551058675966" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7872" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M85.333333 512h85.333334a340.736 340.736 0 0 1 99.712-241.621333 337.493333 337.493333 0 0 1 108.458666-72.96 346.453333 346.453333 0 0 1 261.546667-1.749334A106.154667 106.154667 0 0 0 746.666667 298.666667C805.802667 298.666667 853.333333 251.136 853.333333 192S805.802667 85.333333 746.666667 85.333333c-29.397333 0-55.978667 11.776-75.221334 30.933334-103.722667-41.514667-222.848-40.874667-325.76 2.517333a423.594667 423.594667 0 0 0-135.68 91.264 423.253333 423.253333 0 0 0-91.306666 135.637333A426.88 426.88 0 0 0 85.333333 512z m741.248 133.205333c-17.109333 40.618667-41.685333 77.141333-72.96 108.416s-67.797333 55.850667-108.458666 72.96a346.453333 346.453333 0 0 1-261.546667 1.749334A106.154667 106.154667 0 0 0 277.333333 725.333333C218.197333 725.333333 170.666667 772.864 170.666667 832S218.197333 938.666667 277.333333 938.666667c29.397333 0 55.978667-11.776 75.221334-30.933334A425.173333 425.173333 0 0 0 512 938.666667a425.941333 425.941333 0 0 0 393.258667-260.352A426.325333 426.325333 0 0 0 938.666667 512h-85.333334a341.034667 341.034667 0 0 1-26.752 133.205333z" p-id="7873"></path><path d="M512 318.378667c-106.752 0-193.621333 86.869333-193.621333 193.621333S405.248 705.621333 512 705.621333s193.621333-86.869333 193.621333-193.621333S618.752 318.378667 512 318.378667z m0 301.909333c-59.690667 0-108.288-48.597333-108.288-108.288S452.309333 403.712 512 403.712s108.288 48.597333 108.288 108.288-48.597333 108.288-108.288 108.288z" p-id="7874"></path></svg>
\ No newline at end of file
diff --git a/ui/src/config/settings.js b/ui/src/config/settings.js
index 3e1550f45ba..f0c2914733f 100644
--- a/ui/src/config/settings.js
+++ b/ui/src/config/settings.js
@@ -14,7 +14,7 @@ export default {
   appTitle: 'CloudStack',
   // vue-ls options
   storageOptions: {
-    namespace: 'cs__', // key prefix
+    namespace: 'primate__', // key prefix
     name: 'ls', // name variable Vue.[ls] or this.[$ls],
     storage: 'local' // storage name session, local, memory
   }
diff --git a/ui/src/core/lazy_lib/components_use.js b/ui/src/core/lazy_lib/components_use.js
index 0eb2acfeb0a..4a4914d86e0 100644
--- a/ui/src/core/lazy_lib/components_use.js
+++ b/ui/src/core/lazy_lib/components_use.js
@@ -41,7 +41,6 @@ import {
   message,
   notification
 } from 'ant-design-vue'
-// import VueCropper from 'vue-cropper'
 
 Vue.use(LocaleProvider)
 Vue.use(Layout)
@@ -80,7 +79,6 @@ Vue.use(Upload)
 Vue.use(Progress)
 Vue.use(Skeleton)
 Vue.use(Popconfirm)
-// Vue.use(VueCropper)
 Vue.use(notification)
 
 Vue.prototype.$confirm = Modal.confirm
diff --git a/ui/src/locales/index.js b/ui/src/locales/index.js
new file mode 100644
index 00000000000..b7279a79e50
--- /dev/null
+++ b/ui/src/locales/index.js
@@ -0,0 +1,23 @@
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+function loadLocaleMessages () {
+  const locales = require.context('./', true, /[A-Za-z0-9-_,\s]+\.json$/i)
+  const messages = {}
+  locales.keys().forEach(key => {
+    const matched = key.match(/([A-Za-z0-9-_]+)\./i)
+    if (matched && matched.length > 1) {
+      const locale = matched[1]
+      messages[locale] = locales(key)
+    }
+  })
+  return messages
+}
+
+Vue.use(VueI18n)
+
+export default new VueI18n({
+  locale: Vue.ls ? Vue.ls.get('current_locale') || 'en' : 'en',
+  fallbackLocale: 'en',
+  messages: loadLocaleMessages()
+})
diff --git a/ui/src/main.js b/ui/src/main.js
index 5a5d5709a99..1b66963a84d 100644
--- a/ui/src/main.js
+++ b/ui/src/main.js
@@ -1,8 +1,8 @@
 import Vue from 'vue'
-import VueI18n from 'vue-i18n'
 import App from './App.vue'
 import router from './router'
 import store from './store'
+import i18n from './locales'
 import { VueAxios } from './utils/request'
 
 import bootstrap from './core/bootstrap'
@@ -20,28 +20,7 @@ library.add(fab, far, fas)
 Vue.component('font-awesome-icon', FontAwesomeIcon)
 
 Vue.config.productionTip = false
-Vue.use(VueI18n, VueAxios, router)
-
-function loadLocaleMessages () {
-  const locales = require.context('./locales', true, /[A-Za-z0-9-_,\s]+\.json$/i)
-  const messages = {}
-  locales.keys().forEach(key => {
-    const matched = key.match(/([A-Za-z0-9-_]+)\./i)
-    if (matched && matched.length > 1) {
-      const locale = matched[1]
-      messages[locale] = locales(key)
-    }
-  })
-  return messages
-}
-
-const i18n = new VueI18n({
-  locale: Vue.ls.get('current_locale') || 'en',
-  fallbackLocale: 'en',
-  messages: loadLocaleMessages()
-})
-
-export default i18n
+Vue.use(VueAxios, router)
 
 new Vue({
   router,
diff --git a/ui/src/permission.js b/ui/src/permission.js
index 52e641438cd..04ad55da039 100644
--- a/ui/src/permission.js
+++ b/ui/src/permission.js
@@ -29,7 +29,6 @@ router.beforeEach((to, from, next) => {
               router.addRoutes(store.getters.addRouters)
               const redirect = decodeURIComponent(from.query.redirect || to.path)
               if (to.path === redirect) {
-                // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
                 next({ ...to, replace: true })
               } else {
                 next({ path: redirect })
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 9d508a8ac6d..0c01e43c090 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -5,7 +5,7 @@ import { constantRouterMap } from '@/config/router'
 Vue.use(Router)
 
 export default new Router({
-  mode: 'hash', // 'history',
+  mode: 'hash',
   base: process.env.BASE_URL,
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRouterMap