IS-Refactor-folder-structure

Author: vetlesolgaard

src/sider/Side.tsx renamed to src/components/Side.tsx

@@ -1,10 +1,10 @@
 import React, { ReactElement } from 'react';
 import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
-import Side from '../sider/Side';
+import Side from '../components/Side';
 import Decorator from '../decorator/Decorator';
-import OversiktContainer from '@/containers/OversiktContainer';
+import OversiktContainer from '@/sider/oversikt/OversiktContainer';
 import ErrorBoundary from '@/components/error/ErrorBoundary';
-import SokContainer from '@/components/sokperson/SokContainer';
+import SokContainer from '@/sider/sokperson/SokContainer';
 import { routes } from '@/routers/routes';
 
 const AppRouter = (): ReactElement => {

src/routers/AppRouter.tsx

@@ -4,19 +4,19 @@ import {
   PersonregisterState,
 } from '@/api/types/personregisterTypes';
 import { toPersonData } from '@/utils/toPersondata';
-import { PersonFilter } from '@/components/Filter/PersonFilter';
-import Sokeresultat from '@/components/Sokeresultat';
+import { PersonFilter } from '@/sider/oversikt/filter/PersonFilter';
+import Sokeresultat from '@/sider/oversikt/sokeresultat/Sokeresultat';
 import styled from 'styled-components';
-import { TekstFilter } from '@/components/Filter/TekstFilter';
-import { ClearFiltersButton } from '@/components/Filter/ClearFiltersButton';
+import { TekstFilter } from '@/sider/oversikt/filter/TekstFilter';
+import { ClearFiltersButton } from '@/sider/oversikt/filter/ClearFiltersButton';
 import {
   Filterable,
   filterEventsOnVeileder,
 } from '@/utils/hendelseFilteringUtils';
 import { PersonOversiktStatusDTO } from '@/api/types/personoversiktTypes';
 import { useFilters } from '@/context/filters/FilterContext';
 import { useAktivVeilederQuery } from '@/data/veiledereQueryHooks';
-import { HendelseFilter } from '@/components/Filter/HendelseFilter';
+import { HendelseFilter } from '@/sider/oversikt/filter/HendelseFilter';
 import { Box } from '@navikt/ds-react';
 import { TabType, useTabType } from '@/hooks/useTabType';
 
@@ -39,15 +39,15 @@ const OversiktContainerInnhold = styled.div`
   }
 `;
 
-interface OversiktProps {
+interface Props {
   personoversiktData: PersonOversiktStatusDTO[];
   personregisterData: PersonregisterData[];
 }
 
-export const Oversikt = ({
+export default function Oversikt({
   personoversiktData,
   personregisterData,
-}: OversiktProps) => {
+}: Props) {
   const aktivVeilederQuery = useAktivVeilederQuery();
   const { filterState } = useFilters();
   const { selectedTab } = useTabType();
@@ -90,4 +90,4 @@ export const Oversikt = ({
       <Sokeresultat allEvents={allEvents} />
     </OversiktContainerInnhold>
   );
-};
+}

src/containers/Oversikt.tsx renamed to src/sider/oversikt/Oversikt.tsx

@@ -2,7 +2,6 @@ import React, { ReactElement, useEffect } from 'react';
 import { usePersonregisterQuery } from '@/data/personregisterHooks';
 import { usePersonoversiktQuery } from '@/data/personoversiktHooks';
 import AppSpinner from '@/components/AppSpinner';
-import { Oversikt } from '@/containers/Oversikt';
 import { NavigationBar } from '@/components/NavigationBar';
 import { NotificationBar } from '@/components/error/NotificationBar';
 import ErrorBoundary from '@/components/error/ErrorBoundary';
@@ -13,6 +12,7 @@ import { StoreKey, useLocalStorageState } from '@/hooks/useLocalStorageState';
 import { getWeeksBetween } from '@/utils/dateUtils';
 import { useFeatureToggles } from '@/data/unleash/unleashQueryHooks';
 import { TabType, useTabType } from '@/hooks/useTabType';
+import Oversikt from '@/sider/oversikt/Oversikt';
 
 function logPageView(tab: TabType) {
   Amplitude.logEvent({
@@ -32,7 +32,7 @@ function toReadableString(overviewTabType: TabType): string {
   }
 }
 
-const OversiktContainer = (): ReactElement => {
+export default function OversiktContainer(): ReactElement {
   const personregisterQuery = usePersonregisterQuery();
   const personoversiktQuery = usePersonoversiktQuery();
   const { toggles } = useFeatureToggles();
@@ -74,6 +74,4 @@ const OversiktContainer = (): ReactElement => {
       </div>
     </ErrorBoundary>
   );
-};
-
-export default OversiktContainer;
+}

src/containers/OversiktContainer.tsx renamed to src/sider/oversikt/OversiktContainer.tsx

@@ -1,7 +1,7 @@
 import React, { ReactElement } from 'react';
 import styled from 'styled-components';
 import themes from '@/styles/themes';
-import SlettIkon from '@/components/common/SlettIkon';
+import SlettIkon from '@/sider/oversikt/filter/SlettIkon';
 import { useFilters } from '@/context/filters/FilterContext';
 import { ActionType } from '@/context/filters/filterContextActions';
 
@@ -20,12 +20,15 @@ const ClearFiltersWrapper = styled.div`
   padding: 0.5rem 0.25rem;
   -webkit-user-select: none;
   user-select: none;
+
   :hover {
     cursor: pointer;
   }
+
   :active {
     border: 2px solid ${themes.color.navBla};
   }
+
   > svg {
     margin-right: 0.25em;
   }