From c2e8154a82ff9c2ad16ede6dc488150628cb17b3 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Tue, 19 Nov 2019 16:51:15 +0800
Subject: feat: change the order of main menu and re-install the node package

Change-Id: I683424b3a568fc9594061d63c9d358ca592ff099
Issue-ID: USECASEUI-352
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 usecaseui-portal/package-lock.json          | 76 +++++++++++++++++++++++------
 usecaseui-portal/package.json               |  2 +-
 usecaseui-portal/src/app/app.component.html | 31 +++++++-----
 3 files changed, 82 insertions(+), 27 deletions(-)

(limited to 'usecaseui-portal')

diff --git a/usecaseui-portal/package-lock.json b/usecaseui-portal/package-lock.json
index e1653e5e..7fa0c160 100644
--- a/usecaseui-portal/package-lock.json
+++ b/usecaseui-portal/package-lock.json
@@ -851,24 +851,34 @@
       "dev": true
     },
     "axios": {
-      "version": "0.15.3",
-      "resolved": "http://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
-      "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
-      "dev": true,
-      "optional": true,
+      "version": "0.19.0",
+      "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.19.0.tgz",
+      "integrity": "sha1-jgm/89kSLhM/e4EByPvdAO09Krg=",
       "requires": {
-        "follow-redirects": "1.0.0"
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
       },
       "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz",
+          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
         "follow-redirects": {
-          "version": "1.0.0",
-          "resolved": "http://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
-          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
-          "dev": true,
-          "optional": true,
+          "version": "1.5.10",
+          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.10.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.5.10.tgz",
+          "integrity": "sha1-e3qfmuov3/NnhqlP9kPtB/T/Xio=",
           "requires": {
-            "debug": "^2.2.0"
+            "debug": "=3.1.0"
           }
+        },
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npm.taobao.org/is-buffer/download/is-buffer-2.0.4.tgz?cache=0&sync_timestamp=1569905495687&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-2.0.4.tgz",
+          "integrity": "sha1-PlcvI8hBGlz9lVfISeNmXgspBiM="
         }
       }
     },
@@ -7428,6 +7438,16 @@
         "streamroller": "0.7.0"
       },
       "dependencies": {
+        "axios": {
+          "version": "0.15.3",
+          "resolved": "https://registry.npm.taobao.org/axios/download/axios-0.15.3.tgz",
+          "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "follow-redirects": "1.0.0"
+          }
+        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -7437,6 +7457,35 @@
             "ms": "^2.1.1"
           }
         },
+        "follow-redirects": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.0.0.tgz",
+          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^2.2.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz",
+              "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fms%2Fdownload%2Fms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -8024,8 +8073,7 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multicast-dns": {
       "version": "6.2.3",
diff --git a/usecaseui-portal/package.json b/usecaseui-portal/package.json
index 067fe771..eabd63d0 100644
--- a/usecaseui-portal/package.json
+++ b/usecaseui-portal/package.json
@@ -61,4 +61,4 @@
     "tslint": "~5.9.1",
     "typescript": "~2.5.3"
   }
-}
\ No newline at end of file
+}
diff --git a/usecaseui-portal/src/app/app.component.html b/usecaseui-portal/src/app/app.component.html
index f5ee199c..385c4990 100644
--- a/usecaseui-portal/src/app/app.component.html
+++ b/usecaseui-portal/src/app/app.component.html
@@ -19,6 +19,7 @@
       <img src="assets/images/uui-logo130.png" alt="">
     </div>
     <ul nz-menu [nzTheme]="'dark'" [nzMode]="'inline'">
+      <!-- home page -->
       <li nz-menu-item [ngClass]="{'activeMenuBar': url === 'home'}">
         <a routerLink="home">
           <span title>
@@ -31,6 +32,7 @@
         </a>
       </li>
       <hr>
+      <!-- customer page -->
       <li nz-menu-item [ngClass]="{'activeMenuBar': url === 'management'}">
         <a routerLink="management">
           <span title>
@@ -44,18 +46,7 @@
         </a>
       </li>
       <hr>
-      <li nz-menu-item [ngClass]="{'activeMenuBar': url === 'fcaps'}">
-        <a routerLink="fcaps">
-          <span title>
-            <i>
-              <img src="{{ url === 'fcaps' ? 'assets/images/monitor-icon-active.png':'assets/images/monitor-icon.png'}}"
-                alt="home">
-            </i>
-            <span> {{"i18nTextDefine_Monitor" | translate}} </span>
-          </span>
-        </a>
-      </li>
-      <hr>
+      <!-- service page -->
       <li nz-submenu [ngClass]="{'activeMenuBar': url.indexOf('services') === 0}" [nzOpen]="flag">
         <span title>
           <i>
@@ -75,6 +66,8 @@
         </ul>
       </li>
       <hr>
+      <!-- package page -->
+      <!-- network page -->
       <li nz-menu-item [ngClass]="{'activeMenuBar': url === 'network'}">
         <a routerLink="network">
           <span title>
@@ -87,6 +80,20 @@
           </span>
         </a>
       </li>
+      <hr>
+      <!-- monitor page -->
+      <li nz-menu-item [ngClass]="{'activeMenuBar': url === 'fcaps'}">
+        <a routerLink="fcaps">
+          <span title>
+            <i>
+              <img src="{{ url === 'fcaps' ? 'assets/images/monitor-icon-active.png':'assets/images/monitor-icon.png'}}"
+                alt="home">
+            </i>
+            <span> {{"i18nTextDefine_Monitor" | translate}} </span>
+          </span>
+        </a>
+      </li>
+      <hr>
     </ul>
   </nz-sider>
   <nz-layout class="main">
-- 
cgit 1.2.3-korg