-
+
{t.hero.title}
{t.hero.subtitle}
{t.when.date}
+
@@ -168,7 +171,7 @@ export default function LandingPage(
{t.where.location}} after={} />
- {t.when.date}
+ {t.when.date}
{t.when.extra}
}
/>
{t.tickets.status}} />
diff --git a/src/components/newsletter-form.tsx b/src/components/newsletter-form.tsx
new file mode 100644
index 0000000..1f41446
--- /dev/null
+++ b/src/components/newsletter-form.tsx
@@ -0,0 +1,131 @@
+"use client";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useForm } from "react-hook-form";
+
+import { subscribe } from "@/actions/newsletter";
+import { Button } from "@/components/ui/button";
+import {
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { oxanium } from "@/fonts";
+import { Translations } from "@/i18n/translations";
+import {
+ NewsletterFormSchema,
+ newsletterFormSchema,
+} from "@/schemas/newsletter";
+import { Checkbox } from "./ui/checkbox";
+
+export function NewsletterPopup({ t }: { t: Translations }) {
+ return (
+
+ );
+}
+
+export default function SubscriptionForm({ t }: { t: Translations }) {
+ const form = useForm({
+ resolver: zodResolver(newsletterFormSchema),
+ defaultValues: {
+ email: "",
+ name: "",
+ uodo: true,
+ },
+ });
+
+ const succeded = form.formState.isValid && form.formState.isSubmitSuccessful;
+
+ return (
+
+
+ );
+}
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index acf5367..65d4fcd 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -1,22 +1,22 @@
+import * as React from "react"
import { Slot } from "@radix-ui/react-slot"
import { cva, type VariantProps } from "class-variance-authority"
-import * as React from "react"
-import { cn } from '../../lib/utils'
+import { cn } from "@/lib/utils"
const buttonVariants = cva(
- "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
+ "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
{
variants: {
variant: {
default:
- "bg-primary text-primary-foreground shadow-sm hover:bg-primary/90",
+ "bg-primary text-primary-foreground shadow hover:bg-primary/90",
destructive:
- "bg-destructive text-destructive-foreground shadow-xs hover:bg-destructive/90",
+ "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
outline:
- "border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground",
+ "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
secondary:
- "bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
+ "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
},
@@ -36,7 +36,7 @@ const buttonVariants = cva(
export interface ButtonProps
extends React.ButtonHTMLAttributes,
- VariantProps {
+ VariantProps {
asChild?: boolean
}
diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsx
new file mode 100644
index 0000000..cabfbfc
--- /dev/null
+++ b/src/components/ui/card.tsx
@@ -0,0 +1,76 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+const Card = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => (
+
+))
+Card.displayName = "Card"
+
+const CardHeader = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => (
+
+))
+CardHeader.displayName = "CardHeader"
+
+const CardTitle = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => (
+
+))
+CardTitle.displayName = "CardTitle"
+
+const CardDescription = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => (
+
+))
+CardDescription.displayName = "CardDescription"
+
+const CardContent = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => (
+
+))
+CardContent.displayName = "CardContent"
+
+const CardFooter = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => (
+
+))
+CardFooter.displayName = "CardFooter"
+
+export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsx
new file mode 100644
index 0000000..c6fdd07
--- /dev/null
+++ b/src/components/ui/checkbox.tsx
@@ -0,0 +1,30 @@
+"use client"
+
+import * as React from "react"
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
+import { Check } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+const Checkbox = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+
+
+
+
+
+))
+Checkbox.displayName = CheckboxPrimitive.Root.displayName
+
+export { Checkbox }
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
new file mode 100644
index 0000000..1647513
--- /dev/null
+++ b/src/components/ui/dialog.tsx
@@ -0,0 +1,122 @@
+"use client"
+
+import * as React from "react"
+import * as DialogPrimitive from "@radix-ui/react-dialog"
+import { X } from "lucide-react"
+
+import { cn } from "@/lib/utils"
+
+const Dialog = DialogPrimitive.Root
+
+const DialogTrigger = DialogPrimitive.Trigger
+
+const DialogPortal = DialogPrimitive.Portal
+
+const DialogClose = DialogPrimitive.Close
+
+const DialogOverlay = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+
+))
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+
+const DialogContent = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, children, ...props }, ref) => (
+
+
+
+ {children}
+
+
+ Close
+
+
+
+))
+DialogContent.displayName = DialogPrimitive.Content.displayName
+
+const DialogHeader = ({
+ className,
+ ...props
+}: React.HTMLAttributes) => (
+
+)
+DialogHeader.displayName = "DialogHeader"
+
+const DialogFooter = ({
+ className,
+ ...props
+}: React.HTMLAttributes) => (
+
+)
+DialogFooter.displayName = "DialogFooter"
+
+const DialogTitle = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+
+))
+DialogTitle.displayName = DialogPrimitive.Title.displayName
+
+const DialogDescription = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+
+))
+DialogDescription.displayName = DialogPrimitive.Description.displayName
+
+export {
+ Dialog,
+ DialogPortal,
+ DialogOverlay,
+ DialogTrigger,
+ DialogClose,
+ DialogContent,
+ DialogHeader,
+ DialogFooter,
+ DialogTitle,
+ DialogDescription,
+}
diff --git a/src/components/ui/form.tsx b/src/components/ui/form.tsx
new file mode 100644
index 0000000..b6daa65
--- /dev/null
+++ b/src/components/ui/form.tsx
@@ -0,0 +1,178 @@
+"use client"
+
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { Slot } from "@radix-ui/react-slot"
+import {
+ Controller,
+ ControllerProps,
+ FieldPath,
+ FieldValues,
+ FormProvider,
+ useFormContext,
+} from "react-hook-form"
+
+import { cn } from "@/lib/utils"
+import { Label } from "@/components/ui/label"
+
+const Form = FormProvider
+
+type FormFieldContextValue<
+ TFieldValues extends FieldValues = FieldValues,
+ TName extends FieldPath = FieldPath
+> = {
+ name: TName
+}
+
+const FormFieldContext = React.createContext(
+ {} as FormFieldContextValue
+)
+
+const FormField = <
+ TFieldValues extends FieldValues = FieldValues,
+ TName extends FieldPath = FieldPath
+>({
+ ...props
+}: ControllerProps) => {
+ return (
+
+
+
+ )
+}
+
+const useFormField = () => {
+ const fieldContext = React.useContext(FormFieldContext)
+ const itemContext = React.useContext(FormItemContext)
+ const { getFieldState, formState } = useFormContext()
+
+ const fieldState = getFieldState(fieldContext.name, formState)
+
+ if (!fieldContext) {
+ throw new Error("useFormField should be used within ")
+ }
+
+ const { id } = itemContext
+
+ return {
+ id,
+ name: fieldContext.name,
+ formItemId: `${id}-form-item`,
+ formDescriptionId: `${id}-form-item-description`,
+ formMessageId: `${id}-form-item-message`,
+ ...fieldState,
+ }
+}
+
+type FormItemContextValue = {
+ id: string
+}
+
+const FormItemContext = React.createContext(
+ {} as FormItemContextValue
+)
+
+const FormItem = React.forwardRef<
+ HTMLDivElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => {
+ const id = React.useId()
+
+ return (
+
+
+
+ )
+})
+FormItem.displayName = "FormItem"
+
+const FormLabel = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => {
+ const { error, formItemId } = useFormField()
+
+ return (
+
+ )
+})
+FormLabel.displayName = "FormLabel"
+
+const FormControl = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ ...props }, ref) => {
+ const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
+
+ return (
+
+ )
+})
+FormControl.displayName = "FormControl"
+
+const FormDescription = React.forwardRef<
+ HTMLParagraphElement,
+ React.HTMLAttributes
+>(({ className, ...props }, ref) => {
+ const { formDescriptionId } = useFormField()
+
+ return (
+
+ )
+})
+FormDescription.displayName = "FormDescription"
+
+const FormMessage = React.forwardRef<
+ HTMLParagraphElement,
+ React.HTMLAttributes
+>(({ className, children, ...props }, ref) => {
+ const { error, formMessageId } = useFormField()
+ const body = error ? String(error?.message) : children
+
+ if (!body) {
+ return null
+ }
+
+ return (
+
+ {body}
+
+ )
+})
+FormMessage.displayName = "FormMessage"
+
+export {
+ useFormField,
+ Form,
+ FormItem,
+ FormLabel,
+ FormControl,
+ FormDescription,
+ FormMessage,
+ FormField,
+}
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
new file mode 100644
index 0000000..69b64fb
--- /dev/null
+++ b/src/components/ui/input.tsx
@@ -0,0 +1,22 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+const Input = React.forwardRef>(
+ ({ className, type, ...props }, ref) => {
+ return (
+
+ )
+ }
+)
+Input.displayName = "Input"
+
+export { Input }
diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsx
new file mode 100644
index 0000000..5341821
--- /dev/null
+++ b/src/components/ui/label.tsx
@@ -0,0 +1,26 @@
+"use client"
+
+import * as React from "react"
+import * as LabelPrimitive from "@radix-ui/react-label"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+
+const labelVariants = cva(
+ "text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
+)
+
+const Label = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef &
+ VariantProps
+>(({ className, ...props }, ref) => (
+
+))
+Label.displayName = LabelPrimitive.Root.displayName
+
+export { Label }
diff --git a/src/fonts.ts b/src/fonts.ts
new file mode 100644
index 0000000..c700a67
--- /dev/null
+++ b/src/fonts.ts
@@ -0,0 +1,10 @@
+import localFont from "next/font/local";
+export const oxanium = localFont({
+ src: "./fonts/Oxanium-VariableFont_wght.ttf",
+ variable: "--font-oxanium",
+});
+
+export const jgs7 = localFont({
+ src: "./fonts/jgs7.ttf",
+ variable: "--font-jgs7",
+});
diff --git a/src/fonts/Oxanium-VariableFont_wght.ttf b/src/fonts/Oxanium-VariableFont_wght.ttf
new file mode 100644
index 0000000..63702dd
Binary files /dev/null and b/src/fonts/Oxanium-VariableFont_wght.ttf differ
diff --git a/public/fonts/jgs7.ttf b/src/fonts/jgs7.ttf
similarity index 100%
rename from public/fonts/jgs7.ttf
rename to src/fonts/jgs7.ttf
diff --git a/public/fonts/jgs7.woff b/src/fonts/jgs7.woff
similarity index 100%
rename from public/fonts/jgs7.woff
rename to src/fonts/jgs7.woff
diff --git a/public/fonts/jgs7.woff2 b/src/fonts/jgs7.woff2
similarity index 100%
rename from public/fonts/jgs7.woff2
rename to src/fonts/jgs7.woff2
diff --git a/src/globals.css b/src/globals.css
index 9015583..4bc0c11 100644
--- a/src/globals.css
+++ b/src/globals.css
@@ -65,15 +65,6 @@
}
@layer utilities {
- @font-face {
- font-family: "JGS7";
- src: url("/fonts/jgs7.woff2") format("woff2"),
- url("/fonts/jgs7.woff") format("woff"),
- url("/fonts/jgs7.ttf") format("truetype");
- font-weight: normal;
- font-style: normal;
- }
-
html {
@media (prefers-reduced-motion: no-preference) {
scroll-behavior: smooth;
@@ -159,10 +150,6 @@
transition: transform 0.25s ease-out;
}
-.jgs7 {
- font-family: "JGS7" !important;
-}
-
/* Fix for leaflet's weird z-index */
.z-max {
z-index: 10000;
diff --git a/src/i18n/translations.ts b/src/i18n/translations.ts
index 1735710..f103c12 100644
--- a/src/i18n/translations.ts
+++ b/src/i18n/translations.ts
@@ -65,6 +65,20 @@ const pl = {
oxanium: common.oxanium,
jgs7: common.jgs7,
},
+
+ newsletter: {
+ emailField: "E-mail",
+ nameField: "Imię/ksywa (opcjonalne)",
+ popupButton: "Zapisz się do newslettera",
+ title: "Newsletter CebulaCamp 2025",
+ description: "Zasubskrybuj aby otrzymywać najnowsze wiadomości",
+ subscribeButton: "Subskrybuj",
+ submitSuccess: "Dziękujemy za subskrypcję!",
+ submitPending: "Subskrybuję...",
+ policyPrivacyCheckboxTitle: "Akceptuję politykę prywatności",
+ policyPrivacyCheckboxDescription:
+ "Zgadzam się na przetwarzanie przekazanych danych osobowych przez Hackerspace Wrocław w ramach otrzymywania wiadomości na temat wydarzenia.",
+ },
};
const en = {
@@ -128,6 +142,20 @@ const en = {
oxanium: common.oxanium,
jgs7: common.jgs7,
},
+
+ newsletter: {
+ emailField: "E-mail",
+ nameField: "Name/nickname (optional)",
+ popupButton: "Subscribe to newsletter",
+ title: "Newsletter CebulaCamp 2025",
+ description: "Subscribe for live news",
+ subscribeButton: "Subscribe",
+ submitSuccess: "Thank you for subscribing!",
+ submitPending: "Subscribing...",
+ policyPrivacyCheckboxTitle: "I accept the privacy policy",
+ policyPrivacyCheckboxDescription:
+ "I agree to the processing of the provided personal data by Hackerspace Wrocław for the purpose of receiving information about the event.",
+ },
};
export const translations: {
diff --git a/src/schemas/newsletter.ts b/src/schemas/newsletter.ts
new file mode 100644
index 0000000..c52c7e1
--- /dev/null
+++ b/src/schemas/newsletter.ts
@@ -0,0 +1,9 @@
+import { z } from "zod";
+
+export const newsletterFormSchema = z.object({
+ email: z.string().email(),
+ name: z.string().optional(),
+ uodo: z.boolean().default(false),
+});
+
+export type NewsletterFormSchema = z.infer;