Skip to content

Commit

Permalink
Merging in Dylan's Landing page (#914)
Browse files Browse the repository at this point in the history
* feat(client): dialog for when user logs out

* added auth cleanup and user addition to db

* lint

* changed ci

* Update auth.service.ts

* Feature: Changed dark mode settings toggle to icon button in sidebar (Sidebar Dark Mode Icon #850) (#850)

* adding redirect link to devsoc

* made dark mode button component

* removed dark mode toggle

* removed darkmode toggle from settings

* made sidebar footer icons padding consistent

* added prop type for dark mode button

* sync dark mode button updates

* fully implemented dark mode button

---------

Co-authored-by: ray <[email protected]>
Co-authored-by: Dylan Zhang <[email protected]>

* docs: added our latest 2024 subcom member

* renamed migrations

* testing out db migration changes

* changing script

* Created Landing Page

* setup tailwind

* updated packages for tailwind

* added white devsoc svg

* started hero section

* added hero section

* changed to black svg

* added lib utils

* added hovering animation

* new component

* moved out of herosection

* added sponsor section

* changed packes

* slight changes to colours and imports

* added macquarie

* sync slight changes

* made bigger added animations

* changing host name redirect handler

* fixed redirect details

* docker file fixed

* docker file fixed

* cleaned conditional

* cleaned conditional

* testing migrations changes

* changing migrations stuff

* removing migrations folder

* sync

* sync from macbook

* sync for cooperative work

* finished scrolling features section except for gifs

* slightly changed sponsors

* Merge divergent branches nikki -> main landing page branch (#888)

* tried some stuff for key features

* added features blocks

* completed key features component

* added footer

* deleted unecessary file

---------

Co-authored-by: nikkichins <[email protected]>

* added blob image

* added how it works text

* hacky solution for changing page

* make further above

* added gifs

* removed unnecessary bg

* removed unnecessary bg colour

* added gifs

* removed 0 margin

* Added Feedback section to landing page and cleaned up code in the Features section

* changed to accommodate snap scrolling

* change so default is landing page then after visiting becomes normal app

* renamed hero section

* Made hero section responsive

* made features and sponsors responsive

* made footer and feedback responsive

* made scrolling features section responsive

* made landing page responsive

* Merge conflicts resoplved

* fixing merge conflicts

* http change

* user context put in index

* working fe hero lp

* converting styled components from footer so that tailwindcss won't override

---------

Co-authored-by: hhuolu <[email protected]>
Co-authored-by: dlyn <[email protected]>
Co-authored-by: Dylan Zhang <[email protected]>
Co-authored-by: Shaam <[email protected]>
Co-authored-by: Jasmine Tran <[email protected]>
Co-authored-by: dylan <[email protected]>
Co-authored-by: Dylan Zhang <[email protected]>
Co-authored-by: nikkichins <[email protected]>
  • Loading branch information
9 people authored Nov 13, 2024
1 parent c4e7f33 commit 5e2245b
Show file tree
Hide file tree
Showing 32 changed files with 2,021 additions and 1,179 deletions.
35 changes: 21 additions & 14 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,26 @@
},
"dependencies": {
"@apollo/client": "3.11.8",
"@date-io/date-fns": "3.0.0",
"@emotion/react": "11.13.0",
"@emotion/styled": "11.13.0",
"@fontsource-variable/roboto-flex": "5.0.15",
"@mui/icons-material": "5.16.4",
"@mui/lab": "5.0.0-alpha.172",
"@mui/material": "5.16.4",
"@mui/system": "5.16.4",
"@mui/x-date-pickers": "7.11.0",
"@sentry/browser": "7.118.0",
"@sentry/node": "7.118.0",
"@sentry/react": "7.118.0",
"@sentry/tracing": "7.114.0",
"@uiw/react-color": "2.3.0",
"@date-io/date-fns": "2.17.0",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@fontsource-variable/roboto-flex": "5.0.8",
"@heroicons/react": "2.1.3",
"@mui/icons-material": "5.14.19",
"@mui/lab": "5.0.0-alpha.154",
"@mui/material": "5.14.19",
"@mui/system": "5.14.19",
"@mui/x-date-pickers": "6.18.2",
"@sentry/browser": "7.84.0",
"@sentry/node": "7.84.0",
"@sentry/react": "7.84.0",
"@sentry/tracing": "7.84.0",
"@uiw/react-color": "2.1.1",
"clsx": "2.1.1",
"date-fns": "2.30.0",
"dayjs": "1.11.12",
"file-saver": "2.0.5",
"framer-motion": "11.3.17",
"fuse.js": "7.0.0",
"ics": "3.7.6",
"is-base64": "^1.1.0",
Expand All @@ -44,6 +47,7 @@
"react-router-dom": "6.25.1",
"react-transition-group": "4.4.5",
"react-window": "1.8.10",
"tailwind-merge": "2.4.0",
"uuid": "9.0.1",
"web-vitals": "4.2.2",
"workbox-background-sync": "7.1.0",
Expand Down Expand Up @@ -87,13 +91,16 @@
"@typescript-eslint/eslint-plugin": "7.16.1",
"@typescript-eslint/parser": "7.16.1",
"@vitejs/plugin-react-swc": "3.7.0",
"autoprefixer": "10.4.19",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-react": "7.35.0",
"eslint-plugin-simple-import-sort": "12.1.1",
"eslint-plugin-unused-imports": "4.1.4",
"jsdom": "25.0.1",
"postcss": "8.4.39",
"prettier": "3.3.3",
"tailwindcss": "3.4.4",
"typescript": "5.5.3",
"vite": "5.2.14",
"vite-bundle-visualizer": "1.2.1",
Expand Down
Loading

0 comments on commit 5e2245b

Please sign in to comment.