diff --git a/.gitignore b/.gitignore index e43b0f9..5c8ea4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +.superpowers/ diff --git a/docs/superpowers/plans/2026-10-28-frontend-redesign.md b/docs/superpowers/plans/2026-10-28-frontend-redesign.md new file mode 100644 index 0000000..9412687 --- /dev/null +++ b/docs/superpowers/plans/2026-10-28-frontend-redesign.md @@ -0,0 +1,260 @@ +# PICKUP Frontend Redesign Implementation Plan + +> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. + +**Goal:** Restyle every PICKUP screen into the approved navy + sage, ASPC-family design system without changing any behavior. + +**Architecture:** Colors, fonts, radii and shadows become semantic tokens (CSS variables in `globals.css`, mapped in `tailwind.config.js`). A small shared UI kit in `src/components/ui/` is built once, then every page is migrated onto it. A guard test fails while any file still uses raw Tailwind palette classes or hex colors; each migration task removes its files from the guard's legacy allowlist, and the final task asserts the allowlist is empty. + +**Tech Stack:** Next.js 15 App Router, React 18, Tailwind 3.3, Radix (popover, tooltip, scroll-area), react-day-picker 10, lucide-react, Jest + Testing Library, pnpm. + +**Spec:** `docs/superpowers/specs/2026-10-28-frontend-redesign-design.md` + +## Global Constraints + +- Palette tokens only: `navy #13294B`, `sage #3E7C6B`, `sage-tint ~#E3EDE8`, `paper #F7F5F0`, `card #FFFFFF`, `stone ~#6B7280` family, `line ~#E7E3DA`, `danger ~#B42318` + tint. Optional `warning` (amber) only for a real pending-action state. No raw Tailwind color scales or hex values in `src/` outside `globals.css` and `tailwind.config.js`. +- Fonts: Inter for body/UI, Playfair Display for h1 / hero headlines only. Both via `next/font/google`. +- No gradients, blobs, floating shapes, pulsing or bouncing decoration. Motion 150-200ms, respects `prefers-reduced-motion`. +- Behavior, routes, API calls, Supabase queries and copy meaning are unchanged. +- Keep name PICKUP and existing logo files; logo sits on a white rounded tile in the navy header. +- Light theme only. +- WCAG AA contrast, visible focus rings (sage), 44px min touch targets on mobile. +- Student pages: centered column, max ~640-720px. Info pages: prose width. Admin: full width. +- Prettier config in repo (no semicolons, single quotes, 2 spaces). No em dashes anywhere. +- CI must pass: `pnpm type-check`, `pnpm knip`, `pnpm knip:production`, `pnpm lint`, `pnpm test:ci`, `pnpm build`. +- Keep `.animate-spin` on the admin loading indicator (asserted in `AdminDashboard.test.tsx:412`). +- All work on branch `redesign/frontend`, one commit per task, one PR at the end. + +## Review Focus + +1. Long content on phones (long names, long pickup locations, 6-person groups, many comments): text must wrap or truncate, never overflow the 360px viewport. Each page task's E2E step checks at 360px as well as 390px. +2. Keyboard and screen-reader use of rebuilt interactive pieces (mobile menu, modal, accordion, date picker): focus moves in and back out, Escape closes, labels announced. Pinned by tests in Task 2 and Task 3. +3. Loading, empty and error states of every data page (results with no matches, unmatched with none, admin with no rides, Supabase error): each must use the kit's `Spinner` / `EmptyState` / `Alert`, not a blank screen. Checked in each page task's E2E step by forcing the state with seed data or offline mode. +4. Status meaning: matched, waiting/unmatched, cancelled, ready, and delayed must always map to the same badge tone everywhere. Pinned by the `StatusBadge` mapping test in Task 2. +5. Signed-out and non-admin access: header must never flash admin links to non-admins, and protected pages must look right while auth resolves. Pinned by Header tests in Task 3. + +--- + +## File Structure + +New: + +- `src/styles/noRawColors.test.ts` - guard test with `LEGACY_FILES` allowlist +- `src/components/ui/Button.tsx` - `Button`, `ButtonLink` +- `src/components/ui/Field.tsx` - `Field`, `Input`, `Textarea`, `Select`, `Checkbox` +- `src/components/ui/Card.tsx` - `Card`, `CardHeader`, `CardBody`, `CardFooter` +- `src/components/ui/StatusBadge.tsx` - `Badge`, `StatusBadge`, `rideStatusTone` +- `src/components/ui/Alert.tsx` +- `src/components/ui/Modal.tsx` +- `src/components/ui/Accordion.tsx` +- `src/components/ui/PageHeader.tsx` - `PageHeader`, `PageContainer` +- `src/components/ui/EmptyState.tsx` +- `src/components/ui/Spinner.tsx` +- `src/components/ui/RideTicket.tsx` - boarding-pass card +- `src/components/ui/ui.test.tsx` - kit tests +- `src/components/ui/RideTicket.test.tsx` +- `src/components/PickupHeader.test.tsx` + +Modified: `tailwind.config.js`, `src/app/globals.css`, `src/app/layout.tsx`, `package.json`, `.gitignore`, every page and component listed in the spec's Scope. + +Removed: `src/providers/ThemeProvider.tsx` (if nothing else imports it), `src/components/results/EmptyState.tsx` (replaced by kit), `src/components/buttons/*` (replaced by `ButtonLink` / nav links) once unused. + +--- + +### Task 1: Tokens, fonts, dependency cleanup, guard test + +**Files:** + +- Create: `frontend/src/styles/noRawColors.test.ts` +- Modify: `frontend/tailwind.config.js`, `frontend/src/app/globals.css`, `frontend/src/app/layout.tsx`, `frontend/package.json`, `.gitignore` +- Remove: `frontend/src/providers/ThemeProvider.tsx` + +**Interfaces:** + +- Produces Tailwind color names: `navy` (`DEFAULT`, `50`..`900` tonal steps, `foreground`), `sage` (`DEFAULT`, `tint`, `strong`, `foreground`), `paper`, `card`, `ink` (body text, = navy-ish), `stone` (`DEFAULT` muted text, `light` placeholder), `line`, `danger` (`DEFAULT`, `tint`, `foreground`), optional `warning` (`DEFAULT`, `tint`). Keep shadcn aliases `background`, `foreground`, `border`, `input`, `ring`, `primary`, `muted`, `accent`, `destructive`, `popover` pointing at those tokens so Radix-based files keep working. +- Produces font families: `font-sans` (Inter, CSS var `--font-inter`), `font-display` (Playfair Display, `--font-playfair`). +- Produces `borderRadius`: `lg` 12px (cards), `md` 9px (controls), `sm` 6px. +- Produces `LEGACY_FILES: string[]` in the guard test, which later tasks shrink. + +- [ ] **Step 1:** Create branch `redesign/frontend` from `main`. Add `.superpowers/` to root `.gitignore`. +- [ ] **Step 2:** Start the app with `./start.sh`, sign in as a seeded student and a seeded admin, and save "before" screenshots of every route at 390px and 1440px to the scratchpad (not the repo). These are the reference for "behavior unchanged". +- [ ] **Step 3: Write the guard test** `noRawColors.test.ts`. It globs `src/**/*.{ts,tsx}` (excluding `*.test.*`, `database.types.ts`) and fails for any file not in `LEGACY_FILES` that matches either regex: + - `/\b(?:bg|text|border|ring|from|via|to|fill|stroke|outline|divide|placeholder|shadow|decoration|accent|caret)-(?:slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-\d{2,3}\b/` + - `/#[0-9a-fA-F]{3,8}\b/` inside a `className`, `style`, or `color=` value (ignore `#` in URLs and comments by matching only within quotes/backticks on lines containing `className`, `style`, or `color`). + - Also fails for any file that matches `bg-gradient-` or `animate-(?:float|gradient-x|pulse|bounce)`. + - Second test: `it('legacy allowlist only lists files that still violate')` fails if a listed file is now clean (forces shrinking the list). + - Initialize `LEGACY_FILES` with every currently violating file (generate the list by running the matcher once). +- [ ] **Step 4:** Run `pnpm test -- noRawColors`. Expected: PASS (allowlist covers today's violations). Temporarily add `text-teal-500` to a clean file and confirm it FAILS, then revert. +- [ ] **Step 5:** Replace tokens in `globals.css` (`:root` HSL vars for the palette above, `body` uses `bg-paper text-ink font-sans antialiased`, a `:focus-visible` base ring in sage, `@media (prefers-reduced-motion: reduce)` disabling transitions/animations). Delete `fade-in-up`, `gradient-x`, `float` keyframes and their utility classes only after Task 5 removes their last use (leave a note in the task log until then). Keep the `cecil-arc` spinner CSS. +- [ ] **Step 6:** Rewrite `tailwind.config.js` without `withMT`; add the color, font and radius tokens above; keep `tailwindcss-animate`. +- [ ] **Step 7:** In `layout.tsx` load Inter and Playfair Display via `next/font/google` with `variable` option, drop Geist and `ThemeProvider`, set NextTopLoader color to sage `#3E7C6B` (the one allowed hex outside CSS: add `layout.tsx` to a `TOKEN_FILES` exemption in the guard, with a comment). `pnpm remove @material-tailwind/react geist next-themes` (FAQ keeps working until Task 12 only if it is migrated in the same commit, so migrate the FAQ accordion import to a temporary plain `
` here and finish styling in Task 12). +- [ ] **Step 8:** Run `pnpm type-check && pnpm lint && pnpm test:ci && pnpm knip && pnpm build`. Expected: all pass. +- [ ] **Step 9:** Commit `Add design tokens, fonts and raw color guard`. + +### Task 2: Shared UI kit + +**Files:** + +- Create: the `src/components/ui/` files listed in File Structure (except `RideTicket`), `src/components/ui/ui.test.tsx` +- Modify: `src/components/ui/popover.tsx`, `tooltip.tsx`, `scroll-area.tsx`, `date-picker.tsx` (token restyle only) + +**Interfaces (Produces):** + +- `Button(props: ButtonHTMLAttributes & { variant?: 'primary' | 'secondary' | 'ghost' | 'danger' | 'accent'; size?: 'sm' | 'md' | 'lg'; loading?: boolean; fullWidth?: boolean })`. `primary` = navy fill, `accent` = sage fill, `secondary` = white + line border, `ghost` = text only, `danger` = danger fill. `loading` shows `Spinner` and sets `disabled` + `aria-busy`. +- `ButtonLink(props: LinkProps & same variant/size/fullWidth & { children })` - Next `Link` styled as button. +- `buttonClasses({ variant, size, fullWidth }): string` - exported for non-button elements. +- `Field({ label, htmlFor, hint?, error?, required?, children })`; `Input`, `Textarea`, `Select` forward refs, accept `invalid?: boolean` (sets `aria-invalid` and danger border); `Checkbox({ label, ...input })`. +- `Card({ as?, padded?: boolean, className, children })`, `CardHeader({ title, description?, action? })`, `CardBody`, `CardFooter`. +- `type BadgeTone = 'neutral' | 'success' | 'danger' | 'warning' | 'info'`; `Badge({ tone, dot?: boolean, children })`. +- `type RideStatus = 'matched' | 'ready' | 'waiting' | 'unmatched' | 'cancelled' | 'delayed' | 'past'`; `rideStatusTone(status: RideStatus): BadgeTone`; `StatusBadge({ status, label? })` (default labels: Matched, Ready, Waiting, Unmatched, Cancelled, Delayed, Past). +- `Alert({ tone: 'info' | 'success' | 'warning' | 'danger', title?, children, action? })` with `role="alert"` for danger/warning, `role="status"` otherwise. +- `Modal({ open, onClose, title, description?, children, footer?, size?: 'sm' | 'md' | 'lg' })` - portal, `role="dialog"`, `aria-modal`, labelled by title, Escape and backdrop click call `onClose`, focus moves into the dialog on open and returns to the previously focused element on close, body scroll locked while open. +- `Accordion({ items: { id: string; title: ReactNode; content: ReactNode }[]; defaultOpenId?: string })` - buttons with `aria-expanded` / `aria-controls`. +- `PageContainer({ width?: 'narrow' | 'prose' | 'wide' | 'full', children })` (narrow = max-w-2xl, prose = max-w-3xl, wide = max-w-6xl, full = none, all with `px-4 sm:px-6`), `PageHeader({ eyebrow?, title, description?, actions? })` (title in `font-display`). +- `EmptyState({ icon?: LucideIcon, title, description?, action? })`. +- `Spinner({ size?: 'sm' | 'md' | 'lg', label?: string })` - uses `animate-spin`, `role="status"`, visually hidden label default "Loading". + +- [ ] **Step 1: Write failing tests** in `ui.test.tsx`: + - `rideStatusTone`: `matched`→`success`, `ready`→`success`, `waiting`→`neutral`, `unmatched`→`neutral`, `past`→`neutral`, `cancelled`→`danger`, `delayed`→`warning`. + - `Button loading` renders `aria-busy="true"`, is disabled, and contains `role="status"`. + - `Input invalid` sets `aria-invalid="true"`; `Field` associates label with input (`getByLabelText('Email')` returns the input) and renders `error` text linked by `aria-describedby`. + - `Modal`: when `open`, `getByRole('dialog', { name: 'Title' })` exists; pressing Escape calls `onClose`; focus is inside the dialog after open; on rerender with `open=false`, focus returns to the trigger button. + - `Accordion`: clicking a title toggles `aria-expanded` from `false` to `true` and shows content; only `defaultOpenId` is open initially. + - `Alert tone="danger"` has `role="alert"`. +- [ ] **Step 2:** Run `pnpm test -- ui.test`. Expected: FAIL (modules not found). +- [ ] **Step 3:** Implement the components to the interfaces above using `cn` from `@/utils/tailwind` and only token classes. Restyle popover/tooltip/scroll-area/date-picker with tokens (day picker: selected day navy, today ring sage, disabled stone-light). +- [ ] **Step 4:** Run `pnpm test -- ui.test`. Expected: PASS. +- [ ] **Step 5:** Build a temporary unlisted route `src/app/_kit/page.tsx` showing every component and state; inspect it in Chrome at 360px and 1440px for spacing, alignment, focus rings, contrast; fix issues; delete the route. +- [ ] **Step 6:** Run full CI command set from Task 1 Step 8. Commit `Add shared UI kit`. + +### Task 3: Header, footer, sign-in modal + +**Files:** + +- Modify: `src/components/PickupHeader.tsx`, `src/components/PickupFooter.tsx`, `src/components/SignInModal.tsx` +- Create: `src/components/PickupHeader.test.tsx` +- Remove: `src/components/buttons/SimpleRedirectButton.tsx`, `RedirectButton.tsx` once no imports remain (check with `pnpm knip`) + +**Interfaces:** + +- Consumes: `Modal`, `Button`, `buttonClasses` from Task 2; `useAuth()` (`user`, `avatarUrl`, `isAdmin`, `signOut`, `signInWithGoogle`). +- Produces: `NavLink({ href, children, variant: 'header' | 'mobile' | 'footer', onNavigate? })` in `src/components/NavLink.tsx`, preserving `SimpleRedirectButton`'s behavior: `aria-current="page"` when active (exact or prefix match), click on current exact route is prevented. + +- [ ] **Step 1: Write failing tests** (mock `useAuth`, `next/navigation`): + - Signed-out: no "Dashboard" link; "Sign in" button present; clicking profile area opens dialog named "Sign in". + - Non-admin signed-in: no "Dashboard" link in the DOM at all (not just hidden). + - Admin: "Dashboard" link to `/admin` present. + - Mobile menu: toggle button has `aria-expanded`, opening it shows nav links, pressing Escape closes it and returns focus to the toggle. + - With pathname `/results`, the Results link has `aria-current="page"`. +- [ ] **Step 2:** Run, expect FAIL. +- [ ] **Step 3:** Rebuild header: navy bar (`h-16`), left: logo on white `rounded-lg` tile + "PICKUP" wordmark with "by ASPC" small caps in navy-200; desktop nav (`md:` and up) with Forms, Results, About, FAQ, and Dashboard for admins, sage underline for active; right: avatar button (profile) or "Sign in" secondary-on-navy button; mobile: hamburger opening a full-height paper sheet with large links and sign out. Remove the "always rendered but invisible" Dashboard trick; reserve layout width instead to avoid shift. Footer: paper with top hairline, links About, Contact, FAQ, ASPC Info, and "PICKUP is a service of the Associated Students of Pomona College". SignInModal uses `Modal` + Google button (`Button variant="primary"`). +- [ ] **Step 4:** Run tests, expect PASS. Remove header/footer/SignInModal from `LEGACY_FILES`; guard passes. +- [ ] **Step 5:** E2E in Chrome at 360, 390, 768, 1440 as signed-out, student, admin. Check no layout shift when auth resolves. +- [ ] **Step 6:** CI set, commit `Redesign header, footer and sign-in modal`. + +### Task 4: Boarding-pass RideTicket + +**Files:** + +- Create: `src/components/ui/RideTicket.tsx`, `src/components/ui/RideTicket.test.tsx` + +**Interfaces (Produces):** + +- `RideTicket({ date: string | null, time: string | null, airport: string, toAirport: boolean, status: RideStatus, stub?: ReactNode, children?: ReactNode, timeLabel?: string })`. +- Origin/destination codes: campus code is `CLA` (label "Claremont"); `toAirport` true → `CLA` then airport, false → airport then `CLA`. Time is formatted with existing `formatTime12Hour` from `@/utils/formatTime`; date shown as `Fri, Dec 12` using the parse approach in `date-picker.tsx` (no UTC shift). +- `children` render below the route (details, actions); `stub` renders below the dashed perforation. + +- [ ] **Step 1: Write failing tests:** `toAirport=true, airport='LAX'` renders codes in order `CLA`, `LAX`; `toAirport=false, airport='ONT'` renders `ONT`, `CLA`; `date='2026-12-12'` renders `Sat, Dec 12` regardless of TZ (run with `TZ=America/Los_Angeles` and `TZ=UTC` via `process.env.TZ` in test); `status='matched'` renders a `StatusBadge` with text Matched; route has an accessible label like "Claremont to LAX". +- [ ] **Step 2:** Run, expect FAIL. **Step 3:** Implement per spec's signature element description; codes `text-2xl font-semibold tracking-wide tabular-nums`; dashed line `border-dashed border-line`; perforation: dashed top border plus two paper-colored half-circle notches at the edges. Long `stub` text wraps. **Step 4:** Run, expect PASS. +- [ ] **Step 5:** Commit `Add boarding-pass RideTicket`. + +### Task 5: Home and error page + +**Files:** Modify `src/app/page.tsx`, `src/app/error.tsx`. + +- [ ] **Step 1:** Rebuild home keeping `handleGetStarted` logic untouched: paper hero (eyebrow in sage, Playfair headline "Split the ride to the airport.", supporting copy keeping the "$100+" message, primary CTA "Sign in with Google" / "Get started"), a three-step "How it works" row (Submit your flight → We match you → Ride together) with lucide icons in navy on sage-tint tiles, then a short ASPC subsidy/info strip linking to `/aspc-info`, and an FAQ link. No full-viewport-height hero on mobile; content starts above the fold. +- [ ] **Step 2:** Error page: `PageContainer narrow` + `EmptyState` with retry `Button` calling `reset`. +- [ ] **Step 3:** Remove both from `LEGACY_FILES`; delete now-unused `fade-in-up`/`gradient-x`/`float` CSS (grep first). Guard + CI pass. +- [ ] **Step 4:** E2E: signed-out CTA triggers Google sign-in, signed-in with incomplete profile routes to `/profile`, complete to `/questionnaires`. Check 360/390/1440. +- [ ] **Step 5:** Commit `Redesign home and error page`. + +### Task 6: Profile + +**Files:** Modify `src/app/profile/page.tsx`. + +- [ ] **Step 1:** Restyle with `PageContainer narrow`, `PageHeader`, `Card` sections, `Field`/`Input`/`Select`, avatar upload area, `Button` loading states, `Alert` for save success/error. Keep every handler, validation, and state variable. +- [ ] **Step 2:** Remove from `LEGACY_FILES`; guard + CI pass. +- [ ] **Step 3:** E2E: edit and save each field, trigger a validation error, upload avatar, check header avatar refresh; 360/390/1440. +- [ ] **Step 4:** Commit `Redesign profile page`. + +### Task 7: Flight forms + +**Files:** Modify `src/components/forms/FlightForm.tsx`, `src/app/questionnaires/page.tsx`, `src/app/matchForm/page.tsx`, `src/app/editForm/[flight_id]/page.tsx`, `src/components/questionnaires/ConfirmCancel.tsx`, `ManyBagsNotice.tsx`, `SubmitSuccess.tsx`. + +- [ ] **Step 1:** While restyling `FlightForm.tsx`, split presentational sections into `src/components/forms/flight-form/` files (one per visual section, e.g. `TripSection.tsx`, `TimeWindowSection.tsx`, `LuggageSection.tsx`, `PreferencesSection.tsx`, `ReviewSection.tsx`), each receiving values and callbacks as props; state, validation and submit logic stay in `FlightForm.tsx`. Use `Field` components, `DatePicker`, segmented control for to/from airport built from `buttonClasses`, sticky bottom submit bar on mobile. +- [ ] **Step 2:** Questionnaires list: each submitted flight as a `RideTicket` with status (`waiting` / `matched` / `past`) and edit/cancel actions; `ConfirmCancel` uses `Modal`; `ManyBagsNotice` uses `Alert warning`; `SubmitSuccess` uses `EmptyState`-style success panel. +- [ ] **Step 3:** Remove all listed files from `LEGACY_FILES`; guard + CI pass (including `flightValidation` and `studentCommands` tests untouched). +- [ ] **Step 4:** E2E: submit a new flight (to and from airport), trigger each validation error, edit an existing flight, cancel one, many-bags notice; deadline-closed state; 360/390/1440. +- [ ] **Step 5:** Commit `Redesign flight forms and questionnaires`. + +### Task 8: Results + +**Files:** Modify `src/app/results/page.tsx`, `src/app/results/layout.tsx`, `src/components/results/MatchCard.tsx`, `CommentSection.tsx`, `ConfirmCancelMatch.tsx`. Remove `src/components/results/EmptyState.tsx` in favor of the kit. + +- [ ] **Step 1:** `MatchCard` renders `RideTicket` (status from `isGroupReady`/`upcoming`), group members as avatar list with names and contact links, voucher and Uber type in the stub, add-to-calendar and airport address actions as `Button secondary sm`, cancel via `ConfirmCancelMatch` on `Modal`. Upcoming and past sections with headings. `CommentSection` as a simple thread inside the card. +- [ ] **Step 2:** Remove files from `LEGACY_FILES`; guard + CI pass. +- [ ] **Step 3:** E2E with seeded matches: upcoming + past, ready group, 6-person group, long names, comment post, calendar download, cancel; no-match empty state; 360/390/1440. +- [ ] **Step 4:** Commit `Redesign results`. + +### Task 9: Unmatched and match requests + +**Files:** Modify `src/app/unmatched/page.tsx`, `src/app/unmatched/layout.tsx`, `src/app/MatchRequestsPage/page.tsx`. + +- [ ] **Step 1:** Unmatched flights as `RideTicket status="unmatched"`; other riders list as compact cards; request actions as `Button`; info `Alert` explaining next steps. Same for match requests page. +- [ ] **Step 2:** Guard + CI. **Step 3:** E2E with `NEXT_PUBLIC_ENABLE_MATCH_REQUESTS` both `true` and `false`; empty state; 360/1440. **Step 4:** Commit `Redesign unmatched and match requests`. + +### Task 10: ASPC delay and ready flows + +**Files:** Modify `src/app/aspc-delay/page.tsx`, `src/app/aspc-delay/[rideId]/page.tsx`, `src/components/aspc-delay/*.tsx`, `src/app/aspc-ready/page.tsx`. + +- [ ] **Step 1:** Multi-step delay flow gets a step indicator (numbered, navy current, sage done), one `Card` per step, sticky back/next bar on mobile, `RideTicket status="delayed"` summary. Ready page: large clear confirm action, group summary as `RideTicket status="ready"`. +- [ ] **Step 2:** Guard + CI. **Step 3:** E2E through every delay step, including validation errors and the new-flight step; ready confirmation; 360/1440. **Step 4:** Commit `Redesign ASPC delay and ready flows`. + +### Task 11: Feedback + +**Files:** Modify `src/app/feedback/page.tsx`, `src/components/feedback/StarRating.tsx`. + +- [ ] **Step 1:** Form in `Card`s with `Field`s; `StarRating` stars in navy filled / line outline, keyboard operable as a radio group (`role="radiogroup"`, arrow keys). Add a test in `src/components/feedback/StarRating.test.tsx`: arrow right increases selection, each star has an accessible name "N stars". +- [ ] **Step 2:** Run test, FAIL, implement, PASS. Guard + CI. **Step 3:** E2E submit; 360/1440. **Step 4:** Commit `Redesign feedback`. + +### Task 12: Info pages + +**Files:** Modify `src/app/about/page.tsx`, `contact/page.tsx`, `faq/page.tsx`, `aspc-info/page.tsx`, `aspc-fees/page.tsx`, `aspc-policy/page.tsx`. + +- [ ] **Step 1:** `PageContainer prose` + `PageHeader`; consistent prose styles (headings, lists, tables for fees using `line` borders, callouts as `Alert`). FAQ uses `Accordion`. About keeps `teampic.jpg` with rounded corners. +- [ ] **Step 2:** Guard + CI. **Step 3:** E2E read-through at 360/1440, check tables don't overflow (wrap in horizontal scroll container on mobile). **Step 4:** Commit `Redesign info pages`. + +### Task 13: Admin dashboard + +**Files:** Modify `src/app/admin/layout.tsx`, `src/components/admin/AdminDashboard.tsx`, `AddRider.tsx`, `EmailComposerModal.tsx`. + +- [ ] **Step 1:** `PageContainer full`, admin sub-nav (Dashboard, Groups) as tabs, stat tiles as `Card`s, tables with sticky header, zebra-free rows separated by `line`, compact `Badge`s, `Button size="sm"`. `EmailComposerModal` on `Modal size="lg"`. Keep `.animate-spin` loading indicator (via `Spinner`). +- [ ] **Step 2:** Run `pnpm test -- AdminDashboard`; update only selectors that targeted removed classes, never assertions. Guard + CI. +- [ ] **Step 3:** E2E as admin at 1440 and 1024: add rider, compose email (do not send to real addresses; local DB only), filters, loading/empty states. **Step 4:** Commit `Redesign admin dashboard`. + +### Task 14: Admin groups management + +**Files:** Modify `src/components/admin/GroupsManagement.tsx` and every `.tsx` under `src/components/admin/groups-management/`. + +- [ ] **Step 1:** Restyle panels (`FiltersPanel`, `UnmatchedRidersPanel`, `MatchedGroupsPanel`, `CorralPanel`, `CreateGroupPanel`, `ChangesPanel`, `ChangeLogPanel`, `GroupsManagementModals`) with kit components and tokens. Groups shown as compact cards (route codes, time, members, voucher); drag/select states in sage-tint; destructive actions danger. Keep density: no larger than current row heights. +- [ ] **Step 2:** Run `pnpm test -- GroupsManagement UnmatchedRidersPanel`; selector-only updates. Guard + CI. +- [ ] **Step 3:** E2E as admin at 1440: filter, create group, move rider, corral, view changes and change log, export. **Step 4:** Commit `Redesign admin groups management`. + +### Task 15: Final sweep and PR + +**Files:** Modify `src/styles/noRawColors.test.ts`, any stragglers. + +- [ ] **Step 1:** Add assertion `expect(LEGACY_FILES).toEqual([])`; fix any remaining files. Remove unused components/exports flagged by `pnpm knip` and `pnpm knip:production`. +- [ ] **Step 2:** Full CI set passes; `pnpm format-check` passes; `grep -rn "—" src` returns nothing. +- [ ] **Step 3:** Full E2E pass of every route as signed-out, student and admin at 360, 390 and 1440, compared against the "before" screenshots for missing features. Fix anything off, however small. +- [ ] **Step 4:** Commit, push branch, open PR to `main` with a summary and before/after screenshots (no Claude attribution). diff --git a/docs/superpowers/specs/2026-10-28-frontend-redesign-design.md b/docs/superpowers/specs/2026-10-28-frontend-redesign-design.md new file mode 100644 index 0000000..d996ef3 --- /dev/null +++ b/docs/superpowers/specs/2026-10-28-frontend-redesign-design.md @@ -0,0 +1,128 @@ +# PICKUP frontend redesign - design + +Date: 2026-10-28 +Status: draft, awaiting approval + +## Intent + +PICKUP groups Claremont students into shared airport rides. The current frontend works but looks unfinished: a teal-to-pale-yellow gradient header and footer, floating blobs, pulsing text, and raw Tailwind teal / blue / indigo / yellow / red used with no shared meaning. Two styling systems coexist (shadcn-style CSS tokens that are mostly unused, plus Material Tailwind). + +The redesign should make PICKUP look like a member of the ASPC family (see `../aspc-website-v2`) while keeping its own personality, with a **clean and natural** feel. All existing functionality stays exactly as it is. + +## Users and devices + +- **Students, mostly on phones.** Every student screen is designed mobile-first and must look excellent at 360-430px wide, then scale up. +- **Admins, on laptops.** Admin screens are designed for 1280px+ first, using the same tokens and components but denser layouts. They must remain usable (not necessarily pretty) on tablets. + +## Goals + +1. One small, disciplined palette, enforced through tokens. No page may use raw Tailwind color scales (`teal-500`, `blue-600`, `gray-700`, ...) or hex values. +2. Visual kinship with ASPC: navy header, Inter body text, Playfair Display headings, white surfaces. +3. PICKUP's own identity through the sage accent and the boarding-pass ride card. +4. A shared component set (button, input, select, textarea, card, badge, modal, alert, page header, empty state, etc.) used by every page, so the look stays consistent and future pages inherit it. +5. Pixel-level polish: consistent spacing scale, alignment, focus states, hover/active states, loading and empty states, no layout shift. + +## Non-goals + +- No changes to behavior, data flow, routes, API routes, Supabase queries, auth, edge functions, or the ML pipeline. +- No rename and no new logo. Keep the name **PICKUP** and the current logo files (`/favicon.png`, `/favicon.ico`). +- No dark mode in this pass (no page uses `dark:` today). Light theme only. +- No new features. + +## Anti-goals (failure even if it "works") + +- Gradients, glowing blobs, floating shapes, pulsing or bouncing decorative text, rainbow of accent colors. +- A generic "AI template" look: centered hero with emoji, purple gradients, glassmorphism. +- Any regression in a student or admin flow, or any change in copy meaning. +- Admin tables and panels becoming less information-dense or slower to work in. + +## Visual system (decided) + +### Palette + +| Token | Value | Use | +| -------------------- | -------------------------------------- | ------------------------------------------------------------ | +| `navy` (primary) | `#13294B` | Header bar, headings, primary buttons, brand | +| `sage` (accent) | `#3E7C6B` | "Go / matched", success, links, small highlights, focus ring | +| `sage-tint` | approx `#E3EDE8` | Background behind sage badges and success alerts | +| `paper` (background) | `#F7F5F0` | Page background | +| `white` (card) | `#FFFFFF` | Cards, inputs, modals | +| `stone` (muted fg) | approx `#6B7280` family | Secondary text, placeholders, icons | +| `line` (border) | approx `#E7E3DA` | Hairline borders and dividers (warm, matches paper) | +| `danger` | a muted red, e.g. `#B42318` + its tint | Errors and destructive actions only | + +The builder may add tonal steps of navy and sage (for hover/pressed states, and a lighter navy for header text such as `#C9D3E3`) and a warm amber for "warning / pending action" states **only if a real state needs it**. Every color must be a named token in `globals.css` and `tailwind.config.js`; nothing else is allowed. + +### Typography + +- **Body/UI:** Inter (via `next/font/google`), replacing Geist. +- **Display:** Playfair Display for page titles (h1) and hero headlines only. Section headings and everything inside cards stay in Inter. +- A defined type scale (e.g. display, h1, h2, h3, body, small, caption, eyebrow) used everywhere. + +### Surfaces and shape + +- Paper page, white cards with a 1px warm hairline border. Shadows minimal (at most a subtle shadow on popovers/modals). +- Corner radius around 10-14px for cards, 8-10px for controls. Consistent across the app. +- Generous whitespace on student pages; tighter spacing on admin pages. + +### Header and footer + +- **Header:** solid navy bar like ASPC's. Logo + "PICKUP" wordmark with a small "by ASPC" line. Desktop: text nav links (Forms, Results, info pages, Dashboard for admins), profile avatar / sign-in. Mobile: hamburger opening a clean full-height navy or paper sheet. The current behaviors (admin Dashboard link, sign-in modal, sign-out, avatar refresh, active-route highlighting, preventing re-navigation to the current page) must all be preserved. +- **Footer:** quiet: paper or navy, with About, Contact, FAQ, ASPC Info links and a small ASPC attribution. + +### Signature element: boarding-pass ride card + +A ride/match is shown as a boarding pass: date and status badge on top; large origin and destination codes (e.g. `CLA` to `LAX`) joined by a dashed line, with time underneath; a dashed perforation separating a stub with group size and pickup location. Used on Results (`MatchCard`) and anywhere a ride summary appears (profile, unmatched, delay flow). Status badges use a dot plus a label: matched = sage, waiting/unmatched = stone, cancelled/error = danger. + +### Motion + +Subtle and functional only: short (150-200ms) color/opacity transitions, gentle enter for modals and the mobile menu, respecting `prefers-reduced-motion`. Keep the existing Cecil loading spinner and NextTopLoader (recolored to navy or sage). + +## Scope: every screen + +Student and public: + +- `/` home (hero, how it works, CTA logic for signed-in vs signed-out) +- `/profile` +- `/questionnaires`, `/matchForm`, `/editForm/[flight_id]` and `components/forms/FlightForm.tsx` (largest form, 2.6k lines) +- `/results` (+ `MatchCard`, `CommentSection`, `ConfirmCancelMatch`, `EmptyState`) +- `/unmatched`, `/MatchRequestsPage` (behind `NEXT_PUBLIC_ENABLE_MATCH_REQUESTS`) +- `/aspc-delay`, `/aspc-delay/[rideId]` and `components/aspc-delay/*` +- `/aspc-ready`, `/aspc-info`, `/aspc-fees`, `/aspc-policy` +- `/feedback` (+ `StarRating`) +- `/about`, `/contact`, `/faq` (drop Material Tailwind's accordion for a small in-house one) +- `error.tsx`, `SignInModal`, `components/questionnaires/*` + +Admin: + +- `/admin` (`AdminDashboard`, `AddRider`, `EmailComposerModal`) +- `/admin/groups` (`GroupsManagement` and everything in `groups-management/`) + +## Constraints + +- Stack stays: Next.js 15 App Router, React 18, Tailwind 3, Supabase. Keep existing Radix primitives (popover, tooltip, scroll-area) and `react-day-picker`; restyle them. +- Remove `@material-tailwind/react` (only used by the FAQ) and the `withMT` wrapper in `tailwind.config.js`. Remove `geist`. Remove `next-themes` / `ThemeProvider` if nothing else needs it after going light-only. Clean up unused custom animations in `globals.css`. +- CI must stay green: `pnpm type-check`, `pnpm knip`, `pnpm knip:production`, `pnpm lint`, `pnpm test:ci`, `pnpm build`. Existing tests (e.g. `AdminDashboard.test.tsx`, `GroupsManagement.test.tsx`, `UnmatchedRidersPanel.test.tsx`) must keep passing; update selectors only if they relied on visual classes, never weaken assertions. +- Accessibility: WCAG AA contrast for all text, visible focus rings, proper labels, 44px minimum touch targets on mobile. +- Prettier formatting as configured in the repo. No em dashes in copy or code. + +## How the work is verified + +- Run locally with `./start.sh` (local Supabase with seeded fake users and flights), sign in, and walk every flow end to end in a real browser at phone width (390px) and laptop width (1440px), as both a student and an admin. +- Screenshot each screen before and after for comparison. +- All CI checks above pass. + +## Calls made during review (not discussed explicitly) + +- **Logo:** the current logo is a cartoon mint car. It stays unchanged, sitting in a small white/paper rounded tile on the navy header so its mint glow does not clash with sage. Revisit if a new mark is designed later. +- **Delivery:** all work happens on one feature branch (`redesign/frontend`) with a commit per phase, merged as a single PR. `main` deploys to production on Netlify, so shipping half the pages restyled would look broken; the Netlify deploy preview on the PR is used for review. +- **Home hero:** light paper hero with a Playfair headline (as in the approved mockup), no photo and no navy hero block. +- **Wide layouts:** student pages use a centered single column (max around 640-720px) even on desktop; info pages use a readable prose width; admin uses full width. + +## Left to the builder + +- Exact tonal steps, spacing scale and type scale values, within the rules above. +- Component APIs and file layout for the shared UI kit (expected under `src/components/ui/`). +- The order pages are rebuilt in. Expected order: tokens and UI kit, then header and footer, then the student flow in the order students hit it, then info pages, then admin. +- How to restructure very large files (`FlightForm.tsx`, `GroupsManagement.tsx`) during restyling, provided behavior is unchanged and tests pass. +- Copy may be tightened for clarity, but meaning and instructions must stay the same. diff --git a/frontend/.fossa.yaml b/frontend/.fossa.yaml index e87d72c..921302e 100644 --- a/frontend/.fossa.yaml +++ b/frontend/.fossa.yaml @@ -2,4 +2,4 @@ version: 4 project: name: pickup-frontend - license: "LicenseRef-Proprietary" \ No newline at end of file + license: 'LicenseRef-Proprietary' diff --git a/frontend/documentation/BATCH_EMAIL_LOGIC.md b/frontend/documentation/BATCH_EMAIL_LOGIC.md index de50040..c26fe11 100644 --- a/frontend/documentation/BATCH_EMAIL_LOGIC.md +++ b/frontend/documentation/BATCH_EMAIL_LOGIC.md @@ -17,6 +17,7 @@ if (is_subsidized && to_airport) { ``` ### Factors: + 1. **`is_subsidized`** (boolean) - Is the ride covered by ASPC? 2. **`to_airport`** (boolean from Flights table) - Direction of travel - `true` = School → Airport (departure) @@ -25,15 +26,17 @@ if (is_subsidized && to_airport) { ### Variants: #### Variant 1: Subsidized TO Airport + - **When**: `is_subsidized = true` AND `to_airport = true` - **Subject**: "PICKUP — Your ASPC-subsidized ride group!" -- **Content**: +- **Content**: - Welcome message about upcoming trip - Meeting point: 647 N College Way (outside Lincoln Hall) - Voucher section - Contingency voucher (if exists and `to_airport = false` - wait, this seems wrong...) #### Variant 2: Subsidized FROM Airport + - **When**: `is_subsidized = true` AND `to_airport = false` - **Subject**: "PICKUP — Your ASPC-subsidized ride group!" - **Content**: @@ -43,6 +46,7 @@ if (is_subsidized && to_airport) { - Contingency voucher (only for return trips) #### Variant 3: Unsubsidized + - **When**: `is_subsidized = false` - **Subject**: "PICKUP — Your ride group!" - **Content**: @@ -53,11 +57,13 @@ if (is_subsidized && to_airport) { ### Additional Logic: **Contingency Voucher**: + - Only shown for **FROM airport trips** (`to_airport = false`) - Displayed when `contingency_voucher` exists - Includes delay/cancellation instructions **Group Members List**: + - Generated dynamically for each user - Excludes the current user - Shows name, email, and phone number @@ -67,6 +73,7 @@ if (is_subsidized && to_airport) { ### ❌ **Don't Use Templates (For Now)** **Reasons:** + 1. **Complex conditional logic** - You have nested conditions (subsidized + direction + contingency voucher) 2. **Dynamic group members** - Each email has different group members rendered as HTML 3. **Already working** - Your current HTML generation works fine @@ -75,6 +82,7 @@ if (is_subsidized && to_airport) { ### ✅ **Use Inline HTML (Current Approach)** **Benefits:** + 1. **All logic in one place** - Easy to see and modify 2. **Dynamic content** - Group members, vouchers, etc. generated per email 3. **No template setup** - Works immediately @@ -101,4 +109,3 @@ The batch function: 6. **Marks** `email_sent = true` for successful sends All email variants are handled in the `generateEmailHtml()` function with clear conditional logic. - diff --git a/frontend/documentation/OPERATIONS.md b/frontend/documentation/OPERATIONS.md index f37991a..32388b4 100644 --- a/frontend/documentation/OPERATIONS.md +++ b/frontend/documentation/OPERATIONS.md @@ -29,11 +29,11 @@ If the project is not linked, use `--project-id ` instead of `--linked`. Se Run this checklist before each break (Thanksgiving, winter, spring, summer, etc.). -| Step | File | What to change | -| ---- | ---- | -------------- | +| Step | File | What to change | +| ------------------------------------------ | ----------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | **All break dates, deadlines, directions** | [`src/config/servicePeriods.ts`](../src/config/servicePeriods.ts) | Add or edit period rows: `subsidized` outbound/inbound ranges, `buffered` window, `deadline` (ISO with correct PT offset), `allowedDirections`. Short breaks = one dual-direction row; long winter gap = separate outbound/return rows. | -| Airport mins + school | [`src/config/subsidyConfig.ts`](../src/config/subsidyConfig.ts) | `AIRPORT_MIN_RIDERS`, `ALLOWED_SCHOOL` only — covered date lists are derived automatically. | -| Optional deadline summary | [`FEATURE_STATUS.md`](./FEATURE_STATUS.md) | Any future banner should read buffered windows from `SERVICE_PERIODS` in `servicePeriods.ts`. | +| Airport mins + school | [`src/config/subsidyConfig.ts`](../src/config/subsidyConfig.ts) | `AIRPORT_MIN_RIDERS`, `ALLOWED_SCHOOL` only — covered date lists are derived automatically. | +| Optional deadline summary | [`FEATURE_STATUS.md`](./FEATURE_STATUS.md) | Any future banner should read buffered windows from `SERVICE_PERIODS` in `servicePeriods.ts`. | **Auto-updated consumers** (no manual edits needed after `servicePeriods.ts` changes): diff --git a/frontend/documentation/PERFORMANCE_BASELINE.md b/frontend/documentation/PERFORMANCE_BASELINE.md index 25002bc..8bc112f 100644 --- a/frontend/documentation/PERFORMANCE_BASELINE.md +++ b/frontend/documentation/PERFORMANCE_BASELINE.md @@ -14,12 +14,12 @@ Automated evidence verifies one-command browser contracts for the common move pa On June 13, 2026, Xavier M's `AA 123` flight was removed from Group #736 and restored to the same group through the authenticated local production build. Timing began with the mutation click and ended when the corresponding rider state became visible. The original four-rider group was restored after measurement. -| Mutation | Visible completion | -| --- | ---: | -| Remove from Group #736 to Unmatched | **404 ms** | -| Move from Unmatched into the Corral | **637 ms** | -| Re-add from the Corral to Group #736 | **703 ms** | -| Complete re-add mutation work | **1.34 s** | +| Mutation | Visible completion | +| ------------------------------------ | -----------------: | +| Remove from Group #736 to Unmatched | **404 ms** | +| Move from Unmatched into the Corral | **637 ms** | +| Re-add from the Corral to Group #736 | **703 ms** | +| Complete re-add mutation work | **1.34 s** | The 1.34-second re-add total combines the required Unmatched-to-Corral and Corral-to-group mutations and excludes administrator navigation and selection time. These measurements represent immediate user-visible state on a warm local production build; server persistence remains protected by the saving state, and failures trigger authoritative reconciliation. @@ -37,12 +37,12 @@ For each route, open the browser network panel with cache disabled, perform one On June 13, 2026, the application was built with `next build`, served with `next start` on localhost, and measured through an authenticated account containing matches, unmatched flights, and scoped Admin access. After one warm-up navigation, each route was fully reloaded three times. The endpoint was considered visible when its principal page heading appeared. Browser cache remained enabled, so these values represent warm repeat navigation rather than cold-cache or public-network performance. -| Route | Three authenticated runs | Median time to principal content | Primary telemetry response | -| --- | ---: | ---: | --- | -| Results | 826 ms, 710 ms, 692 ms | **710 ms** | Server-rendered `/results`; `/api/results` on later refresh | -| Unmatched | 646 ms, 640 ms, 915 ms | **646 ms** | Server-rendered `/unmatched`; `/api/unmatched/options` on later refresh | -| Admin | 672 ms, 683 ms, 666 ms | **672 ms** | `/api/admin/dashboard-summary` | -| Admin Groups | 775 ms, 818 ms, 790 ms | **790 ms** | `/api/admin/groups/snapshot` | +| Route | Three authenticated runs | Median time to principal content | Primary telemetry response | +| ------------ | -----------------------: | -------------------------------: | ----------------------------------------------------------------------- | +| Results | 826 ms, 710 ms, 692 ms | **710 ms** | Server-rendered `/results`; `/api/results` on later refresh | +| Unmatched | 646 ms, 640 ms, 915 ms | **646 ms** | Server-rendered `/unmatched`; `/api/unmatched/options` on later refresh | +| Admin | 672 ms, 683 ms, 666 ms | **672 ms** | `/api/admin/dashboard-summary` | +| Admin Groups | 775 ms, 818 ms, 790 ms | **790 ms** | `/api/admin/groups/snapshot` | All four principal views became visible in under one second at the median. Admin Groups, the heaviest audited workflow, reached visible content in 790 ms while loading a bounded first page. These values demonstrate the remediated local application path but do not include internet latency, remote production compute variance, or cold-cache startup. The `Server-Timing` and `X-Response-Bytes` headers remain available for a Network-panel capture in staging or production. diff --git a/frontend/documentation/SCHEMA.md b/frontend/documentation/SCHEMA.md index cbf8d7b..4940d18 100644 --- a/frontend/documentation/SCHEMA.md +++ b/frontend/documentation/SCHEMA.md @@ -59,8 +59,8 @@ erDiagram ## Storage (not in `database.types`) -| Bucket | Purpose | -|--------|---------| +| Bucket | Purpose | +| ----------------- | -------------------------------------------------------------- | | `profile_picture` | User-uploaded avatars (`Users.photo_url` points to public URL) | --- @@ -69,20 +69,20 @@ erDiagram One row per person; `user_id` = Supabase Auth user id. -| Column | Type | Definition | -|--------|------|------------| -| `user_id` | `uuid` | Primary key; same as `auth.users.id` | -| `firstname` | `text` | Legal/given name (required for flight submit) | -| `lastname` | `text` | Family name | -| `email` | `text` | Contact email (can be different from auth email) | -| `phonenumber` | `text` | Contact Phone number | -| `school` | `text` | Campus affiliation (e.g. Pomona); used for admin scope | -| `role` | `text` | `admin`, `super_admin`, or default student | -| `admin_scope` | `text` | For `admin`: limits which riders/groups they can edit (e.g. school) | -| `photo_url` | `text` | URL to avatar in `profile_picture` storage (not really used right now) | -| `instagram` | `text` | Optional handle | -| `sms_opt_in` | `boolean` | Whether user opted into SMS with ASPC | -| `created_at` | `timestamptz` | Profile row created | +| Column | Type | Definition | +| ------------- | ------------- | ---------------------------------------------------------------------- | +| `user_id` | `uuid` | Primary key; same as `auth.users.id` | +| `firstname` | `text` | Legal/given name (required for flight submit) | +| `lastname` | `text` | Family name | +| `email` | `text` | Contact email (can be different from auth email) | +| `phonenumber` | `text` | Contact Phone number | +| `school` | `text` | Campus affiliation (e.g. Pomona); used for admin scope | +| `role` | `text` | `admin`, `super_admin`, or default student | +| `admin_scope` | `text` | For `admin`: limits which riders/groups they can edit (e.g. school) | +| `photo_url` | `text` | URL to avatar in `profile_picture` storage (not really used right now) | +| `instagram` | `text` | Optional handle | +| `sms_opt_in` | `boolean` | Whether user opted into SMS with ASPC | +| `created_at` | `timestamptz` | Profile row created | --- @@ -90,34 +90,34 @@ One row per person; `user_id` = Supabase Auth user id. Trip questionnaire submission; one user can have multiple flights over time. -| Column | Type | Definition | -|--------|------|------------| -| `flight_id` | `bigint` | Primary key | -| `user_id` | `uuid` | Owner → `Users.user_id` | -| `to_airport` | `boolean` | `true` = campus → airport; `false` = airport → campus | -| `airport` | `text` | Airport code (e.g. LAX, ONT) | -| `date` | `date` | Primary travel date | -| `earliest_time` | `time` | Start of preferred window | -| `latest_time` | `time` | End of preferred window | -| `latest_date` | `date` | End date if window spans days | -| `bag_no` | `int` | Standard checked bags | -| `bag_no_large` | `int` | Oversize checked bags | -| `bag_no_personal` | `int` | Personal/carry-on items | -| `flight_no` | `int` | Airline flight number (required) | -| `airline_iata` | `text` | Airline code (required) | -| `terminal` | `text` | Terminal | -| `opt_in` | `boolean` | Included in unmatched page | -| `matched` | `boolean` | `true` when user is in a group (`Matches` exists) | -| `original_unmatched` | `boolean` | Was unmatched before manual/algorithm grouping | -| `max_dropoff` | `int` | Max extra dropoffs willing (not really used currently) | -| `max_price` | `int` | Max price willingness (not really used currently) | -| `unmatched_email_sent` | `boolean` | Unmatched outreach email already sent | -| `last_status` | `text` | Last flight-status API status | -| `last_arr_estimated_utc` | `timestamptz` | Last known arrival estimate (UTC) | -| `last_dep_estimated_utc` | `timestamptz` | Last known departure estimate (UTC) | -| `last_notified_at` | `timestamptz` | Last delay notification time | -| `last_notified_delay_min` | `int` | Delay minutes at last notification | -| `created_at` | `timestamptz` | Row created | +| Column | Type | Definition | +| ------------------------- | ------------- | ------------------------------------------------------ | +| `flight_id` | `bigint` | Primary key | +| `user_id` | `uuid` | Owner → `Users.user_id` | +| `to_airport` | `boolean` | `true` = campus → airport; `false` = airport → campus | +| `airport` | `text` | Airport code (e.g. LAX, ONT) | +| `date` | `date` | Primary travel date | +| `earliest_time` | `time` | Start of preferred window | +| `latest_time` | `time` | End of preferred window | +| `latest_date` | `date` | End date if window spans days | +| `bag_no` | `int` | Standard checked bags | +| `bag_no_large` | `int` | Oversize checked bags | +| `bag_no_personal` | `int` | Personal/carry-on items | +| `flight_no` | `int` | Airline flight number (required) | +| `airline_iata` | `text` | Airline code (required) | +| `terminal` | `text` | Terminal | +| `opt_in` | `boolean` | Included in unmatched page | +| `matched` | `boolean` | `true` when user is in a group (`Matches` exists) | +| `original_unmatched` | `boolean` | Was unmatched before manual/algorithm grouping | +| `max_dropoff` | `int` | Max extra dropoffs willing (not really used currently) | +| `max_price` | `int` | Max price willingness (not really used currently) | +| `unmatched_email_sent` | `boolean` | Unmatched outreach email already sent | +| `last_status` | `text` | Last flight-status API status | +| `last_arr_estimated_utc` | `timestamptz` | Last known arrival estimate (UTC) | +| `last_dep_estimated_utc` | `timestamptz` | Last known departure estimate (UTC) | +| `last_notified_at` | `timestamptz` | Last delay notification time | +| `last_notified_delay_min` | `int` | Delay minutes at last notification | +| `created_at` | `timestamptz` | Row created | --- @@ -125,31 +125,31 @@ Trip questionnaire submission; one user can have multiple flights over time. Rider ↔ group membership. **Shared `ride_id`** = one carpool group. -| Column | Type | Definition | -|--------|------|------------| -| `id` | `bigint` | Primary key (match row id) | -| `ride_id` | `bigint` | Group id (links members; FK to `Rides.ride_id` in DB) | -| `user_id` | `uuid` | Rider → `Users.user_id` | -| `flight_id` | `bigint` | Rider’s flight → `Flights.flight_id` | -| `date` | `date` | Group pickup date (admin/algorithm set) | -| `time` | `time` | Group pickup time | -| `earliest_time` | `time` | Optional window start on match row | -| `latest_time` | `time` | Optional window end on match row | -| `voucher` | `text` | Primary Uber voucher URL (`https://r.uber.com/...`) | -| `contingency_voucher` | `text` | Backup voucher (for return trips) | -| `is_subsidized` | `boolean` | ASPC-subsidized ride | -| `subsidized_override` | `boolean` | Admin forced subsidy on/off | -| `uber_type` | `text` | Suggested product: `X`, `XL`, `XXL`, `Connect` | -| `uber_type_override` | `boolean` | Admin overrode vehicle size | -| `is_verified` | `boolean` | Optionally used for testing before sending batch match emails (have to change batch emails edge function to use with this)| -| `email_sent` | `boolean` | Match confirmation email sent | -| `source` | `text` | algorithm, manual, match request, etc. | -| `group_ready_at` | `timestamptz` | Set when all riders completed ASPC ready flow | -| `ready_for_pickup_at` | `timestamptz` | When this user marked ready at pickup | -| `ready_for_pickup_status` | `text` | `ready` or `reporting_missing` | -| `reported_missing_user_ids` | `uuid[]` | Users reported absent at pickup | -| `reason_for_delay` | `text` | Delay reason from ASPC delay flow | -| `created_at` | `timestamptz` | Row created | +| Column | Type | Definition | +| --------------------------- | ------------- | -------------------------------------------------------------------------------------------------------------------------- | +| `id` | `bigint` | Primary key (match row id) | +| `ride_id` | `bigint` | Group id (links members; FK to `Rides.ride_id` in DB) | +| `user_id` | `uuid` | Rider → `Users.user_id` | +| `flight_id` | `bigint` | Rider’s flight → `Flights.flight_id` | +| `date` | `date` | Group pickup date (admin/algorithm set) | +| `time` | `time` | Group pickup time | +| `earliest_time` | `time` | Optional window start on match row | +| `latest_time` | `time` | Optional window end on match row | +| `voucher` | `text` | Primary Uber voucher URL (`https://r.uber.com/...`) | +| `contingency_voucher` | `text` | Backup voucher (for return trips) | +| `is_subsidized` | `boolean` | ASPC-subsidized ride | +| `subsidized_override` | `boolean` | Admin forced subsidy on/off | +| `uber_type` | `text` | Suggested product: `X`, `XL`, `XXL`, `Connect` | +| `uber_type_override` | `boolean` | Admin overrode vehicle size | +| `is_verified` | `boolean` | Optionally used for testing before sending batch match emails (have to change batch emails edge function to use with this) | +| `email_sent` | `boolean` | Match confirmation email sent | +| `source` | `text` | algorithm, manual, match request, etc. | +| `group_ready_at` | `timestamptz` | Set when all riders completed ASPC ready flow | +| `ready_for_pickup_at` | `timestamptz` | When this user marked ready at pickup | +| `ready_for_pickup_status` | `text` | `ready` or `reporting_missing` | +| `reported_missing_user_ids` | `uuid[]` | Users reported absent at pickup | +| `reason_for_delay` | `text` | Delay reason from ASPC delay flow | +| `created_at` | `timestamptz` | Row created | --- @@ -157,14 +157,14 @@ Rider ↔ group membership. **Shared `ride_id`** = one carpool group. Group-level header (date/time/voucher at ride granularity). The frontend mostly reads/writes **`Matches`**; we added extra columns here for the future if ride characteristics (time, type, voucher, etc.) should be moved to this table instead of in `Matches`. Currently, all this info is stored in `Matches` and the query logic follows that. -| Column | Type | Definition | -|--------|------|------------| -| `ride_id` | `bigint` | Primary key (same id used on `Matches.ride_id`) | -| `ride_date` | `date` | Group date | -| `ride_time` | `time` | Group time (unused) | -| `ride_type` | `text` | Category label for the ride (unused)| -| `subsidized` | `boolean` | Ride-level subsidy flag (unused)| -| `voucher` | `text` | Ride-level voucher (may mirror match vouchers) (unused)| +| Column | Type | Definition | +| ------------ | --------- | ------------------------------------------------------- | +| `ride_id` | `bigint` | Primary key (same id used on `Matches.ride_id`) | +| `ride_date` | `date` | Group date | +| `ride_time` | `time` | Group time (unused) | +| `ride_type` | `text` | Category label for the ride (unused) | +| `subsidized` | `boolean` | Ride-level subsidy flag (unused) | +| `voucher` | `text` | Ride-level voucher (may mirror match vouchers) (unused) | --- @@ -172,15 +172,15 @@ Group-level header (date/time/voucher at ride granularity). The frontend mostly Peer requests between unmatched travelers. -| Column | Type | Definition | -|--------|------|------------| -| `id` | `uuid` | Primary key | -| `sender_id` | `uuid` | User who sent request | -| `receiver_id` | `uuid` | User who receives request | -| `sender_flight_id` | `bigint` | Sender’s `Flights.flight_id` | -| `receiver_flight_id` | `bigint` | Receiver’s `Flights.flight_id` | -| `status` | `text` | `pending`, `accepted`, or `rejected` | -| `created_at` | `timestamptz` | Request created | +| Column | Type | Definition | +| -------------------- | ------------- | ------------------------------------ | +| `id` | `uuid` | Primary key | +| `sender_id` | `uuid` | User who sent request | +| `receiver_id` | `uuid` | User who receives request | +| `sender_flight_id` | `bigint` | Sender’s `Flights.flight_id` | +| `receiver_flight_id` | `bigint` | Receiver’s `Flights.flight_id` | +| `status` | `text` | `pending`, `accepted`, or `rejected` | +| `created_at` | `timestamptz` | Request created | Accepting calls RPC `accept_match_request`, which creates/updates `Matches` and marks flights matched. @@ -190,20 +190,20 @@ Accepting calls RPC `accept_match_request`, which creates/updates `Matches` and Audit trail for admin actions, algorithm runs, emails, and ASPC delay events. -| Column | Type | Definition | -|--------|------|------------| -| `id` | `uuid` | Primary key | -| `actor_user_id` | `uuid` | Who performed the action | -| `actor_role` | `text` | Role at time of action (e.g. Admin) | -| `action` | `text` | Event type (see list below) | -| `target_group_id` | `bigint` | Affected `ride_id`, if any | -| `target_user_id` | `uuid` | Affected user, if any | -| `metadata` | `jsonb` | Structured details (times, vouchers, flight ids, etc.) | -| `algorithm_run_id` | `text` | Links to matching run when relevant | -| `change_batch_id` | `uuid` | Groups multiple log lines from one admin operation | -| `confirmed` | `boolean` | Admin acknowledged a validation warning | -| `ignored_error` | `boolean` | Error was explicitly ignored | -| `created_at` | `timestamptz` | Event time | +| Column | Type | Definition | +| ------------------ | ------------- | ------------------------------------------------------ | +| `id` | `uuid` | Primary key | +| `actor_user_id` | `uuid` | Who performed the action | +| `actor_role` | `text` | Role at time of action (e.g. Admin) | +| `action` | `text` | Event type (see list below) | +| `target_group_id` | `bigint` | Affected `ride_id`, if any | +| `target_user_id` | `uuid` | Affected user, if any | +| `metadata` | `jsonb` | Structured details (times, vouchers, flight ids, etc.) | +| `algorithm_run_id` | `text` | Links to matching run when relevant | +| `change_batch_id` | `uuid` | Groups multiple log lines from one admin operation | +| `confirmed` | `boolean` | Admin acknowledged a validation warning | +| `ignored_error` | `boolean` | Error was explicitly ignored | +| `created_at` | `timestamptz` | Event time | **Common `action` values** (from app): `RUN_ALGORITHM`, `ADD_TO_GROUP`, `REMOVE_FROM_GROUP`, `CREATE_GROUP`, `DELETE_GROUP`, `UPDATE_GROUP_TIME`, `UPDATE_VOUCHER`, `UPDATE_RIDER_DETAILS`, `EMAIL_CONFIRMED`, `ADD_FLIGHT`, `ASPC_DELAY`, `IGNORE_ERROR`. @@ -213,18 +213,18 @@ Audit trail for admin actions, algorithm runs, emails, and ASPC delay events. Matching job lifecycle (admin dashboard). -| Column | Type | Definition | -|--------|------|------------| -| `id` | `uuid` | Primary key | -| `algorithm_name` | `text` | Which matcher ran | -| `status` | `text` | Run state (scheduled, running, completed, failed, etc.) | -| `target` | `text` | Scope or target description | -| `run_id` | `text` | External or internal run identifier | -| `scheduled_for` | `timestamptz` | When run was scheduled | -| `started_at` | `timestamptz` | Run start | -| `finished_at` | `timestamptz` | Run end | -| `error_message` | `text` | Failure details | -| `created_at` | `timestamptz` | Row created | +| Column | Type | Definition | +| ---------------- | ------------- | ------------------------------------------------------- | +| `id` | `uuid` | Primary key | +| `algorithm_name` | `text` | Which matcher ran | +| `status` | `text` | Run state (scheduled, running, completed, failed, etc.) | +| `target` | `text` | Scope or target description | +| `run_id` | `text` | External or internal run identifier | +| `scheduled_for` | `timestamptz` | When run was scheduled | +| `started_at` | `timestamptz` | Run start | +| `finished_at` | `timestamptz` | Run end | +| `error_message` | `text` | Failure details | +| `created_at` | `timestamptz` | Row created | --- @@ -232,14 +232,14 @@ Matching job lifecycle (admin dashboard). Comments on a match or ride (results UI). People use this for messaging each other within their groups. -| Column | Type | Definition | -|--------|------|------------| -| `id` | `bigint` | Primary key | -| `user_id` | `uuid` | Author | -| `match_id` | `bigint` | Optional → `Matches.id` | -| `ride_id` | `bigint` | Optional group reference | -| `comment` | `text` | Body | -| `created_at` | `timestamptz` | Posted at | +| Column | Type | Definition | +| ------------ | ------------- | ------------------------ | +| `id` | `bigint` | Primary key | +| `user_id` | `uuid` | Author | +| `match_id` | `bigint` | Optional → `Matches.id` | +| `ride_id` | `bigint` | Optional group reference | +| `comment` | `text` | Body | +| `created_at` | `timestamptz` | Posted at | --- @@ -247,15 +247,15 @@ Comments on a match or ride (results UI). People use this for messaging each oth Post-trip ratings. -| Column | Type | Definition | -|--------|------|------------| -| `feedback_id` | `bigint` | Primary key | -| `user_id` | `uuid` | Respondent | -| `flight_id` | `bigint` | Trip rated | -| `overall` | `int` | Overall score | -| `convenience` | `int` | Convenience score | -| `comments` | `text` | Free text | -| `created_at` | `timestamptz` | Submitted at | +| Column | Type | Definition | +| ------------- | ------------- | ----------------- | +| `feedback_id` | `bigint` | Primary key | +| `user_id` | `uuid` | Respondent | +| `flight_id` | `bigint` | Trip rated | +| `overall` | `int` | Overall score | +| `convenience` | `int` | Convenience score | +| `comments` | `text` | Free text | +| `created_at` | `timestamptz` | Submitted at | --- @@ -263,13 +263,13 @@ Post-trip ratings. Terms / privacy acceptance log. -| Column | Type | Definition | -|--------|------|------------| -| `id` | `uuid` | Primary key | -| `user_id` | `uuid` | Who accepted | -| `terms_version` | `text` | Version string of legal docs | -| `action` | `text` | Context (e.g. new flight vs edit) | -| `accepted_at` | `timestamptz` | When accepted | +| Column | Type | Definition | +| --------------- | ------------- | --------------------------------- | +| `id` | `uuid` | Primary key | +| `user_id` | `uuid` | Who accepted | +| `terms_version` | `text` | Version string of legal docs | +| `action` | `text` | Context (e.g. new flight vs edit) | +| `accepted_at` | `timestamptz` | When accepted | --- @@ -277,23 +277,23 @@ Terms / privacy acceptance log. Recorded when users cancel a match (admin reporting / policy). -| Column | Type | Definition | -|--------|------|------------| -| `id` | `bigint` | Primary key | -| `user_id` | `uuid` | Who cancelled | -| `ride_id` | `bigint` | Group left | -| `flight_id` | `bigint` | Flight row | -| `airport` | `text` | Airport at time of cancel | -| `to_airport` | `boolean` | Direction | -| `match_date` | `date` | Scheduled group date | -| `match_time` | `time` | Scheduled group time | -| `is_subsidized` | `boolean` | Was subsidized | -| `cancellation_type` | `text` | Category (no-show, user cancel, etc.) | -| `reason` | `text` | User or system reason | -| `cancelled_at` | `timestamptz` | When cancelled | -| `cancelled_before_1hr` | `boolean` | Within 1 hour of pickup | -| `cancelled_after_deadline` | `boolean` | After policy deadline | -| `waived` | `boolean` | No fee applies (no voucher and not Connect at cancel time) | +| Column | Type | Definition | +| -------------------------- | ------------- | ---------------------------------------------------------- | +| `id` | `bigint` | Primary key | +| `user_id` | `uuid` | Who cancelled | +| `ride_id` | `bigint` | Group left | +| `flight_id` | `bigint` | Flight row | +| `airport` | `text` | Airport at time of cancel | +| `to_airport` | `boolean` | Direction | +| `match_date` | `date` | Scheduled group date | +| `match_time` | `time` | Scheduled group time | +| `is_subsidized` | `boolean` | Was subsidized | +| `cancellation_type` | `text` | Category (no-show, user cancel, etc.) | +| `reason` | `text` | User or system reason | +| `cancelled_at` | `timestamptz` | When cancelled | +| `cancelled_before_1hr` | `boolean` | Within 1 hour of pickup | +| `cancelled_after_deadline` | `boolean` | After policy deadline | +| `waived` | `boolean` | No fee applies (no voucher and not Connect at cancel time) | --- diff --git a/frontend/package.json b/frontend/package.json index 7f26144..7aa04ad 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -35,9 +35,7 @@ "install-safe": "corepack use pnpm@9.15.2 && pnpm install --frozen-lockfile" }, "dependencies": { - "@material-tailwind/react": "^2.1.10", "@radix-ui/react-popover": "^1.3.1", - "@radix-ui/react-scroll-area": "^1.4.0", "@radix-ui/react-tooltip": "^1.4.1", "@supabase/ssr": "^0.12.7", "@supabase/supabase-js": "^2.118.0", @@ -46,16 +44,14 @@ "@types/react-dom": "18.2.5", "autoprefixer": "10.6.1", "clsx": "^2.1.0", - "geist": "^1.8.2", "lucide-react": "^0.304.0", "next": "15.5.28", - "next-themes": "^0.4.6", "nextjs-toploader": "^1.6.4", "react": "18.2.0", "react-day-picker": "^10.0.2", "react-dom": "18.2.0", "tailwind-merge": "^2.2.0", - "tailwindcss": "3.3.3", + "tailwindcss": "3.4.19", "tailwindcss-animate": "^1.0.7", "typescript": "5.1.3" }, diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 076fa83..03c4f2d 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -23,15 +23,9 @@ importers: .: dependencies: - '@material-tailwind/react': - specifier: ^2.1.10 - version: 2.1.10(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@radix-ui/react-popover': specifier: ^1.3.1 version: 1.3.1(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - '@radix-ui/react-scroll-area': - specifier: ^1.4.0 - version: 1.4.0(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) '@radix-ui/react-tooltip': specifier: ^1.4.1 version: 1.4.1(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -56,18 +50,12 @@ importers: clsx: specifier: ^2.1.0 version: 2.1.1 - geist: - specifier: ^1.8.2 - version: 1.8.2(next@15.5.28(@babel/core@7.29.6)(@types/node@20.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)) lucide-react: specifier: ^0.304.0 version: 0.304.0(react@18.2.0) next: specifier: 15.5.28 version: 15.5.28(@babel/core@7.29.6)(@types/node@20.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - next-themes: - specifier: ^0.4.6 - version: 0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0) nextjs-toploader: specifier: ^1.6.4 version: 1.6.12(next@15.5.28(@babel/core@7.29.6)(@types/node@20.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0) @@ -84,11 +72,11 @@ importers: specifier: ^2.2.0 version: 2.6.0 tailwindcss: - specifier: 3.3.3 - version: 3.3.3 + specifier: 3.4.19 + version: 3.4.19 tailwindcss-animate: specifier: ^1.0.7 - version: 1.0.7(tailwindcss@3.3.3) + version: 1.0.7(tailwindcss@3.4.19) typescript: specifier: 5.1.3 version: 5.1.3 @@ -412,12 +400,6 @@ packages: '@emnapi/wasi-threads@1.2.2': resolution: {integrity: sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==} - '@emotion/is-prop-valid@0.8.8': - resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==} - - '@emotion/memoize@0.7.4': - resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==} - '@eslint-community/eslint-utils@4.9.1': resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -436,39 +418,18 @@ packages: resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - '@floating-ui/core@1.7.3': - resolution: {integrity: sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==} - '@floating-ui/core@1.8.0': resolution: {integrity: sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==} - '@floating-ui/dom@1.7.4': - resolution: {integrity: sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==} - '@floating-ui/dom@1.8.0': resolution: {integrity: sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==} - '@floating-ui/react-dom@1.3.0': - resolution: {integrity: sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==} - peerDependencies: - react: '>=16.8.0' - react-dom: '>=16.8.0' - '@floating-ui/react-dom@2.1.9': resolution: {integrity: sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==} peerDependencies: react: '>=16.8.0' react-dom: '>=16.8.0' - '@floating-ui/react@0.19.0': - resolution: {integrity: sha512-fgYvN4ksCi5OvmPXkyOT8o5a8PSKHMzPHt+9mR6KYWdF16IAjWRLZPAAziI2sznaWT23drRFrYw64wdvYqqaQw==} - peerDependencies: - react: '>=16.8.0' - react-dom: '>=16.8.0' - - '@floating-ui/utils@0.2.10': - resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} - '@floating-ui/utils@0.2.12': resolution: {integrity: sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==} @@ -755,30 +716,6 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} - '@material-tailwind/react@2.1.10': - resolution: {integrity: sha512-xGU/mLDKDBp/qZ8Dp2XR7fKcTpDuFeZEBqoL9Bk/29kakKxNxjUGYSRHEFLsyOFf4VIhU6WGHdIS7tOA3QGJHA==} - peerDependencies: - react: ^16 || ^17 || ^18 - react-dom: ^16 || ^17 || ^18 - - '@motionone/animation@10.18.0': - resolution: {integrity: sha512-9z2p5GFGCm0gBsZbi8rVMOAJCtw1WqBTIPw3ozk06gDvZInBPIsQcHgYogEJ4yuHJ+akuW8g1SEIOpTOvYs8hw==} - - '@motionone/dom@10.12.0': - resolution: {integrity: sha512-UdPTtLMAktHiqV0atOczNYyDd/d8Cf5fFsd1tua03PqTwwCe/6lwhLSQ8a7TbnQ5SN0gm44N1slBfj+ORIhrqw==} - - '@motionone/easing@10.18.0': - resolution: {integrity: sha512-VcjByo7XpdLS4o9T8t99JtgxkdMcNWD3yHU/n6CLEz3bkmKDRZyYQ/wmSf6daum8ZXqfUAgFeCZSpJZIMxaCzg==} - - '@motionone/generators@10.18.0': - resolution: {integrity: sha512-+qfkC2DtkDj4tHPu+AFKVfR/C30O1vYdvsGYaR13W/1cczPrrcjdvYCj0VLFuRMN+lP1xvpNZHCRNM4fBzn1jg==} - - '@motionone/types@10.17.1': - resolution: {integrity: sha512-KaC4kgiODDz8hswCrS0btrVrzyU2CSQKO7Ps90ibBVSQmjkrt2teqta6/sOG59v7+dPnKMAg13jyqtMKV2yJ7A==} - - '@motionone/utils@10.18.0': - resolution: {integrity: sha512-3XVF7sgyTSI2KWvTf6uLlBJ5iAgRgmvp3bpuOiQJvInd4nZ19ET8lX5unn30SlmRH7hXbBbH+Gxd0m0klJ3Xtw==} - '@napi-rs/wasm-runtime@0.2.12': resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==} @@ -1097,9 +1034,6 @@ packages: '@polka/url@1.0.0-next.29': resolution: {integrity: sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==} - '@radix-ui/number@1.1.3': - resolution: {integrity: sha512-Road2bidD0uu/1BGDOWNdPI06g0lIRy6IF9GZcIrDK2KGItfor8IQwQa+yM2ERgHM1MmHxaxpTzk0/Jp42lNfA==} - '@radix-ui/primitive@1.2.0': resolution: {integrity: sha512-KABY+VMIRPJL+Vyzv/335FEhXXD/xDv8BMb1kl48/aXJZMH0LtHCTx5ga5RnxaEP3nZHtmTLf1P9vanmFX46bw==} @@ -1134,15 +1068,6 @@ packages: '@types/react': optional: true - '@radix-ui/react-direction@1.2.0': - resolution: {integrity: sha512-FtRA52a/r+LKStFT+neLUm+8vSe7wbzkbQGGeU8ixFiwC8NU14Evoq9ATECqL3eGbcUzJR4fyfA4KkK/q6dfqg==} - peerDependencies: - '@types/react': '*' - react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - peerDependenciesMeta: - '@types/react': - optional: true - '@radix-ui/react-dismissable-layer@1.2.1': resolution: {integrity: sha512-KIfDcAsx+oVylFZ4xryVKusJUrLLhTQmfnJW4kwk4Km5myvhHCrj04hnWWUC166+xD4DHdH8tQGylwYX1h6+Pg==} peerDependencies: @@ -1252,19 +1177,6 @@ packages: '@types/react-dom': optional: true - '@radix-ui/react-scroll-area@1.4.0': - resolution: {integrity: sha512-CFrLqHNejWq5FhKAcj9V/WPGRsol76HBQto81NdOBVFEOqIEkJkKIJt0Z824A/9hHLCtoiR/Kw3euRgzXP2pxg==} - peerDependencies: - '@types/react': '*' - '@types/react-dom': '*' - react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc - peerDependenciesMeta: - '@types/react': - optional: true - '@types/react-dom': - optional: true - '@radix-ui/react-slot@1.5.0': resolution: {integrity: sha512-tyYd9ddPXAysAbdbD9eYxgwpCSv6f3PncqVSNKQFSR5lcJVLz3cb/pANDoYrLiHBpXv7skortyUgGUWsYuPPFQ==} peerDependencies: @@ -2037,9 +1949,6 @@ packages: cjs-module-lexer@2.2.0: resolution: {integrity: sha512-4bHTS2YuzUvtoLjdy+98ykbNB5jS0+07EvFNXerqZQJ89F7DI6ET7OQo/HJuW6K0aVsKA9hj9/RVb2kQVOrPDQ==} - classnames@2.3.2: - resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==} - cli-cursor@5.0.0: resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==} engines: {node: '>=18'} @@ -2174,10 +2083,6 @@ packages: deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} - deepmerge@4.2.2: - resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==} - engines: {node: '>=0.10.0'} - deepmerge@4.3.1: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} @@ -2519,15 +2424,6 @@ packages: fraction.js@5.3.4: resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==} - framer-motion@6.5.1: - resolution: {integrity: sha512-o1BGqqposwi7cgDrtg0dNONhkmPsUFDaLcKXigzuTFC5x58mE8iyTazxSudFzmT6MEyJKfjjU8ItoMe3W+3fiw==} - peerDependencies: - react: '>=16.8 || ^17.0.0 || ^18.0.0' - react-dom: '>=16.8 || ^17.0.0 || ^18.0.0' - - framesync@6.0.1: - resolution: {integrity: sha512-fUY88kXvGiIItgNC7wcTOl0SNRCVXMKSWW2Yzfmn7EKNc+MpCzcz9DhdHcdjbrtN3c6R4H5dTY2jiCpPdysEjA==} - fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -2546,11 +2442,6 @@ packages: functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - geist@1.8.2: - resolution: {integrity: sha512-fRF4sbJ9qcCxPb35cVtKBAwYlTt1IbU9nkbPi0a+xyZqPIjCJ2BY8ekGhx6/SGSZKrR7/UuL57r/eeDQ1Xy11g==} - peerDependencies: - next: '>=13.2.0' - generator-function@2.0.1: resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==} engines: {node: '>= 0.4'} @@ -2664,9 +2555,6 @@ packages: resolution: {integrity: sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==} engines: {node: '>= 0.4'} - hey-listen@1.0.8: - resolution: {integrity: sha512-COpmrF2NOg4TBWUJ5UVyaCU2A88wEMkUPK4hNqyCkqHbxT92BbvfjoSozkAIIm6XhicGlJHhFdullInrdhwU8Q==} - html-encoding-sniffer@4.0.0: resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==} engines: {node: '>=18'} @@ -3145,10 +3033,6 @@ packages: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} - lilconfig@2.1.0: - resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} - engines: {node: '>=10'} - lilconfig@3.1.3: resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} engines: {node: '>=14'} @@ -3206,9 +3090,6 @@ packages: makeerror@1.0.12: resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} - material-ripple-effects@2.0.1: - resolution: {integrity: sha512-hHlUkZAuXbP94lu02VgrPidbZ3hBtgXBtjlwR8APNqOIgDZMV8MCIcsclL8FmGJQHvnORyvoQgC965vPsiyXLQ==} - math-intrinsics@1.1.0: resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} engines: {node: '>= 0.4'} @@ -3281,12 +3162,6 @@ packages: natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} - next-themes@0.4.6: - resolution: {integrity: sha512-pZvgD5L0IEvX5/9GWyHMf3m8BKiVQwsCMHfoFosXtXBMnaS0ZnIJ9ST4b4NqLVKDEm8QBxoNNGNaBv2JNF6XNA==} - peerDependencies: - react: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc - react-dom: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc - next@15.5.28: resolution: {integrity: sha512-JjhLBBY1PNnuwPtcZ7t8yxVeJVYvD2Jyp633J+gRCNbzSt7N0E+xqCf6uQiff3+3qmUkwcF/ksfSsK1xsZ76Tw==} engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0} @@ -3510,9 +3385,6 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - popmotion@11.0.3: - resolution: {integrity: sha512-Y55FLdj3UxkR7Vl3s7Qr4e9m0onSnP8W7d/xQLsoJM40vs6UKHFdygs6SWryasTZYqugMjm3BepCF4CWXDiHgA==} - possible-typed-array-names@1.1.0: resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==} engines: {node: '>= 0.4'} @@ -3983,9 +3855,6 @@ packages: resolution: {integrity: sha512-1tB5mhVo7U+ETBKNf92xT4hrQa3pm0MZ0PQvuDnWgAAGHDsfp4lPSpiS6psrSiet87wyGPh9ft6wmhOMQ0hDiw==} engines: {node: '>=14.16'} - style-value-types@5.0.0: - resolution: {integrity: sha512-08yq36Ikn4kx4YU6RD7jWEv27v4V+PUsOGa4n/as8Et3CuODMJQ00ENeAVXAeydX4Z2j1XHZF1K2sX4mGl18fA==} - styled-jsx@5.1.6: resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==} engines: {node: '>= 12.0.0'} @@ -4027,12 +3896,6 @@ packages: resolution: {integrity: sha512-eNRKgb3z66Yp3D2CixVujOUvXLFUTij/zVnV8KRyvFdQwpz7I5DS8UfRkTeLzb64u+dkzDSdelE24izu+zSSUg==} engines: {node: ^14.18.0 || >=16.0.0} - tabbable@6.2.0: - resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - - tailwind-merge@1.8.1: - resolution: {integrity: sha512-+fflfPxvHFr81hTJpQ3MIwtqgvefHZFUHFiIHpVIRXvG/nX9+gu2P7JNlFu2bfDMJ+uHhi/pUgzaYacMoXv+Ww==} - tailwind-merge@2.6.0: resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==} @@ -4041,8 +3904,8 @@ packages: peerDependencies: tailwindcss: '>=3.0.0 || insiders' - tailwindcss@3.3.3: - resolution: {integrity: sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==} + tailwindcss@3.4.19: + resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -4060,10 +3923,6 @@ packages: thenify@3.3.1: resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - tinyglobby@0.2.16: - resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.17: resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} @@ -4619,14 +4478,6 @@ snapshots: tslib: 2.8.1 optional: true - '@emotion/is-prop-valid@0.8.8': - dependencies: - '@emotion/memoize': 0.7.4 - optional: true - - '@emotion/memoize@0.7.4': - optional: true - '@eslint-community/eslint-utils@4.9.1(eslint@8.57.1)': dependencies: eslint: 8.57.1 @@ -4650,46 +4501,21 @@ snapshots: '@eslint/js@8.57.1': {} - '@floating-ui/core@1.7.3': - dependencies: - '@floating-ui/utils': 0.2.10 - '@floating-ui/core@1.8.0': dependencies: '@floating-ui/utils': 0.2.12 - '@floating-ui/dom@1.7.4': - dependencies: - '@floating-ui/core': 1.7.3 - '@floating-ui/utils': 0.2.10 - '@floating-ui/dom@1.8.0': dependencies: '@floating-ui/core': 1.8.0 '@floating-ui/utils': 0.2.12 - '@floating-ui/react-dom@1.3.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': - dependencies: - '@floating-ui/dom': 1.7.4 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - '@floating-ui/react-dom@2.1.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@floating-ui/dom': 1.8.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - '@floating-ui/react@0.19.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': - dependencies: - '@floating-ui/react-dom': 1.3.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - aria-hidden: 1.2.6 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - tabbable: 6.2.0 - - '@floating-ui/utils@0.2.10': {} - '@floating-ui/utils@0.2.12': {} '@humanwhocodes/config-array@0.13.0': @@ -5042,53 +4868,6 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 - '@material-tailwind/react@2.1.10(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': - dependencies: - '@floating-ui/react': 0.19.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - classnames: 2.3.2 - deepmerge: 4.2.2 - framer-motion: 6.5.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - material-ripple-effects: 2.0.1 - prop-types: 15.8.1 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - tailwind-merge: 1.8.1 - - '@motionone/animation@10.18.0': - dependencies: - '@motionone/easing': 10.18.0 - '@motionone/types': 10.17.1 - '@motionone/utils': 10.18.0 - tslib: 2.8.1 - - '@motionone/dom@10.12.0': - dependencies: - '@motionone/animation': 10.18.0 - '@motionone/generators': 10.18.0 - '@motionone/types': 10.17.1 - '@motionone/utils': 10.18.0 - hey-listen: 1.0.8 - tslib: 2.8.1 - - '@motionone/easing@10.18.0': - dependencies: - '@motionone/utils': 10.18.0 - tslib: 2.8.1 - - '@motionone/generators@10.18.0': - dependencies: - '@motionone/types': 10.17.1 - '@motionone/utils': 10.18.0 - tslib: 2.8.1 - - '@motionone/types@10.17.1': {} - - '@motionone/utils@10.18.0': - dependencies: - '@motionone/types': 10.17.1 - hey-listen: 1.0.8 - tslib: 2.8.1 - '@napi-rs/wasm-runtime@0.2.12': dependencies: '@emnapi/core': 1.10.0 @@ -5289,8 +5068,6 @@ snapshots: '@polka/url@1.0.0-next.29': {} - '@radix-ui/number@1.1.3': {} - '@radix-ui/primitive@1.2.0': {} '@radix-ui/react-arrow@1.1.17(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': @@ -5314,12 +5091,6 @@ snapshots: optionalDependencies: '@types/react': 18.2.8 - '@radix-ui/react-direction@1.2.0(@types/react@18.2.8)(react@18.2.0)': - dependencies: - react: 18.2.0 - optionalDependencies: - '@types/react': 18.2.8 - '@radix-ui/react-dismissable-layer@1.2.1(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': dependencies: '@radix-ui/primitive': 1.2.0 @@ -5427,24 +5198,6 @@ snapshots: '@types/react': 18.2.8 '@types/react-dom': 18.2.5 - '@radix-ui/react-scroll-area@1.4.0(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)': - dependencies: - '@radix-ui/number': 1.1.3 - '@radix-ui/primitive': 1.2.0 - '@radix-ui/react-compose-refs': 1.1.5(@types/react@18.2.8)(react@18.2.0) - '@radix-ui/react-context': 1.3.0(@types/react@18.2.8)(react@18.2.0) - '@radix-ui/react-direction': 1.2.0(@types/react@18.2.8)(react@18.2.0) - '@radix-ui/react-presence': 1.1.11(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - '@radix-ui/react-primitive': 2.2.0(@types/react-dom@18.2.5)(@types/react@18.2.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - '@radix-ui/react-slot': 1.5.0(@types/react@18.2.8)(react@18.2.0) - '@radix-ui/react-use-callback-ref': 1.1.5(@types/react@18.2.8)(react@18.2.0) - '@radix-ui/react-use-layout-effect': 1.1.4(@types/react@18.2.8)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - optionalDependencies: - '@types/react': 18.2.8 - '@types/react-dom': 18.2.5 - '@radix-ui/react-slot@1.5.0(@types/react@18.2.8)(react@18.2.0)': dependencies: '@radix-ui/react-compose-refs': 1.1.5(@types/react@18.2.8)(react@18.2.0) @@ -6226,8 +5979,6 @@ snapshots: cjs-module-lexer@2.2.0: {} - classnames@2.3.2: {} - cli-cursor@5.0.0: dependencies: restore-cursor: 5.1.0 @@ -6350,8 +6101,6 @@ snapshots: deep-is@0.1.4: {} - deepmerge@4.2.2: {} - deepmerge@4.3.1: {} define-data-property@1.1.4: @@ -6814,10 +6563,6 @@ snapshots: dependencies: walk-up-path: 4.0.0 - fdir@6.5.0(picomatch@4.0.4): - optionalDependencies: - picomatch: 4.0.4 - fdir@6.5.0(picomatch@4.0.7): optionalDependencies: picomatch: 4.0.7 @@ -6864,23 +6609,6 @@ snapshots: fraction.js@5.3.4: {} - framer-motion@6.5.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0): - dependencies: - '@motionone/dom': 10.12.0 - framesync: 6.0.1 - hey-listen: 1.0.8 - popmotion: 11.0.3 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - style-value-types: 5.0.0 - tslib: 2.8.1 - optionalDependencies: - '@emotion/is-prop-valid': 0.8.8 - - framesync@6.0.1: - dependencies: - tslib: 2.8.1 - fs.realpath@1.0.0: {} fsevents@2.3.3: @@ -6899,10 +6627,6 @@ snapshots: functions-have-names@1.2.3: {} - geist@1.8.2(next@15.5.28(@babel/core@7.29.6)(@types/node@20.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)): - dependencies: - next: 15.5.28(@babel/core@7.29.6)(@types/node@20.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - generator-function@2.0.1: {} gensync@1.0.0-beta.2: {} @@ -7014,8 +6738,6 @@ snapshots: dependencies: function-bind: 1.1.2 - hey-listen@1.0.8: {} - html-encoding-sniffer@4.0.0: dependencies: whatwg-encoding: 3.1.1 @@ -7694,8 +7416,6 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - lilconfig@2.1.0: {} - lilconfig@3.1.3: {} lines-and-columns@1.2.4: {} @@ -7766,8 +7486,6 @@ snapshots: dependencies: tmpl: 1.0.5 - material-ripple-effects@2.0.1: {} - math-intrinsics@1.1.0: {} merge-stream@2.0.0: {} @@ -7819,11 +7537,6 @@ snapshots: natural-compare@1.4.0: {} - next-themes@0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0): - dependencies: - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - next@15.5.28(@babel/core@7.29.6)(@types/node@20.3.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0): dependencies: '@next/env': 15.5.28 @@ -8079,13 +7792,6 @@ snapshots: dependencies: find-up: 4.1.0 - popmotion@11.0.3: - dependencies: - framesync: 6.0.1 - hey-listen: 1.0.8 - style-value-types: 5.0.0 - tslib: 2.8.1 - possible-typed-array-names@1.1.0: {} postcss-import@15.1.0(postcss@8.5.23): @@ -8103,7 +7809,7 @@ snapshots: postcss-load-config@4.0.2(postcss@8.5.23): dependencies: lilconfig: 3.1.3 - yaml: 2.9.0 + yaml: 2.9.1 optionalDependencies: postcss: 8.5.23 @@ -8561,11 +8267,6 @@ snapshots: strip-json-comments@5.0.3: {} - style-value-types@5.0.0: - dependencies: - hey-listen: 1.0.8 - tslib: 2.8.1 - styled-jsx@5.1.6(@babel/core@7.29.6)(react@18.2.0): dependencies: client-only: 0.0.1 @@ -8580,7 +8281,7 @@ snapshots: lines-and-columns: 1.2.4 mz: 2.7.0 pirates: 4.0.7 - tinyglobby: 0.2.16 + tinyglobby: 0.2.17 ts-interface-checker: 0.1.13 supabase@2.110.0: @@ -8613,17 +8314,13 @@ snapshots: dependencies: '@pkgr/core': 0.3.6 - tabbable@6.2.0: {} - - tailwind-merge@1.8.1: {} - tailwind-merge@2.6.0: {} - tailwindcss-animate@1.0.7(tailwindcss@3.3.3): + tailwindcss-animate@1.0.7(tailwindcss@3.4.19): dependencies: - tailwindcss: 3.3.3 + tailwindcss: 3.4.19 - tailwindcss@3.3.3: + tailwindcss@3.4.19: dependencies: '@alloc/quick-lru': 5.2.0 arg: 5.0.2 @@ -8634,7 +8331,7 @@ snapshots: glob-parent: 6.0.2 is-glob: 4.0.3 jiti: 1.21.7 - lilconfig: 2.1.0 + lilconfig: 3.1.3 micromatch: 4.0.8 normalize-path: 3.0.0 object-hash: 3.0.0 @@ -8666,11 +8363,6 @@ snapshots: dependencies: any-promise: 1.3.0 - tinyglobby@0.2.16: - dependencies: - fdir: 6.5.0(picomatch@4.0.4) - picomatch: 4.0.4 - tinyglobby@0.2.17: dependencies: fdir: 6.5.0(picomatch@4.0.7) diff --git a/frontend/src/app/MatchRequestsPage/page.tsx b/frontend/src/app/MatchRequestsPage/page.tsx index d90e255..9cb0873 100644 --- a/frontend/src/app/MatchRequestsPage/page.tsx +++ b/frontend/src/app/MatchRequestsPage/page.tsx @@ -3,7 +3,15 @@ import { postJson, requestJson } from '@/utils/api' import { useEffect, useState, useCallback } from 'react' import { useAuth } from '@/hooks/useAuth' -import EmptyState from '@/components/results/EmptyState' +import { Inbox } from 'lucide-react' + +import { SignInPrompt } from '@/components/SignInPrompt' +import { Button, ButtonLink } from '@/components/ui/Button' +import { EmptyState } from '@/components/ui/EmptyState' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' +import { RideTicket } from '@/components/ui/RideTicket' +import { Spinner } from '@/components/ui/Spinner' +import { formatTime12Hour } from '@/utils/formatTime' type IncomingMatchRequest = { id: string @@ -69,75 +77,95 @@ export default function MatchRequestsPage() { } } + const header = ( + + ) + // Show loading state while checking authentication if (isLoading) { return ( -
-

Incoming Match Requests

-
-
Loading...
+ + {header} +
+ + Loading...
-
+ ) } // Show login prompt for unauthenticated users if (!isAuthenticated || !user) { return ( -
-

Incoming Match Requests

- -
+ + {header} + + ) } return ( -
-

Incoming Match Requests

- + + {header} {requests.length === 0 ? ( -

No new requests.

+ + Browse unmatched flights + + } + /> ) : (
    {requests.map((req) => ( -
  • -

    - {req.sender_flight?.Users?.firstname}{' '} - {req.sender_flight?.Users?.lastname} wants to ride with you. -

    -

    - Flight Date: {req.sender_flight?.date} -

    -

    - Direction:{' '} - {req.sender_flight?.to_airport - ? `School → ${req.sender_flight?.airport}` - : `${req.sender_flight?.airport} → School`} -

    -

    - Earliest: {req.sender_flight?.earliest_time} -

    -

    - Latest: {req.sender_flight?.latest_time} -

    -
    - - -
    +
  • + + + +
+ } + > +

+ {req.sender_flight?.Users?.firstname}{' '} + {req.sender_flight?.Users?.lastname} wants to ride with you. +

+

+ Earliest{' '} + {formatTime12Hour(req.sender_flight?.earliest_time ?? '')} · + Latest{' '} + {formatTime12Hour(req.sender_flight?.latest_time ?? '')} +

+ ))} )} -
+ ) } diff --git a/frontend/src/app/about/page.tsx b/frontend/src/app/about/page.tsx index 52b5efb..3d73dc6 100644 --- a/frontend/src/app/about/page.tsx +++ b/frontend/src/app/about/page.tsx @@ -1,210 +1,122 @@ -'use client' import Image from 'next/image' +import { Card } from '@/components/ui/Card' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' + +const TIMELINE = [ + { when: 'Months in advance', what: 'Book your flight.' }, + { + when: '14 days', + what: 'Complete PICKUP questionnaire.', + note: 'Anytime between booking and 7 days before', + }, + { when: '3 days', what: 'Receive your match and contact.' }, + { when: '0 days!', what: 'Get PICKed UP! Fill out feedback.' }, +] + export default function About() { return ( -
- {/* Background decoration */} -
-
-
-
-
+ + + +
+

+ No student should pay $100+ for a solo ride to LAX. While the + Claremont Colleges sometimes provide shuttles, they're often + limited. That's where PICKUP comes in. +

+

+ We're a student-led team making travel more affordable and + accessible for the 5C community. Our platform matches students with + similar flight plans so you can share rides and split costs. +

+

+ The idea for PICKUP was born out of personal frustration. After + struggling to find affordable airport transportation ourselves, we + realized there was a better solution waiting to be built. With the + help of our loving and dedicated engineering team, we've been + working on this platform throughout the year. +

+

+ Whether it's your first ride or your fiftieth, we hope PICKUP + makes your journey a little easier. +

-
- {/* Header Section */} -
-
-
- - +

+ How it works +

+

Countdown to flight:

+
    + {TIMELINE.map((step, index) => ( +
  1. + {index < TIMELINE.length - 1 && ( + - -
-

- About PICKUP -

-

- Making airport travel affordable and accessible for the 5C - community -

-
-
- - {/* Content Section */} -
-
- {/* Story Section */} -
-
-

- No student should pay $100+ for a solo ride to LAX. While the - Claremont Colleges sometimes provide shuttles, they're - often limited. That's where PICKUP comes in. -

-

- We're a student-led team making travel more affordable - and accessible for the 5C community. Our platform matches - students with similar flight plans so you can share rides and - split costs. -

-

- The idea for PICKUP was born out of personal frustration. - After struggling to find affordable airport transportation - ourselves, we realized there was a better solution waiting to - be built. With the help of our loving and dedicated - engineering team, we've been working on this platform - throughout the year. -

-

- Whether it's your first ride or your fiftieth, we hope - PICKUP makes your journey a little easier. -

-
-
- - {/* How it Works Section */} -
-
-

- How it Works -

-

- Countdown to Flight: -

+ )} + + {index + 1} + +
+

{step.when}

+

{step.what}

+ {step.note && ( +

{step.note}

+ )}
+ + ))} + + - {/* Simple Timeline */} -
-
-
- 1 -
-
-

- Months in Advance -

-

Book your flight.

-
-
- -
-
- 2 -
-
-

- 14 Days -

-

- Complete PICKUP questionnaire. -

-

- * anytime between booking and 7 days before * -

-
-
- -
-
- 3 -
-
-

- 3 Days -

-

- Receive your match and contact. -

-
-
+
+

+ Meet our team +

+

+ Built by students, for students. Special thanks to our incredible + engineering team! +

-
-
- 4 -
-
-

- 0 Days! -

-

- Get PICKed UP! Fill out feedback. -

-
-
-
-
- - {/* Team Section */} -
-
-

- Meet Our Team -

-

- Built by students, for students. Special thanks to our - incredible engineering team! -

- - {/* Team Photo */} -
-
- PICKUP Engineering Team -
-
-
- - {/* Photo Caption */} -
-

- Our engineers (top to bottom, left to right):
- - Haram Yoon, Henok Dawite, Francisco Morales (Lead ML), - Yunju Song, Julianne Louie (Lead SWE), Kellie Au, Josh - Oyadomari-Chun, Melinda Deng - -

-
- - {/* Cofounders Recognition */} -
-

- Cofounders -

-

- Julianne Louie & Francisco Morales -

-
- -
-

- 🙏 Thank you to our - amazing team for helping us build the foundation of PICKUP. - Your contributions made this platform possible for the 5C - community! -

-
-
+ + PICKUP Engineering Team +
+

+ Our engineers (top to bottom, left to right): + + Haram Yoon, Henok Dawite, Francisco Morales (Lead ML), Yunju + Song, Julianne Louie (Lead SWE), Kellie Au, Josh Oyadomari-Chun, + Melinda Deng + +

+
+

Cofounders

+

+ Julianne Louie & Francisco Morales +

-
-
-
+ + +

+ Thank you to our amazing team for helping us build the foundation of + PICKUP. Your contributions made this platform possible for the 5C + community! +

+ + ) } diff --git a/frontend/src/app/admin/layout.tsx b/frontend/src/app/admin/layout.tsx index 13bdf14..bfade61 100644 --- a/frontend/src/app/admin/layout.tsx +++ b/frontend/src/app/admin/layout.tsx @@ -2,6 +2,8 @@ import { AuthHydrator } from '@/providers/AuthProvider' import { getAdminPagePrincipal } from '@/lib/server/auth' import { redirect } from 'next/navigation' +import { AdminNav } from '@/components/admin/AdminNav' + export default async function AdminLayout({ children, }: { @@ -12,6 +14,7 @@ export default async function AdminLayout({ return ( + {children} ) diff --git a/frontend/src/app/aspc-delay/[rideId]/page.tsx b/frontend/src/app/aspc-delay/[rideId]/page.tsx index 83326fd..84e2867 100644 --- a/frontend/src/app/aspc-delay/[rideId]/page.tsx +++ b/frontend/src/app/aspc-delay/[rideId]/page.tsx @@ -5,7 +5,7 @@ import { useParams } from 'next/navigation' import { useAuth } from '@/hooks/useAuth' import { requestJson } from '@/utils/api' import { useCallback, useEffect, useState } from 'react' -import RedirectButton from '@/components/buttons/RedirectButton' +import { ButtonLink } from '@/components/ui/Button' import FlightConfirmStep from '@/components/aspc-delay/FlightConfirmStep' import NewFlightStep, { type NewFlightTimeRange, @@ -204,10 +204,9 @@ export default function AspcDelayPage() { if (loading) { return ( -
-
-
-

Loading…

+
+
+

Loading…

) @@ -215,12 +214,13 @@ export default function AspcDelayPage() { if (error) { return ( -
-
-
-
-

{error}

- +
+
+
+

{error}

+ + Back to Results +
@@ -230,32 +230,29 @@ export default function AspcDelayPage() { if (findResult?.success) { if (findResult.keptOriginalGroupBecauseEarlierEta) { return ( -
-
-
+
+
-
-

+
+

This isn't a delay for your match

-

+

The pickup time you entered is earlier than your original group's time. You can still make that ride, so you've been{' '} - kept on your original group—nothing was + kept on your original group - nothing was changed.

-

+

Wait for your original pickup time on Results. If your plans change again and you'll be later than the group, you can report a delay then.

-
- +
+ + Back to Results +
@@ -274,28 +271,27 @@ export default function AspcDelayPage() { getContingencyVoucherDeclineReasons(findResult) return ( -
-
-
+
+
-
+
{joinedRideId != null ? ( <> -

+

You've been added to the group. Your Results page has been updated.

) : choseUnmatched ? ( <> -

+

You've been removed from your group. You can look for other riders on the unmatched page.

-

+

Go to unmatched page @@ -303,23 +299,23 @@ export default function AspcDelayPage() { ) : findResult.movedToUnmatched ? ( <> -

+

We couldn't find another group for your new pickup time. No contingency voucher was applied for these reasons:

-
-
+

+ Important information +

+
    +
  • + Pickup Location:{' '} + 647 College Way (in front of Lincoln Hall east entrance) +
  • +
  • + Uber Vouchers:{' '} + Geofenced to only allow pickup within 250 ft of the designated + location +
  • +
  • + Safety: For + emergencies, call 911 (off-campus) or Campus Safety at (909) 607-2000 + (on-campus) +
  • +
+ +

+ This page provides quick access to ASPC's official RideLink + resources. External links open in new tabs. Questions about PICKUP + itself?{' '} + + Contact us + + . +

+ ) } diff --git a/frontend/src/app/aspc-policy/page.tsx b/frontend/src/app/aspc-policy/page.tsx index bef748b..d591ac1 100644 --- a/frontend/src/app/aspc-policy/page.tsx +++ b/frontend/src/app/aspc-policy/page.tsx @@ -1,197 +1,130 @@ -'use client' +import { Lightbulb } from 'lucide-react' +import Link from 'next/link' -import { useRouter } from 'next/navigation' -import { SERVICE_PERIODS } from '@/config/servicePeriods' +import { Alert } from '@/components/ui/Alert' +import { Card } from '@/components/ui/Card' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' import { formatDeadlineForDisplay, formatSubsidizedWindowsForDisplay, } from '@/config/servicePeriodHelpers' +import { SERVICE_PERIODS } from '@/config/servicePeriods' + +const textLink = + 'font-medium text-navy underline underline-offset-2 hover:text-sage' export default function ASPCPolicy() { - const router = useRouter() const activePeriod = SERVICE_PERIODS[SERVICE_PERIODS.length - 1] return ( -
- {/* Background decoration */} -
-
-
-
-
-
- -
-
- {/* Header Section */} -
-
- - - -
-

- ASPC RideLink Policy -

-

- 2025-2026 Operational Guidelines -

-
- - {/* Policy Content */} -
- {/* Contact Info */} -
-

- Questions? Contact{' '} - - ridelink@aspc.pomona.edu - -

-

- 📋 View{' '} - -

-
+ + - {/* Operational Periods */} -
-

- 📅 Operational Periods -

+ + Questions? Contact{' '} + + ridelink@aspc.pomona.edu + + . View{' '} + + Cancellation & Change Fees + + . + - {activePeriod && ( -
-

- {activePeriod.name} -

-
-
-

- Deadline to request: -

-

- {formatDeadlineForDisplay(activePeriod.deadline)} -

-
-
-

- Service Window: -

-
    - {formatSubsidizedWindowsForDisplay(activePeriod).map( - (line) => ( -
  • {line}
  • - ), - )} -
-
-
-
- )} -
- - {/* How Matching Works */} -
-

- 🤝 How Matching Works -

-
-

- RideLink covers rides only when groups can be formed:{' '} - 2+ riders to ONT or{' '} - 3+ riders to LAX. -

-
-

- 💡 Tips to Increase Your Matching Odds: -

-
    -
  • - • - - Travel during common times: Daytime - hours and within ±1 day of the start or end of the break - -
  • -
  • - • - - Be flexible: Provide a wide range of - availability and be willing to arrive at the airport - earlier than necessary - -
  • -
  • - • - - Encourage friends: More riders = more - matches! Get your friends to sign up - -
  • +
    +

    + Operational periods +

    + {activePeriod && ( + +

    + {activePeriod.name} +

    +
    +
    +
    Deadline to request:
    +
    + {formatDeadlineForDisplay(activePeriod.deadline)} +
    +
    +
    +
    Service window:
    +
    +
      + {formatSubsidizedWindowsForDisplay(activePeriod).map( + (line) => ( +
    • {line}
    • + ), + )}
    -
    -

    - If a sufficient group cannot be formed, RideLink will be - unable to cover the ride. However, you may still use PICKUP to - coordinate non-subsidized carpools. -

    +
-
+ + + )} + - {/* Important Notes */} -
-

- ⚠️ Important Notes -

-
-
    -
  • - • - - Ride Scheduling: Ride times are assigned - to increase shared ridership and ensure efficient use of - the program's budget. - -
  • -
  • - • - - Your scheduled ride may depart earlier than the latest - possible time you could leave for your flight. Students - should plan accordingly when booking flights. - -
  • -
-
-
-
+
+

+ How matching works +

+

+ RideLink covers rides only when groups can be formed:{' '} + 2+ riders to ONT or{' '} + 3+ riders to LAX. +

+
+

+ + Tips to increase your matching odds +

+
    +
  • + + Travel during common times: + {' '} + Daytime hours and within ±1 day of the start or end of the break +
  • +
  • + Be flexible: Provide a + wide range of availability and be willing to arrive at the airport + earlier than necessary +
  • +
  • + Encourage friends: More + riders = more matches! Get your friends to sign up +
  • +
-
-
+

+ If a sufficient group cannot be formed, RideLink will be unable to + cover the ride. However, you may still use PICKUP to coordinate + non-subsidized carpools. +

+ + +
+

+ Important notes +

+
    +
  • + Ride Scheduling: Ride + times are assigned to increase shared ridership and ensure efficient + use of the program's budget. +
  • +
  • + Your scheduled ride may depart earlier than the latest possible time + you could leave for your flight. Students should plan accordingly + when booking flights. +
  • +
+
+ ) } diff --git a/frontend/src/app/aspc-ready/page.tsx b/frontend/src/app/aspc-ready/page.tsx index ab4c068..27c5da4 100644 --- a/frontend/src/app/aspc-ready/page.tsx +++ b/frontend/src/app/aspc-ready/page.tsx @@ -7,7 +7,9 @@ import { useSearchParams } from 'next/navigation' import { useRouter } from 'next/navigation' import { useCallback, useEffect, useState } from 'react' import Link from 'next/link' -import RedirectButton from '@/components/buttons/RedirectButton' +import { ButtonLink } from '@/components/ui/Button' +import { formatRideDate } from '@/components/ui/RideTicket' +import { formatTime12Hour } from '@/utils/formatTime' import { isGroupReady } from '@/utils/groupReadiness' type MatchRow = { @@ -195,18 +197,18 @@ function AspcReadyContent() { if (!isAuthenticated) { return ( -
-
-
-

+
+
+
+

ASPC Ready for Pickup

-

+

Sign in to confirm your group is ready for pickup.

@@ -218,21 +220,20 @@ function AspcReadyContent() { if (loading) { return ( -
-
+
+
) } if (!rideId && userRides.length > 0) { return ( -
-
-
-

+
+
+

Ready for Pickup

-

+

Select a ride to confirm your group is ready:

@@ -240,14 +241,16 @@ function AspcReadyContent() { {r.label} ))}
- + + Back to Results +
@@ -256,16 +259,18 @@ function AspcReadyContent() { if (!rideId && userRides.length === 0) { return ( -
-
-

+
+
+

Ready for Pickup

-

+

You don't have any upcoming rides. Go to the results page to view your matches.

- + + Back to Results +
) @@ -273,13 +278,15 @@ function AspcReadyContent() { if (error && matches.length === 0) { return ( -
-
-

+
+
+

Ready for Pickup

-

{error}

- +

{error}

+ + Back to Results +
) @@ -287,13 +294,12 @@ function AspcReadyContent() { if (groupReady) { return ( -
-
-
-
-
+
+
+
+
-

+

Your group is ready!

-

+

Your voucher is available on the results page.

- + + View Results +
) } - const matchDate = firstMatch?.date - ? new Date(firstMatch.date + 'T00:00:00').toLocaleDateString() - : firstMatch?.Flights?.date - ? new Date(firstMatch.Flights.date + 'T00:00:00').toLocaleDateString() - : '' + const matchDate = formatRideDate( + firstMatch?.date ?? firstMatch?.Flights?.date ?? null, + ) - const matchTime = firstMatch?.time ? firstMatch.time.slice(0, 5) : '' + const matchTime = firstMatch?.time ? formatTime12Hour(firstMatch.time) : '' return ( -
-
-
-
+
+
+
{/* Delayed / Missing notice */} - +
-

- Delayed or missing? -

-

+

Delayed or missing?

+

If you are delayed and will miss this ride, report it here and get rematched or a contingency voucher.

-

+

Confirm your group is ready to receive voucher

-

+

{firstMatch?.Flights?.to_airport - ? `${firstMatch.Flights.airport} — School → Airport` - : `${firstMatch?.Flights?.airport} — Airport → School`} + ? `${firstMatch.Flights.airport} - School → Airport` + : `${firstMatch?.Flights?.airport} - Airport → School`}

{confirmedCount} of {totalCount} group members have confirmed

{everyoneAccountedFor ? ( -

+

Everyone accounted for! You may return to the Results. {rideVoucher && ( @@ -409,7 +412,7 @@ function AspcReadyContent() { href={rideVoucher} target="_blank" rel="noopener noreferrer" - className="text-green-800 underline hover:text-green-900" + className="font-medium text-navy underline underline-offset-2 hover:text-sage" > {rideVoucher} @@ -428,7 +431,7 @@ function AspcReadyContent() { href={rideContingency} target="_blank" rel="noopener noreferrer" - className="text-green-800 underline hover:text-green-900" + className="font-medium text-navy underline underline-offset-2 hover:text-sage" > {rideContingency} @@ -440,7 +443,7 @@ function AspcReadyContent() { Your voucher will also appear on the results page.

) : ( -

+

Complete the form below and press Confirm. If some members are missing, select them below.

@@ -450,21 +453,19 @@ function AspcReadyContent() { type="button" onClick={() => void fetchRideData()} className={`min-h-[44px] shrink-0 text-sm font-medium hover:underline sm:min-h-0 ${ - everyoneAccountedFor ? 'text-green-600' : 'text-orange-600' + everyoneAccountedFor ? 'text-sage-strong' : 'text-warning' }`} > Refresh
-
-

+

+

{matchDate} {matchTime && ` at ${matchTime}`}

-

- Pickup: {pickupLocation} -

+

Pickup: {pickupLocation}

@@ -474,9 +475,9 @@ function AspcReadyContent() { type="checkbox" checked={atPickupLocation} onChange={(e) => setAtPickupLocation(e.target.checked)} - className="mt-1 h-5 w-5 shrink-0 rounded border-gray-300 text-teal-600 sm:mt-0" + className="mt-0.5 h-5 w-5 shrink-0 cursor-pointer rounded border-line-strong accent-sage sm:mt-0" /> - + I'm at the correct pickup location ({pickupLocation}) @@ -485,9 +486,9 @@ function AspcReadyContent() { type="checkbox" checked={ackVehicleSize} onChange={(e) => setAckVehicleSize(e.target.checked)} - className="mt-1 h-5 w-5 shrink-0 rounded border-gray-300 text-teal-600 sm:mt-0" + className="mt-0.5 h-5 w-5 shrink-0 cursor-pointer rounded border-line-strong accent-sage sm:mt-0" /> - + I acknowledge the suggested vehicle size (Uber {uberType}). If not all people or luggage will fit, you can order a larger ride. @@ -498,9 +499,9 @@ function AspcReadyContent() { type="checkbox" checked={ackWaitForGroup} onChange={(e) => setAckWaitForGroup(e.target.checked)} - className="mt-1 h-5 w-5 shrink-0 rounded border-gray-300 text-teal-600 sm:mt-0" + className="mt-0.5 h-5 w-5 shrink-0 cursor-pointer rounded border-line-strong accent-sage sm:mt-0" /> - + I acknowledge that I will wait for everyone in my group before requesting the ride. If I know they are not showing up, are delayed, or we have waited at least 15 minutes for them, I @@ -510,7 +511,7 @@ function AspcReadyContent() {
-

+

Everyone in my group is:

@@ -523,7 +524,7 @@ function AspcReadyContent() { setEveryoneReady(true) setMissingUserIds([]) }} - className="h-5 w-5 border-gray-300 text-teal-600" + className="h-5 w-5 cursor-pointer accent-sage" /> Here and ready @@ -533,15 +534,15 @@ function AspcReadyContent() { name="readyStatus" checked={!everyoneReady} onChange={() => setEveryoneReady(false)} - className="h-5 w-5 border-gray-300 text-teal-600" + className="h-5 w-5 cursor-pointer accent-sage" /> Some people are missing
{!everyoneReady && otherMembers.length > 0 && ( -
-

+

+

Who is missing? (check all that apply)

@@ -554,7 +555,7 @@ function AspcReadyContent() { type="checkbox" checked={missingUserIds.includes(m.user_id)} onChange={() => toggleMissing(m.user_id)} - className="h-5 w-5 rounded border-gray-300 text-teal-600" + className="h-5 w-5 cursor-pointer rounded accent-sage" /> {m.Users?.firstname || 'Unknown'} @@ -564,20 +565,22 @@ function AspcReadyContent() { )}
- {error &&

{error}

} - {success &&

{success}

} + {error &&

{error}

} + {success &&

{success}

}
- + + Back to Results +
@@ -589,8 +592,8 @@ export default function AspcReadyPage() { return ( -
+
+
} > diff --git a/frontend/src/app/contact/page.tsx b/frontend/src/app/contact/page.tsx index 06cec0c..c1b2181 100644 --- a/frontend/src/app/contact/page.tsx +++ b/frontend/src/app/contact/page.tsx @@ -1,95 +1,70 @@ -import RedirectButton from '@/components/buttons/RedirectButton' +import { LifeBuoy, Mail, MessageSquare } from 'lucide-react' + +import { ButtonLink } from '@/components/ui/Button' +import { Card } from '@/components/ui/Card' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' + +const SUPPORT_EMAIL = 'pickup.pai.47@gmail.com' export default function Contact() { return ( -
- {/* Background decoration */} -
-
-
-
-
-
+ + -
-
- {/* Header Section */} -
-
- - - -
-

- Contact Us -

-

- We're here to help! Get in touch with our team for support or - feedback. -

-
+

How can we help you?

+

+ Choose the option that best fits your needs +

- {/* Contact Options */} -
-
-
-

- How can we help you? -

-

- Choose the option that best fits your needs -

-
- -
- - -
+
+ + +

Service help

+

+ Something wrong with a form, a match or your ride. +

+ + Email support + +
+ + +

Share feedback

+

+ Tell us how your ride went so we can improve matching. +

+ + Leave feedback + +
+
-
-

- Email Support -

-

- For technical issues or general questions: -

- - pickup.pai.47@gmail.com - -
-
-
+
+ +
+

Email support

+

+ For technical issues or general questions: +

+ + {SUPPORT_EMAIL} +
-
+ ) } diff --git a/frontend/src/app/editForm/[flight_id]/page.tsx b/frontend/src/app/editForm/[flight_id]/page.tsx index 6bc12ad..239366d 100644 --- a/frontend/src/app/editForm/[flight_id]/page.tsx +++ b/frontend/src/app/editForm/[flight_id]/page.tsx @@ -1,83 +1,37 @@ 'use client' -import FlightForm from '@/components/forms/FlightForm' +import { AlertTriangle } from 'lucide-react' import { usePathname } from 'next/navigation' +import FlightForm from '@/components/forms/FlightForm' +import { EmptyState } from '@/components/ui/EmptyState' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' + export default function EditForm() { const pathname = usePathname() const flight_id = pathname.split('/').pop() if (!flight_id) { return ( -
-
-
-
-
-
-

- Error: Flight ID not found -

-
-
-
+ + + ) } return ( -
- {/* Background decoration */} -
-
-
-
-
-
- -
-
- {/* Header Section */} -
-
- - - -
-

- Edit Flight Request -

-

- Update your flight details and preferences -

-
- - {/* Form Container */} -
- -
-
-
-
+ + + + ) } diff --git a/frontend/src/app/error.tsx b/frontend/src/app/error.tsx index f60acd9..0d654ef 100644 --- a/frontend/src/app/error.tsx +++ b/frontend/src/app/error.tsx @@ -1,7 +1,12 @@ 'use client' +import { AlertTriangle } from 'lucide-react' import { useEffect } from 'react' +import { Button } from '@/components/ui/Button' +import { EmptyState } from '@/components/ui/EmptyState' +import { PageContainer } from '@/components/ui/PageHeader' + export default function AppError({ error, reset, @@ -14,20 +19,13 @@ export default function AppError({ }, [error]) return ( -
-

- Something went wrong -

-

- {error.message || 'An unexpected error occurred.'} -

- -
+ + reset()}>Try again} + /> + ) } diff --git a/frontend/src/app/faq/page.tsx b/frontend/src/app/faq/page.tsx index b9f035b..7d564eb 100644 --- a/frontend/src/app/faq/page.tsx +++ b/frontend/src/app/faq/page.tsx @@ -1,185 +1,162 @@ -'use client' -import React from 'react' -import { - Accordion, - AccordionHeader, - AccordionBody, -} from '@material-tailwind/react' -import SimpleRedirectButton from '@/components/buttons/SimpleRedirectButton' +import Link from 'next/link' -export default function Faq() { - const [open, setOpen] = React.useState(1) +import { Accordion } from '@/components/ui/Accordion' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' - const handleOpen = (value: React.SetStateAction) => - setOpen(open === value ? 0 : value) +const FAQ_ITEMS = [ + { + id: 'q1', + title: 'Can I edit my questionnaire?', + content: ( + <> + You can edit your information{' '} + UP TO 3 DAYS BEFORE YOUR FLIGHT. Otherwise, you must + cancel it and send in a new questionnaire. In that case, on your + questionnaire, you can opt in to be placed in the unmatched section + where you can try to find others who you may be able to split a ride + with. + + ), + }, + { + id: 'q2', + title: 'When will I know who I am matched with?', + content: ( + <> + We will display your match 3 DAYS BEFORE YOUR FLIGHT, unless you do not + submit your questionnaire more than 3 days in advance. In that case, on + your questionnaire, you can opt in to be placed in the unmatched section + where you can try to find others who you may be able to split a ride + with. + + ), + }, + { + id: 'q3', + title: 'What happens if I’m not matched?', + content: ( + <> + When you fill out your questionnaire form, you have the option to opt in + to be placed in the unmatched section if we can’t find you a match. This + page will help you find others who you may be able to split a ride with. + + ), + }, + { + id: 'q4', + title: + 'What happens if I or someone in my group has a delayed/canceled flight?', + content: ( + <> + Please utilize the commenting system on your match so that you can + update your group members about any issues. We hope your group can come + to an agreement if this happens, for example, how long of a delay is too + long for group members to wait for you. The delayed member can always + opt in to the unmatched section to find others. + + ), + }, + { + id: 'q5', + title: + 'What if I need to cancel my questionnaire/match due to unforeseen circumstances?', + content: ( + <> + We understand travelling can be unpredictable. If at all possible, + please cancel your questionnaire form for your flight at least 3 days in + advance of your flight. This way, you will not be affecting any group + creations.
If that is not possible, then you can cancel, but keep + in mind that this will affect the others assigned to your group. + + ), + }, + { + id: 'q6', + title: 'Can I get a rematch?', + content: ( + <> + You cannot request a rematch at this time. If you are dissatisfied with + your match, you can cancel. If you resend in a questionnaire and opt in + to being in the unmatched section, you can find others who you may be + able to split a ride with. + + ), + }, + { + id: 'q7', + title: 'How does the Unmatched page work?', + content: ( + <> + If you are within 3 days of your upcoming flight and have not been + matched, you can check out our unmatched page and try to join other + groups! Browse through groups and individuals who are in the same boat + as you. Send a join request if you find something that works for you! + NOTE: this is only available if you opted in when you filled out your + questionnaire for that flight. + + ), + }, + { + id: 'q8', + title: 'How exactly am I being matched?', + content: ( + <> + We are using a machine learning model to group all of our existing match + requests by flight time, bag numbers, terminals, drop off points, and + other important details. Our model’s performance improves as our user + base increases, so please spread the word about Pickup! Further, please + submit feedback on matches so that we can improve our model in the + future! + + ), + }, + { + id: 'q9', + title: 'What information is shared with other users?', + content: ( + <> + We aim to keep our users as anonymous as possible. Once you’ve matched + with a group, we provide the group members your first name and email. We + do not share your flight info, last name, or phone number. Further, we + do not share any personal info with people not in your group. + + ), + }, + { + id: 'q10', + title: 'What if I didn’t get the price that I was hoping for?', + content: ( + <> + We will try our best to get a match that has a price within your budget + but we cannot guarantee this. We assure you that our machine learning + model will try to find the optimal match for you! Our model’s + performance improves as our user base increases, so please spread the + word about Pickup! Also, submit feedback so we can train our model to be + better! + + ), + }, +] +export default function Faq() { return ( -
-

- Frequently Asked Questions -

-

- Why pay $100 for a ride to the airport? We help you split the cost and - share the journey. -

- - handleOpen(1)}> - Can I edit my questionnaire? - - - You can edit your information{' '} - UP TO 3 DAYS BEFORE YOUR FLIGHT. Otherwise, you must - cancel it and send in a new questionnaire. In that case, on your - questionnaire, you can opt in to be placed in the unmatched section - where you can try to find others who you may be able to split a ride - with. - - - - handleOpen(2)}> - When will I know who I am matched with? - - - We will display your match 3 DAYS BEFORE YOUR FLIGHT, unless you do - not submit your questionnaire more than 3 days in advance. In that - case, on your questionnaire, you can opt in to be placed in the - unmatched section where you can try to find others who you may be able - to split a ride with. - - - - handleOpen(3)}> - What happens if I’m not matched? - - - When you fill out your questionnaire form, you have the option to opt - in to be placed in the unmatched section if we can’t find you a match. - This page will help you find others who you may be able to split a - ride with. - - - - handleOpen(4)}> - What happens if I or someone in my group has a delayed/canceled - flight? - - - Please utilize the commenting system on your match so that you can - update your group members about any issues. We hope your group can - come to an agreement if this happens, for example, how long of a delay - is too long for group members to wait for you. The delayed member can - always opt in to the unmatched section to find others. - - - - handleOpen(5)}> - What if I need to cancel my questionnaire/match due to unforeseen - circumstances? - - - We understand travelling can be unpredictable. If at all possible, - please cancel your questionnaire form for your flight at least 3 days - in advance of your flight. This way, you will not be affecting any - group creations.

- If that is not possible, then you can cancel, but keep in mind that - this will affect the others assigned to your group. -
-
- - handleOpen(6)}> - Can I get a rematch? - - - You cannot request a rematch at this time. If you are dissatisfied - with your match, you can cancel. If you resend in a questionnaire and - opt in to being in the unmatched section, you can find others who you - may be able to split a ride with. - - - - handleOpen(7)}> - How does the Unmatched page work? - - - If you are within 3 days of your upcoming flight and have not been - matched, you can check out our unmatched page and try to join other - groups! Browse through groups and individuals who are in the same boat - as you. Send a join request if you find something that works for you! - NOTE: this is only available if you opted in when you filled out your - questionnaire for that flight. - - - - handleOpen(8)}> - How exactly am I being matched? - - - We are using a machine learning model to group all of our existing - match requests by flight time, bag numbers, terminals, drop off - points, and other important details. Our model’s performance improves - as our user base increases, so please spread the word about Pickup! - Further, please submit feedback on matches so that we can improve our - model in the future! - - - - handleOpen(9)}> - What information is shared with other users? - - - We aim to keep our users as anonymous as possible. Once you’ve matched - with a group, we provide the group members your first name and email. - We do not share your flight info, last name, or phone number. Further, - we do not share any personal info with people not in your group. - - - - handleOpen(10)}> - What if I didn’t get the price that I was hoping for? - - - We will try our best to get a match that has a price within your - budget but we cannot guarantee this. We assure you that our machine - learning model will try to find the optimal match for you! Our model’s - performance improves as our user base increases, so please spread the - word about Pickup! Also, submit feedback so we can train our model to - be better! - - -

+ + + +

If you have any other questions, please{' '} - -

-
+ + contact us + + . +

+ ) } diff --git a/frontend/src/app/feedback/page.tsx b/frontend/src/app/feedback/page.tsx index 986e83c..7d00ce6 100644 --- a/frontend/src/app/feedback/page.tsx +++ b/frontend/src/app/feedback/page.tsx @@ -2,6 +2,11 @@ import { useEffect, useState } from 'react' import StarRating from '@/components/feedback/StarRating' +import { Alert } from '@/components/ui/Alert' +import { Button } from '@/components/ui/Button' +import { Card, CardBody, CardFooter } from '@/components/ui/Card' +import { Field, Select, Textarea } from '@/components/ui/Field' +import { PageContainer, PageHeader } from '@/components/ui/PageHeader' import { postJson, requestJson } from '@/utils/api' export default function FeedbackForm() { @@ -22,6 +27,7 @@ export default function FeedbackForm() { const [errorMessage, setErrorMessage] = useState('') const [successMessage, setSuccessMessage] = useState('') + const [submitting, setSubmitting] = useState(false) useEffect(() => { const fetchRides = async () => { @@ -57,6 +63,7 @@ export default function FeedbackForm() { return } + setSubmitting(true) try { await postJson('/api/feedback', { flightId: Number(selectedFlight), @@ -65,339 +72,112 @@ export default function FeedbackForm() { comments, }) - alert('Feedback submitted successfully!') + setSuccessMessage('Feedback submitted successfully!') setSelectedFlight('') setOverall(0) setConvenience(0) setComments('') } catch (error: any) { console.error('Error submitting feedback:', error) - alert(`Error submitting feedback: ${error?.message || 'Unknown error'}`) + setErrorMessage( + `Error submitting feedback: ${error?.message || 'Unknown error'}`, + ) + } finally { + setSubmitting(false) } } - return ( -
- {/* Background decoration */} -
-
-
-
-
-
- -
-
- {/* Header Section */} -
-
- - - -
-

- Leave Feedback -

-

- We value your feedback. Help us improve PICKUP for everyone. -

-
- - {/* Form Container - Hidden on mobile, shown on desktop */} -
- {errorMessage && ( -
-
- - - - {errorMessage} -
-
- )} - - {successMessage && ( -
-
- - - - {successMessage} -
-
- )} + const oneYearAgo = new Date() + oneYearAgo.setFullYear(oneYearAgo.getFullYear() - 1) + const rideOptions = rides.flatMap((ride) => { + if (!ride.Flights?.date) return [] + const [year, month, day] = ride.Flights.date.split('-').map(Number) + const flightDate = new Date(year, month - 1, day) + if (flightDate < oneYearAgo) return [] + const label = `${flightDate.toLocaleDateString('en-US', { + month: '2-digit', + day: '2-digit', + })} - ${ + ride.Flights.to_airport + ? 'School to ' + ride.Flights.airport + : ride.Flights.airport + ' to School' + }` + return [{ value: ride.flight_id, label }] + }) -
- {/* Ride Selection */} - - - {/* Overall Rating */} - - - {/* Convenience Rating */} -