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

DEV-6 Events #34

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a993e1a
feat: Add basic design for profile photo and fields
joeng03 Mar 12, 2024
2304358
initialize branch
Mar 14, 2024
cbbeb8e
Added event tag
bransometan Mar 14, 2024
a9ecbf3
made adjustment
bransometan Mar 14, 2024
fb5eb2a
Used CSS Modules
bransometan Mar 14, 2024
6942e6d
Add toast component with demo buttons on home page
JustinPeng13 Mar 15, 2024
1ee8051
Fix screen responsiveness and button text
JustinPeng13 Mar 15, 2024
6c4631d
Merge remote-tracking branch 'origin/main' into epic/DEV-6-events
gnimnix Mar 19, 2024
7a97286
Merge remote-tracking branch 'origin/epic/DEV-6-events' into task-20-…
bransometan Mar 19, 2024
4251d4c
feat: Add react-form
joeng03 Mar 19, 2024
7328188
moved files to router
bransometan Mar 19, 2024
b3c1c2a
chore: Merge from main branch
joeng03 Mar 19, 2024
8e0251a
fixed explicit types
Mar 19, 2024
8dc15f2
fixed typo
Mar 19, 2024
bf2d544
Merge pull request #35 from NUS-Fintech-Society/task-20-event-tag-des…
gnimnix Mar 19, 2024
e1fe6f3
Merge commit 'bf2d5449402f25fcee86b7592cd6e5b5a759cb3a' into feature/…
JustinPeng13 Mar 26, 2024
fb77cfb
chore: Merge DEV-6
joeng03 Mar 26, 2024
ee6529f
chore: Merge DEV-6
joeng03 Mar 26, 2024
1cf2414
chore: Add route
joeng03 Mar 26, 2024
fa0f023
fix: CSS import
joeng03 Mar 26, 2024
48cfccb
feat: Add handler for patch request
joeng03 Mar 26, 2024
f57ad60
Refactor Toast code
JustinPeng13 Mar 29, 2024
1de96e7
Move components under "shared" folder
JustinPeng13 Mar 29, 2024
50575b9
minor fixes
gnimnix May 19, 2024
0b1b6b8
fixed unit tests
gnimnix May 19, 2024
9674dd0
Merge pull request #33 from NUS-Fintech-Society/feature/TAS-14-profil…
gnimnix May 19, 2024
54787e5
Merge remote-tracking branch 'refs/remotes/origin/epic/DEV-6-events' …
gnimnix May 22, 2024
f72ad36
Merge pull request #36 from NUS-Fintech-Society/feature/TAS-18-toast
gnimnix May 22, 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
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
"test": "vitest"
},
"dependencies": {
"@tanstack/react-form": "^0.14.0",
"@tanstack/react-query": "^5.18.0",
"@tanstack/react-query-devtools": "^5.18.0",
"@types/js-cookie": "^3.0.6",
"@uidotdev/usehooks": "^2.4.1",
"@tanstack/zod-form-adapter": "^0.14.0",
"date-fns": "^3.3.1",
"js-cookie": "^3.0.5",
"localforage": "^1.10.0",
Expand All @@ -23,7 +25,8 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.22.3",
"sort-by": "^1.2.0"
"sort-by": "^1.2.0",
"zod": "^3.22.4"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.2",
Expand Down
4 changes: 4 additions & 0 deletions public/-icon-home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/-icon-mail.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/-icon-phone.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/-icon-user.svg
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 public/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/dropdown-filter-select.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions public/edit-profile-pic.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/email.svg
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 public/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/home.svg
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 public/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/phone.svg
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 public/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/role.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 127 additions & 0 deletions src/assets/css/Navbar.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
.fintechsocLogo6Icon {
height: 4.063rem;
width: 9.125rem;
position: relative;
object-fit: cover;
}
.announcements {
align-self: stretch;
position: relative;
}
.announcementsFrame {
width: 10.938rem;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
padding: var(--padding-2xl) 0 0;
box-sizing: border-box;
}
.members {
align-self: stretch;
position: relative;
}
.attendanceFrame {
width: 8.75rem;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
padding: var(--padding-mid) var(--padding-9xs) 0 0;
box-sizing: border-box;
color: var(--brand-yellow);
}
.events {
align-self: stretch;
position: relative;
}
.attendanceFrame1 {
width: 6.938rem;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
padding: var(--padding-mid) 0 0;
box-sizing: border-box;
}
.tasks {
align-self: stretch;
position: relative;
}
.attendanceFrame2 {
width: 7.313rem;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
padding: var(--padding-base) 0.688rem 0 0;
box-sizing: border-box;
}
.attendance {
align-self: stretch;
position: relative;
}
.attendanceFrame3 {
width: 9.188rem;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
padding: var(--padding-base) 0.5rem 0 0;
box-sizing: border-box;
}
.recruitment {
align-self: stretch;
position: relative;
}
.attendanceFrame4 {
flex: 1;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
padding: var(--padding-base) 2.188rem 0 0;
}
.image5Icon {
height: 3.438rem;
width: 3.431rem;
position: relative;
object-fit: cover;
}
.desktopNavBarUpdatedAtt,
.eventsFrame,
.tasksFrame {
display: flex;
align-items: flex-start;
justify-content: flex-start;
}
.tasksFrame {
align-self: stretch;
flex-direction: row;
gap: 0 1.188rem;
}
.desktopNavBarUpdatedAtt,
.eventsFrame {
box-sizing: border-box;
max-width: 100%;
}
.eventsFrame {
flex: 1;
flex-direction: column;
padding: var(--padding-8xs) 0 0;
}
.desktopNavBarUpdatedAtt {
align-self: stretch;
background-color: var(--brand-blue);
overflow: hidden;
flex-direction: row;
padding: var(--padding-mid) 2.75rem var(--padding-base) var(--padding-xl);
gap: 0 1.188rem;
top: 0;
z-index: 99;
position: sticky;
text-align: center;
font-size: var(--font-size-xl);
color: var(--color-white);
font-family: var(--font-dm-sans);
}
Loading