Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0a6cf01
routing added
yohan-oc Jan 24, 2025
0bf496a
mock login
yohan-oc Jan 31, 2025
d8cc11a
mock login deploy
yohan-oc Jan 31, 2025
fbe9647
mock login deploy fix 01
yohan-oc Jan 31, 2025
9fd6dfb
mock login deploy fix 02
yohan-oc Jan 31, 2025
d875669
mock login deploy fix 03
yohan-oc Jan 31, 2025
d3e3c6b
mock login deploy fix 04
yohan-oc Jan 31, 2025
b5ecf0b
mode mock design added
yohan-oc Feb 5, 2025
698ccb6
modespage added
yohan-oc Feb 5, 2025
8835719
mode page ui added
yohan-oc Feb 5, 2025
15551d1
parent page ui added
yohan-oc Feb 5, 2025
51a04d6
location page ui added
yohan-oc Feb 5, 2025
ff1749d
css fix
yohan-oc Feb 5, 2025
f455aff
authentication added
yohan-oc Feb 5, 2025
3ff9084
navbar and layout added
yohan-oc Feb 5, 2025
d034f7f
transaction ui added
yohan-oc Feb 6, 2025
bc694d1
notification ui added
yohan-oc Feb 7, 2025
aa97aaa
notification ui css fix
yohan-oc Feb 7, 2025
ed8da0a
dynamic ui
yohan-oc Feb 7, 2025
5a1dd1d
dynamic ui updated
yohan-oc Feb 7, 2025
f05c369
login page removed
yohan-oc Feb 10, 2025
98ae19e
scan parent endpoint added
yohan-oc Feb 10, 2025
16d0889
config updated
yohan-oc Feb 11, 2025
e714ab3
loading screen added
yohan-oc Feb 11, 2025
8ceb888
overlay screen added
yohan-oc Feb 11, 2025
fc4ba41
new transaction design added
yohan-oc Feb 11, 2025
6773670
session button added
yohan-oc Feb 11, 2025
6c617e3
inventory list data binded
yohan-oc Feb 12, 2025
f70fb32
refactoring minor bug fixes for key enter
yohan-oc Feb 12, 2025
94acc86
animation added
yohan-oc Feb 12, 2025
a635a8a
animation added
yohan-oc Feb 12, 2025
0fb9097
asset scanning added
yohan-oc Feb 12, 2025
8875a80
session updated
yohan-oc Feb 12, 2025
d218ae4
bug fix for updating inventory list
yohan-oc Feb 12, 2025
3ddcae7
force feature added
yohan-oc Feb 13, 2025
578658a
title added
yohan-oc Feb 13, 2025
4991ce7
Merge branch 'main' into navigation-poc
yohan-oc Feb 13, 2025
916c5b9
asset focus bug fixed
yohan-oc Feb 13, 2025
e4d45a7
sounds updated
yohan-oc Feb 14, 2025
5a740ca
keep input focus for asset scan
yohan-oc Feb 17, 2025
6674cde
landing page updated
yohan-oc Feb 17, 2025
f6481f8
tidy up
yohan-oc Feb 17, 2025
31710ae
new table design added
yohan-oc Feb 17, 2025
afcf318
empty states handled
yohan-oc Feb 17, 2025
5f396c4
.env added
yohan-oc Feb 17, 2025
283ff34
new ui design enabled
yohan-oc Feb 18, 2025
c73886c
change to localstorage to session
yohan-oc Feb 18, 2025
09985b6
navigation updated
yohan-oc Feb 18, 2025
5d7b299
flow refactoring
yohan-oc Feb 18, 2025
fb09e5a
more flow refactoring
yohan-oc Feb 18, 2025
d78bd41
content updates
yohan-oc Feb 18, 2025
f52f167
packing complete page added
yohan-oc Feb 18, 2025
7704b0c
Move asset complete page added
yohan-oc Feb 18, 2025
343a813
css refactoring
yohan-oc Feb 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Warehouse App - New

on:
push:
branches:
- navigation-poc # Runs only on the navigation-poc branch

jobs:
build-and-deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 18

- name: Install dependencies
run: |
cd vue-frontend/warehouse-frontend
npm install

- name: Build project
run: |
cd vue-frontend/warehouse-frontend
npm run build

- name: Deploy to GitHub Pages
if: success()
uses: peaceiris/actions-gh-pages@v3
with:
personal_token: ${{ secrets.GH_PAT }}
publish_branch: gh-pages
publish_dir: vue-frontend/warehouse-frontend/dist # Updated path
user_name: "github-actions[bot]"
user_email: "github-actions[bot]@users.noreply.github.com"
Binary file added designs/modes/desktop-imaged.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/laptop-imaged.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/laptop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/logo_new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
162 changes: 162 additions & 0 deletions designs/modes/modes.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Select a Mode - Turing Trust</title>
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
<style>
body {
background-color: #f0f2f5;
}
.navbar {
background-color: #0b4c62;
}
.navbar-brand {
color: white;
font-weight: bold;
}
.logout {
color: white;
text-decoration: none;
}
.container {
margin-top: 40px;
}
.section-title {
color: #0b4c62;
/*font-weight: bold;*/
margin-bottom: 10px;
}
.card {
text-align: center;
padding: 20px;
border-radius: 10px;
box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.1);
}
.btn-outline-success {
border-color: #04A27D;
color: #04A27D;
}
.btn-outline-success:hover {
background-color: #04A27D;
color: white;
}
.card {
border-bottom-width: 3px;
border-bottom-color: #04A27D;
/*width: 216px; !* Adjust as needed *!*/
/*height: 200px;*/
}

</style>
</head>
<body>

<nav class="navbar navbar-dark px-4">
<a class="navbar-brand" href="#">
<img src="logo_new.png" alt="Turing Trust Logo" height="30">
</a>
<a class="logout" href="#"><i class="bi bi-box-arrow-left"></i> Log out</a>
</nav>

<div class="container">
<h4 class="section-title">Select a mode</h4>
<p style="color: #075976;">Begin palleting or by selecting a mode below.</p>

<div class="row">
<div class="col-md-2">
<h5 class="section-title">Palleting</h5>
</div>
<div class="col-md-2">
<div class="card">
<img src="work-in-progress.png" alt="Work in Progress" width="50" class="d-block mx-auto">
<br/><p>Work in progress palleting</p>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>
<div class="col-md-2">
<div class="card">
<img src="shipping-box.png" alt="Shipping Box" width="50" class="d-block mx-auto">
<br/><p>Shipping box palleting</p>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>
</div>

<div class="row mt-4">
<div class="col-md-2">
<h5 class="section-title">Boxing</h5>
</div>

<div class="col-md-2">
<div class="card">
<img src="desktop.png" alt="Wiped Desktops" width="50" class="d-block mx-auto">
<br/><p>Boinlxing (Wiped) Desktops for shipping</p>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>

<div class="col-md-2">
<div class="card">
<img src="desktop-imaged.png" alt="Imaged Desktops" width="50" class="d-block mx-auto">
<br/><p>Boxing (Imaged) Desktops for shipping</p>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>

<div class="col-md-2">
<div class="card">
<img src="laptop.png" alt="Wiped Laptops" width="50" class="d-block mx-auto">
<br/>
<p>Boxing (Wiped) Laptops for shipping</p>
<br/>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>

<div class="col-md-2">
<div class="card">
<img src="laptop-imaged.png" alt="Imaged Laptops" width="50" class="d-block mx-auto">
<br/><p>Boxing (Imaged) Laptops for shipping</p><br/>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>

</div>

<div class="row mt-4 mb-5">
<div class="col-md-2">

</div>

<div class="col-md-2">
<div class="card">
<img src="monitor.png" alt="Monitors" width="50" class="d-block mx-auto">
<br/><p>Boxing monitors for shipping</p><br/>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>

<div class="col-md-2">
<div class="card">
<img src="phone.png" alt="Phones and Laptops" width="50" class="d-block mx-auto">
<br/><p>Boxing (Wiped) phones and laptops for shipping</p>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>

<div class="col-md-2">
<div class="card">
<img src="money.png" alt="For Sale" width="50" class="d-block mx-auto">
<br/><p>Boxing Desktops and Laptops for sale</p><br/>
<button class="btn btn-outline-success w-100">Start →</button>
</div>
</div>
</div>

</div>
</body>
</html>
Binary file added designs/modes/money.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/monitor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/phone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/shipping-box.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added designs/modes/work-in-progress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions designs/parent/parent.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Work in Progress Pallet</title>
<!-- Bootstrap CSS -->
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
</head>
<body>
<div class="container mt-5">
<div class="row justify-content-center">
<div class="col-md-6">
<div class="card">
<div class="card-header">
<h3 class="card-title">Work in Progress Pallet</h3>
</div>
<div class="card-body">
<form>
<div class="form-group">
<label for="parentId">Scan the barcode or enter the ID of the pallet that you'll be adding boxes to.</label>
<input type="text" class="form-control" id="parentId" placeholder="Parent ID">
</div>
<div class="form-group">
<button type="button" class="btn btn-secondary">Back</button>
<button type="submit" class="btn btn-primary">Continue</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>

<!-- Bootstrap JS and dependencies -->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.5.2/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
</body>
</html>
Binary file added designs/transactions/logo_new.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
120 changes: 120 additions & 0 deletions designs/transactions/new_design.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Work in Progress Palleting</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"> </head>
<link rel="stylesheet" href="styles.css">
<body>

<div class="container">
<div class="header">
<div class="logo">
<img src="your_logo.png" alt="Turing Trust Logo"> </div>
<div class="logout">
<button>Log out</button>
</div>
</div>

<h1>Work in progress palleting</h1>

<div class="row">
<div class="col-md-8"> <div class="transactions">
<h2>Transactions</h2>
<div class="input-group">
<input type="text" placeholder="Scan or enter asset ID">
<button>Add</button>
</div>
<table class="table">
<thead>
<tr>
<th>Transaction ID</th>
<th>Asset ID</th>
<th>Notes</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
<tr>
<td>5</td>
<td>SB004321</td>
<td>SB004321 is already assigned to XXX123</td>
<td></td> </tr>
<tr>
<td>4</td>
<td>SB001243</td>
<td>SB001243 is already assigned to XXX123</td>
<td></td> </tr>
<tr>
<td>3</td>
<td>SB003412</td>
<td>SB003412 is already assigned to XXX123</td>
<td></td> </tr>
</tbody>
</table>
</div>

<div class="inventory">
<h2>Inventory List</h2>
<p>Assets assigned to the parent will display below.</p>
<table class="table">
<thead>
<tr>
<th>Asset ID</th>
<th>Status</th>
<th>Make</th>
<th>Model</th>
</tr>
</thead>
<tbody>
<tr>
<td>SB004321</td>
<td>Boxed for shipping</td>
<td>Acer</td>
<td>0560X</td>
</tr>
<tr>
<td>SB001243</td>
<td>Boxed for shipping</td>
<td>Dell</td>
<td>Inspiron</td>
</tr>
<tr>
<td>SB003412</td>
<td>Boxed for shipping</td>
<td>Apple</td>
<td>Macbook Air</td>
</tr>
</tbody>
</table>
</div>
</div>

<div class="col-md-4"> <div class="summary">
<div class="parent-id">
<h3>Parent ID</h3>
<p>XXX123</p>
</div>
<div class="transaction-errors">
<h3>Transaction Errors</h3>
<p>0</p>
</div>
<div class="inventory-count">
<h3>Inventory List Count</h3>
<p>3</p>
</div>
</div>
</div>
</div>

<div class="footer">
<button>Finish scanning</button>
</div>
</div>

<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.9.3/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
</body>
</html>
Loading