+
โ
+ + {emptyMessage} +
+ {emptyDescription && ( ++ {emptyDescription} +
+ )} +
-
- )
- }
-
return (
@@ -186,39 +151,36 @@ function App() {
-
- {userIsAdmin ?
-
-
-
-
-
-
-
- (null)
- return (
-
-
-
-
-
-
-
-
-
- Profile
-
-
-
- {
- event.preventDefault()
- submit(formRef.current)
- }}
- >
-
-
-
-
-
- )
-}
-
-function AdminDropdown() {
- return (
-
-
-
-
-
-
-
-
-
- Users
-
-
-
-
-
-
- Horses
-
-
-
-
-
-
- Email
-
-
-
-
-
-
- )
-}
diff --git a/app/routes/_auth+/login.tsx b/app/routes/_auth+/login.tsx
index 2221863..ad01a50 100644
--- a/app/routes/_auth+/login.tsx
+++ b/app/routes/_auth+/login.tsx
@@ -41,20 +41,29 @@ export default function LoginPage() {
const redirectTo = searchParams.get('redirectTo') || '/'
return (
-
Equestrian
- Volunteer Scheduler
-
-
-
- Terms of Service
-
-
- Privacy Policy
-
+
+ {user ? (
+ // Authenticated: sidebar layout
+
-
-
+ ) : (
+ // Unauthenticated: top-nav layout
+
+
+
-
-
+
+
+
+ )}
+
+ The Barn
+
+
+
+
+
+
+
-
-
-
Welcome back!
-- Please enter your details. -
+
+ {/* Left brand panel */}
+
+
+ {/* Right form panel */}
+
)
diff --git a/app/routes/_auth+/signup/index.tsx b/app/routes/_auth+/signup/index.tsx
index 1d41897..bd9fc57 100644
--- a/app/routes/_auth+/signup/index.tsx
+++ b/app/routes/_auth+/signup/index.tsx
@@ -162,7 +162,7 @@ export default function SignupRoute() {
return (
+
+
-
+
+ Welcome back
++ Sign in to your account to continue. +
+
-
Let's saddle up!
+Let's get started!
Please enter your email and the secret password given to you by the
volunteer coordinator.
diff --git a/app/routes/_marketing+/index.tsx b/app/routes/_marketing+/index.tsx
index 6460760..7cf76ed 100644
--- a/app/routes/_marketing+/index.tsx
+++ b/app/routes/_marketing+/index.tsx
@@ -1,107 +1,117 @@
import type { V2_MetaFunction } from '@remix-run/node'
-import { horseMountains, ohack } from './logos/logos.ts'
import { Link } from '@remix-run/react'
+import { Calendar, Users, Footprints, Building2 } from 'lucide-react'
import { Button } from '~/components/ui/button.tsx'
import { useOptionalUser } from '~/utils/user.ts'
-// Get siteName from data.ts
import { siteName } from '~/data.ts'
-
-export const meta: V2_MetaFunction = () => {
-
+export const meta: V2_MetaFunction = () => {
return [
- {
- title: siteName,
- },
- {
- property: "og:title",
- content: siteName,
- },
- {
- name: "description",
- content: `Welcome to ${siteName}, the premier equestrian training facility.`,
- },
- {
- name: "og:description",
- content: `Welcome to ${siteName}, the premier equestrian training facility.`,
- },
+ { title: `${siteName} โ Volunteer Scheduling for Nonprofits` },
{
- name: "og:image",
- content: "/img/calendar-icon-with-horse-at-grand-canyon-using-arizona-flag-colors.jpeg",
+ name: 'description',
+ content:
+ 'The Barn helps animal-assisted therapy nonprofits coordinate volunteers, manage animals, and schedule events โ all in one place.',
},
- ];
-};
+ ]
+}
+
+const features = [
+ {
+ icon:
- Equestrian Volunteer Scheduling Application
-
+ The Barn gives your organization a dedicated space to manage events,
+ track animals, and keep volunteers in sync โ with zero spreadsheets.
+
+ Set up your organization in minutes. No credit card required.
+
+ Create your organization account and start coordinating volunteers.
+
- These terms of service govern your use of TrotTrack.org. By accessing
+ These terms of service govern your use of thebarnaz.com. By accessing
or using our website, you acknowledge that you have read, understood,
and agree to be bound by these terms.
- TrotTrack.org is a nonprofit equestrian volunteer system that connects
- volunteers with equestrian organizations. Our services include
+ thebarnaz.com is a nonprofit animal volunteer management system that connects
+ volunteers with animal-assisted therapy organizations. Our services include
providing a platform for volunteers to find and sign up for volunteer
opportunities, and for organizations to manage their volunteer
programs.
@@ -45,7 +45,7 @@ export default function TermsOfServiceRoute() {
As a user of TrotTrack.org, you agree to: As a user of thebarnaz.com, you agree to:
- All content and materials on TrotTrack.org, including but not limited
+ All content and materials on thebarnaz.com, including but not limited
to text, graphics, logos, images, and software, are the property of
- TrotTrack.org or its licensors and are protected by intellectual
+ thebarnaz.com or its licensors and are protected by intellectual
property laws. You may not reproduce, distribute, modify, or create
derivative works of any content without prior written consent from
- TrotTrack.org.
+ thebarnaz.com.
- TrotTrack.org and its affiliates shall not be liable for any direct,
+ thebarnaz.com and its affiliates shall not be liable for any direct,
indirect, incidental, special, or consequential damages arising out of
or in connection with your use of the website or services.
These terms of service shall be governed by and construed in
- accordance with the laws of the jurisdiction in which TrotTrack.org
+ accordance with the laws of the jurisdiction in which thebarnaz.com
operates.
- By using TrotTrack.org, you agree to these terms of service. If you do
+ By using thebarnaz.com, you agree to these terms of service. If you do
not agree with any part of these terms, please do not use our website
or services.
-
-
-
+
-
-
-
-
-
-
-
- The Barn: Volunteer Portal
-
-
-
- {user ? (
-
- ) : (
-
- )}
-
-
+ {/* Hero */}
+
+ Coordinate volunteers.{' '}
+ Simplify scheduling.
+
+
+ {user ? (
+
+ ) : (
+ <>
+
+
+
+ )}
+
-
)
}
-
diff --git a/app/routes/_marketing+/org-signup.tsx b/app/routes/_marketing+/org-signup.tsx
new file mode 100644
index 0000000..a14ab7a
--- /dev/null
+++ b/app/routes/_marketing+/org-signup.tsx
@@ -0,0 +1,272 @@
+import { conform, useForm } from '@conform-to/react'
+import { getFieldsetConstraint, parse } from '@conform-to/zod'
+import {
+ json,
+ redirect,
+ type DataFunctionArgs,
+ type V2_MetaFunction,
+} from '@remix-run/node'
+import {
+ Form,
+ Link,
+ useActionData,
+ useFormAction,
+ useNavigation,
+} from '@remix-run/react'
+import { z } from 'zod'
+import { ErrorList, Field } from '~/components/forms.tsx'
+import { StatusButton } from '~/components/ui/status-button.tsx'
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from '~/components/ui/select.tsx'
+import { Label } from '~/components/ui/label.tsx'
+import { Separator } from '~/components/ui/separator.tsx'
+import { requireAnonymous, signupOrg, authenticator } from '~/utils/auth.server.ts'
+import { commitSession, getSession } from '~/utils/session.server.ts'
+import {
+ nameSchema,
+ passwordSchema,
+ usernameSchema,
+ emailSchema,
+} from '~/utils/user-validation.ts'
+import { siteName } from '~/data.ts'
+import { prisma } from '~/utils/db.server.ts'
+
+const orgSignupSchema = z
+ .object({
+ orgName: z
+ .string()
+ .min(2, { message: 'Organization name is too short' })
+ .max(80, { message: 'Organization name is too long' }),
+ animalType: z.string().min(1, { message: 'Please select an animal type' }),
+ name: nameSchema,
+ username: usernameSchema,
+ email: emailSchema,
+ password: passwordSchema,
+ confirmPassword: passwordSchema,
+ })
+ .superRefine(({ confirmPassword, password }, ctx) => {
+ if (confirmPassword !== password) {
+ ctx.addIssue({
+ path: ['confirmPassword'],
+ code: 'custom',
+ message: 'The passwords did not match',
+ })
+ }
+ })
+
+function slugify(name: string) {
+ return name
+ .toLowerCase()
+ .trim()
+ .replace(/[^a-z0-9\s-]/g, '')
+ .replace(/\s+/g, '-')
+ .replace(/-+/g, '-')
+ .slice(0, 60)
+}
+
+export async function loader({ request }: DataFunctionArgs) {
+ await requireAnonymous(request)
+ return json({})
+}
+
+export const meta: V2_MetaFunction = () => {
+ return [{ title: `Register Your Organization | ${siteName}` }]
+}
+
+export async function action({ request }: DataFunctionArgs) {
+ await requireAnonymous(request)
+ const formData = await request.formData()
+ const submission = await parse(formData, {
+ schema: orgSignupSchema.superRefine(async ({ username, email, orgName }, ctx) => {
+ const existingUser = await prisma.user.findFirst({
+ where: { OR: [{ username }, { email }] },
+ select: { id: true, username: true, email: true },
+ })
+ if (existingUser?.username === username) {
+ ctx.addIssue({
+ path: ['username'],
+ code: 'custom',
+ message: 'A user already exists with this username',
+ })
+ }
+ if (existingUser?.email === email) {
+ ctx.addIssue({
+ path: ['email'],
+ code: 'custom',
+ message: 'A user already exists with this email',
+ })
+ }
+ const slug = slugify(orgName)
+ const existingOrg = await prisma.organization.findUnique({
+ where: { slug },
+ select: { id: true },
+ })
+ if (existingOrg) {
+ ctx.addIssue({
+ path: ['orgName'],
+ code: 'custom',
+ message: 'An organization with a similar name already exists',
+ })
+ }
+ }),
+ async: true,
+ })
+
+ if (submission.intent !== 'submit') {
+ return json({ status: 'idle', submission } as const)
+ }
+ if (!submission.value) {
+ return json({ status: 'error', submission } as const, { status: 400 })
+ }
+
+ const { orgName, animalType, name, username, email, password } =
+ submission.value
+ const orgSlug = slugify(orgName)
+
+ const session = await signupOrg({
+ orgName,
+ orgSlug,
+ animalType,
+ email,
+ username,
+ name,
+ password,
+ })
+
+ const cookieSession = await getSession(request.headers.get('cookie'))
+ cookieSession.set(authenticator.sessionKey, session.id)
+
+ return redirect('/calendar', {
+ headers: {
+ 'Set-Cookie': await commitSession(cookieSession, {
+ expires: session.expirationDate,
+ }),
+ },
+ })
+}
+
+export default function OrgSignup() {
+ const actionData = useActionData
-
-
-
+
+
+ {/* CTA strip */}
+ Ready to get started?
+
+ {/* Left image panel */}
+
+
+ {/* Right form panel */}
+
+ )
+}
diff --git a/app/routes/_marketing+/privacy.tsx b/app/routes/_marketing+/privacy.tsx
index 3a1fee2..7ca600a 100644
--- a/app/routes/_marketing+/privacy.tsx
+++ b/app/routes/_marketing+/privacy.tsx
@@ -3,16 +3,16 @@ import { type V2_MetaFunction } from '@remix-run/node'
export const meta: V2_MetaFunction = () => {
return [
{
- title: 'Privacy Policy | TrotTrack.org',
+ title: 'Privacy Policy | thebarnaz.com',
},
{
property: 'og:title',
- content: 'Privacy Policy | TrotTrack.org',
+ content: 'Privacy Policy | thebarnaz.com',
},
{
name: 'description',
content:
- 'Read our Privacy Policy for TrotTrack.org, a nonprofit equestrian volunteer system that connects volunteers with equestrian organizations.',
+ 'Read our Privacy Policy for thebarnaz.com, a nonprofit animal volunteer management system that connects volunteers with animal-assisted therapy organizations.',
},
]
}
diff --git a/app/routes/_marketing+/tos.tsx b/app/routes/_marketing+/tos.tsx
index 51dd935..ca0439b 100644
--- a/app/routes/_marketing+/tos.tsx
+++ b/app/routes/_marketing+/tos.tsx
@@ -3,16 +3,16 @@ import { type V2_MetaFunction } from '@remix-run/node'
export const meta: V2_MetaFunction = () => {
return [
{
- title: 'Terms of Service | TrotTrack.org',
+ title: 'Terms of Service | thebarnaz.com',
},
{
property: 'og:title',
- content: 'Terms of Service | TrotTrack.org',
+ content: 'Terms of Service | thebarnaz.com',
},
{
name: 'description',
content:
- 'Read or Terms of Service for TrotTrack.org, a nonprofit equestrian volunteer system that connects volunteers with equestrian organizations.',
+ 'Read our Terms of Service for thebarnaz.com, a nonprofit animal volunteer management system that connects volunteers with animal-assisted therapy organizations.',
},
]
}
@@ -28,7 +28,7 @@ export default function TermsOfServiceRoute() {
+
+
+
+
+
+
+
+ Register Your Organization
+ 1. Acceptance of Terms
2. Description of Services
3. User Responsibilities
-
4. Intellectual Property
5. Limitation of Liability
6. Governing Law