Lint ja prettier korjauksia

Opetushallitus · Nov 29, 2024 · 7526d58 · 7526d58
1 parent 6b9ba46
commit 7526d58
Show file tree

Hide file tree

Showing 32 changed files with 587 additions and 464 deletions.
diff --git a/src/maksut-ui/.eslintrc.json b/src/maksut-ui/.eslintrc.json
@@ -2,9 +2,11 @@
   "extends": [
     "next/core-web-vitals",
     "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/strict",
+    "plugin:@typescript-eslint/stylistic"
   ],
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint"],
   "root": true
-}
+}
diff --git a/src/maksut-ui/.prettierrc.json b/src/maksut-ui/.prettierrc.json
@@ -5,4 +5,4 @@
   "singleQuote": true,
   "tabWidth": 2,
   "trailingComma": "all"
-}
+}
diff --git a/src/maksut-ui/app/[locale]/[...rest]/page.tsx b/src/maksut-ui/app/[locale]/[...rest]/page.tsx
@@ -1,5 +1,5 @@
-import {notFound} from 'next/navigation';
+import { notFound } from 'next/navigation';
 
 export default function CatchAllPage() {
   notFound();
-}
+}
diff --git a/src/maksut-ui/app/[locale]/error.tsx b/src/maksut-ui/app/[locale]/error.tsx
@@ -1,13 +1,13 @@
-'use client'
+'use client';
 
-import ErrorPanel from "@/app/components/ErrorPanel";
-import { useTranslations } from "use-intl";
+import ErrorPanel from '@/app/components/ErrorPanel';
+import { useTranslations } from 'use-intl';
 
 export default function Error() {
-  const t = useTranslations('Error')
+  const t = useTranslations('Error');
   return (
     <ErrorPanel>
       <h2>{t('header')}</h2>
     </ErrorPanel>
-  )
-}
+  );
+}
diff --git a/src/maksut-ui/app/[locale]/layout.tsx b/src/maksut-ui/app/[locale]/layout.tsx
@@ -1,47 +1,48 @@
-import type { Metadata } from "next";
-import { OphNextJsThemeProvider } from "@opetushallitus/oph-design-system/next/theme"
-import { CssBaseline } from '@mui/material'
-import { AppRouterCacheProvider} from "@mui/material-nextjs/v13-appRouter"
-import { CSSProperties, ReactNode } from "react"
-import { NextIntlClientProvider } from "next-intl";
-import { getMessages } from "next-intl/server";
-import { TopBar } from "@/app/components/TopBar";
-import { Locale } from "@/app/lib/types";
-import { OphLanguage } from "@opetushallitus/oph-design-system";
+import type { Metadata } from 'next';
+import { OphNextJsThemeProvider } from '@opetushallitus/oph-design-system/next/theme';
+import { CssBaseline } from '@mui/material';
+import { AppRouterCacheProvider } from '@mui/material-nextjs/v13-appRouter';
+import { CSSProperties, ReactNode } from 'react';
+import { NextIntlClientProvider } from 'next-intl';
+import { getMessages } from 'next-intl/server';
+import { TopBar } from '@/app/components/TopBar';
+import { Locale } from '@/app/lib/types';
+import { OphLanguage } from '@opetushallitus/oph-design-system';
 
 export const metadata: Metadata = {
-  title: "Maksut",
-  description: "Maksujen käyttöliittymä"
+  title: 'Maksut',
+  description: 'Maksujen käyttöliittymä',
 };
 
 export default async function LocaleLayout({
   children,
-  params
+  params,
 }: Readonly<{
   children: ReactNode;
-  params: Promise<{locale: string}>;
+  params: Promise<{ locale: string }>;
 }>) {
   const messages = await getMessages();
-  const { locale } = await params
+  const { locale } = await params;
 
   const bodyStyle: CSSProperties = {
     display: 'flex',
     flexDirection: 'column',
     alignItems: 'center',
     backgroundColor: '#F6F6F6',
-  }
+  };
 
   return (
     <html lang={locale}>
       <body style={bodyStyle}>
         <AppRouterCacheProvider>
           <NextIntlClientProvider messages={messages}>
-            <OphNextJsThemeProvider lang={locale as OphLanguage} variant={"opintopolku"}>
-              <CssBaseline/>
+            <OphNextJsThemeProvider
+              lang={locale as OphLanguage}
+              variant={'opintopolku'}
+            >
+              <CssBaseline />
               <TopBar lang={locale as Locale}></TopBar>
-              <main>
-                {children}
-              </main>
+              <main>{children}</main>
             </OphNextJsThemeProvider>
           </NextIntlClientProvider>
         </AppRouterCacheProvider>

diff --git a/src/maksut-ui/app/[locale]/not-found.tsx b/src/maksut-ui/app/[locale]/not-found.tsx
@@ -1,14 +1,14 @@
-import { getTranslations } from "next-intl/server";
-import ErrorPanel from "@/app/components/ErrorPanel";
+import { getTranslations } from 'next-intl/server';
+import ErrorPanel from '@/app/components/ErrorPanel';
 
 export default async function NotFound() {
-  const t = await getTranslations('NotFound')
+  const t = await getTranslations('NotFound');
 
   return (
     <ErrorPanel>
       <h2>{t('header')}</h2>
       <span>{t('body1')}</span>
       <span>{t('body2')}</span>
     </ErrorPanel>
-  )
-}
+  );
+}
diff --git a/src/maksut-ui/app/[locale]/page.tsx b/src/maksut-ui/app/[locale]/page.tsx
@@ -1,37 +1,38 @@
-import { fetchLaskutBySecret } from "@/app/lib/data";
-import MaksutPanel from "@/app/components/MaksutPanel";
-import { notFound, redirect } from "next/navigation";
-import Header from "@/app/components/Header";
-import { routing } from "@/i18n/routing";
-import { getLocale } from "next-intl/server";
-import ExpiredPanel from "@/app/components/ExpiredPanel";
-import { Locale } from '@/app/lib/types'
+import { fetchLaskutBySecret } from '@/app/lib/data';
+import MaksutPanel from '@/app/components/MaksutPanel';
+import { notFound, redirect } from 'next/navigation';
+import Header from '@/app/components/Header';
+import { routing } from '@/i18n/routing';
+import { getLocale } from 'next-intl/server';
+import ExpiredPanel from '@/app/components/ExpiredPanel';
+import { Locale } from '@/app/lib/types';
 
-export default async function Page({ searchParams }: {searchParams: Promise<{secret?: string}>}) {
-  const { secret } = await searchParams
-  const locale = await getLocale()
+export default async function Page({
+  searchParams,
+}: {
+  searchParams: Promise<{ secret?: string }>;
+}) {
+  const { secret } = await searchParams;
+  const locale = await getLocale();
 
   if (!routing.locales.includes(locale as Locale)) {
-    redirect(`/fi?secret=${secret}`)
+    redirect(`/fi?secret=${secret}`);
   }
 
   if (!secret) {
-    notFound()
+    notFound();
   }
-  const { laskut, contact } = await fetchLaskutBySecret(secret)
-  const activeLasku = laskut.find((lasku) => lasku.secret === secret)
+  const { laskut, contact } = await fetchLaskutBySecret(secret);
+  const activeLasku = laskut.find((lasku) => lasku.secret === secret);
 
   if (!laskut.length || !activeLasku) {
-    return (
-      <ExpiredPanel contact={contact}/>
-    )
+    return <ExpiredPanel contact={contact} />;
   }
 
-
   return (
     <>
       <Header lasku={activeLasku}></Header>
-      <MaksutPanel laskut={laskut} secret={secret}/>
+      <MaksutPanel laskut={laskut} secret={secret} />
     </>
   );
 }
diff --git a/src/maksut-ui/app/components/AlertIcon.tsx b/src/maksut-ui/app/components/AlertIcon.tsx
@@ -1,16 +1,18 @@
-import Image from "next/image";
-import { Box } from "@mui/material";
+import Image from 'next/image';
+import { Box } from '@mui/material';
 
 const AlertIcon = () => {
   return (
-    <Box style={{
-      backgroundColor: '#cc2f1b',
-      borderRadius: '50%',
-      width: '60px',
-      height: '60px',
-      display: 'flex',
-      alignItems: 'center',
-    }}>
+    <Box
+      style={{
+        backgroundColor: '#cc2f1b',
+        borderRadius: '50%',
+        width: '60px',
+        height: '60px',
+        display: 'flex',
+        alignItems: 'center',
+      }}
+    >
       <Image
         src={'/maksut-ui/alert.svg'}
         alt={'Alert icon'}
@@ -19,10 +21,10 @@ const AlertIcon = () => {
         style={{
           filter: 'invert(1)',
           margin: 'auto',
-        }}>
-      </Image>
+        }}
+      ></Image>
     </Box>
-  )
-}
+  );
+};
 
-export default AlertIcon
+export default AlertIcon;
diff --git a/src/maksut-ui/app/components/AstuPanel.tsx b/src/maksut-ui/app/components/AstuPanel.tsx
@@ -1,16 +1,16 @@
-'use client'
+'use client';
 
-import { Lasku, Locale } from "@/app/lib/types";
-import Maksu from "@/app/components/Maksu";
-import { useLocale, useTranslations } from "use-intl";
-import { translateLocalizedString } from "@/app/lib/utils";
-import Panel from "@/app/components/Panel";
-import MaksaButton from "@/app/components/MaksaButton";
+import { Lasku, Locale } from '@/app/lib/types';
+import Maksu from '@/app/components/Maksu';
+import { useLocale, useTranslations } from 'use-intl';
+import { translateLocalizedString } from '@/app/lib/utils';
+import Panel from '@/app/components/Panel';
+import MaksaButton from '@/app/components/MaksaButton';
 
-const AstuPanel = ({ lasku }: {lasku: Lasku}) => {
-  const t = useTranslations('AstuPanel')
-  const locale = useLocale() as Locale
-  const tMaksut = useTranslations('MaksutPanel')
+const AstuPanel = ({ lasku }: { lasku: Lasku }) => {
+  const t = useTranslations('AstuPanel');
+  const locale = useLocale() as Locale;
+  const tMaksut = useTranslations('MaksutPanel');
 
   const stateText = () => {
     if (lasku.status === 'paid') {
@@ -19,23 +19,30 @@ const AstuPanel = ({ lasku }: {lasku: Lasku}) => {
           <span>{t('päätösMaksettu')}</span>
           <span>{tMaksut('yhteiskäytto')}</span>
         </>
-      )
+      );
     } else {
       return (
         <>
           <span>{t('päätösMaksamatta')}</span>
         </>
-      )
+      );
     }
-  }
+  };
 
   return (
     <Panel>
-      <h2>{translateLocalizedString(lasku.metadata?.form_name, locale, "ASTU lomake")}</h2>
+      <h2>
+        {translateLocalizedString(
+          lasku.metadata?.form_name,
+          locale,
+          'ASTU lomake',
+        )}
+      </h2>
       {stateText()}
       <Maksu lasku={lasku} />
       <MaksaButton lasku={lasku}></MaksaButton>
-    </Panel>)
-}
+    </Panel>
+  );
+};
 
-export default AstuPanel
+export default AstuPanel;
diff --git a/src/maksut-ui/app/components/ErrorPanel.tsx b/src/maksut-ui/app/components/ErrorPanel.tsx
@@ -1,17 +1,17 @@
-'use client'
+'use client';
 
-import Panel from "@/app/components/Panel";
-import AlertIcon from "@/app/components/AlertIcon";
+import Panel from '@/app/components/Panel';
+import AlertIcon from '@/app/components/AlertIcon';
 
-const ErrorPanel = ({children}: {children: React.ReactNode}) => {
+const ErrorPanel = ({ children }: { children: React.ReactNode }) => {
   return (
-    <div style={{marginTop: '72px'}}>
+    <div style={{ marginTop: '72px' }}>
       <Panel>
         <AlertIcon></AlertIcon>
         {children}
       </Panel>
     </div>
-  )
-}
+  );
+};
 
-export default ErrorPanel
+export default ErrorPanel;
diff --git a/src/maksut-ui/app/components/ExpiredPanel.tsx b/src/maksut-ui/app/components/ExpiredPanel.tsx
@@ -1,19 +1,22 @@
-'use client'
+'use client';
 
-import ErrorPanel from "@/app/components/ErrorPanel";
-import { useTranslations } from "use-intl";
-import { OphLink } from "@opetushallitus/oph-design-system";
+import ErrorPanel from '@/app/components/ErrorPanel';
+import { useTranslations } from 'use-intl';
+import { OphLink } from '@opetushallitus/oph-design-system';
 
-const ExpiredPanel = ({contact}: {contact: string | undefined}) => {
-  const t = useTranslations('ExpiredPanel')
+const ExpiredPanel = ({ contact }: { contact: string | undefined }) => {
+  const t = useTranslations('ExpiredPanel');
 
   return (
     <ErrorPanel>
       <h2>{t('header')}</h2>
       <span>{t('body1')}</span>
-      <span>{t('body2')}<OphLink href={`mailto:${contact}`}>{contact}</OphLink>.</span>
+      <span>
+        {t('body2')}
+        <OphLink href={`mailto:${contact}`}>{contact}</OphLink>.
+      </span>
     </ErrorPanel>
-  )
-}
+  );
+};
 
-export default ExpiredPanel;
+export default ExpiredPanel;