Merge branch 'dev' of github.com:LucasVbr/projet-web4 into dev

src/components/Navbar.tsx

@@ -11,18 +11,18 @@ import { useRouter } from "next/router";
 import { signOut, useSession } from "next-auth/react";
 
 type Props = {
-  variant: "static" | "fixed";
+  variant?: "static" | "fixed";
 };
 
 export default function Navbar({ variant = "fixed" }: Props) {
   const router = useRouter();
-  const { data: session, status } = useSession();
+  const { status } = useSession();
 
   const MiddleSection = () => {
     const authenticatedLinks = (
       <>
         <Link href={"/dashboard"}>Tableau de bord</Link>
-        <Link href={"/profile"}>Profile</Link>
+        <Link href={"/profile"}>Profil</Link>
         <Link href={"/map"}>Carte</Link>
       </>
     );
@@ -66,8 +66,7 @@ export default function Navbar({ variant = "fixed" }: Props) {
       backdropFilter={"auto"}
       backdropBlur={"20px"}
       px={10}
-      py={2}
+      py={2}>
-    >
       <Flex align={"center"}>
         <Box flexBasis={"100%"}>
           <Image src={"/logo.svg"} h={"3rem"} objectFit={"contain"} />

src/components/form/FormMessage.tsx

@@ -1,8 +1,6 @@
 import {Button, Flex, Input} from '@chakra-ui/react';
 import {useState} from 'react';
 import {User} from '@prisma/client';
-import {io, Socket} from 'socket.io-client';
-import Message from '@/components/chat/Message';
 
 type Props = {
   user: User,
@@ -15,19 +13,7 @@ export default function FormMessage(props: Props) {
   const [text, setText] = useState("");
 
   const handleSubmit = () => {
-    if (text !== "") {
+    if (text) socket.emit("createdMessage", {text, sender: user.id})
-      socket.emit("createdMessage", {text, sender: user.id})
-
-      // fetch("/api/messages", {
-      //   method: "POST",
-      //   headers: {'Content-Type': 'application/json'},
-      //   body: JSON.stringify({
-      //     text,
-      //     'User': {"connect": {'id': user.id}},
-      //     'Chat': {"connect": {'id': chatId}}
-      //   })
-      // }).then(res => res.json()).then(res => console.log(res)).catch(err => console.error(err))
-    }
   }
 
   return (

src/components/form/GettingStartForm/BirthInput.tsx

@@ -1,30 +0,0 @@
-import {Button, Flex, FormControl, Input} from '@chakra-ui/react';
-import {useDispatch} from 'react-redux';
-import {useState} from 'react';
-import moment from 'moment';
-
-const BirthInput = () => {
-  const dispatch = useDispatch();
-  const [birth, setBirth] = useState('');
-
-  return (
-      <Flex>
-        <FormControl>
-          <Input type={'date'} onChange={(evt) => setBirth(evt.target.value)}
-                 value={birth}/>
-        </FormControl>
-
-        <FormControl>
-          <Button onClick={() => dispatch({
-            type: 'gettingStartForm/setInput',
-            payload: {
-              inputs: {'birth': moment(birth).toISOString()},
-              message: `Le ${moment(birth).format("ll")}.`, // TODO formate date
-            },
-          })}>Envoyer</Button>
-        </FormControl>
-      </Flex>
-  );
-};
-
-export default BirthInput;

src/components/form/GettingStartForm/GettingStartForm.tsx

@@ -4,12 +4,11 @@ import {useSelector} from 'react-redux';
 import {RootState} from '@/redux/redux';
 import Message from '@/components/chat/Message';
 import {Message as MessageType} from '@prisma/client';
+
 import GenderInput from '@/components/form/GettingStartForm/GenderInput';
 import AgeInput from '@/components/form/GettingStartForm/AgeInput';
-import BirthInput from '@/components/form/GettingStartForm/BirthInput';
 import PassionsInput from '@/components/form/GettingStartForm/PassionsInput';
-import SubmitGettingStartForm
+import SubmitGettingStartForm from '@/components/form/GettingStartForm/SubmitGettingStartForm';
-  from '@/components/form/GettingStartForm/SubmitGettingStartForm';
 
 type Props = {
   user: UserType
@@ -19,7 +18,6 @@ type FormInputs = {
   ownGender?: Gender
   researchGender?: Gender,
   ages?: [number, number],
-  birth?: Date,
   passions?: Passion[]
 }
 
@@ -31,9 +29,8 @@ export default function GettingStartForm({user}: Props) {
     <GenderInput key={0} field={'ownGender'}/>,
     <GenderInput key={1} field={'researchGender'}/>,
     <AgeInput key={2}/>,
-    <BirthInput key={3}/>,
+    <PassionsInput key={3}/>,
-    <PassionsInput key={4}/>,
+    <SubmitGettingStartForm user={user} key={4}/>,
-    <SubmitGettingStartForm user={user} key={5}/>,
   ];
 
   return (

src/components/form/GettingStartForm/SubmitGettingStartForm.tsx

@@ -10,13 +10,7 @@ export default function SubmitGettingStartForm({user}: { user: User }) {
       (state: RootState) => state.gettingStartForm);
 
   const handleSubmit = () => {
-    const {
+    const {ownGender, researchGender, ages, passions} = gettingStartForm.inputs;
-      ownGender,
-      researchGender,
-      ages,
-      birth,
-      passions,
-    } = gettingStartForm.inputs;
 
     const options = {
       method: 'PUT',
@@ -26,11 +20,8 @@ export default function SubmitGettingStartForm({user}: { user: User }) {
         prefGender: researchGender,
         ageMin: ages[0],
         ageMax: ages[1],
-        birthdate: new Date(birth),
         Passion: {
-          connect: passions.map((p: Passion) => {
+          connect: passions.map((p: Passion) => ({id: p.id})),
-            return {id: p.id};
-          }),
         },
       }),
     };

src/redux/redux.tsx

@@ -6,7 +6,6 @@ const questions: string[] = [
   'Salut, je suis Cupibot. Il me manque quelques détails avant de terminer ton inscription. C\'est quoi ton sexe ?',
   'Ok et tu es attiré par quel genre ?',
   'Ça marche, c\'est quoi la tranche d\'âge que tu recherche ?',
-  'D\'ailleurs je ne t\'ai pas demandé, quand est-ce que tu est né ?',
   'T\'as des passions dans la vie ? (Choisis-en 3 minimum)',
   'Ok j\'ai toutes les infos d\'on j\'ai besoin, je vais tout faire pour te faire trouver la personne qui te correspond!',
 ];
@@ -19,7 +18,6 @@ const gettingStartFormSlice = createSlice({
       ownGender: Gender.UNKNOWN,
       researchGender: Gender.UNKNOWN,
       ages: [18, 25],
-      birth: "",
       passions: [],
     },
     messages: [