diff --git a/.env.dev b/.env.dev index 825d55976..936fac282 100644 --- a/.env.dev +++ b/.env.dev @@ -34,5 +34,4 @@ FRANCECONNECT_CLIENT_SECRET= FRANCECONNECT_URL=https://fcp.integ01.dev-franceconnect.fr FRANCECONNECT_REDIRECT_URI=http://localhost:3000/api/auth/france-connect/callback FRANCECONNECT_POST_LOGOUT_REDIRECT_URI=http://localhost:3000/api/auth/france-connect/logout-callback -NEXT_PUBLIC_CRISP_WEBSITE_ID=064fca1b-bdd6-4a81-af56-9f38e40953ad DATA_SUBVENTION_API_KEY= \ No newline at end of file diff --git a/app/(header-default)/faq/parcours/_components/parcours-questions.tsx b/app/(header-default)/faq/parcours/_components/parcours-questions.tsx index 580b28ded..188ace05c 100644 --- a/app/(header-default)/faq/parcours/_components/parcours-questions.tsx +++ b/app/(header-default)/faq/parcours/_components/parcours-questions.tsx @@ -3,12 +3,14 @@ import { MultiChoice } from '#components-ui/multi-choice'; import Question, { EQuestionType } from '#components/faq-parcours/question'; import { FAQTargets, allFaqArticlesByTarget } from '#models/article/faq'; +import { ISession } from '#models/user/session'; import { useRef, useState } from 'react'; type IProps = { question: EQuestionType; + session: ISession | null; }; -export default function ParcoursQuestions({ question }: IProps) { +export default function ParcoursQuestions({ question, session }: IProps) { const initialQuestionType = Object.values(EQuestionType).indexOf(question) ? question : null; @@ -56,6 +58,7 @@ export default function ParcoursQuestions({ question }: IProps) { userType ? Object.values(allFaqArticlesByTarget[userType]) : [] } userType={userType} + session={session} /> )} diff --git a/app/(header-default)/faq/parcours/page.tsx b/app/(header-default)/faq/parcours/page.tsx index 6afc29cd9..30c39a909 100644 --- a/app/(header-default)/faq/parcours/page.tsx +++ b/app/(header-default)/faq/parcours/page.tsx @@ -1,5 +1,6 @@ -import { Metadata } from 'next'; import { EQuestionType } from '#components/faq-parcours/question'; +import getSession from '#utils/server-side-helper/app/get-session'; +import { Metadata } from 'next'; import ParcoursQuestions from './_components/parcours-questions'; export const metadata: Metadata = { @@ -10,19 +11,20 @@ export const metadata: Metadata = { }, }; -export default function Parcours({ +export default async function Parcours({ searchParams, }: { searchParams?: { question?: string }; }) { const question = (searchParams?.question ?? '') as EQuestionType; + const session = await getSession(); return ( <>

Bonjour, comment pouvons-nous vous aider ?

Pour commencer, faisons connaissance :

Qui ĂȘtes-vous ? - +
); diff --git a/components/faq-parcours/question.tsx b/components/faq-parcours/question.tsx index 86a4932a0..dee1d04ee 100644 --- a/components/faq-parcours/question.tsx +++ b/components/faq-parcours/question.tsx @@ -2,6 +2,7 @@ import { MultiChoice } from '#components-ui/multi-choice'; import TextWrapper from '#components-ui/text-wrapper'; import { allDataToModify } from '#models/administrations/data-to-modify'; import { IFaqArticle } from '#models/article/faq'; +import { ISession } from '#models/user/session'; import { PropsWithChildren, useEffect, useRef, useState } from 'react'; export enum EQuestionType { LOADER = 'loader', @@ -15,6 +16,7 @@ type IProps = { setQuestionType: (type: EQuestionType) => void; userType: string; questions: IFaqArticle[]; + session: ISession | null; }; export default function Question({ @@ -22,6 +24,7 @@ export default function Question({ setQuestionType, userType, questions = [], + session, }: IProps) { const bottomRef = useRef(null); @@ -63,11 +66,13 @@ export default function Question({