Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<div align="center">

<img src="frontend/public/favicon.png" alt="PICKUP" width="72" />
<img src="frontend/public/favicon.png" alt="RideLink" width="72" />

# PICKUP - Local Development
# RideLink - Local Development

Run the PICKUP web app and matching pipeline on your machine against a **local dev database**, without touching production.
Run the RideLink web app and matching pipeline on your machine against a **local dev database**, without touching production.

</div>

PICKUP groups students into shared airport rides. This repo has two parts:
RideLink groups students into shared airport rides. This repo has two parts:

| Folder | What it is |
| ----------- | -------------------------------------------------- |
Expand All @@ -25,7 +25,7 @@ Both talk to **Supabase** (auth + Postgres). Locally, `start.sh` runs a full Sup
- [Docker Desktop](https://www.docker.com/products/docker-desktop/) (running)
- Node.js 20+ and [pnpm](https://pnpm.io/installation) (the repo pins pnpm 9.15.2; pnpm switches to it automatically)
- Python 3.11+
- A Supabase account that is a member of the PICKUP organization (ask a maintainer)
- A Supabase account that is a member of the RideLink organization (ask a maintainer)

## Setup

Expand Down
2 changes: 1 addition & 1 deletion frontend/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PICKUP Frontend
# RideLink Frontend

Next.js app for managing pickup workflows, matching requests, and admin operations with Supabase.

Expand Down
6 changes: 3 additions & 3 deletions frontend/documentation/BATCH_EMAIL_LOGIC.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if (is_subsidized && to_airport) {
#### Variant 1: Subsidized TO Airport

- **When**: `is_subsidized = true` AND `to_airport = true`
- **Subject**: "PICKUP — Your ASPC-subsidized ride group!"
- **Subject**: "RideLink - Your ASPC-subsidized ride group!"
- **Content**:
- Welcome message about upcoming trip
- Meeting point: 647 N College Way (outside Lincoln Hall)
Expand All @@ -38,7 +38,7 @@ if (is_subsidized && to_airport) {
#### Variant 2: Subsidized FROM Airport

- **When**: `is_subsidized = true` AND `to_airport = false`
- **Subject**: "PICKUP — Your ASPC-subsidized ride group!"
- **Subject**: "RideLink - Your ASPC-subsidized ride group!"
- **Content**:
- Welcome back message
- Different meeting point instructions (LAX-it for LAX, curbside for ONT)
Expand All @@ -48,7 +48,7 @@ if (is_subsidized && to_airport) {
#### Variant 3: Unsubsidized

- **When**: `is_subsidized = false`
- **Subject**: "PICKUP — Your ride group!"
- **Subject**: "RideLink - Your ride group!"
- **Content**:
- Message about not being subsidized
- Links to unmatched page
Expand Down
2 changes: 1 addition & 1 deletion frontend/documentation/PLATFORM_OVERVIEW.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Platform overview

PICKUP helps students coordinate airport rides (often ASPC-subsidized). This repo is the **Next.js web app**, hosted on **Netlify**; application data and bulk email sending live in **Supabase** (Postgres + edge functions), while an external matching process writes grouping results to Supabase.
RideLink helps students coordinate airport rides (often ASPC-subsidized). This repo is the **Next.js web app**, hosted on **Netlify**; application data and bulk email sending live in **Supabase** (Postgres + edge functions), while an external matching process writes grouping results to Supabase.

## High-level architecture

Expand Down
2 changes: 1 addition & 1 deletion frontend/documentation/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PICKUP documentation
# RideLink documentation

Engineering docs for the frontend repo. Start here when onboarding.

Expand Down
2 changes: 1 addition & 1 deletion frontend/documentation/REMEDIATION.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# PICKUP Frontend Remediation Notice
# RideLink Frontend Remediation Notice

This document records frontend repository remediation work for the ASPC Required Remediation Items dated June 10, 2026. Issues #1-#3 apply to the separate ML repository and are not duplicated here. This frontend notice covers Issues #4-#12.

Expand Down
2 changes: 1 addition & 1 deletion frontend/documentation/SCHEMA.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Supabase schema reference

Human-readable catalog of the `public` schema used by PICKUP. Column types match [`src/lib/database.types.ts`](../src/lib/database.types.ts) (generated from Supabase). Regenerate types after schema changes — full steps in [OPERATIONS.md](./OPERATIONS.md):
Human-readable catalog of the `public` schema used by RideLink. Column types match [`src/lib/database.types.ts`](../src/lib/database.types.ts) (generated from Supabase). Regenerate types after schema changes - full steps in [OPERATIONS.md](./OPERATIONS.md):

```bash
pnpm exec supabase gen types typescript --linked --schema public > src/lib/database.types.ts
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/app/about/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const TIMELINE = [
{ when: 'Months in advance', what: 'Book your flight.' },
{
when: '14 days',
what: 'Complete PICKUP questionnaire.',
what: 'Complete RideLink questionnaire.',
note: 'Anytime between booking and 7 days before',
},
{ when: '3 days', what: 'Receive your match and contact.' },
Expand All @@ -19,30 +19,30 @@ export default function About() {
<PageContainer width="prose">
<PageHeader
eyebrow="About"
title="About PICKUP"
title="About RideLink"
description="Making airport travel affordable and accessible for the 5C community."
/>

<div className="space-y-5 text-[17px] leading-relaxed text-ink">
<p>
No student should pay $100+ for a solo ride to LAX. While the
Claremont Colleges sometimes provide shuttles, they&apos;re often
limited. That&apos;s where PICKUP comes in.
limited. That&apos;s where RideLink comes in.
</p>
<p>
We&apos;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.
</p>
<p>
The idea for PICKUP was born out of personal frustration. After
The idea for RideLink 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&apos;ve been
working on this platform throughout the year.
</p>
<p className="font-display text-xl text-navy">
Whether it&apos;s your first ride or your fiftieth, we hope PICKUP
Whether it&apos;s your first ride or your fiftieth, we hope RideLink
makes your journey a little easier.
</p>
</div>
Expand Down Expand Up @@ -88,7 +88,7 @@ export default function About() {
<Card className="mt-6 overflow-hidden">
<Image
src="/images/teampic.jpg"
alt="PICKUP Engineering Team"
alt="RideLink Engineering Team"
width={800}
height={600}
className="h-auto w-full object-cover"
Expand All @@ -113,7 +113,7 @@ export default function About() {

<p className="mt-6 rounded-lg bg-sage-tint px-5 py-4 text-[15px] leading-relaxed text-ink">
Thank you to our amazing team for helping us build the foundation of
PICKUP. Your contributions made this platform possible for the 5C
RideLink. Your contributions made this platform possible for the 5C
community!
</p>
</section>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/aspc-fees/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function ASPCFees() {
<strong className="font-semibold">no fee</strong>.
</p>
<p className="mt-2 text-sm text-ink/80">
Make changes freely through the PICKUP dashboard before the
Make changes freely through the RideLink dashboard before the
deadline for your break period.
</p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/app/aspc-info/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export default function ASPCInfoPage() {
const policyLinks = [
{
title: 'Subsidy policy',
description: 'PICKUP-specific subsidy information and guidelines',
description: 'Subsidy information and guidelines',
href: '/aspc-policy',
},
{
Expand Down Expand Up @@ -202,8 +202,8 @@ export default function ASPCInfoPage() {

<p className="mt-10 text-sm text-stone">
This page provides quick access to ASPC&apos;s official RideLink
resources. External links open in new tabs. Questions about PICKUP
itself?{' '}
resources. External links open in new tabs. Questions about this
website? itself?{' '}
<Link href="/contact" className={textLink}>
Contact us
</Link>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/aspc-policy/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function ASPCPolicy() {
</div>
<p className="mt-4 text-sm leading-relaxed text-stone">
If a sufficient group cannot be formed, RideLink will be unable to
cover the ride. However, you may still use PICKUP to coordinate
cover the ride. However, you may still use RideLink to coordinate
non-subsidized carpools.
</p>
</section>
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/app/faq/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ const FAQ_ITEMS = [
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!
base increases, so please spread the word about RideLink! Further,
please submit feedback on matches so that we can improve our model in
the future!
</>
),
},
Expand All @@ -131,8 +131,8 @@ const FAQ_ITEMS = [
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!
word about RideLink! Also, submit feedback so we can train our model to
be better!
</>
),
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/feedback/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function FeedbackForm() {
<PageHeader
eyebrow="Your rides"
title="Leave feedback"
description="We value your feedback. Help us improve PICKUP for everyone."
description="We value your feedback. Help us improve RideLink for everyone."
/>

<Card as="form" onSubmit={handleSubmit}>
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Inter, Playfair_Display } from 'next/font/google'
import NextTopLoader from 'nextjs-toploader'
import './globals.css'
import PickupHeader from '@/components/PickupHeader'
import PickupFooter from '@/components/PickupFooter'
import RideLinkHeader from '@/components/RideLinkHeader'
import RideLinkFooter from '@/components/RideLinkFooter'
import { TooltipProvider } from '@/components/ui/tooltip'
import { AuthProvider } from '@/providers/AuthProvider'

Expand All @@ -25,7 +25,7 @@ const defaultUrl = process.env.VERCEL_URL

export const metadata = {
metadataBase: new URL(defaultUrl),
title: 'PICKUP',
title: 'RideLink',
description: 'Your AI powered RideShare App',
icons: {
icon: [{ url: '/favicon.ico?v=2', sizes: 'any' }],
Expand All @@ -49,9 +49,9 @@ export default function RootLayout({
<AuthProvider>
<TooltipProvider>
<div className="flex min-h-screen flex-col">
<PickupHeader />
<RideLinkHeader />
<div className="flex-1">{children}</div>
<PickupFooter />
<RideLinkFooter />
</div>
</TooltipProvider>
</AuthProvider>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default function Index() {
{primaryAction('lg')}
{!user && (
<p className="max-w-md text-[13px] leading-relaxed text-stone">
By signing in, you agree to PICKUP&apos;s{' '}
By signing in, you agree to RideLink&apos;s{' '}
<Link
href={TERMS_URL}
target="_blank"
Expand Down Expand Up @@ -172,7 +172,7 @@ export default function Index() {
<div className="mx-auto max-w-6xl px-4 py-16 sm:px-6 sm:py-20">
<div className="max-w-2xl">
<h2 className="font-display text-3xl font-semibold text-navy sm:text-4xl">
How PICKUP works
How RideLink works
</h2>
<p className="mt-3 text-[17px] leading-relaxed text-stone">
Simple, safe and affordable airport transportation that connects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@ const FOOTER_LINKS = [
{ href: '/aspc-info', label: 'ASPC Info' },
]

export default function PickupFooter() {
export default function RideLinkFooter() {
return (
<footer className="border-t border-line bg-paper">
<div className="mx-auto flex max-w-7xl flex-col gap-4 px-4 py-8 sm:flex-row sm:items-center sm:justify-between sm:px-6">
<p className="text-sm text-stone">
<span className="font-semibold tracking-[0.06em] text-navy">
PICKUP
</span>{' '}
is a service of the Associated Students of Pomona College.
<span className="font-semibold text-navy">RideLink</span> is a service
of the Associated Students of Pomona College.
</p>
<nav aria-label="Footer" className="flex flex-wrap gap-x-6 gap-y-2">
{FOOTER_LINKS.map((link) => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { render, screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'

import PickupHeader from './PickupHeader'
import RideLinkHeader from './RideLinkHeader'

const mockAuth = jest.fn()
let mockPathname = '/'
Expand All @@ -24,15 +24,15 @@ const authState = (overrides: Record<string, unknown> = {}) => ({

const student = { id: 'u1', email: 'ana@pickup.dev' }

describe('PickupHeader', () => {
describe('RideLinkHeader', () => {
beforeEach(() => {
mockPathname = '/'
})

it('offers sign in to signed-out visitors and opens the sign-in dialog', async () => {
const user = userEvent.setup()
mockAuth.mockReturnValue(authState())
render(<PickupHeader />)
render(<RideLinkHeader />)

expect(screen.queryByRole('link', { name: 'Dashboard' })).toBeNull()
await user.click(screen.getByRole('button', { name: 'Sign in' }))
Expand All @@ -41,21 +41,21 @@ describe('PickupHeader', () => {

it('never renders the Dashboard link for students', () => {
mockAuth.mockReturnValue(authState({ user: student }))
render(<PickupHeader />)
render(<RideLinkHeader />)
expect(screen.queryByRole('link', { name: 'Dashboard' })).toBeNull()
})

it('shows the Dashboard link to admins', () => {
mockAuth.mockReturnValue(authState({ user: student, isAdmin: true }))
render(<PickupHeader />)
render(<RideLinkHeader />)
const links = screen.getAllByRole('link', { name: 'Dashboard' })
expect(links[0]).toHaveAttribute('href', '/admin')
})

it('marks the current page in the navigation', () => {
mockPathname = '/results'
mockAuth.mockReturnValue(authState({ user: student }))
render(<PickupHeader />)
render(<RideLinkHeader />)
const nav = screen.getByRole('navigation', { name: 'Main' })
expect(within(nav).getByRole('link', { name: 'Results' })).toHaveAttribute(
'aria-current',
Expand All @@ -66,7 +66,7 @@ describe('PickupHeader', () => {
it('opens the mobile menu and closes it with Escape', async () => {
const user = userEvent.setup()
mockAuth.mockReturnValue(authState({ user: student }))
render(<PickupHeader />)
render(<RideLinkHeader />)

const toggle = screen.getByRole('button', { name: 'Menu' })
expect(toggle).toHaveAttribute('aria-expanded', 'false')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const NAV_ITEMS = [

const ADMIN_ITEM = { href: '/admin', label: 'Dashboard' }

export default function PickupHeader() {
export default function RideLinkHeader() {
const { user, avatarUrl, isAdmin, isLoading, signOut, signInWithGoogle } =
useAuth()
const router = useRouter()
Expand Down Expand Up @@ -66,7 +66,7 @@ export default function PickupHeader() {
<Link
href="/"
className="group flex shrink-0 items-center gap-3 rounded-md"
aria-label="PICKUP home"
aria-label="RideLink home"
>
<span className="flex h-10 w-10 items-center justify-center overflow-hidden rounded-[10px] bg-white">
<Image
Expand All @@ -78,8 +78,8 @@ export default function PickupHeader() {
/>
</span>
<span className="leading-none">
<span className="block text-[17px] font-bold tracking-[0.06em]">
PICKUP
<span className="block text-lg font-bold tracking-tight">
RideLink
</span>
<span className="mt-1 block text-[10px] font-medium uppercase tracking-[0.14em] text-navy-200">
by ASPC
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/SignInModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ export default function SignInModal({
open={isOpen}
onClose={onClose}
size="sm"
title="Sign in to PICKUP"
title="Sign in to RideLink"
description="Use your college Google account."
>
<div className="space-y-4 pt-2">
<GoogleSignInButton onSignIn={onSignIn} />
<p className="text-[13px] leading-relaxed text-stone">
By signing in, you agree to PICKUP&apos;s{' '}
By signing in, you agree to RideLink&apos;s{' '}
<Link
href={TERMS_URL}
target="_blank"
Expand Down
Loading
Loading