Skip to content

Commit 4991ce7

Browse files
yohan-ocyohan-oc
committed
Merge branch 'main' into navigation-poc
# Conflicts: # vue-frontend/warehouse-frontend/src/App.vue # vue-frontend/warehouse-frontend/src/config.js # vue-frontend/warehouse-frontend/vue.config.js
2 parents 578658a + 6da09ed commit 4991ce7

File tree

3 files changed

+168
-0
lines changed

3 files changed

+168
-0
lines changed

‎src/logo.png‎

54.7 KB
Loading

‎src/test.html‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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>Turing Trust Login</title>
7+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
8+
<style>
9+
body {
10+
background-color: #0b4c62; /* Dark blue background */
11+
display: flex;
12+
justify-content: center;
13+
align-items: center;
14+
height: 100vh;
15+
}
16+
.card {
17+
padding: 30px;
18+
border-radius: 10px;
19+
max-width: 400px;
20+
width: 100%;
21+
border-bottom-width: 3px;
22+
border-bottom-color: #04A27D;
23+
}
24+
.btn-primary {
25+
background-color: #04A27D; /* Green button */
26+
border: none;
27+
}
28+
.btn-primary:hover {
29+
background-color: #0a6b38;
30+
}
31+
.logo {
32+
display: block;
33+
margin: 0 auto 15px;
34+
width: 150px;
35+
}
36+
</style>
37+
</head>
38+
<body>
39+
40+
<div class="card shadow">
41+
<img src="logo.png" alt="Turing Trust Logo" class="logo">
42+
<p class="text-l">Welcome to the Turing Trust warehouse management application.</p>
43+
<p class="text-muted">Please enter your name to get started.</p>
44+
45+
<div class="mb-3">
46+
<label for="fullname" class="form-label">Full name</label>
47+
<input type="text" class="form-control" id="fullname" placeholder="Joe Bloggs">
48+
</div>
49+
50+
<button class="btn btn-primary w-100">Continue</button>
51+
</div>
52+
53+
</body>
54+
</html>

‎vue-frontend/warehouse-frontend/src/views/AppTemplate.html‎

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<div class="container mt-3">
2+
<div class="mb-3">
3+
<label class="fw-bold">Operator Name:</label>
4+
<input type="text" class="form-control d-inline w-auto" :disabled="isOperatorDisabled" v-model="operatorName" @keyup.enter="checkOperator" ref="operatorInput">
5+
<label class="fw-bold ms-3">Current State:</label>
6+
<input type="text" class="form-control d-inline w-auto" v-model="currentState" disabled>
7+
<button class="btn btn-secondary ms-3" style="margin-top: -5px;" disabled>Completed</button>
8+
<label class="fw-bold ms-3">Mode:</label>
9+
<select class="form-select d-inline" :disabled="isModeDisabled" ref="modeInput" v-model="selectedMode" @change="modeChanged" style="width: 400px;">
10+
<option selected>Select a mode</option>
11+
<option v-for="mode in modes" :key="mode">{{ mode }}</option>
12+
</select>
13+
</div>
14+
15+
<div class="mb-3" v-if="showParent">
16+
<div class="d-flex align-items-center">
17+
<div class="col-auto">
18+
<label class="fw-bold" for="assetId">Parent ID:</label>
19+
</div>
20+
<div class="col">
21+
<div class="d-flex align-items-center">
22+
<input type="text" class="form-control d-inline w-auto" :disabled="isParentDisabled" v-model="parentId" @keyup.enter="scanParent" ref="parentInput">
23+
<span class="badge bg-success" v-if="isParentIdValid">OK</span>
24+
<div id="message" class="alert alert-danger ms-2 mb-0 custom-alert" style="display: none; max-width: 300px;">
25+
<!-- Error message will appear here -->
26+
</div>
27+
<div id="message-success" class="alert alert-success ms-2 mb-0 custom-alert" style="display: none; max-width: 300px;">
28+
<!-- Success message will appear here -->
29+
</div>
30+
</div>
31+
</div>
32+
</div>
33+
</div>
34+
35+
<div class="mb-3" v-if="showAsset">
36+
<div class="d-flex align-items-center">
37+
<div class="col-auto">
38+
<label class="fw-bold" for="assetId">Asset ID:</label>
39+
</div>
40+
<div class="col">
41+
<div class="d-flex align-items-center">
42+
<input type="text" class="form-control d-inline w-auto" v-model="assetId" @keyup.enter="scanAsset" ref="assetInput">
43+
<div id="message" class="alert alert-danger ms-2 mb-0 custom-alert" style="display: none; max-width: 300px;">
44+
<!-- Error message will appear here -->
45+
</div>
46+
<div id="message-success" class="alert alert-success ms-2 mb-0 custom-alert" style="display: none; max-width: 300px;">
47+
<!-- Success message will appear here -->
48+
</div>
49+
</div>
50+
</div>
51+
</div>
52+
</div>
53+
54+
<!-- Transaction Section -->
55+
<h4 v-if="showTransActionsAndInventory">Transaction</h4>
56+
<div class="mb-2 text-end" v-if="showTransActionsAndInventory">Asset Scan Failure Count: <input type="text" value="0" class="form-control d-inline w-auto"></div>
57+
58+
<table class="table table-bordered" v-if="showTransActionsAndInventory">
59+
<thead>
60+
<tr>
61+
<th>Transaction ID</th>
62+
<th>Asset ID</th>
63+
<th>Equipment</th>
64+
<th>Notes</th>
65+
<th>Force</th>
66+
</tr>
67+
</thead>
68+
<tbody>
69+
<tr class="bg-warning-custom">
70+
<td>4</td>
71+
<td>SB001662</td>
72+
<td></td>
73+
<td>Cannot assign asset to parent: Asset Status was 'Registered', expected: Boxed for Shipping for mode 'Shipping Box Palleting'.</td>
74+
<td><button class="btn btn-primary">Force</button></td>
75+
</tr>
76+
<tr class="bg-success-custom">
77+
<td>3</td>
78+
<td>SB001662</td>
79+
<td></td>
80+
<td>SB001662 is already assigned to SP000123</td>
81+
<td></td>
82+
</tr>
83+
</tbody>
84+
</table>
85+
86+
<!-- Inventory List Section -->
87+
<h4 v-if="showTransActionsAndInventory">Inventory List</h4>
88+
<div class="mb-2" v-if="showTransActionsAndInventory">Inventory list count <input type="text" value="2" class="form-control d-inline w-auto"></div>
89+
90+
<table class="table table-bordered" v-if="showTransActionsAndInventory">
91+
<thead>
92+
<tr>
93+
<th>Asset ID</th>
94+
<th>Status</th>
95+
<th>Make</th>
96+
<th>Model</th>
97+
</tr>
98+
</thead>
99+
<tbody>
100+
<tr>
101+
<td>SB000555</td>
102+
<td>Boxed for Shipping</td>
103+
<td>null</td>
104+
<td>null</td>
105+
</tr>
106+
<tr>
107+
<td>SB001662</td>
108+
<td>Boxed for Shipping</td>
109+
<td>null</td>
110+
<td>null</td>
111+
</tr>
112+
</tbody>
113+
</table>
114+
</div>

0 commit comments

Comments
 (0)