Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mock/global styles #42

Merged
merged 24 commits into from
Jul 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ff69512
Merge branch 'main' of github.com:SFU-Blueprint/Pedals
Jun 26, 2024
6b327a3
Mock global styles
Jun 27, 2024
189efa9
Update README.md
dangminhduc1101 Jun 27, 2024
8d5d14d
Finished front end, also added router feature to the button
terry9041 Jun 30, 2024
5413a7e
Merge branch 'feature/access-code-page' of github.com:SFU-Blueprint/P…
Jun 30, 2024
d92fe92
Changed NavBar for highlighting current page
Jun 30, 2024
c4d4417
basic shift manager component
Jun 30, 2024
dd44ed4
added option for forgetting password
terry9041 Jun 30, 2024
e6192e2
Merge branch 'feature/shift-component' of github.com:SFU-Blueprint/Pe…
Jun 30, 2024
fe8a6fc
Merged and fixed Supriya's code
Jun 30, 2024
d328392
manage-navbar
ayanahye Jun 30, 2024
c6a5709
Fix conflict w Ayana
Jul 1, 2024
535db17
Merge & Quick fix Ayana Changes
Jul 1, 2024
b8550ac
Merge branch 'feature/access-code-page' of github.com:SFU-Blueprint/P…
Jul 1, 2024
cd9fc80
Update feauture
qvd808 Jul 1, 2024
581e555
Fix design
ayanahye Jul 1, 2024
e6a8c21
Format and lint
ayanahye Jul 1, 2024
7b1e4cc
Merge branch 'feature/checkin-component' of github.com:SFU-Blueprint/…
Jul 1, 2024
44924e4
Merge branch 'feature-manage-nav' of github.com:SFU-Blueprint/Pedals …
Jul 1, 2024
781f7b4
Merged Vinh & Ayana's code
Jul 1, 2024
9154fb8
refactoring
terry9041 Jul 8, 2024
918768b
Merge remote-tracking branch 'origin/feature/access-code-page' into m…
Jul 8, 2024
e04e39b
Fixed Check in Dropdown, Merged Terry and Ronney's code
Jul 8, 2024
257ce56
Merged Arthur's code
Jul 8, 2024
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

defaults:
run:
working-directory: ./client
working-directory: ./src

steps:
- name: Checkout repository
Expand All @@ -28,7 +28,7 @@ jobs:
with:
node-version: "20"
cache: "npm"
cache-dependency-path: client/package-lock.json
cache-dependency-path: src/package-lock.json

- name: Install dependencies
run: npm ci
Expand All @@ -50,15 +50,15 @@ jobs:

- name: Annotate formatting errors
if: steps.format.outcome != 'success'
run: echo "::warning file=client::Formatting errors found"
run: echo "Formatting errors found"

- name: Annotate linter errors
if: steps.lint.outcome != 'success'
run: echo "::warning file=client::Linter errors found"
run: echo "Linter errors found"

- name: Annotate test errors
if: steps.test.outcome != 'success'
run: echo "::warning file=client::Test errors found"
run: echo ":Test errors found"

- name: Fail the job if any checks failed
if: steps.format.outcome != 'success' || steps.lint.outcome != 'success' || steps.test.outcome != 'success'
Expand Down
16 changes: 7 additions & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
{
"eslint.workingDirectories": [
"./client"
],
"files.associations": {
"*.css": "tailwindcss"
},
"explorer.sortOrder": "type",
"editor.formatOnSave": true
}
"eslint.workingDirectories": ["./src"],
"files.associations": {
"*.css": "tailwindcss"
},
"explorer.sortOrder": "type",
"editor.formatOnSave": true
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ To install and start developing, follow these steps:
2. Navigate to the client directory:

```sh
cd ./client
cd ./src
```

3. Install the dependencies using npm or other package managers:
Expand Down
14 changes: 0 additions & 14 deletions client/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions client/next.config.mjs

This file was deleted.

Binary file removed client/public/fonts/PPSupplyMono-Regular.otf
Binary file not shown.
Binary file removed client/public/fonts/PPSupplyMono-Ultralight.otf
Binary file not shown.
1 change: 0 additions & 1 deletion client/public/next.svg

This file was deleted.

1 change: 0 additions & 1 deletion client/public/vercel.svg

This file was deleted.

Empty file.
Empty file removed client/src/app/(manage)/page.tsx
Empty file.
Empty file removed client/src/app/auth/login.tsx
Empty file.
Empty file removed client/src/app/checkin/page.tsx
Empty file.
Empty file.
46 changes: 0 additions & 46 deletions client/src/app/globals.css

This file was deleted.

22 changes: 0 additions & 22 deletions client/src/app/layout.tsx

This file was deleted.

30 changes: 0 additions & 30 deletions client/src/app/lib/supabaseClient.test.ts

This file was deleted.

17 changes: 0 additions & 17 deletions client/src/app/lib/supabaseClient.ts

This file was deleted.

76 changes: 0 additions & 76 deletions client/src/app/middleware/requireAuth.test.ts

This file was deleted.

19 changes: 0 additions & 19 deletions client/src/app/middleware/requireAuth.ts

This file was deleted.

Loading
Loading