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.

Sign up for GitHub

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

add wip version of settings page, refactor button component #43

Merged
merged 16 commits into from
Dec 10, 2024
Merged

add wip version of settings page, refactor button component #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c805bfd
🛣 add basic settings page nested routing
lachlanshoesmith Dec 9, 2024
5e6515a
🧭 add some styling to the nav
lachlanshoesmith Dec 9, 2024
92f8014
🥸 add settings page restructure
lachlanshoesmith Dec 9, 2024
43f202e
🆗 refactor button component, add variants
lachlanshoesmith Dec 9, 2024
afc99a7
🆒 complete secondary button styling
lachlanshoesmith Dec 9, 2024
0ae35fe
👶 begin work on profile page
lachlanshoesmith Dec 9, 2024
8328f84
💜 fix incorrect underlining, add new page stuff
lachlanshoesmith Dec 9, 2024
3c06719
⬅ add back button linking
lachlanshoesmith Dec 9, 2024
f4339c1
🔗 allow settings nav links to have fns on click
lachlanshoesmith Dec 9, 2024
d4284bd
🗣 fix button usage, move extra exports from component files
lachlanshoesmith Dec 10, 2024
5a65a03
🤔 try fix workflow when pnpm version mismatch
lachlanshoesmith Dec 10, 2024
3f9c7ec
🌈 try update pnpm
lachlanshoesmith Dec 10, 2024
9876c03
🥌 remove potentially unnecessary dep?
lachlanshoesmith Dec 10, 2024
2104231
🥌 remove potentially unnecessary file
lachlanshoesmith Dec 10, 2024
c9a7c2d
🥌 remove more unnecessary deps
lachlanshoesmith Dec 10, 2024
5ed049d
💀 ok lets try this
lachlanshoesmith Dec 10, 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
22 changes: 10 additions & 12 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,29 @@
"author": "",
"license": "ISC",
"dependencies": {
"@prisma/client": "^5.21.1",
"@prisma/client": "^5.22.0",
"bcrypt": "^5.1.1",
"connect-redis": "^7.1.1",
"cors": "^2.8.5",
"dayjs": "^1.11.13",
"express": "^4.21.1",
"express": "^4.21.2",
"express-session": "^1.18.1",
"prisma": "^5.21.1",
"prisma": "^5.22.0",
"redis": "^4.7.0",
"zod": "^3.23.8",
"zod-prisma-types": "^3.1.8"
"zod-prisma-types": "^3.2.1"
},
"devDependencies": {
"@types/bcrypt": "^5.0.2",
"@types/cors": "^2.8.17",
"@types/express": "4",
"@types/express-session": "^1.18.0",
"@types/node": "^22.7.7",
"jest-mock-extended": "2.0.4",
"@types/express": "^4.17.21",
"@types/express-session": "^1.18.1",
"@types/node": "^22.10.1",
"supertest": "^7.0.0",
"sync-request-curl": "^3.0.0",
"ts-node": "^10.9.2",
"tsx": "^4.19.1",
"typescript": "^5.6.3",
"vitest": "^2.1.4",
"tsx": "^4.19.2",
"typescript": "^5.7.2",
"vitest": "^2.1.8",
"vitest-mock-extended": "^2.0.2"
}
}
Loading
Loading