- {event[volunteerTypes[idx].field].map(user => {
+ {volunteers.map(user => {
return
})}
{placeholders}
diff --git a/app/routes/calendar+/index.tsx b/app/routes/calendar+/index.tsx
index cdf2944..70f748f 100644
--- a/app/routes/calendar+/index.tsx
+++ b/app/routes/calendar+/index.tsx
@@ -6,6 +6,8 @@ import { Icon } from '~/components/ui/icon.tsx'
import {
volunteerTypes,
+ getVolunteers,
+ getVolunteerReq,
type UserData,
type AnimalData,
type EventWithVolunteers,
@@ -517,13 +519,11 @@ function RegistrationDialogue({ selectedEventId, events }: RegistrationProps) {
>
{volunteerTypes.map(volunteerType => {
- const spotsLeft =
- calEvent[`${volunteerType.field}Req`] -
- calEvent[volunteerType.field].length
+ const volunteers = getVolunteers(calEvent, volunteerType.field)
+ const required = getVolunteerReq(calEvent, volunteerType.reqField)
+ const spotsLeft = required - volunteers.length
- const isFull =
- calEvent[volunteerType.reqField] <=
- calEvent[volunteerType.field].length
+ const isFull = required <= volunteers.length
let hasPermissions = true
if (volunteerType.field == 'lessonAssistants') {
diff --git a/app/routes/resources+/theme/index.tsx b/app/routes/resources+/theme/index.tsx
index 5ba1b83..a8ba00d 100644
--- a/app/routes/resources+/theme/index.tsx
+++ b/app/routes/resources+/theme/index.tsx
@@ -79,8 +79,9 @@ export function ThemeSwitch({
},
})
- const mode = userPreference ?? 'light'
- const nextMode = mode === 'light' ? 'dark' : 'light'
+ const mode = userPreference ?? 'system'
+ const nextMode =
+ mode === 'system' ? 'light' : mode === 'light' ? 'dark' : 'system'
const modeLabel = {
light: (
@@ -92,6 +93,11 @@ export function ThemeSwitch({
Dark
),
+ system: (
+
+ System
+
+ ),
}
return (
diff --git a/app/utils/auth.server.ts b/app/utils/auth.server.ts
index 95360ce..fd7681f 100644
--- a/app/utils/auth.server.ts
+++ b/app/utils/auth.server.ts
@@ -180,12 +180,18 @@ export async function verifyLogin(
usernameOrEmail: string,
password: Password['hash'],
) {
- const userWithPassword = await prisma.user.findFirst({
- where: {
- OR: [{ username: usernameOrEmail }, { email: usernameOrEmail }],
- },
+ // Prioritize exact username match to avoid ambiguity when a username
+ // happens to equal another user's email address
+ let userWithPassword = await prisma.user.findUnique({
+ where: { username: usernameOrEmail },
select: { id: true, password: { select: { hash: true } } },
})
+ if (!userWithPassword) {
+ userWithPassword = await prisma.user.findUnique({
+ where: { email: usernameOrEmail },
+ select: { id: true, password: { select: { hash: true } } },
+ })
+ }
if (!userWithPassword || !userWithPassword.password) {
return null
diff --git a/app/utils/role-labels.ts b/app/utils/role-labels.ts
new file mode 100644
index 0000000..41a38b7
--- /dev/null
+++ b/app/utils/role-labels.ts
@@ -0,0 +1,97 @@
+/**
+ * Maps the internal volunteer slot field names to human-readable display names
+ * based on the organization's animal type. This allows orgs working with
+ * different animals to see contextually appropriate role names without
+ * changing the underlying schema.
+ */
+
+interface RoleLabels {
+ cleaningCrew: string
+ sideWalkers: string
+ lessonAssistants: string
+ animalHandlers: string
+}
+
+/**
+ * Default labels use horse-specific terms to maintain backward compatibility
+ * with the existing equestrian customer. New orgs with a different animalType
+ * will get their own contextual labels via the overrides below.
+ */
+const defaultLabels: RoleLabels = {
+ cleaningCrew: 'cleaning crew',
+ sideWalkers: 'side walkers',
+ lessonAssistants: 'lesson assistants',
+ animalHandlers: 'animal handlers',
+}
+
+const labelsByAnimalType: Record> = {
+ horses: {
+ // defaults already use horse-specific terms; only override if needed
+ },
+ dogs: {
+ sideWalkers: 'dog walkers',
+ lessonAssistants: 'activity assistants',
+ animalHandlers: 'dog handlers',
+ },
+ cats: {
+ sideWalkers: 'socialization helpers',
+ lessonAssistants: 'session assistants',
+ animalHandlers: 'cat handlers',
+ },
+ wildlife: {
+ sideWalkers: 'habitat assistants',
+ lessonAssistants: 'program assistants',
+ animalHandlers: 'wildlife handlers',
+ },
+}
+
+export function getRoleLabels(animalType?: string | null): RoleLabels {
+ const overrides = animalType ? labelsByAnimalType[animalType] : undefined
+ return { ...defaultLabels, ...overrides }
+}
+
+interface RoleDescription {
+ cleaningCrew: string
+ sideWalkers: string
+ lessonAssistants: string
+ animalHandlers: string
+}
+
+/**
+ * Default descriptions use horse-specific language to match the existing
+ * equestrian customer's experience. Overrides below provide contextual
+ * descriptions for other animal types.
+ */
+const defaultDescriptions: RoleDescription = {
+ cleaningCrew:
+ 'Cleaning crew volunteers help maintain the facility, check waterers, sweep common areas, and handle other miscellaneous cleaning tasks. No prior experience with animals is required.',
+ sideWalkers:
+ 'Side walkers walk alongside participants helping to support them during sessions. No prior experience with animals needed. Must be able to walk on uneven surfaces.',
+ lessonAssistants:
+ 'Lesson assistants should have 1+ years of experience with the animals. They assist instructors and communicate effectively with both participants and staff.',
+ animalHandlers:
+ 'Animal handlers guide and manage animals during sessions. Should have 1+ years of experience with animals, and must be able to walk on uneven surfaces.',
+}
+
+const descriptionsByAnimalType: Record> = {
+ horses: {
+ // defaults already use horse-appropriate language
+ },
+ dogs: {
+ sideWalkers:
+ 'Dog walkers take dogs on scheduled walks and help with socialization activities. Must be comfortable handling dogs of varying sizes.',
+ lessonAssistants:
+ 'Activity assistants help run training sessions and enrichment programs. Should have experience with dog behavior and basic commands.',
+ animalHandlers:
+ 'Dog handlers manage dogs during adoption events and therapy visits. Should have 1+ years of experience with dogs.',
+ },
+}
+
+export function getRoleDescriptions(
+ animalType?: string | null,
+): RoleDescription {
+ const overrides = animalType
+ ? descriptionsByAnimalType[animalType]
+ : undefined
+ return { ...defaultDescriptions, ...overrides }
+}
diff --git a/prisma/migrations/20260313030000_rename_horse_to_animal/migration.sql b/prisma/migrations/20260313030000_rename_horse_to_animal/migration.sql
index 49271fe..71e1c20 100644
--- a/prisma/migrations/20260313030000_rename_horse_to_animal/migration.sql
+++ b/prisma/migrations/20260313030000_rename_horse_to_animal/migration.sql
@@ -22,27 +22,7 @@ DROP INDEX "_horseLeader_B_index";
-- DropIndex
DROP INDEX "_horseLeader_AB_unique";
--- DropTable
-PRAGMA foreign_keys=off;
-DROP TABLE "Horse";
-PRAGMA foreign_keys=on;
-
--- DropTable
-PRAGMA foreign_keys=off;
-DROP TABLE "HorseAssignment";
-PRAGMA foreign_keys=on;
-
--- DropTable
-PRAGMA foreign_keys=off;
-DROP TABLE "_EventToHorse";
-PRAGMA foreign_keys=on;
-
--- DropTable
-PRAGMA foreign_keys=off;
-DROP TABLE "_horseLeader";
-PRAGMA foreign_keys=on;
-
--- CreateTable
+-- CreateTable (before dropping Horse so we can migrate data)
CREATE TABLE "Animal" (
"id" TEXT NOT NULL PRIMARY KEY,
"name" TEXT NOT NULL,
@@ -59,6 +39,10 @@ CREATE TABLE "Animal" (
CONSTRAINT "Animal_imageId_fkey" FOREIGN KEY ("imageId") REFERENCES "Image" ("fileId") ON DELETE SET NULL ON UPDATE CASCADE
);
+-- Migrate existing Horse data into Animal
+INSERT INTO "Animal" ("id", "name", "species", "notes", "status", "updatedAt", "cooldown", "cooldownStartDate", "cooldownEndDate", "orgId", "imageId")
+SELECT "id", "name", 'horse', "notes", "status", "updatedAt", "cooldown", "cooldownStartDate", "cooldownEndDate", "orgId", "imageId" FROM "Horse";
+
-- CreateTable
CREATE TABLE "AnimalAssignment" (
"id" TEXT NOT NULL PRIMARY KEY,
@@ -70,6 +54,10 @@ CREATE TABLE "AnimalAssignment" (
CONSTRAINT "AnimalAssignment_animalId_fkey" FOREIGN KEY ("animalId") REFERENCES "Animal" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
+-- Migrate existing HorseAssignment data into AnimalAssignment
+INSERT INTO "AnimalAssignment" ("id", "eventId", "userId", "animalId")
+SELECT "id", "eventId", "userId", "horseId" FROM "HorseAssignment";
+
-- CreateTable
CREATE TABLE "_AnimalToEvent" (
"A" TEXT NOT NULL,
@@ -78,6 +66,10 @@ CREATE TABLE "_AnimalToEvent" (
CONSTRAINT "_AnimalToEvent_B_fkey" FOREIGN KEY ("B") REFERENCES "Event" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
+-- Migrate existing Horse-Event join data
+INSERT INTO "_AnimalToEvent" ("A", "B")
+SELECT "A", "B" FROM "_EventToHorse";
+
-- CreateTable
CREATE TABLE "_animalHandler" (
"A" TEXT NOT NULL,
@@ -86,6 +78,27 @@ CREATE TABLE "_animalHandler" (
CONSTRAINT "_animalHandler_B_fkey" FOREIGN KEY ("B") REFERENCES "User" ("id") ON DELETE CASCADE ON UPDATE CASCADE
);
+-- Migrate existing horseLeader join data
+INSERT INTO "_animalHandler" ("A", "B")
+SELECT "A", "B" FROM "_horseLeader";
+
+-- Now safe to drop old tables
+PRAGMA foreign_keys=off;
+DROP TABLE "Horse";
+PRAGMA foreign_keys=on;
+
+PRAGMA foreign_keys=off;
+DROP TABLE "HorseAssignment";
+PRAGMA foreign_keys=on;
+
+PRAGMA foreign_keys=off;
+DROP TABLE "_EventToHorse";
+PRAGMA foreign_keys=on;
+
+PRAGMA foreign_keys=off;
+DROP TABLE "_horseLeader";
+PRAGMA foreign_keys=on;
+
-- RedefineTables
PRAGMA foreign_keys=OFF;
CREATE TABLE "new_Event" (
@@ -101,7 +114,7 @@ CREATE TABLE "new_Event" (
"isPrivate" BOOLEAN NOT NULL DEFAULT false,
CONSTRAINT "Event_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Organization" ("id") ON DELETE SET NULL ON UPDATE CASCADE
);
-INSERT INTO "new_Event" ("cleaningCrewReq", "end", "id", "isPrivate", "lessonAssistantsReq", "orgId", "sideWalkersReq", "start", "title") SELECT "cleaningCrewReq", "end", "id", "isPrivate", "lessonAssistantsReq", "orgId", "sideWalkersReq", "start", "title" FROM "Event";
+INSERT INTO "new_Event" ("cleaningCrewReq", "end", "id", "isPrivate", "lessonAssistantsReq", "orgId", "sideWalkersReq", "animalHandlersReq", "start", "title") SELECT "cleaningCrewReq", "end", "id", "isPrivate", "lessonAssistantsReq", "orgId", "sideWalkersReq", "horseLeadersReq", "start", "title" FROM "Event";
DROP TABLE "Event";
ALTER TABLE "new_Event" RENAME TO "Event";
CREATE UNIQUE INDEX "Event_id_key" ON "Event"("id");
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 118a4c7..94aa638 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -75,13 +75,14 @@ export default {
foreground: 'hsl(var(--color-card-foreground))',
},
sidebar: {
- DEFAULT: 'hsl(var(--color-sidebar))',
- foreground: 'hsl(var(--color-sidebar-foreground))',
- border: 'hsl(var(--color-sidebar-border))',
- active: 'hsl(var(--color-sidebar-active))',
- 'active-foreground': 'hsl(var(--color-sidebar-active-foreground))',
- },
- day: {
+ DEFAULT: 'hsl(var(--color-sidebar))',
+ foreground: 'hsl(var(--color-sidebar-foreground))',
+ border: 'hsl(var(--color-sidebar-border))',
+ active: 'hsl(var(--color-sidebar-active))',
+ 'active-foreground':
+ 'hsl(var(--color-sidebar-active-foreground))',
+ },
+ day: {
100: 'hsl(var(--color-day-100))',
200: 'hsl(var(--color-day-200))',
300: 'hsl(var(--color-day-300))',
diff --git a/tests/e2e/admin.test.ts b/tests/e2e/admin.test.ts
index ace6923..f3566f1 100644
--- a/tests/e2e/admin.test.ts
+++ b/tests/e2e/admin.test.ts
@@ -12,9 +12,14 @@ test('Admin can log in and see admin panel', async ({ page }) => {
.fill(adminUser.username)
await page.getByLabel(/^password$/i).fill(password)
await page.getByRole('button', { name: /log in/i }).click()
- await expect(page).toHaveURL(`/`)
- await expect(page.getByRole('link', { name: /admin/i })).toBeVisible()
+ // Admin login redirects to /admin which redirects to /admin/users
+ await expect(page).toHaveURL(/\/admin/)
+
+ // Sidebar shows admin nav links
+ await expect(page.getByRole('link', { name: /users/i })).toBeVisible()
+ await expect(page.getByRole('link', { name: /animals/i })).toBeVisible()
+ await expect(page.getByRole('link', { name: /email/i })).toBeVisible()
})
test('Admin can edit users with proper validation for height and feet', async ({
@@ -29,14 +34,13 @@ test('Admin can edit users with proper validation for height and feet', async ({
.fill(adminUser.username)
await page.getByLabel(/^password$/i).fill(password)
await page.getByRole('button', { name: /log in/i }).click()
- await expect(page).toHaveURL(`/`)
- await expect(page.getByRole('link', { name: /admin/i })).toBeVisible()
+ // Admin login redirects to /admin/users
+ await expect(page).toHaveURL(/\/admin/)
- // Navigate to users page
- await page.getByRole('link', { name: /admin/i }).click()
- await page.getByRole('menuitem', { name: 'Users' }).click()
- await expect(page.getByRole('heading', { name: 'Users' })).toBeVisible()
+ // Navigate to users page via sidebar
+ await page.getByRole('link', { name: /users/i }).click()
+ await expect(page.getByRole('heading', { name: /volunteers/i })).toBeVisible()
// Open Edit user page
await page.getByText('open menu').first().click()
diff --git a/tests/e2e/onboarding.test.ts b/tests/e2e/onboarding.test.ts
index 55c0de2..ed32025 100644
--- a/tests/e2e/onboarding.test.ts
+++ b/tests/e2e/onboarding.test.ts
@@ -92,16 +92,8 @@ test('onboarding with link', async ({ page }) => {
await page.getByRole('button', { name: /Create an account/i }).click()
- await expect(page).toHaveURL(`/`)
-
- await page.getByRole('link', { name: onboardingData.name }).click()
- await page.getByRole('menuitem', { name: /profile/i }).click()
-
- await expect(page).toHaveURL(`/users/${onboardingData.username}`)
-
- await page.getByRole('link', { name: onboardingData.name }).click()
- await page.getByRole('menuitem', { name: /logout/i }).click()
- await expect(page).toHaveURL(`/`)
+ // After onboarding, user has no org — lands on org-setup
+ await expect(page).toHaveURL(`/org-setup`)
// have to do this here because we didn't use insertNewUser (because we're testing user create)
await deleteUserByUsername(onboardingData.username)
@@ -162,9 +154,10 @@ test('login as existing user', async ({ page }) => {
await page.getByRole('textbox', { name: /username/i }).fill(user.username)
await page.getByLabel(/^password$/i).fill(password)
await page.getByRole('button', { name: /log in/i }).click()
- await expect(page).toHaveURL(`/`)
- await expect(page.getByRole('link', { name: user.name })).toBeVisible()
+ // After login, user lands on calendar (or admin redirect)
+ // Sidebar shows the user's name
+ await expect(page.getByText(user.name)).toBeVisible()
})
test('reset password with a link', async ({ page }) => {
@@ -215,9 +208,8 @@ test('reset password with a link', async ({ page }) => {
await page.getByLabel(/^password$/i).fill(newPassword)
await page.getByRole('button', { name: /log in/i }).click()
- await expect(page).toHaveURL(`/`)
-
- await expect(page.getByRole('link', { name: user.name })).toBeVisible()
+ // Sidebar shows the user's name after successful login
+ await expect(page.getByText(user.name)).toBeVisible()
})
test('reset password with a short code', async ({ page }) => {
diff --git a/tests/playwright-utils.ts b/tests/playwright-utils.ts
index 9e4ce47..ad3de8b 100644
--- a/tests/playwright-utils.ts
+++ b/tests/playwright-utils.ts
@@ -13,11 +13,27 @@ export function deleteUserByUsername(username: string) {
return prisma.user.delete({ where: { username } })
}
+export async function getOrCreateDefaultOrg() {
+ let org = await prisma.organization.findFirst()
+ if (!org) {
+ org = await prisma.organization.create({
+ data: {
+ name: 'Test Org',
+ slug: 'test-org',
+ animalType: 'horses',
+ },
+ })
+ }
+ return org
+}
+
export async function insertNewUser({ password }: { password?: string } = {}) {
const userData = createUser()
+ const org = await getOrCreateDefaultOrg()
const user = await prisma.user.create({
data: {
...userData,
+ org: { connect: { id: org.id } },
password: {
create: {
hash: await getPasswordHash(password || userData.username),
@@ -51,9 +67,11 @@ export async function insertNewAdmin({ password }: { password?: string } = {}) {
})
}
+ const org = await getOrCreateDefaultOrg()
const user = await prisma.user.create({
data: {
...userData,
+ org: { connect: { id: org.id } },
password: {
create: {
hash: await getPasswordHash(password || userData.username),