Skip to content

Commit 09985b6

Browse files
committed
navigation updated
1 parent c73886c commit 09985b6

File tree

5 files changed

+655
-29
lines changed

5 files changed

+655
-29
lines changed

vue-frontend/warehouse-frontend/src/components/AppNavbar.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<template>
22
<nav class="navbar navbar-dark px-4">
3-
<!-- <router-link to="/mode" class="navbar-brand">-->
4-
<!-- <img src="../assets/logo_new.png" alt="Turing Trust Logo" height="30">-->
5-
<!-- </router-link>-->
6-
<span class="navbar-brand">
7-
<img src="@/assets/logo_new.png" alt="Turing Trust Logo" height="30">
8-
</span>
3+
<router-link to="/" class="navbar-brand">
4+
<img src="../assets/logo_new.png" alt="Turing Trust Logo" height="30">
5+
</router-link>
6+
<!-- <span class="navbar-brand">-->
7+
<!-- <img src="@/assets/logo_new.png" alt="Turing Trust Logo" height="30">-->
8+
<!-- </span>-->
99
<!-- <button class="logout btn btn-link text-white" @click="logout"><i class="bi bi-box-arrow-left" style="padding-right: 5px;"></i>Logout</button>-->
1010
</nav>
1111
</template>

vue-frontend/warehouse-frontend/src/router/index.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ import ModePage from "../views/ModePage.vue";
66
import ParentPage from "../views/ParentPage.vue";
77
import LocationPage from "../views/LocationPage.vue";
88
import TransactionPage from "../views/TransactionPage.vue";
9+
import MoveAssetPage from "../views/MoveAssetPage.vue";
910

1011
const routes = [
1112
// { path: "/", component: LoginPage },
1213
{
1314
path: "/",
1415
component: DefaultLayout,
1516
children: [
16-
{ path: "", component: ModePage /*, meta: { requiresAuth: true }*/ },
17-
{ path: "home", component: HomePage /*, meta: { requiresAuth: true }*/ },
17+
{ path: "", component: HomePage /*, meta: { requiresAuth: true }*/ },
18+
{ path: "mode", component: ModePage /*, meta: { requiresAuth: true }*/ },
1819
{ path: "parent", component: ParentPage /*, meta: { requiresAuth: true }*/ },
1920
{ path: "transaction", component: TransactionPage /*, meta: { requiresAuth: true }*/ },
20-
{ path: "location", component: LocationPage /*, meta: { requiresAuth: true }*/ }
21+
{ path: "location", component: LocationPage /*, meta: { requiresAuth: true }*/ },
22+
{ path: "moveAsset", component: MoveAssetPage /*, meta: { requiresAuth: true }*/ }
2123
],
2224
},
2325
];

vue-frontend/warehouse-frontend/src/views/HomePage.vue

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ export default {
88
mounted() {
99
},
1010
methods: {
11-
hello(){
12-
11+
navigateToModePage(){
12+
this.$router.push("/mode");
13+
},
14+
navigateToMoveAssetPage(){
15+
this.$router.push("/moveAsset");
1316
}
1417
},
1518
};
@@ -23,7 +26,7 @@ export default {
2326

2427
<div class="row" style="padding-top: 15px;">
2528
<div class="col-md-4">
26-
<div class="card" @click="hello">
29+
<div class="card" @click="navigateToModePage">
2730
<div class="d-flex align-items-start">
2831
<img src="../assets/palleting-and-shipping.png" alt="Work in Progress" width="50" class="me-3">
2932
<span style="font-size: 28px">Work in progress palleting</span>
@@ -35,7 +38,7 @@ export default {
3538
</div>
3639

3740
<div class="col-md-4">
38-
<div class="card">
41+
<div class="card" @click="navigateToMoveAssetPage">
3942
<div class="d-flex align-items-start">
4043
<img src="../assets/moving-location.png" alt="Work in Progress" width="50" class="me-3">
4144
<span style="font-size: 28px">Moving assets</span>

0 commit comments

Comments
 (0)