Merge branch 'feature/add-basic-authentication' of https://github.com/ajnart/homarr into feature/add-basic-authentication

next-env.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-/// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/basic-features/typescript for more information.

public/locales/en/authentication/invite.json

@@ -29,7 +29,7 @@
         },
         "error": {
             "title": "Error",
-            "text": "Something went wrong"
+            "text": "Something went wrong, got the following error: {{error}}"
         }
     }
 }

src/components/layout/Background/FloatingBackground.tsx

@@ -1,5 +1,5 @@
 import { Box, createStyles, useMantineTheme } from '@mantine/core';
-import { useMouse, useViewportSize } from '@mantine/hooks';
+import { useMouse } from '@mantine/hooks';
 
 import { PolkaElement } from './PolkaElement';
 
@@ -12,6 +12,7 @@ export const FloatingBackground = () => {
         <PolkaElement rotation={95} top={0} left={100} />
         <PolkaElement rotation={10} top={50} right={20} />
         <PolkaElement rotation={-4} bottom={20} left={20} />
+        <PolkaElement rotation={-10} bottom={0} right={0} />
       </Box>
     </Box>
   );
@@ -19,9 +20,7 @@ export const FloatingBackground = () => {
 
 const MouseBackdrop = () => {
   const { x, y } = useMouse();
-  const { width, height } = useViewportSize();
+  const radius = 40;
-  const smaller = Math.min(width, height);
-  const radius = Math.max(smaller - 500, 200);
   return (
     <Box pos="absolute" top={0} left={0} w="100%" h="100%">
       <Box

src/pages/auth/invite/[inviteId].tsx

@@ -1,4 +1,14 @@
-import { Button, Card, Flex, PasswordInput, Stack, Text, TextInput, Title } from '@mantine/core';
+import {
+  Button,
+  Card,
+  Flex,
+  PasswordInput,
+  Popover,
+  Stack,
+  Text,
+  TextInput,
+  Title,
+} from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { showNotification, updateNotification } from '@mantine/notifications';
 import { IconCheck, IconX } from '@tabler/icons-react';
@@ -9,6 +19,8 @@ import Head from 'next/head';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
 import { z } from 'zod';
+import { PasswordRequirements } from '~/components/Password/password-requirements';
+import { FloatingBackground } from '~/components/layout/Background/FloatingBackground';
 import { getServerAuthSession } from '~/server/auth';
 import { prisma } from '~/server/db';
 import { getServerSideTranslations } from '~/tools/server/getServerSideTranslations';
@@ -23,13 +35,18 @@ export default function AuthInvitePage() {
   const { i18nZodResolver } = useI18nZodResolver();
   const router = useRouter();
   const query = router.query as { token: string };
-  const { mutateAsync } = api.user.createFromInvite.useMutation();
+  const { mutateAsync, isError } = api.user.createFromInvite.useMutation();
   const [isLoading, setIsLoading] = useState(false);
 
   const form = useForm<z.infer<typeof signUpFormSchema>>({
     validateInputOnChange: true,
     validateInputOnBlur: true,
     validate: i18nZodResolver(signUpFormSchema),
+    initialValues: {
+      username: '',
+      password: '',
+      passwordConfirmation: '',
+    },
   });
 
   const handleSubmit = (values: z.infer<typeof signUpFormSchema>) => {
@@ -68,11 +85,11 @@ export default function AuthInvitePage() {
             router.push('/manage');
           });
         },
-        onError() {
+        onError(error) {
           updateNotification({
             id: notificationId,
             title: t('notifications.error.title'),
-            message: t('notifications.error.text'),
+            message: t('notifications.error.text', { error: error.message }),
             color: 'red',
             icon: <IconX />,
           });
@@ -90,6 +107,7 @@ export default function AuthInvitePage() {
       </Head>
 
       <Flex h="100dvh" display="flex" w="100%" direction="column" align="center" justify="center">
+        <FloatingBackground />
         <Card withBorder shadow="md" p="xl" radius="md" w="90%" maw={420}>
           <Title align="center" weight={900}>
             {t('title')}
@@ -107,13 +125,20 @@ export default function AuthInvitePage() {
                 withAsterisk
                 {...form.getInputProps('username')}
               />
-
               <PasswordInput
                 variant="filled"
                 label={t('form.fields.password.label')}
                 withAsterisk
                 {...form.getInputProps('password')}
               />
+              <Card
+                withBorder
+                style={{
+                  display: form.isValid('password') ? 'none' : 'block',
+                }}
+              >
+                <PasswordRequirements value={form.values.password} />
+              </Card>
 
               <PasswordInput
                 variant="filled"
@@ -122,7 +147,7 @@ export default function AuthInvitePage() {
                 {...form.getInputProps('passwordConfirmation')}
               />
 
-              <Button fullWidth type="submit" loading={isLoading}>
+              <Button fullWidth type="submit" disabled={!form.isValid()} loading={isLoading}>
                 {t('form.buttons.submit')}
               </Button>
             </Stack>
@@ -182,7 +207,12 @@ export const getServerSideProps: GetServerSideProps = async ({
 
   return {
     props: {
-      ...(await getServerSideTranslations(['authentication/invite'], locale, req, res)),
+      ...(await getServerSideTranslations(
+        ['authentication/invite', 'password-requirements'],
+        locale,
+        req,
+        res
+      )),
     },
   };
 };