Merge Dev into Main#759
Open
TheAbubakrAbu wants to merge 95 commits into
Open
Conversation
* chore(frontend): add theme provider dependency for dark mode and locked node to v20 * feat(frontend): add dark mode support using next-themes - preparing to add toggle * feat(frontend): add light/dark mode toggle in sidebar * feat(frontend): change dark mode button a toggle and fix toolbar * feat(frontend): fix meal card text for dark mode * chore: 🔧 pull workflow workarounds from dev * chore: 🔧 merge dev * chore: 🔧 reegn lockfile * chore: 🔧 remerge lockfile again * chore: 🔧 merge dev AGAIN * chore: add better auth secret on GitHub * fix(ui): fix nested button in theme toggle * chore: replace React import with named imports --------- Co-authored-by: Jacob Moy <apixelatedpug@gmail.com> Co-authored-by: Lex Truong <lext@uci.edu>
* chore: remove verification from pull request template * chore: add testing instructions * feat: ✨ date selection restriction (#545) * wip: event images * feat(api): add image fetching logic to weeklyJob * fix(api): uncomment contributors and weekly job * perf(api/weekly): add batch updates for menus and dishes in weekly * feat(api): get date range trpc query * chore(api): getDateRange test * feat(frontend): restrict pickable dates on calendar * fix(api): convert Y-M-D date string to local time * fix(frontend): date picker button fits date * fix(frontend): cannot select already selected date * feat(api): get list instead of range of pickable dates * feat(frontend): user selects from list of enabled dates * feat(frontend): restrict calendar navigation to pickable dates * fix(api): error msg and db sorting logic * chore(frontend): removed dup DateList type definition --------- Co-authored-by: LexTruong <82004296+LexTruong@users.noreply.github.com> * feat: deploy to sst (#561) * feat: remove db certs (#565) * fix: db nonsense (#566) * fix: misc sst * chore(lint): 🔧 add lint config and packages (#569) * chore(lint): 🔧 add lint config and packages * chore: 🔧 pull the cool looking logo into README * ci: deploy button * feat: sst more (#571) * fix: 🐛 re-gen pnpm-lock * fix: 🐛 import schema properly * fix: 🐛 update graphql schema * fix: 🐛 add DATABASE_URL secret to environment of root SST config * fix: 🐛 remove hyphen from auth route directory * fix: 🐛 daily no longer requires non-null period data * feat: ✨ change deployment invocation cron from daily to weekly * chore: 🔧 update next to latest version * chore: 🔧 upgrade node version for deployment action * fix: migrations (#578) * fix: migrations (#579) * ci: trigger * fix: await upsert in weekly (#581) * fix: pulumi * fix: 🐛 pickable dates * chore: 🔧 regen pnpm-lock * fix: 🐛 date mismatch * fix: 🐛 remove merge heads from json file * removed extra sidebar content and migrated to MUI * refactor: replace mobile Sheet sidebar with permanent drawer component - Remove SheetClose wrapper from SidebarButton to support always-visible drawer - Replace SheetContent with plain div container in SidebarContent - Add @mui/icons-material dependency for Material-UI icon components - Rename Toolbar component to Header for better semantic clarity - Remove @emotion/react direct dependency (retained as peer dependency via @mui/material) * fix(ui): migrate sidebar from shadcn to MUI components - Move Drawer management from Header to SidebarContent component - Replace shadcn Button with MUI ButtonBase in SidebarButton - Add onClose callback prop to SidebarButton for drawer dismissal - Remove unused Drawer import from Header component - Maintain existing styling and functionality while aligning with MUI design system * fix: Route for meal tracker corrected * fix: replace Header with Toolbar * fix: change Toolbar back to Header * fix(frontend): header; converted some styling to tailwind; clean up imports and comments * changed styling to tailwind * removed unnecessary comments * fix: no switch inside button * chore: ghost commit after unlocking sst instance --------- Co-authored-by: Jacob Moy <79670488+EightBitByte@users.noreply.github.com> Co-authored-by: LexTruong <82004296+LexTruong@users.noreply.github.com> Co-authored-by: Kevin Wu <kevinwu098@gmail.com> Co-authored-by: Jacob Moy <apixelatedpug@gmail.com> Co-authored-by: Pranav Batra <batrap1@uci.edu> Co-authored-by: William <wilyan090@gmail.com> Co-authored-by: Lex Truong <lext@uci.edu>
* update packages * feat(frontend): integrated MUI with event card + testing ui (just card, not drawer yet) * feat(frontend): edited sx prop to match prev. styles * feat(frontend): updated food + rating card to MUI styles. todo: migrate dialog+drawer components to render clicks * feat(frontend): updated event-dialog, food-dialog, ratings-card to render clicks, integrate MUI and match figma styles * feat(frontend): integrated MUI styles in event and food drawer * feat: updated event card and food card to be seen through on the sides * feat: left aligned nutrition label on food card * fix!: 💥 🐛 merge pnpm-lock from dev (regen on dev) * fix: 🐛 checkout pnpm-lock from dev * chore: 🔧 regen lockfile * chore: 🔧 remove autogenerated .next directories * chore: 🔧 add .next to gitignore * feat(frontend): edited CSS styles so button matches body font + leaves text as is * chore: 🔧 regen lockfile * fix: remove duplicate migration files --------- Co-authored-by: SAMIKA BHAVESH BHATKAR <samikabhatkar@gmail.com> Co-authored-by: Jacob Moy <apixelatedpug@gmail.com> Co-authored-by: Lex Truong <lext@uci.edu>
* Add stale time and selective refreshing to tRPC * Use multi-threading to speed up wwekly cron job * Optimize data-derivation with zustand Deriving display data from what was in the database was a costly operation, so zustand helps prevent needlessly re-computing the display data. * chore: 🔧 pull dev CI changes --------- Co-authored-by: Jacob Moy <apixelatedpug@gmail.com> Co-authored-by: Lex Truong <lext@uci.edu>
Co-authored by: Dante Dam <laggycomputer@yahoo.com>
* fix: drizzle config includes new tables * fix: auth uses env base url var * fix: regenerated 0002_snapshot with new tables * feat: meal planner integrated with auth * refactor: removed unnecessary useFavorites hook on home page * feat: favorites integrated with auth * refactor: lifted useSession hook from meal card * feat: sidebar user feature tabs disabled if not logged in * feat: integrate ratings with auth * feat: ratings card uses drawer on mobile * feat: can log same meal many times * fix: favorites page passes userid to cards * fix: meal tracker page padding and meal card star fill * chore: replace social provider with genericOAuth plugin * fix: set pkce in auth config * fix: get user's profile image from icssc auth * fix: add betterauth secret and base url to sst config * chore: set client id in sst config * chore: todo snackbar comments Co-authored-by: Jacob Moy <79670488+EightBitByte@users.noreply.github.com> * fix: rename meal-tracker page to nutrition * refactor: move hall store to context folder * feat: get session and store/clear userid in root layout component * feat: use stored userId instead of prop drilling in interactive star rating * chore: get userId with store instead of auth session --------- Co-authored-by: Jacob Moy <79670488+EightBitByte@users.noreply.github.com>
* fixed image properties to fit event dialog/drawer * feat(frontend): edited food dialog/drawer to match figma styles * feat(frontend): fixed event card img to be centered on mobile * feat:frontend(minor styling fixes on event card) * feat(frontend): overwrote inter font w/ poppins * removed pin from food drawer
* chore: 🔧 add mui icons as a dependency * chore: 🔧 icon replacement in progress * chore: 🔧 remove dupes, regen lockfile * chore: 🔧 switched from lucide icons to MUI icons in food-card.tsx * chore: 🔧 switched from lucide icons to MUI icons in event-card.tsx * chore: switched from lucide icons to MUI icons in ratings-card.tsx (HAS ERRORS) * chore: 🔧 removed Lucide dependency * chore: changed from Lucide to MUI icon components for all components in ui (HAS ERRORS) * chore: changed from Lucide to MUI icon components in /utils/types.ts (HAS ERRORS) * chore: merge dev * chore: merge dev * chore: 🔧 merge dev AGAIN * chore: 🔧 merge dev (hopefully the last time) * chore: 🔧 merge, merge, merge... * chore: 🔧 regen lockfile * fix: 🐛 remove double import of tRPC --------- Co-authored-by: Jacob Moy <apixelatedpug@gmail.com> Co-authored-by: Yitong Liu <yitonl21@uci.edu>
* feat: redesign toolbar to follow figma design * fix(front): match toolbar to figma * chore: merge with dev * fix: gradient added to images for toolbar visability, added google image to nextjs config remote pattern * fix: marked gradient as important for tailwind * chore: merge dev * merge dev? --------- Co-authored-by: Lex Truong <lext@uci.edu> Co-authored-by: Jacob Moy <apixelatedpug@gmail.com> Co-authored-by: Jacob Moy <79670488+EightBitByte@users.noreply.github.com>
* chore(db): update test data to not use dish.menuId usage * feat(db): modernize restaurant ids, indexes, and number fields * chore(db): add migration, docs, and constraint fix * refactor(db): remove dishes menu_id and use join table * chore(db): fix journal.json merge conflict * chore(db): fix journal.json merge conflict time for idx 3 * chore(db): fix zotmeal.sql merge conflict * chore(db): fix snapshot.json merge conflict * fix(db): change test period restaurant id --------- Co-authored-by: elmallaa <elmallaa@uci.edu>
* added simplified property * make the isSimplified property default to false * added simplified property * make the isSimplified property default to false * feat: simplified food card * feat: organize food cards to be placed horizontally when multiple exists * feat: added plus button to the simplified food card * fix: added back user feedback button onClick functionality * feat: updated ui for the nonsimplified food card * feat: made the regular food card a smaller width so two can fit in a row consistent with the simplified food card * chore: maintain consistent width for simplified card * chore: reduced duplicated code in div styling for non simpified food card * fix: vertically centered food icon and make it smaller * fix: make the average rating a more apparent gray * fix: favorite button works when clicked * fix: added gap for spacing between text description and favorite button * feat: added card view and compact view buttons * chore: revert back to previous FoodCardContent style * fix: remove food tracker button * chore: 🔧 fix merge conflicts * chore: 🔧 fix another merge conflict * fix: 🐛 remove duplicate DishesInfo --------- Co-authored-by: Jacob Moy <apixelatedpug@gmail.com>
* chore!: update literals * chore: 🔧 update all sql files * fix: 🐛 update logo path * fix: 🐛 await async in test * fix: 🐛 remove redundancies from snapshot * fix!: 💥 🐛 generate migration * fix: 🐛 add manual changes to migration * chore: 🔧 remove turbo usage in graphql script * fix: 🐛 add 15s timeout to AdobeECommerce Parsing * fix: 🐛 legacy restaurant id enum now casts * fix: 🐛 migrate unknown prices to 0 * fix: 🐛 nutrition infos now default to zero when empty string * chore: 🔧 merge dev * fix: 🐛 update some literals changed in the merge
* feat(chore): ✨ 🔧 removed shadow from meal card * fix(chore): 🐛 🔧 desktop restaurant food cards have 2 cards per row * Update apps/next/src/components/ui/card/food-card.tsx Co-authored-by: Jacob Moy <79670488+EightBitByte@users.noreply.github.com> --------- Co-authored-by: Yitong Liu <yitonl21@uci.edu> Co-authored-by: Jacob Moy <79670488+EightBitByte@users.noreply.github.com>
* fix: 🐛 add better_auth_url to auth server trusted origins * fix: 🐛 remove posthog references to customAllergies
…ry conflicts to PopularDishCard (#743)
* feat(frontend): ✨ switched mobile profile from menu to drawer mui container * fix: 🐛 drawer now slides open instead of popping up * feat(styling): ✨ changed colors to align w figma * fix: 🐛 matched dark mode colors to match figma * feat(styling): ✨ fixed some styling inconsistencies * fix: 🐛 syntax errors in sidebar-content * chore: 🔧 fix feedback and info icons * feat(styling): ✨ fixed sign out width and shadow around component --------- Co-authored-by: SAMIKA BHAVESH BHATKAR <samikabhatkar@gmail.com> Co-authored-by: Lex Truong <lext@uci.edu>
Old theme was ocassionally getting overwritten by null value in the localhost.
* fix: 🐛 missing await * refactor: ♻️ magic color constants -> tailwind registration * feat: ✨ sidebar menu styling overhaul * chore: 🔧 update anteatery hero image * fix: 🐛 remove overscroll behavior * refactor: ♻️ status dot * refactor(wip)!: 💥 ♻️ remove magic hex colors * refactor: ♻️ home page dining hall cards * chore(ui): 🔧 sync frontpage event card * chore(ui): 🔧 update colors for event type badge * fix(ui): 🐛 add skeletons for homepage events, make visible in light mode * fix(ui): 🐛 add stylized station headers to compact view * fix(ui): 🐛 sync dark station headers with figma * refactor(ui): ♻️ sidebar sections into components + figma sync * fix(toolbar): 🐛 increase font size, gradient transparency * fix(ui): 🐛 selector no longer makes text unreadable on hover + select * refactor: ♻️ hex codes into globals.css * refactor: ♻️ more constants refactor
* fix(frontend): 🐛 map onboarding selections to db enums * fix(api): 🐛 restaurant menu showing wrong date depending on time zone
* feat: ✨ feedback form design * fix: 🐛 deprecated maxLength * feat: ✨ submission page * feat: ✨ progress bar * feat: ✨ hook up discord + sheets * test: 🚨 add more robust error messages * fix: 🐛 actually have decent error messages * fix(feedback): 🐛 fix feedback bugs and add dark mode support * fix(feedback): 🐛 enable discord/sheets env vars for staging instances --------- Co-authored-by: TheAbubakrAbu <ammelmallah@icloud.com>
* fix: 🐛 matched compact card to figma * fix: 🐛 matched compact layout to figma * fix(dishes): 🐛 tighten card grid and center heart with description * fix(dishes): 🐛 match dish card to Figma (border radius and color) * fix(dishes): 🐛 match food card skeleton to card --------- Co-authored-by: TheAbubakrAbu <ammelmallah@icloud.com>
* feat(styling): ✨ changed preferences override color to be orange * fix(dishes): 🐛 fix dark tint for card and remove opacity --------- Co-authored-by: TheAbubakrAbu <ammelmallah@icloud.com> Co-authored-by: Abubakr Elmallah <130480156+TheAbubakrAbu@users.noreply.github.com>
Sync dev with main
TheAbubakrAbu
temporarily deployed
to
staging-759
GitHub Actions
Inactive
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
End of Academic Year 2026 Cleanup:
Merge Dev into Main