Compare commits

...

2 Commits

Author SHA1 Message Date
Felix Schulze
620156197a fix final backend and styling
All checks were successful
Lint / Lint (push) Successful in 1m7s
2024-10-18 14:20:58 +02:00
Felix Schulze
867bd6797d style, backend 2024-10-18 13:36:15 +02:00
7 changed files with 164 additions and 134 deletions

View File

@ -25,24 +25,24 @@
@layer base { @layer base {
:root { :root {
--background: 0 0% 100%; --background: 0 0% 100%;
--foreground: 20 14.3% 4.1%; --foreground: 0 0% 3.9%;
--card: 0 0% 100%; --card: 0 0% 100%;
--card-foreground: 20 14.3% 4.1%; --card-foreground: 0 0% 3.9%;
--popover: 0 0% 100%; --popover: 0 0% 100%;
--popover-foreground: 20 14.3% 4.1%; --popover-foreground: 0 0% 3.9%;
--primary: 24.6 95% 53.1%; --primary: 0 72.2% 50.6%;
--primary-foreground: 60 9.1% 97.8%; --primary-foreground: 0 85.7% 97.3%;
--secondary: 60 4.8% 95.9%; --secondary: 0 0% 96.1%;
--secondary-foreground: 24 9.8% 10%; --secondary-foreground: 0 0% 9%;
--muted: 60 4.8% 95.9%; --muted: 0 0% 96.1%;
--muted-foreground: 25 5.3% 44.7%; --muted-foreground: 0 0% 45.1%;
--accent: 60 4.8% 95.9%; --accent: 0 0% 96.1%;
--accent-foreground: 24 9.8% 10%; --accent-foreground: 0 0% 9%;
--destructive: 0 84.2% 60.2%; --destructive: 0 84.2% 60.2%;
--destructive-foreground: 60 9.1% 97.8%; --destructive-foreground: 0 0% 98%;
--border: 20 5.9% 90%; --border: 0 0% 89.8%;
--input: 20 5.9% 90%; --input: 0 0% 89.8%;
--ring: 24.6 95% 53.1%; --ring: 0 72.2% 50.6%;
--radius: 1rem; --radius: 1rem;
--chart-1: 12 76% 61%; --chart-1: 12 76% 61%;
--chart-2: 173 58% 39%; --chart-2: 173 58% 39%;
@ -52,25 +52,25 @@
} }
.dark { .dark {
--background: 20 14.3% 4.1%; --background: 0 0% 3.9%;
--foreground: 60 9.1% 97.8%; --foreground: 0 0% 98%;
--card: 20 14.3% 4.1%; --card: 0 0% 3.9%;
--card-foreground: 60 9.1% 97.8%; --card-foreground: 0 0% 98%;
--popover: 20 14.3% 4.1%; --popover: 0 0% 3.9%;
--popover-foreground: 60 9.1% 97.8%; --popover-foreground: 0 0% 98%;
--primary: 20.5 90.2% 48.2%; --primary: 0 72.2% 50.6%;
--primary-foreground: 60 9.1% 97.8%; --primary-foreground: 0 85.7% 97.3%;
--secondary: 12 6.5% 15.1%; --secondary: 0 0% 14.9%;
--secondary-foreground: 60 9.1% 97.8%; --secondary-foreground: 0 0% 98%;
--muted: 12 6.5% 15.1%; --muted: 0 0% 14.9%;
--muted-foreground: 24 5.4% 63.9%; --muted-foreground: 0 0% 63.9%;
--accent: 12 6.5% 15.1%; --accent: 0 0% 14.9%;
--accent-foreground: 60 9.1% 97.8%; --accent-foreground: 0 0% 98%;
--destructive: 0 72.2% 50.6%; --destructive: 0 62.8% 30.6%;
--destructive-foreground: 60 9.1% 97.8%; --destructive-foreground: 0 0% 98%;
--border: 12 6.5% 15.1%; --border: 0 0% 14.9%;
--input: 12 6.5% 15.1%; --input: 0 0% 14.9%;
--ring: 20.5 90.2% 48.2%; --ring: 0 72.2% 50.6%;
--chart-1: 220 70% 50%; --chart-1: 220 70% 50%;
--chart-2: 160 60% 45%; --chart-2: 160 60% 45%;
--chart-3: 30 80% 55%; --chart-3: 30 80% 55%;

View File

@ -9,8 +9,9 @@ export default function Page() {
alt="Bangers and Mash GBG" alt="Bangers and Mash GBG"
width={200} width={200}
height={200} height={200}
className="mx-auto" className="mx-auto my-8"
/> />
<h1 className="mb-4 text-xl">Sign up to our guest list here</h1>
<SignUp /> <SignUp />
</div> </div>
); );

View File

@ -21,17 +21,19 @@ import { Calendar } from "@/components/ui/calendar";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover"; import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { signupFormSubmit } from "@/lib/actions"; import { signupFormSubmit } from "@/lib/actions";
import { useState } from "react";
export const signupFormSchema = z.object({ export const signupFormSchema = z.object({
name: z.string().min(2, { message: "Name is required" }).max(50, { message: "Name is too long" }), name: z.string().min(2, { message: "Name is required" }).max(50, { message: "Name is too long" }),
email: z.string().email({ message: "Email is invalid" }), email: z.string().email({ message: "Email is invalid" }),
dob: z.date({ required_error: "Birthday is required" }), dob: z.date({ required_error: "Birthday is required" }),
}); });
export const youngestDate = new Date(new Date().setFullYear(new Date().getFullYear() - 21)); export const youngestDate = new Date(new Date().setFullYear(new Date().getFullYear() - 21));
export const oldestDate = new Date(new Date().setFullYear(new Date().getFullYear() - 100)); export const oldestDate = new Date(new Date().setFullYear(new Date().getFullYear() - 100));
export default function SignUp() { export default function SignUp() {
const [submitted, setSubmitted] = useState(false);
const [response, setResponse] = useState<string | null>(null);
const form = useForm<z.infer<typeof signupFormSchema>>({ const form = useForm<z.infer<typeof signupFormSchema>>({
resolver: zodResolver(signupFormSchema), resolver: zodResolver(signupFormSchema),
defaultValues: { defaultValues: {
@ -40,9 +42,11 @@ export default function SignUp() {
dob: youngestDate, dob: youngestDate,
}, },
}); });
function onSubmit(values: z.infer<typeof signupFormSchema>) { async function onSubmit(values: z.infer<typeof signupFormSchema>) {
signupFormSubmit(values); setSubmitted(true);
setResponse(await signupFormSubmit(values));
} }
function SignupForm() {
return ( return (
<Form {...form}> <Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8"> <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
@ -117,8 +121,12 @@ export default function SignUp() {
</FormItem> </FormItem>
)} )}
/> />
<Button type="submit">Submit</Button> <Button type="submit" disabled={submitted}>
Submit
</Button>
</form> </form>
</Form> </Form>
); );
} }
return response ?? SignupForm();
}

View File

@ -37,7 +37,7 @@ function Calendar({ className, classNames, showOutsideDays = true, ...props }: C
head_row: "flex", head_row: "flex",
head_cell: "text-muted-foreground rounded-md w-9 font-normal text-[0.8rem]", head_cell: "text-muted-foreground rounded-md w-9 font-normal text-[0.8rem]",
row: "flex w-full mt-2", row: "flex w-full mt-2",
cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected])]:bg-accent first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20", cell: "h-9 w-9 text-center text-sm p-0 relative [&:has([aria-selected].day-range-end)]:rounded-r-md [&:has([aria-selected].day-outside)]:bg-accent/50 first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md focus-within:relative focus-within:z-20",
day: cn( day: cn(
buttonVariants({ variant: "ghost" }), buttonVariants({ variant: "ghost" }),
"h-9 w-9 p-0 font-normal aria-selected:opacity-100" "h-9 w-9 p-0 font-normal aria-selected:opacity-100"

View File

@ -2,18 +2,23 @@
import { z } from "zod"; import { z } from "zod";
import { oldestDate, signupFormSchema, youngestDate } from "@/app/sign-up/sign-up-form"; import { oldestDate, signupFormSchema, youngestDate } from "@/app/sign-up/sign-up-form";
import listmonk from "./listmonk"; import listmonk, { listmonkData } from "./listmonk";
export async function signupFormSubmit(data: z.infer<typeof signupFormSchema>) { export async function signupFormSubmit(data: z.infer<typeof signupFormSchema>): Promise<string> {
if (data.dob > youngestDate || data.dob < oldestDate) { if (data.dob > youngestDate || data.dob < oldestDate) {
return { error: "Invalid date of birth" }; return "Invalid date of birth";
} }
const listmonkData = { const offset = data.dob.getTimezoneOffset();
data.dob = new Date(data.dob.getTime() - offset * 60 * 1000);
const listmonkData: listmonkData = {
email: data.email, email: data.email,
name: data.name, name: data.name,
status: "enabled",
lists: [6],
attribs: { attribs: {
dob: data.dob.toISOString(), dob: data.dob.toISOString().split("T")[0],
}, },
}; };
console.log(listmonkData); return await listmonk(listmonkData);
} }

View File

@ -1,21 +1,37 @@
import "server-only"; import "server-only";
async function makeApiCall(url: string, options?: RequestInit) { export type listmonkData = {
try { email: string;
const response = await fetch(url, options); name: string;
if (!response.ok) { status: "enabled" | "blocklisted";
throw new Error(`HTTP error! Status: ${response.status}`); lists: number[];
} attribs: {};
return await response.json(); };
} catch (error) {
console.error("Error making API call:", error);
throw error;
}
}
async function listmonk() { async function listmonk(data: listmonkData): Promise<string> {
const listmonkUrl = process.env.LISTMONK_URL ?? ""; const listmonkUrl = process.env.LISTMONK_URL ?? "http://localhost:9000/api/";
makeApiCall(listmonkUrl); const listmonkUser = process.env.LISTMONK_USER ?? "nouser";
const listmonkPass = process.env.LISTMONK_PASS ?? "nopass";
// Encode the username and password in base64
const credentials = Buffer.from(`${listmonkUser}:${listmonkPass}`).toString("base64");
const options: RequestInit = {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Basic ${credentials}`,
},
body: JSON.stringify(data),
};
try {
const response = await fetch(`${listmonkUrl}subscribers`, options);
if (!response.ok) {
return "Error. please try again soon.";
}
return "Thanks for signing up!";
} catch (error) {
return "Error. please try again soon.";
}
} }
export default listmonk; export default listmonk;

BIN
public/image/bam.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 694 KiB