From 7691bd2face5b01efdbd8a1821d193af59705170 Mon Sep 17 00:00:00 2001
From: SomeCodecat <88855796+SomeCodecat@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:52:00 +0200
Subject: [PATCH 1/2] feat: tempcommit

---
 src/components/misc/settings-dropdown.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/misc/settings-dropdown.tsx b/src/components/misc/settings-dropdown.tsx
index 5bf256c..c49629c 100644
--- a/src/components/misc/settings-dropdown.tsx
+++ b/src/components/misc/settings-dropdown.tsx
@@ -105,9 +105,9 @@ export function SettingsDropdown({
               <CurrentIcon className='h-4 w-4 text-muted-foreground' />
               <div className='flex flex-col items-start text-left'>
                 <span className='font-medium'>{currentSectionData?.label}</span>
-                <span className='text-xs text-muted-foreground'>
+                <p className='text-xs text-muted-foreground text-wrap'>
                   {currentSectionData?.description}
-                </span>
+                </p>
               </div>
             </div>
             <ChevronDown className='ml-2 h-4 w-4 shrink-0 opacity-50' />
@@ -132,9 +132,9 @@ export function SettingsDropdown({
                         <Icon className='h-4 w-4 text-muted-foreground' />
                         <div className='flex flex-col'>
                           <span className='font-medium'>{section.label}</span>
-                          <span className='text-xs text-muted-foreground'>
+                          <p className='text-xs text-muted-foreground text-wrap'>
                             {section.description}
-                          </span>
+                          </p>
                         </div>
                       </div>
                       <Check

From 6619f0a9eb34b0e9d47a72ae310e6ed50ba67799 Mon Sep 17 00:00:00 2001
From: SomeCodecat <88855796+SomeCodecat@users.noreply.github.com>
Date: Thu, 26 Jun 2025 20:25:13 +0200
Subject: [PATCH 2/2] feat: tempcommit

---
 src/app/globals.css                        | 105 ++++++++++++++++++--
 src/components/custom-ui/labeled-input.tsx |  39 +++++---
 src/components/misc/settings-dropdown.tsx  |   4 +-
 src/components/misc/settings-page.tsx      | 107 ++++++++++++---------
 src/components/wrappers/group-wrapper.tsx  |   6 +-
 5 files changed, 190 insertions(+), 71 deletions(-)

diff --git a/src/app/globals.css b/src/app/globals.css
index 93a24ce..bc18178 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -9,6 +9,7 @@
   --font-heading: 'Comfortaa', sans-serif;
   --font-label: 'Varela Round', sans-serif;
   --font-button: 'Varela Round', sans-serif;
+  --font-sans: var(--font-label);
 
   --transparent: transparent;
 
@@ -28,7 +29,7 @@
 
   --background: var(--neutral-800);
   --background-reversed: var(--neutral-000);
-  --base: var(--neutral-800);
+  --basecl: var(--neutral-800);
   --text: var(--neutral-000);
   --text-alt: var(--neutral-900);
   --text-input: var(--text);
@@ -49,11 +50,23 @@
   --active-secondary: oklch(0.4254 0.133 272.15);
   --disabled-secondary: oklch(0.4937 0.1697 271.26 / 0.5);
 
+  --destructive: oklch(60.699% 0.20755 25.945);
+  --hover-destructive: oklch(60.699% 0.20755 25.945 / 0.8);
+  --active-destructive: oklch(50.329% 0.17084 25.842);
+  --disabled-destructive: oklch(60.699% 0.20755 25.945 / 0.4);
+
   --muted: var(--color-neutral-700);
   --hover-muted: var(--color-neutral-600);
   --active-muted: var(--color-neutral-400);
   --disabled-muted: var(--color-neutral-400);
 
+  --toaster-default-bg: var(--color-neutral-150);
+  --toaster-success-bg: oklch(54.147% 0.09184 144.208);
+  --toaster-error-bg: oklch(52.841% 0.10236 27.274);
+  --toaster-info-bg: oklch(44.298% 0.05515 259.369);
+  --toaster-warning-bg: oklch(61.891% 0.07539 102.943);
+  --toaster-notification-bg: var(--color-neutral-150);
+
   --card: var(--neutral-800);
 
   --sidebar-width-icon: 32px;
@@ -80,8 +93,6 @@
 
   --accent-foreground: oklch(0.21 0.034 264.665);
 
-  --destructive: oklch(0.577 0.245 27.325);
-
   --border: oklch(0.928 0.006 264.531);
 
   --input: oklch(0.928 0.006 264.531);
@@ -115,6 +126,62 @@
   --sidebar-ring: oklch(0.707 0.022 261.325);
 }
 
+h1 {
+  font-family: var(--font-heading);
+  font-size: 40px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: normal;
+}
+
+h2 {
+  font-family: var(--font-heading);
+  font-size: 36px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+
+h3 {
+  font-family: var(--font-heading);
+  font-size: 32px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+
+h4 {
+  font-family: var(--font-heading);
+  font-size: 28px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+
+h5 {
+  font-family: var(--font-heading);
+  font-size: 26px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+
+h6 {
+  font-family: var(--font-heading);
+  font-size: 20px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+}
+
+p {
+  font-family: var(--font-label);
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
 @font-face {
   font-family: 'Comfortaa';
   font-style: normal;
@@ -153,7 +220,7 @@
 
   --color-background: var(--neutral-750);
   --color-background-reversed: var(--background-reversed);
-  --color-base: var(--neutral-800);
+  --color-basecl: var(--neutral-800);
   --color-text: var(--text);
   --color-text-alt: var(--text-alt);
   --color-text-input: var(--text-input);
@@ -175,11 +242,23 @@
   --color-active-secondary: var(--active-secondary);
   --color-disabled-secondary: var(--disabled-secondary);
 
+  --color-destructive: var(--destructive);
+  --color-hover-destructive: var(--hover-destructive);
+  --color-active-destructive: var(--active-destructive);
+  --color-disabled-destructive: var(--disabled-destructive);
+
   --color-muted: var(--muted);
   --color-hover-muted: var(--hover-muted);
   --color-active-muted: var(--active-muted);
   --color-disabled-muted: var(--disabled-muted);
 
+  --color-toaster-default-bg: var(--toaster-default-bg);
+  --color-toaster-success-bg: var(--toaster-success-bg);
+  --color-toaster-error-bg: var(--toaster-error-bg);
+  --color-toaster-info-bg: var(--toaster-info-bg);
+  --color-toaster-warning-bg: var(--toaster-warning-bg);
+  --color-toaster-notification-bg: var(--toaster-notification-bg);
+
   /* Custom values */
 
   --radius-sm: calc(var(--radius) - 4px);
@@ -220,8 +299,6 @@
 
   --color-accent-foreground: var(--accent-foreground);
 
-  --color-destructive: var(--destructive);
-
   --color-border: var(--border);
 
   --color-input: var(--input);
@@ -277,7 +354,7 @@
 
   --background: var(--neutral-750);
   --background-reversed: var(--neutral-000);
-  --base: var(--neutral-750);
+  --basecl: var(--neutral-750);
   --text: var(--neutral-000);
   --text-alt: var(--neutral-900);
   --text-input: var(--text);
@@ -297,11 +374,23 @@
   --active-secondary: oklch(0.4471 0.15 271.61);
   --disabled-secondary: oklch(0.6065 0.213 271.11 / 0.4);
 
+  --destructive: oklch(0.58 0.2149 27.13);
+  --hover-destructive: oklch(0.58 0.2149 27.13 / 0.8);
+  --active-destructive: oklch(45.872% 0.16648 26.855);
+  --disabled-destructive: oklch(0.58 0.2149 27.13 / 0.4);
+
   --muted: var(--color-neutral-650);
   --hover-muted: var(--color-neutral-500);
   --active-muted: var(--color-neutral-400);
   --disabled-muted: var(--color-neutral-400);
 
+  --toaster-default-bg: var(--color-neutral-150);
+  --toaster-success-bg: var(--color-green-200);
+  --toaster-error-bg: var(--color-red-200);
+  --toaster-info-bg: var(--color-blue-200);
+  --toaster-warning-bg: var(--color-yellow-200);
+  --toaster-notification-bg: var(--color-neutral-150);
+
   --card: var(--neutral-750);
 
   /* ------------------- */
@@ -326,8 +415,6 @@
 
   --accent-foreground: oklch(0.985 0.002 247.839);
 
-  --destructive: oklch(0.704 0.191 22.216);
-
   --border: oklch(1 0 0 / 10%);
 
   --input: oklch(1 0 0 / 15%);
diff --git a/src/components/custom-ui/labeled-input.tsx b/src/components/custom-ui/labeled-input.tsx
index ea26e51..b83524d 100644
--- a/src/components/custom-ui/labeled-input.tsx
+++ b/src/components/custom-ui/labeled-input.tsx
@@ -1,5 +1,8 @@
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import React from 'react';
+import { Button } from '../ui/button';
+import { Eye, EyeOff } from 'lucide-react';
 
 export default function LabeledInput({
   type,
@@ -11,7 +14,7 @@ export default function LabeledInput({
   error,
   ...rest
 }: {
-  type: 'text' | 'email' | 'password';
+  type: 'text' | 'email' | 'password' | 'file';
   label: string;
   placeholder?: string;
   value?: string;
@@ -19,19 +22,33 @@ export default function LabeledInput({
   autocomplete?: string;
   error?: string;
 } & React.InputHTMLAttributes<HTMLInputElement>) {
+  const [passwordVisible, setPasswordVisible] = React.useState(false);
+
   return (
     <div className='grid grid-cols-1 gap-1'>
       <Label htmlFor={name}>{label}</Label>
-
-      <Input
-        type={type}
-        placeholder={placeholder}
-        defaultValue={value}
-        id={name}
-        name={name}
-        autoComplete={autocomplete}
-        {...rest}
-      />
+      <span className='relative'>
+        <Input
+          className={type === 'password' ? 'pr-[50px]' : ''}
+          type={passwordVisible ? 'text' : type}
+          placeholder={placeholder}
+          defaultValue={value}
+          id={name}
+          name={name}
+          autoComplete={autocomplete}
+          {...rest}
+        />
+        {type === 'password' && (
+          <Button
+            className='absolute right-0 top-0 w-[36px] h-[36px]'
+            type='button'
+            variant={'outline_muted'}
+            onClick={() => setPasswordVisible((visible) => !visible)}
+          >
+            {passwordVisible ? <Eye /> : <EyeOff />}
+          </Button>
+        )}
+      </span>
       {error && <p className='text-red-500 text-sm mt-1'>{error}</p>}
     </div>
   );
diff --git a/src/components/misc/settings-dropdown.tsx b/src/components/misc/settings-dropdown.tsx
index c49629c..6eaae8d 100644
--- a/src/components/misc/settings-dropdown.tsx
+++ b/src/components/misc/settings-dropdown.tsx
@@ -45,13 +45,13 @@ const settingsSections: SettingsSection[] = [
   {
     label: 'Account',
     value: 'general',
-    description: 'Manage your account details and preferences',
+    description: 'Manage account details',
     icon: User,
   },
   {
     label: 'Notifications',
     value: 'notifications',
-    description: 'Choose how you want to be notified',
+    description: 'Choose notification Preferences',
     icon: Bell,
   },
   {
diff --git a/src/components/misc/settings-page.tsx b/src/components/misc/settings-page.tsx
index ce91579..34e1dd0 100644
--- a/src/components/misc/settings-page.tsx
+++ b/src/components/misc/settings-page.tsx
@@ -27,6 +27,9 @@ import { useGetApiUserMe } from '@/generated/api/user/user';
 import { ThemePicker } from './theme-picker';
 import LabeledInput from '../custom-ui/labeled-input';
 import { GroupWrapper } from '../wrappers/group-wrapper';
+import { Avatar } from '../ui/avatar';
+import Image from 'next/image';
+import { User } from 'lucide-react';
 
 export default function SettingsPage() {
   const router = useRouter();
@@ -43,51 +46,50 @@ export default function SettingsPage() {
                 <CardTitle>Account Settings</CardTitle>
               </CardHeader>
               <CardContent className='space-y-6 mt-2'>
-                <GroupWrapper legend='General Settings'>
+                <GroupWrapper title='General Settings'>
                   <div className='space-y-4'>
                     <div className='flex items-center justify-evenly'>
                       <div>
-                        <Label htmlFor='displayName'>First Name</Label>
-                        <Input
-                          id='displayName'
-                          placeholder='Your Name'
+                        <LabeledInput
+                          label='First Name'
+                          type='text'
+                          placeholder='First Name'
                           defaultValue={data?.data.user.first_name ?? ''}
-                        />
+                        ></LabeledInput>
                       </div>
                       <div>
-                        <Label htmlFor='displayName'>Last Name</Label>
-                        <Input
-                          id='displayName'
-                          placeholder='Your Name'
+                        <LabeledInput
+                          label='Last Name'
+                          type='text'
+                          placeholder='Last Name'
                           defaultValue={data?.data.user.last_name ?? ''}
-                        />
+                        ></LabeledInput>
                       </div>
                     </div>
                     <div className='space-y-2'>
-                      <Label htmlFor='displayName'>Display Name</Label>
-                      <Input
-                        id='displayName'
-                        placeholder='Your Name'
+                      <LabeledInput
+                        label='Display Name'
+                        type='text'
+                        placeholder='Display Name'
                         defaultValue={data?.data.user.name}
-                      />
+                      ></LabeledInput>
                     </div>
-                    <div className='space-y-2'>
-                      <Label htmlFor='email'>Email Address</Label>
-                      <Input
-                        id='email'
+                    <div className='space-y-2 space-b-2'>
+                      <LabeledInput
                         type='email'
-                        placeholder='your.email@example.com'
-                        readOnly
-                        defaultValue={data?.data.user.email}
-                      />
-                      <p className='text-sm text-muted-foreground'>
+                        label='Email Address'
+                        placeholder='Your E-Mail'
+                        defaultValue={data?.data.user.email ?? ''}
+                      ></LabeledInput>
+
+                      <span className='text-sm text-muted-foreground'>
                         Email might be managed by your SSO provider.
-                      </p>
+                      </span>
                     </div>
                   </div>
                 </GroupWrapper>
-                <GroupWrapper legend='Reset Password'>
-                  <div className='flex items-center justify-evenly'>
+                <GroupWrapper title='Reset Password'>
+                  <div className='flex items-center justify-evenly sm:flex-row flex-col gap-6'>
                     <div>
                       <LabeledInput
                         type='password'
@@ -114,12 +116,25 @@ export default function SettingsPage() {
                     </div>
                   </div>
                 </GroupWrapper>
-                <div className='space-y-2'>
-                  <Label htmlFor='profilePicture'>Profile Picture</Label>
-                  <Input id='profilePicture' type='file' />
-                  <p className='text-sm text-muted-foreground'>
-                    Upload a new profile picture.
-                  </p>
+                <div className='space-y-2 grid grid-cols-[1fr_auto] gap-4'>
+                  <LabeledInput
+                    label='Profile Picture'
+                    type='file'
+                    placeholder='Upload Profile Picture'
+                    defaultValue={data?.data.user.image ?? ''}
+                  ></LabeledInput>
+                  <Avatar className='flex justify-center items-center'>
+                    {data?.data.user.image ? (
+                      <Image
+                        src={data?.data.user.image}
+                        alt='Avatar'
+                        width='20'
+                        height='20'
+                      />
+                    ) : (
+                      <User />
+                    )}
+                  </Avatar>
                 </div>
                 <div className='space-y-2'>
                   <Label htmlFor='timezone'>Timezone</Label>
@@ -143,9 +158,9 @@ export default function SettingsPage() {
                 </div>
                 <div className='pt-4'>
                   <Button variant='secondary'>Delete Account</Button>
-                  <p className='text-sm text-muted-foreground pt-1'>
+                  <span className='text-sm text-muted-foreground pt-1'>
                     Permanently delete your account and all associated data.
-                  </p>
+                  </span>
                 </div>
               </CardContent>
             </ScrollableSettingsWrapper>
@@ -277,10 +292,10 @@ export default function SettingsPage() {
                   </legend>
                   <div className='space-y-2'>
                     <Label>Working Hours</Label>
-                    <p className='text-sm text-muted-foreground'>
+                    <span className='text-sm text-muted-foreground'>
                       Define your typical available hours (e.g., Monday-Friday,
                       9 AM - 5 PM).
-                    </p>
+                    </span>
                     <Button variant='outline_muted' size='sm'>
                       Set Working Hours
                     </Button>
@@ -289,9 +304,9 @@ export default function SettingsPage() {
                     <Label htmlFor='minNoticeBooking'>
                       Minimum Notice for Bookings
                     </Label>
-                    <p className='text-sm text-muted-foreground'>
+                    <span className='text-sm text-muted-foreground'>
                       Min time before a booking can be made.
-                    </p>
+                    </span>
                     <div className='space-y-2'>
                       <Input
                         id='bookingWindow'
@@ -304,9 +319,9 @@ export default function SettingsPage() {
                     <Label htmlFor='bookingWindow'>
                       Booking Window (days in advance)
                     </Label>
-                    <p className='text-sm text-muted-foreground'>
+                    <span className='text-sm text-muted-foreground'>
                       Max time in advance a booking can be made.
-                    </p>
+                    </span>
                     <Input
                       id='bookingWindow'
                       type='number'
@@ -378,7 +393,7 @@ export default function SettingsPage() {
                   <Label htmlFor='whoCanSeeFull'>
                     Who Can See Your Full Calendar Details?
                   </Label>
-                  <p className='text-sm text-muted-foreground'>
+                  <span className='text-sm text-muted-foreground'>
                     (Override for Default Visibility)
                     <br />
                     <span className='text-sm text-muted-foreground'>
@@ -386,7 +401,7 @@ export default function SettingsPage() {
                       calendar. You can set specific friends or groups to see
                       your full calendar details.
                     </span>
-                  </p>
+                  </span>
                   <Select>
                     <SelectTrigger id='whoCanSeeFull'>
                       <SelectValue placeholder='Select audience' />
@@ -420,10 +435,10 @@ export default function SettingsPage() {
                 <div className='space-y-2'>
                   <Label>Blocked Users</Label>
                   <Button variant='outline_muted'>Manage Blocked Users</Button>
-                  <p className='text-sm text-muted-foreground'>
+                  <span className='text-sm text-muted-foreground'>
                     Prevent specific users from seeing your calendar or booking
                     time.
-                  </p>
+                  </span>
                 </div>
               </CardContent>
             </ScrollableSettingsWrapper>
diff --git a/src/components/wrappers/group-wrapper.tsx b/src/components/wrappers/group-wrapper.tsx
index 713b5d6..3006c9a 100644
--- a/src/components/wrappers/group-wrapper.tsx
+++ b/src/components/wrappers/group-wrapper.tsx
@@ -3,20 +3,20 @@ import type * as React from 'react';
 
 interface ScrollableSettingsWrapperProps {
   className?: string;
-  legend?: string;
+  title?: string;
   children: React.ReactNode;
 }
 
 export function GroupWrapper({
   className,
-  legend,
+  title,
   children,
 }: ScrollableSettingsWrapperProps) {
   return (
     <fieldset
       className={cn('space-t-4 p-4 border rounded-md shadow-md', className)}
     >
-      <legend className='text-sm font-medium px-1'>{legend}</legend>
+      <legend className='text-sm font-medium px-1'>{title}</legend>
       {children}
     </fieldset>
   );