Merge branch 'main' into feat--add-qr-code

package.json

@@ -18,7 +18,7 @@
         "@radix-ui/react-dialog": "^1.1.1",
         "@radix-ui/react-popover": "^1.1.1",
         "@radix-ui/react-radio-group": "^1.2.0",
-        "@radix-ui/react-select": "^2.1.1",
+        "@radix-ui/react-select": "^2.1.2",
         "@radix-ui/react-separator": "^1.1.0",
         "@radix-ui/react-slot": "^1.1.0",
         "@radix-ui/react-tabs": "^1.1.0",
@@ -87,6 +87,7 @@
         "qrcode.react": "^4.0.1",
         "react": "^18.3.1",
         "react-app-polyfill": "^3.0.0",
+        "react-day-picker": "^9.2.1",
         "react-dev-utils": "^12.0.1",
         "react-dom": "^18.3.1",
         "react-i18next": "^11.18.6",

src/I18n.ts

@@ -8,6 +8,7 @@ import IconUK from './assets/icons/icon_flag_uk.svg';
 import IconTR from './assets/icons/icon_flag_tr.svg';
 import IconRU from './assets/icons/icon_flag_ru.svg';
 import IconAR from './assets/icons/icon_flag_ar.svg';
+import { Settings } from 'luxon';
 
 // As users will rarely use the non-german version, lazily load these language files
 // on demand
@@ -63,6 +64,7 @@ export async function switchLanguage(language: string) {
 
     if (language in lazyLanguages) {
         i18next.addResourceBundle(language, 'translation', await lazyLanguages[language as keyof typeof lazyLanguages](), true, true);
+        Settings.defaultLocale = language;
     }
 
     i18next.changeLanguage(language);

src/Utility.ts

@@ -90,14 +90,10 @@ export const getGradeLabel = (grade: number) => {
     return i18next.t('lernfair.schoolclass', { class: grade });
 };
 
-export const formatDate: (date: Date, format?: Intl.DateTimeFormatOptions, locale?: string) => string = (
-    date,
-    format = DateTime.DATETIME_MED,
-    locale = 'de'
-) => {
+export const formatDate: (date: Date, format?: Intl.DateTimeFormatOptions, locale?: string) => string = (date, format = DateTime.DATETIME_MED, locale) => {
     if (!date) return '';
 
-    return DateTime.fromISO(date.toString()).toLocaleString(format, { locale });
+    return DateTime.fromISO(date.toString()).toLocaleString(format, { locale: locale ?? i18next.language });
 };
 
 export const handleDateString: (datetime: string, format: string, locale?: string, outputFormat?: Intl.DateTimeFormatOptions) => string = (

src/components/Breadcrumb.tsx

@@ -17,7 +17,10 @@ const BreadcrumbContainer = React.forwardRef<
 const BreadcrumbList = React.forwardRef<HTMLOListElement, React.ComponentPropsWithoutRef<'ol'>>(({ className, ...props }, ref) => (
     <ol
         ref={ref}
-        className={cn('flex flex-nowrap overflow-hidden items-center gap-1.5 break-words text-sm text-muted-foreground sm:gap-2.5', className)}
+        className={cn(
+            'flex flex-nowrap overflow-y-hidden overflow-x-scroll items-center gap-1.5 break-words text-sm text-muted-foreground sm:gap-2.5',
+            className
+        )}
         {...props}
     />
 ));
@@ -38,7 +41,7 @@ const BreadcrumbLink = React.forwardRef<
         <Comp
             ref={ref}
             className={cn(
-                'text-detail underline transition-colors hover:text-primary w-max max-w-[100px] lg:max-w-full overflow-hidden whitespace-nowrap text-ellipsis',
+                'text-detail underline transition-colors hover:text-primary max-w-[100px] lg:max-w-full overflow-hidden whitespace-nowrap text-ellipsis',
                 className
             )}
             {...props}
@@ -53,7 +56,7 @@ const BreadcrumbPage = React.forwardRef<HTMLSpanElement, React.ComponentPropsWit
         role="link"
         aria-disabled="true"
         aria-current="page"
-        className={cn('font-normal text-primary text-detail w-max max-w-full lg:max-w-full overflow-hidden whitespace-nowrap text-ellipsis', className)}
+        className={cn('font-normal text-primary text-detail w-max max-w-full lg:max-w-full', className)}
         {...props}
     />
 ));

src/components/Button.tsx

@@ -18,11 +18,13 @@ const buttonVariants = cva(
                 ghost: 'hover:bg-accent hover:text-accent-foreground',
                 link: 'text-primary underline-offset-4 hover:underline',
                 none: 'text-primary',
+                input: 'border border-input justify-between bg-transparent text-form font-normal ring-offset-background placeholder:text-gray-400 focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:w-full [&>span]:justify-between',
             },
             size: {
-                default: 'h-10 px-4 text-form font-medium',
+                default: 'h-10 px-4 text-form',
                 sm: 'h-9 rounded-md px-3 text-sm',
                 lg: 'h-11 rounded-md px-8 text-base',
+                input: 'h-10 px-3 py-1',
                 icon: 'h-10 w-10',
                 auto: 'h-auto w-auto',
             },