From 4b3e0677e491a71110e4ad0079d1e7fd0df8aede Mon Sep 17 00:00:00 2001
From: SomeCodecat <88855796+SomeCodecat@users.noreply.github.com>
Date: Thu, 22 May 2025 15:21:36 +0200
Subject: [PATCH] feat(settings): add font and apply to relevant text fields

---
 src/app/globals.css                 | 35 ++++++++++++++++++++++-------
 src/app/settings/page.tsx           |  2 +-
 src/components/custom-ui/button.tsx |  6 ++---
 src/components/labeled-input.tsx    |  2 +-
 src/components/logo.tsx             | 12 ++++++++++
 src/components/ui/input.tsx         |  2 +-
 src/components/ui/label.tsx         |  2 +-
 src/components/ui/select.tsx        |  2 +-
 src/components/user/login-form.tsx  |  4 ++--
 9 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index 558d875..99e47a7 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -6,6 +6,9 @@
 :root {
   /* Custom values */
 
+  --font-heading: 'Comfortaa', sans-serif;
+  --font-label: 'Varela Round', sans-serif;
+
   --transparent: transparent;
 
   --neutral-000: oklch(0 0 0);
@@ -30,9 +33,9 @@
   --radius: 0.688rem;
 
   --primary: oklch(0.7493 0.1551 74.95);
-  --hover-primary: oklch(0.6568 0.1358 74.86 / 0.8);
-  --active-primary: oklch(0.5911 0.1135 78.29);
-  --disabled-primary: oklch(0.6568 0.1358 74.86 / 0.5);
+  --hover-primary: oklch(0.7493 0.1551 74.95 / 0.8);
+  --active-primary: oklch(0.6191 0.1218 77.58);
+  --disabled-primary: oklch(0.7493 0.1551 74.95 / 0.5);
 
   --secondary: oklch(0.4937 0.1697 271.26);
   --hover-secondary: oklch(0.4937 0.1697 271.26 / 0.8);
@@ -45,8 +48,6 @@
 
   --foreground: oklch(0.13 0.028 261.692);
 
-  --card: oklch(1 0 0);
-
   --card-foreground: oklch(0.13 0.028 261.692);
 
   --popover: oklch(1 0 0);
@@ -100,7 +101,25 @@
   --sidebar-ring: oklch(0.707 0.022 261.325);
 }
 
+@font-face {
+  font-family: 'Comfortaa';
+  font-style: normal;
+  font-weight: 300 700;
+  src: url('/Fonts/Comfortaa/Comfortaa-VariableFont_weight.ttf')
+    format('truetype');
+}
+
+@font-face {
+  font-family: 'Varela Round';
+  font-style: normal;
+  font-weight: 400;
+  src: url('/Fonts/VarelaRound/VarelaRound-Regular.ttf') format('truetype');
+}
+
 @theme inline {
+  --font-heading: var(--font-heading);
+  --font-label: var(--font-label);
+
   --transparent: var(--transparent);
 
   --color-neutral-000: var(--neutral-000);
@@ -132,7 +151,7 @@
   --color-secondary: var(--secondary);
   --color-hover-secondary: var(--hover-secondary);
   --color-active-secondary: var(--active-secondary);
-  --disabled-secondary: var(--disabled-secondary);
+  --color-disabled-secondary: var(--disabled-secondary);
 
   /* Custom values */
 
@@ -152,7 +171,7 @@
 
   --color-card-foreground: var(--card-foreground);
 
-  --color-popover: var(--popover);
+  --color-popover: var(--color-background);
 
   --color-popover-foreground: var(--popover-foreground);
 
@@ -168,7 +187,7 @@
 
   --color-muted-foreground: var(--muted-foreground);
 
-  --color-accent: var(--accent);
+  --color-accent: var(--color-neutral-750);
 
   --color-accent-foreground: var(--accent-foreground);
 
diff --git a/src/app/settings/page.tsx b/src/app/settings/page.tsx
index 9afe7c6..70e198d 100644
--- a/src/app/settings/page.tsx
+++ b/src/app/settings/page.tsx
@@ -88,7 +88,7 @@ export default function SettingsPage() {
                     </Select>
                   </div>
                   <div className='pt-4'>
-                    <Button variant='destructive'>Delete Account</Button>
+                    <Button variant='secondary'>Delete Account</Button>
                     <p className='text-sm text-muted-foreground pt-1'>
                       Permanently delete your account and all associated data.
                     </p>
diff --git a/src/components/custom-ui/button.tsx b/src/components/custom-ui/button.tsx
index 51f3b63..1910ea5 100644
--- a/src/components/custom-ui/button.tsx
+++ b/src/components/custom-ui/button.tsx
@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
 import { cn } from '@/lib/utils';
 
 const buttonVariants = cva(
-  "radius-lg inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
+  "radius-lg inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-label transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
   {
     variants: {
       variant: {
@@ -37,7 +37,7 @@ const buttonVariants = cva(
 );
 
 function Button({
-  className,
+  className = 'font-label',
   variant,
   size,
   asChild = false,
@@ -51,7 +51,7 @@ function Button({
   return (
     <Comp
       data-slot='button'
-      className={cn(buttonVariants({ variant, size, className }))}
+      className={cn(buttonVariants({ variant, size }), className)}
       {...props}
     />
   );
diff --git a/src/components/labeled-input.tsx b/src/components/labeled-input.tsx
index 250dd5f..a16f26a 100644
--- a/src/components/labeled-input.tsx
+++ b/src/components/labeled-input.tsx
@@ -15,7 +15,7 @@ export default function LabeledInput({
   name?: string;
 }) {
   return (
-    <div className='grid grid-cols-1 gap-1'>
+    <div className='grid grid-cols-1 gap-1 font-label'>
       <Label htmlFor={name}>{label}</Label>
 
       <Input
diff --git a/src/components/logo.tsx b/src/components/logo.tsx
index f1d2cff..80a3c6b 100644
--- a/src/components/logo.tsx
+++ b/src/components/logo.tsx
@@ -110,6 +110,18 @@ export default function Logo({
   // Match the varName with the Logo-Asset name and store it in "logoVar"
   const logoVar = logoAssets[varName as keyof typeof logoAssets];
 
+  if (!logoVar) {
+    console.error(`Logo: Could not find logo asset for ${varName}`);
+    return (
+      <div
+        role='alert'
+        className='p-2 text-red-700 bg-red-100 border border-red-500 rounded-md text-xs'
+      >
+        Error: Logo asset not found. Check console.
+      </div>
+    );
+  }
+
   return (
     <Image
       src={logoVar}
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index 485626a..a751360 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -8,7 +8,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
       type={type}
       data-slot='input'
       className={cn(
-        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+        'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-label disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
         'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
         'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
         className,
diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsx
index 6bc5f71..3364d98 100644
--- a/src/components/ui/label.tsx
+++ b/src/components/ui/label.tsx
@@ -13,7 +13,7 @@ function Label({
     <LabelPrimitive.Root
       data-slot='label'
       className={cn(
-        'flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
+        'flex items-center gap-2 text-sm leading-none font-label select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
         className,
       )}
       {...props}
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index 90f7ef0..ac7a30b 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -107,7 +107,7 @@ function SelectItem({
     <SelectPrimitive.Item
       data-slot='select-item'
       className={cn(
-        "focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
+        "focus:bg-accent focus:text-text  [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
         className,
       )}
       {...props}
diff --git a/src/components/user/login-form.tsx b/src/components/user/login-form.tsx
index ec7b8c1..73ff42d 100644
--- a/src/components/user/login-form.tsx
+++ b/src/components/user/login-form.tsx
@@ -25,13 +25,13 @@ export default function LoginForm() {
       <LabeledInput
         type='email'
         label='E-Mail or Username'
-        placeholder='What you are known as.'
+        placeholder='What you are known as'
         name='email'
       />
       <LabeledInput
         type='password'
         label='Password'
-        placeholder="Let's hope you remember it."
+        placeholder="Let's hope you remember it"
         name='password'
       />
       <div className='grid grid-rows-2 gap-2'>