Skip to content

Commit d034f7f

Browse files
yohan-ocyohan-oc
committed
transaction ui added
1 parent 3ff9084 commit d034f7f

File tree

5 files changed

+385
-1
lines changed

5 files changed

+385
-1
lines changed

‎designs/transactions/logo_new.png‎

7.32 KB
Loading

‎designs/transactions/transactions.html‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>Work in Progress Palleting</title>
7+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
8+
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
9+
<style>
10+
body {
11+
background-color: #f0f2f5;
12+
display: flex;
13+
flex-direction: column;
14+
min-height: 100vh;
15+
}
16+
.content {
17+
flex: 1;
18+
padding-bottom: 60px;
19+
}
20+
.card {
21+
border-radius: 10px;
22+
}
23+
.alert-warning {
24+
background-color: #fff3cd;
25+
color: #856404;
26+
border-radius: 5px;
27+
padding: 10px;
28+
font-size: 14px;
29+
}
30+
thead {
31+
border-bottom: 2px solid #000; /* Adjust thickness and color as needed */
32+
}
33+
.footer {
34+
position: fixed;
35+
bottom: 0;
36+
width: 100%;
37+
background-color: #fff;
38+
padding: 10px;
39+
box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1);
40+
}
41+
</style>
42+
</head>
43+
<body>
44+
45+
<!-- Navbar -->
46+
<nav class="navbar navbar-dark px-4" style="background-color: #0b4c62;">
47+
<a class="navbar-brand" href="#">
48+
<img src="logo.png" alt="Turing Trust Logo" height="30">
49+
</a>
50+
<a class="logout text-white text-decoration-none" href="#"><i class="bi bi-box-arrow-left"></i> Log out</a>
51+
</nav>
52+
53+
<div class="container content mt-4">
54+
<div class="mb-3" style="margin-top: 15px;">
55+
<h3 class="fw-bold" style="padding-bottom: 10px;">Work in progress palleting</h3>
56+
<hr class="my-2"> <!-- Adds a horizontal line with small top/bottom margin -->
57+
<p style="margin-top: 20px; padding-bottom: 10px;">
58+
<span class="fw-bold" style="color: #075976;">Parent ID:</span>
59+
<span class="fw-bold text-dark">XXX123</span>
60+
<span style="color: #CED4DA;">|</span>
61+
<span class="fw-bold" style="color: #075976;">Location:</span>
62+
<span class="fw-bold text-dark">LOC456</span>
63+
</p>
64+
</div>
65+
66+
<!-- Transaction Table -->
67+
<div class="card p-3 mt-3">
68+
<h5 class="fw-bold">Transaction</h5>
69+
<table class="table"> <!-- Removed 'table-striped' -->
70+
<thead>
71+
<tr>
72+
<th>Transaction ID</th>
73+
<th>Asset ID</th>
74+
<th>Equipment</th>
75+
<th>Notes</th>
76+
<th>Actions</th>
77+
</tr>
78+
</thead>
79+
<tbody>
80+
<tr>
81+
<td>6</td>
82+
<td>SB001234</td>
83+
<td>-</td>
84+
<td>
85+
<div class="alert-warning">
86+
Cannot assign asset to parent:<br>
87+
Asset status: <strong>Registered</strong><br>
88+
Expected status: <strong>Boxed for shipping</strong>
89+
</div>
90+
</td>
91+
<td>
92+
<div>
93+
<br>
94+
<button class="logout btn" style="color: #075976;">Force</button>
95+
</div>
96+
97+
</td>
98+
</tr>
99+
<tr>
100+
<td>5</td>
101+
<td>SB004321</td>
102+
<td>-</td>
103+
<td>SB004321 is already assigned to XXX123</td>
104+
<td></td>
105+
</tr>
106+
<tr>
107+
<td>4</td>
108+
<td>SB001243</td>
109+
<td>-</td>
110+
<td>SB001243 is already assigned to XXX123</td>
111+
<td></td>
112+
</tr>
113+
<tr>
114+
<td>3</td>
115+
<td>SB003412</td>
116+
<td>-</td>
117+
<td>SB003412 is already assigned to XXX123</td>
118+
<td></td>
119+
</tr>
120+
</tbody>
121+
</table>
122+
</div>
123+
124+
<!-- Inventory List -->
125+
<div class="card p-3 mt-4">
126+
<h5 class="d-flex justify-content-between">
127+
<span>Inventory list</span>
128+
<span style="color: #075976;">Inventory list count: <strong>3</strong></span>
129+
</h5>
130+
<table class="table"> <!-- Removed 'table-striped' -->
131+
<thead>
132+
<tr>
133+
<th>Asset ID</th>
134+
<th>Status</th>
135+
<th>Make</th>
136+
<th>Model</th>
137+
</tr>
138+
</thead>
139+
<tbody>
140+
<tr>
141+
<td>SB004321</td>
142+
<td>Boxed for shipping</td>
143+
<td>Acer</td>
144+
<td>0560X</td>
145+
</tr>
146+
<tr>
147+
<td>SB001243</td>
148+
<td>Boxed for shipping</td>
149+
<td>Dell</td>
150+
<td>Inspiron</td>
151+
</tr>
152+
<tr>
153+
<td>SB003412</td>
154+
<td>Boxed for shipping</td>
155+
<td>Apple</td>
156+
<td>Macbook Air</td>
157+
</tr>
158+
</tbody>
159+
</table>
160+
</div>
161+
</div>
162+
163+
<!-- Footer -->
164+
<div class="footer d-flex w-100">
165+
<div class="container d-flex justify-content-end">
166+
<button class="btn btn-outline-secondary me-2">Cancel</button>
167+
<button class="btn btn-success">Finish scanning</button>
168+
</div>
169+
</div>
170+
171+
</body>
172+
</html>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import HomePage from "../views/HomePage.vue";
55
import ModePage from "../views/ModePage.vue";
66
import ParentPage from "../views/ParentPage.vue";
77
import LocationPage from "../views/LocationPage.vue";
8+
import TransactionPage from "../views/TransactionPage.vue";
89

910
const routes = [
1011
{ path: "/", component: LoginPage },
@@ -16,6 +17,7 @@ const routes = [
1617
{ path: "home", component: HomePage, meta: { requiresAuth: true } },
1718
{ path: "parent", component: ParentPage, meta: { requiresAuth: true } },
1819
{ path: "location", component: LocationPage, meta: { requiresAuth: true } },
20+
{ path: "transaction", component: TransactionPage, meta: { requiresAuth: true } },
1921
],
2022
},
2123
];

‎vue-frontend/warehouse-frontend/src/views/LocationPage.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default {
1919
// } else {
2020
// alert("Please enter username");
2121
// }
22-
//this.$router.push("/parent");
22+
this.$router.push("/transaction");
2323
},
2424
}
2525
};

0 commit comments

Comments
 (0)