Merge pull request #58 from navikt/folder-name

Endret navn på directories og css.module til konvensjon vi bruker i andre apper

Author: Amirhlotfi

src/App.jsx

@@ -1,33 +1,33 @@
-import style from "./App.module.css";
+import styles from "./App.module.css";
 import { LanguageContext } from "./provider/LanguageProvider";
 import { useContext } from "react";
 import { inaktiveVarslerApiUrl } from "./api/urls";
 import { fetcher } from "./api/api";
 import { useQuery } from "react-query";
 import { Alert, Heading, Loader, Ingress } from "@navikt/ds-react";
 import text from "./language/text";
-import NoTidligereVarslerPage from "./components/NoTidligereVarslerPage/NoTidligereVarslerPage.jsx";
-import TidligereVarslerPage from "./components/TidligereVarslerPage/TidligereVarslerPage.jsx";
+import NoTidligereVarslerPage from "./components/noTidligereVarslerPage/NoTidligereVarslerPage.jsx";
+import TidligereVarslerPage from "./components/tidligereVarslerPage/TidligereVarslerPage.jsx";
 
 function App() {
   const language = useContext(LanguageContext);
   const { data: varsler, isSuccess, isLoading } = useQuery(inaktiveVarslerApiUrl, fetcher);
   const hasMaskedVarsel = varsler && varsler.some((varsel) => varsel.isMasked);
 
   return (
-    <div className={style.app}>
-      <Heading className={style.pageTitle} size="large">
+    <div className={styles.app}>
+      <Heading className={styles.pageTitle} size="large">
         {text["tidligereVarslerOverskrift"][language]}
       </Heading>
-      <Ingress className={style.pageDescription}>{text["sidebeskrivelse"][language]}</Ingress>
+      <Ingress className={styles.pageDescription}>{text["sidebeskrivelse"][language]}</Ingress>
       {hasMaskedVarsel && (
-        <Alert className={style.authenticationAlert} variant="info">
+        <Alert className={styles.authenticationAlert} variant="info">
           {text["hoyereSikkerhetsnivaa"][language]}
         </Alert>
       )}
-      <div className={style.pageBodyWrapper}>
+      <div className={styles.pageBodyWrapper}>
         {isLoading ? (
-          <Loader className={style.loader} size="3xlarge" title="venter..." />
+          <Loader className={styles.loader} size="3xlarge" title="venter..." />
         ) : varsler.length === 0 ? (
           <NoTidligereVarslerPage />
         ) : (

src/assets/BeskjedIkon.jsx

@@ -1,9 +1,9 @@
-import style from "./Ikon.module.css";
+import styles from "./Ikon.module.css";
 
 const BeskjedIkon = () => {
   return (
     <svg
-      className={style.varselIkon}
+      className={styles.varselIkon}
       width="24"
       height="24"
       viewBox="0 0 24 24"

src/assets/OppgaveIkon.jsx

@@ -1,9 +1,9 @@
-import style from "./Ikon.module.css";
+import styles from "./Ikon.module.css";
 
 const OppgaveIkon = () => {
   return (
     <svg
-      className={style.varselIkon}
+      className={styles.varselIkon}
       width="24"
       height="24"
       viewBox="0 0 24 24"

src/components/filter/Filter.jsx

@@ -1,10 +1,10 @@
 import ToggleNotifikasjon from "./toggleNotifikasjon/ToggleNotifikasjon";
 import SearchField from "./searchField/SearchField";
-import style from "./Filter.module.css";
+import styles from "./Filter.module.css";
 
 const Filter = () => {
   return (
-    <div className={style.filter}>
+    <div className={styles.filter}>
       <SearchField />
       <ToggleNotifikasjon />
     </div>

src/components/filter/searchField/SearchField.jsx

@@ -1,5 +1,5 @@
 import { Search } from "@navikt/ds-react";
-import style from "./SearchField.module.css";
+import styles from "./SearchField.module.css";
 import useStore from "../../../store/store";
 import { updateSearch } from "../../../store/selectors";
 import text from "../../../language/text";
@@ -12,7 +12,7 @@ const SearchField = () => {
 
   return (
     <Search
-      className={style.searchField}
+      className={styles.searchField}
       label={text["sokefeltLabel"][language]}
       variant="simple"
       hideLabel={false}

src/components/filter/toggleNotifikasjon/ToggleNotifikasjon.jsx

@@ -1,5 +1,5 @@
 import { ToggleGroup } from "@navikt/ds-react";
-import style from "./ToggleNotifikasjon.module.css";
+import styles from "./ToggleNotifikasjon.module.css";
 import useStore from "../../../store/store";
 import { selectAlle, selectBeskjed, selectOppgave } from "../../../store/selectors";
 import { useContext } from "react";
@@ -13,7 +13,7 @@ const ToggleNotifikasjon = () => {
   const language = useContext(LanguageContext);
 
   return (
-    <ToggleGroup className={style.toggleNotifikasjon} size="medium" defaultValue="alle">
+    <ToggleGroup className={styles.toggleNotifikasjon} size="medium" defaultValue="alle">
       <ToggleGroup.Item value="alle" onClick={alle}>
         {text["filterToggleItemAlle"][language]}
       </ToggleGroup.Item>

src/components/NoTidligereVarslerPage/NoTidligereVarslerPage.jsx renamed to src/components/noTidligereVarslerPage/NoTidligereVarslerPage.jsx

@@ -1,5 +1,5 @@
 import { BodyLong, Heading, Link } from "@navikt/ds-react";
-import style from "./NoTidligereVarslerPage.module.css";
+import styles from "./NoTidligereVarslerPage.module.css";
 import { minSideUrl } from "../../api/urls";
 import text from "../../language/text";
 import { useContext } from "react";
@@ -9,15 +9,15 @@ import IngenVarslerKatt from "../../assets/IngenVarslerKatt.jsx";
 const NoTidligereVarslerPage = () => {
   const language = useContext(LanguageContext);
   return (
-    <div className={style.noTidligereVarslerPage}>
+    <div className={styles.noTidligereVarslerPage}>
       <IngenVarslerKatt />
-      <Heading level="2" className={style.noTidligereVarslerHeader} size="small">
+      <Heading level="2" className={styles.noTidligereVarslerHeader} size="small">
         {text["ingenTidligereVarslerHeader"][language]}
       </Heading>
-      <BodyLong className={style.noTidligereVarslerDescription}>
+      <BodyLong className={styles.noTidligereVarslerDescription}>
         {text["ingenTidligereVarslerbody"][language]}{" "}
       </BodyLong>
-      <Link href={minSideUrl} className={style.minSideLink}>
+      <Link href={minSideUrl} className={styles.minSideLink}>
         {text["gaaTilMinSide"][language]}
       </Link>
     </div>

src/components/NoTidligereVarslerPage/NoTidligereVarslerPage.module.css renamed to src/components/noTidligereVarslerPage/NoTidligereVarslerPage.module.css

@@ -1,7 +1,7 @@
 import { useContext, useMemo } from "react";
 import { BodyLong, Heading } from "@navikt/ds-react";
 import Varsel from "../varsel/Varsel";
-import style from "./TidligereVarslerPage.module.css";
+import styles from "./TidligereVarslerPage.module.css";
 import { selectSearch, selectType } from "../../store/selectors";
 import { byForstBehandlet } from "../../utils/date";
 import TomSokKatt from "../../assets/TomSokKatt";
@@ -25,11 +25,11 @@ const TidligereVarslerPage = ({ varsler, isSuccess }) => {
   return (
     <>
       <Filter />
-      <Heading level={2} size="xsmall" className={style.varslerListHeading}>
+      <Heading level={2} size="xsmall" className={styles.varslerListHeading}>
         {text.antallSokeTreff(language, filtertedVarseler.length, varsler.length)}
       </Heading>
       {filtertedVarseler.length > 0 ? (
-        <ul className={style.varslerList}>
+        <ul className={styles.varslerList}>
           {isSuccess &&
             filtertedVarseler?.map((varsel) => (
               <li key={varsel.eventId}>
@@ -38,9 +38,9 @@ const TidligereVarslerPage = ({ varsler, isSuccess }) => {
             ))}
         </ul>
       ) : (
-        <div className={style.emptySearchContainer}>
+        <div className={styles.emptySearchContainer}>
           <TomSokKatt />
-          <BodyLong className={style.emptySearchDescription}>{text["ingenSokeresultat"][language]}</BodyLong>
+          <BodyLong className={styles.emptySearchDescription}>{text["ingenSokeresultat"][language]}</BodyLong>
         </div>
       )}
     </>