Skip to content

Commit

Permalink
feat: add autofill email, remove env var
Browse files Browse the repository at this point in the history
  • Loading branch information
rmonnier9 committed Oct 17, 2024
1 parent 89c70e4 commit 7690b2b
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
1 change: 0 additions & 1 deletion .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -56,6 +58,7 @@ export default function ParcoursQuestions({ question }: IProps) {
userType ? Object.values(allFaqArticlesByTarget[userType]) : []
}
userType={userType}
session={session}
/>
)}
</>
Expand Down
8 changes: 5 additions & 3 deletions app/(header-default)/faq/parcours/page.tsx
Original file line number Diff line number Diff line change
@@ -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 = {
Expand All @@ -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 (
<>
<h1>Bonjour, comment pouvons-nous vous aider ?</h1>
<p>Pour commencer, faisons connaissance :</p>
<strong>Qui êtes-vous ?</strong>
<ParcoursQuestions question={question} />
<ParcoursQuestions session={session} question={question} />
<div style={{ marginTop: '200px' }} />
</>
);
Expand Down
9 changes: 7 additions & 2 deletions components/faq-parcours/question.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -15,13 +16,15 @@ type IProps = {
setQuestionType: (type: EQuestionType) => void;
userType: string;
questions: IFaqArticle[];
session: ISession | null;
};

export default function Question({
questionType,
setQuestionType,
userType,
questions = [],
session,
}: IProps) {
const bottomRef = useRef(null);

Expand Down Expand Up @@ -63,11 +66,13 @@ export default function Question({
<div className="layout-center">
<iframe
title="Contact Form"
src={`https://plugins.crisp.chat/urn:crisp.im:contact-form:0/contact/${process.env.NEXT_PUBLIC_CRISP_WEBSITE_ID}`}
src={`https://plugins.crisp.chat/urn:crisp.im:contact-form:0/contact/064fca1b-bdd6-4a81-af56-9f38e40953ad?type=${userType}${
session?.user?.email ? `&email=${session?.user?.email}` : ''
}`}
referrerPolicy="origin"
sandbox="allow-forms allow-popups allow-scripts allow-same-origin"
width="100%"
height="600px"
height="550px"
frameBorder="0"
></iframe>
</div>
Expand Down

0 comments on commit 7690b2b

Please sign in to comment.