Skip to content

Event updates and Ban - #16

Open
BenYang12 wants to merge 55 commits into
mainfrom
event-updates
Open

Event updates and Ban #16
BenYang12 wants to merge 55 commits into
mainfrom
event-updates

Conversation

@BenYang12

Copy link
Copy Markdown

Ben Summer tickets 1 and 2 for event-updates and ban functionality

tedthavisin and others added 30 commits November 1, 2025 17:13
…ctioning sorting for Patient Name, Assigned Social Worker, and Last Contact.
Implemented _index.tsx (home page) using temporary JSON data with fun…
…t, and add functionality. Updated styling.Added website button.
aryavenkatesan and others added 4 commits July 1, 2026 00:48
… event-updates

# Conflicts:
#	app/routes.ts
#	app/routes/_index.tsx
#	app/services/firebase_app.ts
Resolve conflict with arya/verify-users:
- Keep admin_user.tsx and profile.tsx (deleted upstream, still routed here)
- Keep routes.ts from HEAD: drops a resurrected create-account route
  pointing at a nonexistent file, restores the calendar route
- Keep banned field on User (admin_user.tsx depends on it)
- Keep the inline error handling in verify_email.tsx over alert()
- Drop the duplicate top-bar calendar link

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants