Skip to content

Commit

Permalink
chore: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
lsagetlethias committed Dec 3, 2023
1 parent 32782d8 commit 8a99259
Show file tree
Hide file tree
Showing 19 changed files with 202 additions and 309 deletions.
4 changes: 4 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ const config = {
"plugin:@typescript-eslint/stylistic",
"plugin:@typescript-eslint/recommended-type-checked",
],
parserOptions: {
project: "./tsconfig.json",
tsconfigRootDir: __dirname,
},
plugins: [
"@typescript-eslint",
"typescript-sort-keys"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"eslint-config-next": "^14.0.3",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-lodash": "^7.4.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-typescript-sort-keys": "^3.1.0",
Expand All @@ -62,4 +63,4 @@
"tsconfig-paths": "^4.2.0",
"typescript": "^5.3.2"
}
}
}
22 changes: 8 additions & 14 deletions src/components/DeclarationAccessibilite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ export const DeclarationAccessibilite = ({
<div>
<h1>Déclaration d’accessibilité</h1>
<p>
<span>{produit}</span> s’engage à rendre son service accessible,
conformément à{" "}
<span>{produit}</span> s’engage à rendre son service accessible, conformément à{" "}
<a href="https://www.legifrance.gouv.fr/loda/article_lc/LEGIARTI000037388867/">
l’article 47 de la loi n° 2005-102 du 11 février 2005.
</a>
Expand All @@ -35,10 +34,9 @@ export const DeclarationAccessibilite = ({
</p>
<h2>Amélioration et contact</h2>
<p>
Si vous n’arrivez pas à accéder à un contenu ou à un service, vous
pouvez contacter le responsable de <span>{organisme}</span> pour être
orienté vers une alternative accessible ou obtenir le contenu sous une
autre forme.
Si vous n’arrivez pas à accéder à un contenu ou à un service, vous pouvez contacter le responsable de{" "}
<span>{organisme}</span> pour être orienté vers une alternative accessible ou obtenir le contenu sous une autre
forme.
</p>
<ul className="basic-information feedback h-card">
<li>
Expand All @@ -47,18 +45,14 @@ export const DeclarationAccessibilite = ({
</ul>
<h2>Voie de recours</h2>
<p>
Cette procédure est à utiliser dans le cas suivant : vous avez signalé
au responsable du site internet un défaut d’accessibilité qui vous
empêche d’accéder à un contenu ou à un des services du portail et vous
n’avez pas obtenu de réponse satisfaisante.
Cette procédure est à utiliser dans le cas suivant : vous avez signalé au responsable du site internet un défaut
d’accessibilité qui vous empêche d’accéder à un contenu ou à un des services du portail et vous n’avez pas
obtenu de réponse satisfaisante.
</p>
<p>Vous pouvez :</p>
<ul>
<li>
Écrire un message au{" "}
<a href="https://formulaire.defenseurdesdroits.fr/">
Défenseur des droits
</a>
Écrire un message au <a href="https://formulaire.defenseurdesdroits.fr/">Défenseur des droits</a>
</li>
<li>
Contacter{" "}
Expand Down
8 changes: 4 additions & 4 deletions src/components/MentionPart.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
export type MentionPartProps = {
title: string;
description: string;
export interface MentionPartProps {
children?: React.ReactNode | React.ReactNode[];
description: string;
divProps?: React.HTMLAttributes<HTMLDivElement>;
};
title: string;
}

export const MentionPart = (props: MentionPartProps): JSX.Element => {
return (
Expand Down
8 changes: 4 additions & 4 deletions src/components/StatTile.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { fr } from "@codegouvfr/react-dsfr";

export type StatTileProps = {
export interface StatTileProps {
description?: React.ReactNode | string;
stats: number | string;
title: string;
stats: string | number;
description?: string | React.ReactNode;
};
}

export const StatTile = (props: StatTileProps): JSX.Element => {
return (
Expand Down
6 changes: 3 additions & 3 deletions src/lib/matomo.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export type MatomoResult = {
export interface MatomoResult {
nbPageViews: number;
nbUniqPageViews: number;
nbVisits: number;
};
}

export const fetchMatomoData = async (): Promise<MatomoResult> => {
const MATOMO_URL = [
Expand All @@ -14,7 +14,7 @@ export const fetchMatomoData = async (): Promise<MatomoResult> => {
.then(data => data.json())
.catch(() => {
return null;
})
}),
);
const [nbVisitData, infoData] = await Promise.all(promises);
return {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/404.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { NextPage } from "next";
import { useEffect } from "react";
import { push } from "@socialgouv/matomo-next";
import { type NextPage } from "next";
import { useEffect } from "react";

const NotFound: NextPage = () => {
useEffect(() => {
Expand Down
49 changes: 19 additions & 30 deletions src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
import { ReactNode, useEffect } from "react";
import type { AppProps } from "next/app";
import Head from "next/head";
import Link from "next/link";
import { useRouter } from "next/router";

import { createEmotionSsrAdvancedApproach } from "tss-react/next";
import { createNextDsfrIntegrationApi } from "@codegouvfr/react-dsfr/next-pagesdir";
import { Footer } from "@codegouvfr/react-dsfr/Footer";
import { fr } from "@codegouvfr/react-dsfr";
import { Header } from "@codegouvfr/react-dsfr/Header";
import { headerFooterDisplayItem } from "@codegouvfr/react-dsfr/Display";
import { init } from "@socialgouv/matomo-next";
import { Footer } from "@codegouvfr/react-dsfr/Footer";
import { Header } from "@codegouvfr/react-dsfr/Header";
import { MuiDsfrThemeProvider } from "@codegouvfr/react-dsfr/mui";
import { createNextDsfrIntegrationApi } from "@codegouvfr/react-dsfr/next-pagesdir";
import { init } from "@socialgouv/matomo-next";
import { type AppProps } from "next/app";
import Head from "next/head";
import Link from "next/link";
import { useRouter } from "next/router";
import { type ReactNode, useEffect } from "react";
import { useStyles } from "tss-react/dsfr";
import { createEmotionSsrAdvancedApproach } from "tss-react/next";

declare module "@codegouvfr/react-dsfr/next-pagesdir" {
interface RegisterLink {
Expand Down Expand Up @@ -50,12 +49,11 @@ const { withDsfr, dsfrDocumentApi } = createNextDsfrIntegrationApi({
],
});

const { augmentDocumentWithEmotionCache, withAppEmotionCache } =
createEmotionSsrAdvancedApproach({
key: "css",
});
const { augmentDocumentWithEmotionCache, withAppEmotionCache } = createEmotionSsrAdvancedApproach({
key: "css",
});

export { dsfrDocumentApi, augmentDocumentWithEmotionCache };
export { augmentDocumentWithEmotionCache, dsfrDocumentApi };

const brandTop = (
<>
Expand All @@ -67,8 +65,7 @@ const brandTop = (

const homeLinkPops = {
href: "/",
title:
"Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)",
title: "Accueil - Nom de l’entité (ministère, secrétariat d‘état, gouvernement)",
};

const bottomLinks = [
Expand Down Expand Up @@ -97,8 +94,8 @@ const bottomLinks = [
process.env.NEXT_PUBLIC_APP_VERSION
? `/releases/tag/v${process.env.NEXT_PUBLIC_APP_VERSION}`
: process.env.NEXT_PUBLIC_APP_VERSION_COMMIT
? `/commit/${process.env.NEXT_PUBLIC_APP_VERSION}`
: ""
? `/commit/${process.env.NEXT_PUBLIC_APP_VERSION}`
: ""
}`,
},
},
Expand All @@ -113,17 +110,9 @@ const Layout = ({ children }: { children: ReactNode }) => {
<MuiDsfrThemeProvider>
<Head>
<title>Template | Fabrique numérique des ministères sociaux</title>
{contentSecurityPolicy && (
<meta
httpEquiv="Content-Security-Policy"
content={contentSecurityPolicy}
></meta>
)}
{contentSecurityPolicy && <meta httpEquiv="Content-Security-Policy" content={contentSecurityPolicy}></meta>}
<link rel="icon" href="/favicon.ico" />
<meta
name="description"
content="Template de la fabrique des ministères sociaux."
/>
<meta name="description" content="Template de la fabrique des ministères sociaux." />
</Head>
<Header
brandTop={brandTop}
Expand Down
8 changes: 4 additions & 4 deletions src/pages/_document.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Html, Head, Main, NextScript, DocumentProps } from "next/document";
import { dsfrDocumentApi, augmentDocumentWithEmotionCache } from "./_app";
import { type DocumentProps, Head, Html, Main, NextScript } from "next/document";

const { getColorSchemeHtmlAttributes, augmentDocumentForDsfr } =
dsfrDocumentApi;
import { augmentDocumentWithEmotionCache, dsfrDocumentApi } from "./_app";

const { getColorSchemeHtmlAttributes, augmentDocumentForDsfr } = dsfrDocumentApi;

export default function Document(props: DocumentProps) {
return (
Expand Down
12 changes: 4 additions & 8 deletions src/pages/accessibilite.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from "react";
import type { NextPage } from "next";
import Head from "next/head";

import { Alert } from "@codegouvfr/react-dsfr/Alert";
import { type NextPage } from "next";
import Head from "next/head";
import React from "react";

import { DeclarationAccessibilite } from "../components/DeclarationAccessibilite";

Expand All @@ -18,10 +17,7 @@ const Accessibilite: NextPage = () => {
description={
<>
Utilisez le{" "}
<a href="https://betagouv.github.io/a11y-generateur-declaration/#create">
générateur de déclaration
</a>
.
<a href="https://betagouv.github.io/a11y-generateur-declaration/#create">générateur de déclaration</a>.
</>
}
title={<>Cette page doit être mise à jour</>}
Expand Down
7 changes: 3 additions & 4 deletions src/pages/cgu.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React from "react";
import type { NextPage } from "next";
import Head from "next/head";

import { Alert } from "@codegouvfr/react-dsfr/Alert";
import { type NextPage } from "next";
import Head from "next/head";
import React from "react";

import { MentionPart } from "../components/MentionPart";

Expand Down
35 changes: 9 additions & 26 deletions src/pages/dsfr.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,23 @@
import * as React from "react";
import { fr } from "@codegouvfr/react-dsfr";

import Head from "next/head";
import { NextPage } from "next";

import { Accordion } from "@codegouvfr/react-dsfr/Accordion";
import { Alert } from "@codegouvfr/react-dsfr/Alert";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { Tabs } from "@codegouvfr/react-dsfr/Tabs";
import { Card } from "@codegouvfr/react-dsfr/Card";
import { Accordion } from "@codegouvfr/react-dsfr/Accordion";

import { Tabs } from "@codegouvfr/react-dsfr/Tabs";
import Stack from "@mui/material/Stack";
import { type NextPage } from "next";
import Head from "next/head";
import * as React from "react";

const Home: NextPage = () => {
return (
<>
<Head>
<title>Template | Fabrique numérique des ministères sociaux</title>
</Head>
<Alert
closable
description="Everything went well"
severity="success"
title="Message successfully sent"
/>
<Alert closable description="Everything went well" severity="success" title="Message successfully sent" />
<br />
<Alert
closable
description="Everything went bad"
severity="error"
title="Message NOT successfully sent"
/>
<Alert closable description="Everything went bad" severity="error" title="Message NOT successfully sent" />
<br />
<Tabs
tabs={[
Expand All @@ -55,12 +42,8 @@ const Home: NextPage = () => {
/>
<br />
<div className={fr.cx("fr-accordions-group")}>
<Accordion label="Name of the Accordion 1">
Content of the Accordion 1
</Accordion>
<Accordion label="Name of the Accordion 2">
Content of the Accordion 2
</Accordion>
<Accordion label="Name of the Accordion 1">Content of the Accordion 1</Accordion>
<Accordion label="Name of the Accordion 2">Content of the Accordion 2</Accordion>
</div>
<br />
<Stack spacing={2} sx={{ mt: 5 }} direction="row">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/healthz.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { NextPage } from "next";
import { type NextPage } from "next";
import React from "react";

const HealthZ: NextPage = () => {
Expand Down
30 changes: 11 additions & 19 deletions src/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
import * as React from "react";
import Head from "next/head";
import { NextPage } from "next";
import { push as matomoPush } from "@socialgouv/matomo-next";
import { Alert } from "@codegouvfr/react-dsfr/Alert";
import { Button } from "@codegouvfr/react-dsfr/Button";
import Stack from "@mui/material/Stack";
import { push as matomoPush } from "@socialgouv/matomo-next";
import { type NextPage } from "next";
import Head from "next/head";
import * as React from "react";

const Home: NextPage = () => {
return (
<>
<Head>
<title>Template | Fabrique numérique des ministères sociaux</title>
</Head>
<Alert
closable
description="Everything went well"
severity="success"
title="Message successfully sent"
/>
<Alert closable description="Everything went well" severity="success" title="Message successfully sent" />
<div className="fr-grid-row fr-grid-row--center fr-grid-row--middle fr-mb-8w fr-mt-8w">
<div className="fr-col-12 fr-col-md-6">
<h1>
Expand All @@ -27,18 +22,15 @@ const Home: NextPage = () => {
</span>
</h1>
<p className="fr-mt-10w">
Pariatur veniam ipsum pariatur elit ullamco sit quis ipsum ad veniam
proident sunt. Qui ut irure in quis reprehenderit. Laborum anim ad
laboris ipsum magna ullamco consequat ex consectetur. Duis sit
adipisicing ipsum occaecat commodo consequat officia ea. Cupidatat
fugiat reprehenderit aliqua eiusmod mollit Lorem consectetur. Minim
elit proident eu qui exercitation mollit id esse velit et dolore
velit laboris. Ipsum occaecat Lorem occaecat magna excepteur veniam
ullamco cupidatat irure incididunt velit nulla.
Pariatur veniam ipsum pariatur elit ullamco sit quis ipsum ad veniam proident sunt. Qui ut irure in quis
reprehenderit. Laborum anim ad laboris ipsum magna ullamco consequat ex consectetur. Duis sit adipisicing
ipsum occaecat commodo consequat officia ea. Cupidatat fugiat reprehenderit aliqua eiusmod mollit Lorem
consectetur. Minim elit proident eu qui exercitation mollit id esse velit et dolore velit laboris. Ipsum
occaecat Lorem occaecat magna excepteur veniam ullamco cupidatat irure incididunt velit nulla.
</p>
</div>
<div className="fr-col-12 fr-col-offset-md-1 fr-col-md-4">
{/* eslint-disable-next-line jsx-a11y/img-redundant-alt*/}
{}
{/* eslint-disable-next-line @next/next/no-img-element*/}
<img
className="fr-mt-2w"
Expand Down
Loading

0 comments on commit 8a99259

Please sign in to comment.