Skip to content
Merged
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
9 changes: 8 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,17 @@
"preview": "vite preview"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.2.20",
"@radix-ui/react-icons": "^1.3.2",
"@radix-ui/react-label": "^2.1.15",
"@radix-ui/react-slot": "^1.3.3",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"lucide-react": "^1.28.0",
"react": "^19.2.8",
"react-dom": "^19.2.8",
"react-router-dom": "^7.18.2"
"react-router-dom": "^7.18.2",
"tailwind-merge": "^3.6.0"
},
"devDependencies": {
"@types/node": "^24.13.3",
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import ProtectedRoute from './components/layout/ProtectedRoute'
import { Role } from './lib/api/types'

import HomePage from './pages/HomePage'
import HowItWorksPage from './pages/HowItWorksPage'
import OrganizersPage from './pages/OrganizersPage'
import ContactPage from './pages/ContactPage'
import EventsPage from './pages/EventsPage'
import EventDetailPage from './pages/EventDetailPage'
import LoginPage from './pages/LoginPage'
Expand All @@ -26,6 +29,9 @@ function App() {
<AuthProvider>
<Routes>
<Route path="/" element={<HomePage />} />
<Route path="/how-it-works" element={<HowItWorksPage />} />
<Route path="/organizers" element={<OrganizersPage />} />
<Route path="/contact" element={<ContactPage />} />
<Route path="/events" element={<EventsPage />} />
<Route path="/events/:eventId" element={<EventDetailPage />} />
<Route path="/login" element={<LoginPage />} />
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ export default function Hero() {
Browse events
<ArrowRight size={16} />
</Link>
<a href="/#organizers" className="text-sm font-medium text-white/70 transition-colors hover:text-white">
<Link to="/organizers" className="text-sm font-medium text-white/70 transition-colors hover:text-white">
List your event
</a>
</Link>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/home/OrganizerPitch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const VALUE_PROPS = [

export default function OrganizerPitch() {
return (
<section id="organizers" className="scroll-mt-20 border-t border-line-dark bg-ink px-6 py-20 text-white md:px-12 lg:px-16">
<section className="border-t border-line-dark bg-ink px-6 py-20 text-white md:px-12 lg:px-16">
<div className="grid gap-10 md:grid-cols-2 md:gap-16">
<div>
<p className="text-xs font-medium uppercase tracking-[0.14em] text-brass">For organizers</p>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/home/ReachUs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function ReachUs() {
}

return (
<section id="reach-us" className="scroll-mt-20 border-t border-line-dark bg-ink px-6 py-20 text-white md:px-12 lg:px-16">
<section className="border-t border-line-dark bg-ink px-6 py-20 text-white md:px-12 lg:px-16">
<div className="grid gap-12 md:grid-cols-2 md:gap-16">
<div>
<p className="text-xs font-medium uppercase tracking-[0.14em] text-brass">Reach us</p>
Expand Down
77 changes: 0 additions & 77 deletions frontend/src/components/home/UpcomingEvents.tsx

This file was deleted.

41 changes: 41 additions & 0 deletions frontend/src/components/layout/AuthSplitLayout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import type { ReactNode } from 'react'
import { Link } from 'react-router-dom'
import { Ticket } from 'lucide-react'
import { Typewriter } from '../ui/typewriter'

interface AuthSplitLayoutProps {
image: { src: string; alt: string }
quote: { text: string; author: string }
children: ReactNode
}

export default function AuthSplitLayout({ image, quote, children }: AuthSplitLayoutProps) {
return (
<div className="grid min-h-screen w-full bg-ink font-geist text-white md:grid-cols-2">
<div className="flex flex-col p-6 md:p-10">
<Link to="/" className="flex items-center gap-2 text-lg font-semibold tracking-tight text-white">
<Ticket size={20} className="text-brass" strokeWidth={2.25} />
Muster
</Link>
<div className="flex flex-1 items-center justify-center py-12">
<div className="w-full max-w-sm">{children}</div>
</div>
</div>

<div className="relative hidden md:block">
<img src={image.src} alt={image.alt} className="h-full w-full object-cover" />
<div className="absolute inset-0 bg-gradient-to-t from-ink via-ink/10 to-transparent" />
<div className="absolute inset-x-0 bottom-0 p-10">
<blockquote className="space-y-2">
<p className="min-h-[3.5rem] text-lg font-medium text-white">
&ldquo;
<Typewriter text={quote.text} speed={35} />
&rdquo;
</p>
<cite className="block text-sm font-light not-italic text-white/60">— {quote.author}</cite>
</blockquote>
</div>
</div>
</div>
)
}
117 changes: 41 additions & 76 deletions frontend/src/components/layout/SiteFooter.tsx
Original file line number Diff line number Diff line change
@@ -1,81 +1,46 @@
import { Link } from 'react-router-dom'
import { Mail, MapPin, Ticket } from 'lucide-react'

const EXPLORE_LINKS = [
{ label: 'Browse events', href: '/events' },
{ label: 'For organizers', href: '/#organizers' },
{ label: 'Sign up', href: '/signup' },
{ label: 'Log in', href: '/login' },
]

const SOCIAL_LINKS = [
{ label: 'X', href: 'https://x.com/musterhq' },
{ label: 'Instagram', href: 'https://instagram.com/musterhq' },
{ label: 'LinkedIn', href: 'https://linkedin.com/company/musterhq' },
]
import { Compass, HelpCircle, LogIn, Mail, Megaphone, Ticket, UserPlus } from 'lucide-react'
import { Footer } from '../ui/footer'

export default function SiteFooter() {
return (
<footer className="border-t border-line-dark bg-ink px-6 py-14 text-white md:px-12 lg:px-16">
<div className="grid gap-12 md:grid-cols-[1.4fr_1fr_1fr]">
<div className="max-w-sm">
<Link to="/" className="flex items-center gap-2 text-lg font-semibold tracking-tight text-white">
<Ticket size={20} className="text-brass" strokeWidth={2.25} />
Muster
</Link>
<p className="mt-4 text-sm leading-relaxed text-white/60">
The place organizers list what's happening and people show up.
Every event on Muster is reviewed before it goes live.
</p>
</div>

<div>
<p className="text-xs font-medium uppercase tracking-[0.14em] text-white/40">Explore</p>
<ul className="mt-4 flex flex-col gap-3">
{EXPLORE_LINKS.map((link) => (
<li key={link.label}>
<a href={link.href} className="text-sm text-white/70 transition-colors hover:text-white">
{link.label}
</a>
</li>
))}
</ul>
</div>

<div>
<p className="text-xs font-medium uppercase tracking-[0.14em] text-white/40">Reach us</p>
<ul className="mt-4 flex flex-col gap-3 text-sm text-white/70">
<li className="flex items-center gap-2">
<Mail size={14} className="text-white/40" />
<a href="mailto:hello@muster.app" className="transition-colors hover:text-white">
hello@muster.app
</a>
</li>
<li className="flex items-center gap-2">
<MapPin size={14} className="text-white/40" />
Accra, Ghana &amp; remote
</li>
</ul>
<div className="mt-5 flex gap-4">
{SOCIAL_LINKS.map((link) => (
<a
key={link.label}
href={link.href}
target="_blank"
rel="noreferrer"
className="text-sm text-white/50 transition-colors hover:text-white"
>
{link.label}
</a>
))}
</div>
</div>
</div>

<div className="mt-12 flex flex-col gap-2 border-t border-line-dark pt-6 text-xs text-white/40 sm:flex-row sm:items-center sm:justify-between">
<p>&copy; {new Date().getFullYear()} Muster. All rights reserved.</p>
<p>Built for organizers who'd rather run the event than chase spreadsheets.</p>
</div>
</footer>
<Footer
brand={{
name: 'Muster',
description:
"The place organizers list what's happening and people show up. Every event on Muster is reviewed before it goes live.",
}}
socialLinks={[
{ name: 'X', href: 'https://x.com/musterhq' },
{ name: 'Instagram', href: 'https://instagram.com/musterhq' },
{ name: 'LinkedIn', href: 'https://linkedin.com/company/musterhq' },
]}
columns={[
{
title: 'Explore',
links: [
{ name: 'Browse events', Icon: Ticket, href: '/events' },
{ name: 'How it works', Icon: Compass, href: '/how-it-works' },
{ name: 'FAQ', Icon: HelpCircle, href: '/how-it-works' },
{ name: 'Contact us', Icon: Mail, href: '/contact' },
],
},
{
title: 'Organizers',
links: [
{ name: 'For organizers', Icon: Megaphone, href: '/organizers' },
{ name: 'List an event', Icon: UserPlus, href: '/signup?role=ORGANIZER' },
],
},
{
title: 'Account',
links: [
{ name: 'Log in', Icon: LogIn, href: '/login' },
{ name: 'Sign up', Icon: UserPlus, href: '/signup' },
{ name: 'My tickets', Icon: Ticket, href: '/tickets' },
],
},
]}
copyright={`© ${new Date().getFullYear()} Muster. All rights reserved.`}
/>
)
}
15 changes: 8 additions & 7 deletions frontend/src/components/layout/SiteNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import { Role } from '../../lib/api/types'
const NAV_LINKS = [
{ label: 'Home', href: '/' },
{ label: 'Events', href: '/events' },
{ label: 'For organizers', href: '/#organizers' },
{ label: 'Reach us', href: '/#reach-us' },
{ label: 'How it works', href: '/how-it-works' },
{ label: 'For organizers', href: '/organizers' },
{ label: 'Contact', href: '/contact' },
]

function dashboardPathFor(role: Role): string {
Expand Down Expand Up @@ -47,9 +48,9 @@ export default function SiteNav({ variant = 'solid' }: SiteNavProps) {
</Link>
<div className="hidden items-center gap-8 md:flex">
{NAV_LINKS.map((link) => (
<a key={link.label} href={link.href} className="text-sm text-white/80 transition-colors hover:text-white">
<Link key={link.label} to={link.href} className="text-sm text-white/80 transition-colors hover:text-white">
{link.label}
</a>
</Link>
))}
</div>
</div>
Expand Down Expand Up @@ -119,14 +120,14 @@ export default function SiteNav({ variant = 'solid' }: SiteNavProps) {
>
<div className="flex flex-col gap-6">
{NAV_LINKS.map((link) => (
<a
<Link
key={link.label}
href={link.href}
to={link.href}
onClick={() => setMobileMenuOpen(false)}
className="text-3xl font-medium text-white/90 hover:text-white"
>
{link.label}
</a>
</Link>
))}
{session ? (
<>
Expand Down
Loading
Loading