From 73000a9818afdf44547f649adf5d4a1438e7c6ad Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 27 Jun 2018 16:33:41 +0800
Subject: [PATCH] update route for admin top nav content

---
 resources/assets/js/components/LocaleDropdown.vue | 13 ++++++++-----
 resources/assets/js/router/routes.js              |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 8e5c634b..9fcb2565 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -13,7 +13,9 @@
         </a>
       </div>
     </li>
-    <li><el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
+    <ul class="navbar-nav mr-auto">
+    <li class="nav-item">
+      <el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
           <div align="center">
             <p>Today's Rate</p>
             <p>X1 : Cash: 1.76 Cheque: 1.66 BA: 1.63</p>
@@ -23,10 +25,11 @@
             <el-button type="primary" size="mini" @click="UpdateRatePopoverVisible = false; UpdateRateDialogVisible = true">Update rate</el-button>
           </div>
           <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
-        </el-popover></li>
-    <li><a class="nav-link" href="/admin/complete-order" role="button">Complete Order</a></li>
-    <li><a class="nav-link" href="/admin/transaction-history" role="button">Transaction History</a></li>
-    <li><a class="nav-link" href="/admin/upload-supplier-bank-slip" role="button">Upload Supplier Bank Slip to System</a></li>
+        </el-popover>
+      </li></ul>
+      <li class="nav-item"><router-link :to="{ name: 'admin.complete-order' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li>
+      <li class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
+      <li class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li>
   </ul>
 
 <!-- update rate dialog -->
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index ead49491..f5eb718d 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -76,6 +76,6 @@ export default [
   { path: '/admin', name: 'admin.home', component: AdminHome },
   { path: '/admin/complete-order', name: 'admin.complete-order', component: CompleteOrder },
   { path: '/admin/transaction-history', name: 'admin.transaction-history', component: TransactionHistory },
-  { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-sli', component: UploadSupplierBankSlip },
+  { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-slip', component: UploadSupplierBankSlip },
   { path: '*', name: 'notfound', component: NotFound }
 ]