Skip to content

Commit a85737f

Browse files
authored
Merge branch 'main' into landing-page
2 parents fec7bf8 + c08f1d9 commit a85737f

50 files changed

Lines changed: 6893 additions & 1115 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CI
22

33
on:
44
push:
5-
branches: [ "main", "develop" ]
5+
branches: ['main', 'develop']
66
pull_request:
7-
branches: [ "main", "develop" ]
7+
branches: ['main', 'develop']
88

99
jobs:
1010
build:
@@ -15,22 +15,22 @@ jobs:
1515
node-version: [18.x, 20.x]
1616

1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v4
1919

20-
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v4
22-
with:
23-
node-version: ${{ matrix.node-version }}
24-
cache: 'npm'
20+
- name: Use Node.js ${{ matrix.node-version }}
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: ${{ matrix.node-version }}
24+
cache: 'npm'
2525

26-
- name: Install dependencies
27-
run: npm ci
26+
- name: Install dependencies
27+
run: npm ci
2828

29-
- name: Lint
30-
run: npm run lint
29+
- name: Lint
30+
run: npm run lint
3131

32-
- name: Type Check
33-
run: npm run type-check # Assumes a script "type-check": "tsc --noEmit" exists in package.json
32+
- name: Type Check
33+
run: npm run type-check # Assumes a script "type-check": "tsc --noEmit" exists in package.json
3434

35-
- name: Build Verification
36-
run: npm run build
35+
- name: Build Verification
36+
run: npm run build

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ pnpm-debug.log*
1515
lerna-debug.log*
1616
.git_disabled
1717

18+
19+
.next/
1820
node_modules
1921
dist
2022
dist-ssr

CONTRIBUTING.md

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
```markdown
1+
````markdown
22
# Contributing to SwiftChain Frontend
33

4-
Thank you for your interest in contributing to the **SwiftChain Frontend**! We welcome contributions from the community to help build the user interface for our Blockchain-Powered Logistics & Escrow Delivery Platform.
4+
Thank you for your interest in contributing to the **SwiftChain Frontend**! We welcome contributions from the community to help build the user interface for our Blockchain-Powered Logistics & Escrow Delivery Platform.
55

66
Whether you are building out new Next.js UI components, fixing bugs, or proposing new user features, your help is incredibly valuable.
77

88
## Product Reference
9+
910
Before contributing, please review our comprehensive Product Requirements Document to understand our users, features, and rollout phases:
1011
📄 **[SwiftChain Frontend PRD](https://docs.google.com/document/d/1ShtWjf6i5D5SueeEZ8aH_A3VbnckpbEfPAue4hKwXJo/edit?usp=sharing)**
1112

@@ -26,21 +27,25 @@ Before contributing, please review our comprehensive Product Requirements Docume
2627

2728
The frontend application is the customer and administrator-facing interface allowing participants to interact with the logistics network.
2829

29-
* **Tech Stack**: Next.js App Router, TypeScript, TailwindCSS, React Hook Form, Zod, Axios, TanStack Query, Zustand, WebSocket client.
30-
* **Roles Supported**: Customer, Driver, and Admin.
31-
* **Prerequisites**: Node.js (v18 or higher) and your preferred package manager (npm, yarn, or pnpm).
30+
- **Tech Stack**: Next.js App Router, TypeScript, TailwindCSS, React Hook Form, Zod, Axios, TanStack Query, Zustand, WebSocket client.
31+
- **Roles Supported**: Customer, Driver, and Admin.
32+
- **Prerequisites**: Node.js (v18 or higher) and your preferred package manager (npm, yarn, or pnpm).
3233

3334
### Installation & Setup
3435

3536
1. **Install dependencies:**
3637
```bash
3738
pnpm install
3839
```
40+
````
41+
3942
2. **Setup environment variables:**
43+
4044
```bash
4145
cp .env.example .env.local
4246
```
43-
*(Fill in the required local variables inside `.env.local`)*
47+
48+
_(Fill in the required local variables inside `.env.local`)_
4449

4550
3. **Start the development server:**
4651
```bash
@@ -59,9 +64,11 @@ The frontend application is the customer and administrator-facing interface allo
5964
We believe the community should drive the project's priorities based on the phased rollout outlined in our PRD (Phase 1 MVP ➔ Escrow ➔ Scaling).
6065
6166
### Tackling Existing Issues
67+
6268
When looking for something to work on, please check the GitHub Issues tab. We recommend filtering by our standard priority tags (`high`, `medium`, `low`) or type tags (`frontend`, `ui`).
6369
6470
### Requesting a New Feature
71+
6572
1. **Check existing requests**: Browse existing Issues to avoid duplicates.
6673
2. **Open an Issue**: Include a descriptive title, the problem/use case in the logistics flow, your proposed solution, and link back to the PRD document if applicable.
6774
@@ -70,10 +77,10 @@ When looking for something to work on, please check the GitHub Issues tab. We re
7077
1. **Ensure all checks pass**: Run frontend linters and ensure there are zero strict TypeScript errors before submitting.
7178
2. **Update documentation**: If you change the routing architecture or core component structure, update the relevant markdown files.
7279
3. **Format your code**: Run your Prettier/ESLint formatting scripts.
73-
4. **Submit your PR** to the `main` branch.
74-
* Provide a clear description of the visual and functional changes.
75-
* Upload a **screenshot** or video recording of the working UI.
76-
* Include `Closes #[issue_id]` in the description to automatically link the PR to the issue.
80+
4. **Submit your PR** to the `main` branch.
81+
- Provide a clear description of the visual and functional changes.
82+
- Upload a **screenshot** or video recording of the working UI.
83+
- Include `Closes #[issue_id]` in the description to automatically link the PR to the issue.
7784
7885
---
7986
@@ -85,4 +92,7 @@ By contributing, you agree that your contributions will be licensed under the **
8592
© Copyright
8693
© 2026 SwiftChainn. All rights reserved.
8794
++++++++++++++++++++++++++++++++++
88-
```
95+
96+
```
97+
98+
```

app/(auth)/register/page.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import RegisterForm from '@/components/forms/RegisterForm';
2+
13
export default function RegisterPage() {
24
return (
35
<div>
46
<h1>Register</h1>
57
{/* Registration form placeholder */}
8+
<RegisterForm />
69
</div>
710
);
811
}

app/(dashboard)/admin/page.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ import { DisconnectButton } from '@/components/wallet/DisconnectButton';
33
export default function AdminDashboardPage() {
44
return (
55
<div>
6-
<h1>Admin Dashboard</h1>
6+
<h1 data-tour="dashboard-title">Admin Dashboard</h1>
77
{/* Wallet session controls — see hooks/useWallet.ts for disconnect logic */}
8-
<DisconnectButton />
8+
<div data-tour="disconnect-wallet">
9+
<DisconnectButton />
10+
</div>
911
</div>
1012
);
11-
}
13+
}

app/(dashboard)/deliveries/[id]/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default function DeliveryDetailsPage({
55
}) {
66
return (
77
<div>
8-
<h1>Delivery Details: {params.id}</h1>
8+
<h1 data-tour="delivery-details-title">Delivery Details: {params.id}</h1>
99
{/* Delivery status and tracking placeholder */}
1010
</div>
1111
);
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import { CurrencyConverter } from '@/features/deliveries/components/CurrencyConverter';
2+
13
export default function CreateDeliveryPage() {
24
return (
35
<div>
4-
<h1>Create New Delivery</h1>
5-
{/* Delivery creation form placeholder */}
6+
<h1 data-tour="create-delivery-title">Create New Delivery</h1>
7+
<CurrencyConverter />
68
</div>
79
);
810
}

app/(dashboard)/layout.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Tour } from '@/components/onboarding/Tour';
2+
3+
export default function DashboardLayout({
4+
children,
5+
}: {
6+
children: React.ReactNode;
7+
}) {
8+
return (
9+
<>
10+
<Tour />
11+
{children}
12+
</>
13+
);
14+
}

0 commit comments

Comments
 (0)