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
15 changes: 3 additions & 12 deletions app/admin/applications/[id]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import Link from "next/link";
import { getApplicationById } from "@/services/mockApplications";
<<<<<<< bsl-10-approve-reject-buttons
import ApproveRejectButtons from "@/components/admin/ApproveRejectButtons";
=======
>>>>>>> main

type Props = {
params: { id: string };
params: Promise<{ id: string }>;
};

export default function ApplicationDetail({ params }: Props) {
const { id } = params;
export default async function ApplicationDetail({ params }: Props) {
const { id } = await params;
const app = getApplicationById(id);

if (!app) {
Expand All @@ -29,18 +26,12 @@ export default function ApplicationDetail({ params }: Props) {
<div className="p-6">
<div className="flex items-center justify-between">
<h1 className="text-2xl font-semibold">Application: {app.name}</h1>
<<<<<<< bsl-10-approve-reject-buttons
<div className="flex items-center gap-4">
<ApproveRejectButtons id={app.id} />
<Link href="/admin/applications" className="text-blue-600 hover:underline">
Back
</Link>
</div>
=======
<Link href="/admin/applications" className="text-blue-600 hover:underline">
Back
</Link>
>>>>>>> main
</div>

<div className="mt-6 grid grid-cols-1 md:grid-cols-2 gap-6">
Expand Down
102 changes: 48 additions & 54 deletions app/admin/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,65 +1,59 @@
"use client";

import { useState } from "react";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Button } from "@/components/ui/button";

export default function AdminLoginPage() {
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");

const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
console.log({ email, password });
};
const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();
console.log({ email, password });
};

return (
<div className="flex min-h-screen items-center justify-center bg-background">
<div className="w-full max-w-md space-y-8 rounded-lg border border-border bg-card p-8 shadow-sm">
<div className="text-center">
<h1 className="text-2xl font-bold tracking-tight">Admin Login</h1>
<p className="mt-2 text-sm text-muted-foreground">
Sign in to access the admin dashboard
</p>
</div>
return (
<div className="flex min-h-screen items-center justify-center bg-background">
<div className="w-full max-w-md space-y-8 rounded-lg border border-border bg-card p-8 shadow-sm">
<div className="text-center">
<h1 className="text-2xl font-bold tracking-tight">Admin Login</h1>
<p className="mt-2 text-sm text-muted-foreground">
Sign in to access the admin dashboard
</p>
</div>

<form onSubmit={handleSubmit} className="space-y-6">
<div className="space-y-2">
<label htmlFor="email" className="text-sm font-medium">
Email
</label>
<input
id="email"
type="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder="admin@example.com"
required
className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
/>
</div>
<form onSubmit={handleSubmit} className="space-y-6">
<div className="space-y-2">
<Label htmlFor="email">Email</Label>
<Input
id="email"
type="email"
value={email}
onChange={(e) => setEmail(e.target.value)}
placeholder="admin@example.com"
required
/>
</div>

<div className="space-y-2">
<label htmlFor="password" className="text-sm font-medium">
Password
</label>
<input
id="password"
type="password"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder="••••••••"
required
className="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
/>
</div>
<div className="space-y-2">
<Label htmlFor="password">Password</Label>
<Input
id="password"
type="password"
value={password}
onChange={(e) => setPassword(e.target.value)}
placeholder="••••••••"
required
/>
</div>

<button
type="submit"
className="inline-flex h-10 w-full items-center justify-center rounded-md bg-primary px-4 py-2 text-sm font-medium text-primary-foreground shadow transition-colors hover:bg-primary/90 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
>
Sign In
</button>
</form>
</div>
</div>
);
<Button type="submit" className="w-full">
Sign In
</Button>
</form>
</div>
</div>
);
}
4 changes: 1 addition & 3 deletions app/api/admin/applications/route.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { NextResponse } from "next/server";
import { PrismaClient } from "@/generated/prisma/client";

const prisma = new PrismaClient();
import { prisma } from "@/lib/prisma";

export async function GET() {
try {
Expand Down
23 changes: 14 additions & 9 deletions app/api/admin/events/[id]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,36 @@
import { NextResponse } from "next/server";
import { prisma } from "@/lib/prisma";

export async function GET(_: Request, { params }: { params: { id: string } }) {
type RouteContext = { params: Promise<{ id: string }> };

export async function GET(_: Request, { params }: RouteContext) {
const { id } = await params;
// TODO: require admin
const event = await prisma.event.findUnique({ where: { id: params.id } });
const event = await prisma.event.findUnique({ where: { id } });
if (!event) return NextResponse.json({ error: "Not found" }, { status: 404 });
return NextResponse.json(event);
}

export async function PATCH(req: Request, { params }: { params: { id: string } }) {
export async function PATCH(req: Request, { params }: RouteContext) {
const { id } = await params;
// TODO: require admin
const body = await req.json();

const data: Record<string, any> = {};
const data: Record<string, unknown> = {};
if (body.title !== undefined) data.title = body.title;
if (body.description !== undefined) data.description = body.description ?? null;
if (body.startAt !== undefined) data.startAt = new Date(body.startAt);
if (body.endAt !== undefined) data.endAt = body.endAt ? new Date(body.endAt) : null;
if (body.location !== undefined) data.location = body.location ?? null;
if (body.link !== undefined) data.link = body.link ?? null;

if (data.startAt && data.endAt && data.endAt < data.startAt) {
if (data.startAt && data.endAt && (data.endAt as Date) < (data.startAt as Date)) {
return NextResponse.json({ error: "endAt cannot be before startAt" }, { status: 400 });
}

try {
const updated = await prisma.event.update({
where: { id: params.id },
where: { id },
data,
});
return NextResponse.json(updated);
Expand All @@ -36,12 +40,13 @@ export async function PATCH(req: Request, { params }: { params: { id: string } }
}
}

export async function DELETE(_: Request, { params }: { params: { id: string } }) {
export async function DELETE(_: Request, { params }: RouteContext) {
const { id } = await params;
// TODO: require admin
try {
await prisma.event.delete({ where: { id: params.id } });
await prisma.event.delete({ where: { id } });
return NextResponse.json({ ok: true });
} catch {
return NextResponse.json({ error: "Not found" }, { status: 404 });
}
}
}
4 changes: 1 addition & 3 deletions app/api/applications/startup/route.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
export const runtime = "nodejs";

import { NextResponse } from "next/server";
import { PrismaClient } from "@/generated/prisma/client";

const prisma = new PrismaClient();
import { prisma } from "@/lib/prisma";

export async function POST(request: Request) {
console.log("DATABASE_URL:", process.env.DATABASE_URL);
Expand Down
118 changes: 53 additions & 65 deletions app/apply/startup/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

import { useState } from "react";
import PublicLayout from "@/components/layout/PublicLayout";
import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea";
import { Label } from "@/components/ui/label";
import { Button } from "@/components/ui/button";

type StartupFormState = {
name: string;
Expand Down Expand Up @@ -32,79 +36,63 @@ export default function StartupApplyPage() {
<div className="mx-auto max-w-2xl px-6 py-12">
<h1 className="text-3xl font-semibold">Startup Application</h1>
<p className="mt-2 text-gray-600">
UI only for now — submitting will log your inputs to the console.
Tell us more about your startup!
</p>

<form onSubmit={handleSubmit} className="mt-8 space-y-6">
<div className="space-y-2">
<label className="block font-medium" htmlFor="name">
Startup Name
</label>
<input
id="name"
type="text"
value={form.name}
onChange={(e) => updateField("name", e.target.value)}
className="w-full rounded-md border px-3 py-2"
placeholder="e.g., Startup Labs"
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="description">Tell us more about your startup!</Label>
<Textarea
id="description"
value={form.description}
onChange={(e) => updateField("description", e.target.value)}
placeholder="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
rows={5}
required
/>
</div>

<div className="space-y-2">
<label className="block font-medium" htmlFor="description">
Description
</label>
<textarea
id="description"
value={form.description}
onChange={(e) => updateField("description", e.target.value)}
className="w-full rounded-md border px-3 py-2"
placeholder="What does your startup do?"
rows={5}
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="name">Link to pitch deck</Label>
<Input
id="name"
type="url"
value={form.name}
onChange={(e) => updateField("name", e.target.value)}
placeholder="Loremipsumdolorsitamet.com"
required
/>
</div>

<div className="space-y-2">
<label className="block font-medium" htmlFor="fundingGoal">
Funding Goal
</label>
<input
id="fundingGoal"
type="text"
value={form.fundingGoal}
onChange={(e) => updateField("fundingGoal", e.target.value)}
className="w-full rounded-md border px-3 py-2"
placeholder="e.g., $50,000"
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="fundingGoal">Funding goal ($)</Label>
<Input
id="fundingGoal"
type="text"
value={form.fundingGoal}
onChange={(e) => updateField("fundingGoal", e.target.value)}
placeholder="100,000,000"
required
/>
</div>

<div className="space-y-2">
<label className="block font-medium" htmlFor="contact">
Contact (email or phone)
</label>
<input
id="contact"
type="text"
value={form.contact}
onChange={(e) => updateField("contact", e.target.value)}
className="w-full rounded-md border px-3 py-2"
placeholder="you@company.com"
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="contact">Link to external funding site</Label>
<Input
id="contact"
type="url"
value={form.contact}
onChange={(e) => updateField("contact", e.target.value)}
placeholder="Loremipsumdolorsitamet.com"
required
/>
</div>

<button
type="submit"
className="rounded-md border px-4 py-2 font-medium hover:bg-gray-50"
>
Submit
</button>
</form>
<div className="flex justify-center pt-4">
<Button type="submit">Apply</Button>
</div>
</form>
</div>
</PublicLayout>
);
}

4 changes: 3 additions & 1 deletion app/demo/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// Example of using a service in a component, also using a reusable component

export const dynamic = "force-dynamic";

import Image from "next/image";

import SimpleButton from "../../components/demobutton";

import { Button } from "@/components/ui/shadcndemobutton";
import { Button } from "@/components/ui/button";
import { getProducts } from "@/services/demo";

export default async function DemoPage() {
Expand Down
Loading