Skip to content

Commit 29533a3

Browse files
mahvalmahval
authored
Merge pull request #209 from navikt/restructure
Restructure folders and files
2 parents f8c0546 + a7de8a9 commit 29533a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+199
-224
lines changed

‎src/services/base-service.tsx ‎src/api/api.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { FinalizedKlage, NewKlage, Klage, UpdateKlage } from '../types/klage';
2-
import { User } from '../types/user';
3-
import { Attachment } from '../types/attachment';
4-
import { del, getJSON, getText, postFormData, postJSON, putJSON } from '../utils/fetch/fetch';
5-
import { logError } from '../utils/logger/frontendLogger';
6-
import { environment } from '../utils/environment';
1+
import { del, getJSON, getText, postFormData, postJSON, putJSON } from './fetch';
2+
import { logError } from '../logging/frontendLogger';
3+
import { User } from '../user/user';
4+
import { Attachment } from '../klage/attachment';
5+
import { environment } from '../environment/environment';
6+
import { NewKlage, Klage, UpdateKlage, FinalizedKlage } from '../klage/klage';
77

88
export async function getUser() {
99
const url = environment.userUrl;

‎src/utils/fetch/errors.ts ‎src/api/errors.ts

File renamed without changes.

‎src/utils/fetch/fetch.ts ‎src/api/fetch.ts

File renamed without changes.

‎src/components/app-context/app-context.tsx ‎src/app-context/app-context.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState } from 'react';
2-
import { Klage } from '../../types/klage';
3-
import { User } from '../../types/user';
2+
import { Klage } from '../klage/klage';
3+
import { User } from '../user/user';
44

55
export interface AppContextType {
66
user: User | null;

‎src/services/check-auth.ts ‎src/auth/check-auth.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { User } from '../types/user';
2-
import { logError } from '../utils/logger/frontendLogger';
3-
import { login } from '../utils/login';
4-
import { getJSON } from '../utils/fetch/fetch';
5-
import { NotLoggedInError } from '../utils/fetch/errors';
6-
import { environment } from '../utils/environment';
1+
import { User } from '../user/user';
2+
import { logError } from '../logging/frontendLogger';
3+
import { login } from './login';
4+
import { getJSON } from '../api/fetch';
5+
import { NotLoggedInError } from '../api/errors';
6+
import { environment } from '../environment/environment';
77

88
export async function checkAuth(setUser: (user: User | null) => void, required: boolean) {
99
try {

‎src/utils/login.ts ‎src/auth/login.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { environment } from './environment';
1+
import { environment } from '../environment/environment';
22

33
export const LOGGED_IN_REDIRECT_PATH_KEY = 'logged-in-redirect-path';
44

‎src/components/alert/alert.tsx

-18
This file was deleted.

‎src/utils/date.test.ts ‎src/date/date.test.ts

File renamed without changes.

‎src/utils/date.ts ‎src/date/date.ts

File renamed without changes.

‎src/components/environment-loader/environment-loader.tsx ‎src/environment/environment-loader.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React, { useEffect, useState } from 'react';
22
import NavFrontendSpinner from 'nav-frontend-spinner';
33
import { Normaltekst } from 'nav-frontend-typografi';
44
import { AlertStripeFeil } from 'nav-frontend-alertstriper';
5-
import { CenteredContainer } from '../../styled-components/main-styled-components';
6-
import { environment } from '../../utils/environment';
5+
import { CenteredContainer } from '../styled-components/common';
6+
import { environment } from './environment';
77

88
interface Props {
99
children: JSX.Element;

‎src/utils/environment.ts ‎src/environment/environment.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getJSON } from './fetch/fetch';
1+
import { getJSON } from '../api/fetch';
22

33
interface InboundEnvironment {
44
readonly appUrl: string;

‎src/components/error/ErrorBoundary.tsx ‎src/error-boundry/ErrorBoundary.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import AlertStripe from 'nav-frontend-alertstriper';
3-
import { logError } from '../../utils/logger/frontendLogger';
3+
import { logError } from '../logging/frontendLogger';
44

55
interface Props {
66
boundaryName?: string;

‎src/components/error/error.tsx ‎src/error-boundry/error.tsx

File renamed without changes.

‎src/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import App from './App';
4-
import { logError } from './utils/logger/frontendLogger';
3+
import App from './routes/routes';
4+
import { logError } from './logging/frontendLogger';
55
import './index.css';
66

77
try {

‎src/data/kategorier.ts ‎src/kategorier/kategorier.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { TemaKey } from '../types/tema';
1+
import { TemaKey } from '../tema/tema';
22

33
export interface Kategori {
44
temaKey: TemaKey;

‎src/types/attachment.ts ‎src/klage/attachment.ts

File renamed without changes.

‎src/components/klage-loader/klage-loader.tsx ‎src/klage/klage-loader.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { useParams } from 'react-router-dom';
33
import { AlertStripeFeil } from 'nav-frontend-alertstriper';
44
import NavFrontendSpinner from 'nav-frontend-spinner';
55
import { Normaltekst } from 'nav-frontend-typografi';
6-
import { getKlage } from '../../services/base-service';
7-
import { CenteredContainer } from '../../styled-components/main-styled-components';
6+
import { getKlage } from '../api/api';
7+
import { CenteredContainer } from '../styled-components/common';
88
import { AppContext } from '../app-context/app-context';
9-
import { Klage } from '../../types/klage';
9+
import { Klage } from './klage';
1010

1111
interface Props {
1212
render: (klage: Klage) => JSX.Element;

‎src/types/klage.test.ts ‎src/klage/klage.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { DateOption } from '../components/begrunnelse/datoValg';
1+
import { DateOption } from '../routes/klageskjema/begrunnelse/date-option';
22
import { parseVedtakText, dateToVedtakText, ParsedVedtakText, TIDLIGERE_VEDTAK, SISTE_VEDTAK } from './klage';
33

44
describe('Parse the date and choice from a vedtak text', () => {

‎src/types/klage.ts ‎src/klage/klage.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { ISODate, ISODateTime, isoDateToPretty, prettyDateToISO } from '../date/date';
2+
import { DateOption } from '../routes/klageskjema/begrunnelse/date-option';
3+
import { TemaKey } from '../tema/tema';
14
import { Attachment } from './attachment';
2-
import { DateOption } from '../components/begrunnelse/datoValg';
3-
import { ISODate, ISODateTime, isoDateToPretty, prettyDateToISO } from '../utils/date';
4-
import { TemaKey } from './tema';
55

66
export enum KlageStatus {
77
DRAFT = 'DRAFT',

‎src/components/link/link.tsx ‎src/link/link.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
2-
import { LenkepanelBase } from 'nav-frontend-lenkepanel';
32
import { Link } from 'react-router-dom';
43
import styled from 'styled-components/macro';
5-
import { device } from '../../styled-components/main-styled-components';
4+
import { LenkepanelBase } from 'nav-frontend-lenkepanel';
5+
import { device } from '../styled-components/media-queries';
66

77
export interface KlageLinkProps {
88
className?: string;

‎src/utils/logger/amplitude.ts ‎src/logging/amplitude.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import amplitude from 'amplitude-js';
2-
import { TemaKey } from '../../types/tema';
2+
import { TemaKey } from '../tema/tema';
33

44
const APP_NAME = 'klage-dittnav';
55

‎src/utils/logger/frontendLogger.ts ‎src/logging/frontendLogger.ts

File renamed without changes.

‎src/utils/logger/use-log-page-view.ts ‎src/logging/use-log-page-view.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffect } from 'react';
2-
import { TemaKey } from '../../types/tema';
2+
import { TemaKey } from '../tema/tema';
33
import { logPageView, PageIdentifier } from './amplitude';
44

55
export function useLogPageView(page: PageIdentifier, temaKey?: TemaKey, title?: string) {

‎src/utils/get-query-value.ts ‎src/query/get-query-value.ts

File renamed without changes.

‎src/utils/get-title.ts ‎src/query/get-title.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import queryString from 'query-string';
2-
import { TemaKey, Tema } from '../types/tema';
2+
import { TemaKey, Tema } from '../tema/tema';
33
import { getQueryValue } from './get-query-value';
44

55
export function getTitle(query: queryString.ParsedQuery, temaKey: TemaKey): string {

‎src/pages/create-klage/create-klage.tsx ‎src/routes/create-klage.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import { Redirect, useHistory, useLocation } from 'react-router-dom';
33
import queryString from 'query-string';
44
import NavFrontendSpinner from 'nav-frontend-spinner';
55
import { AlertStripeFeil } from 'nav-frontend-alertstriper';
6-
import { CenteredContainer } from '../../styled-components/main-styled-components';
7-
import { ensureStringIsTema } from '../../types/tema';
8-
import { getQueryValue } from '../../utils/get-query-value';
9-
import { createKlage } from '../../services/base-service';
10-
import { NewKlage } from '../../types/klage';
6+
import { CenteredContainer } from '../styled-components/common';
7+
import { ensureStringIsTema } from '../tema/tema';
8+
import { getQueryValue } from '../query/get-query-value';
9+
import { createKlage } from '../api/api';
1110
import { Normaltekst } from 'nav-frontend-typografi';
12-
import { AppContext } from '../../components/app-context/app-context';
13-
import { getTitle } from '../../utils/get-title';
11+
import { AppContext } from '../app-context/app-context';
12+
import { getTitle } from '../query/get-title';
13+
import { NewKlage } from '../klage/klage';
1414

1515
const CreateKlage = () => {
1616
const { search } = useLocation();

‎src/components/inngang/inngang-hovedkategorier.tsx ‎src/routes/inngang/inngang-hovedkategorier.tsx

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
import React from 'react';
22
import { Systemtittel, Normaltekst, Sidetittel, Undertittel } from 'nav-frontend-typografi';
3-
import { INNGANG_KATEGORIER } from '../../data/kategorier';
4-
import {
5-
Margin40Container,
6-
Margin40TopContainer,
7-
PointsFlexListContainer
8-
} from '../../styled-components/main-styled-components';
93
import Veilederpanel from 'nav-frontend-veilederpanel';
104
import VeilederIcon from '../../assets/Veileder.svg';
11-
import { KlageFlexLinkPanel } from '../link/link';
12-
import { PageIdentifier } from '../../utils/logger/amplitude';
13-
import { useLogPageView } from '../../utils/logger/use-log-page-view';
5+
import { INNGANG_KATEGORIER } from '../../kategorier/kategorier';
6+
import { KlageFlexLinkPanel } from '../../link/link';
7+
import { PageIdentifier } from '../../logging/amplitude';
8+
import { useLogPageView } from '../../logging/use-log-page-view';
9+
import { Margin40TopContainer, Margin40Container, PointsFlexListContainer } from '../../styled-components/common';
1410

1511
const InngangHovedkategorier = () => {
1612
useLogPageView(PageIdentifier.INNGANG_HOVEDKATEGORIER);

‎src/components/inngang/inngang-innsendingsvalg-digital.tsx ‎src/routes/inngang/inngang-innsendingsvalg-digital.tsx

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
import { Normaltekst, Sidetittel, Systemtittel } from 'nav-frontend-typografi';
21
import React from 'react';
2+
import { useLocation } from 'react-router';
3+
import queryString from 'query-string';
4+
import { Normaltekst, Sidetittel, Systemtittel } from 'nav-frontend-typografi';
5+
import { LenkepanelBase } from 'nav-frontend-lenkepanel';
6+
import Lenke from 'nav-frontend-lenker';
37
import LetterOpened from '../../assets/images/icons/LetterOpened';
48
import {
59
IconContainer,
610
LenkePanelContentWithImage,
711
Margin40Container,
812
MarginContainer,
913
MarginTopContainer
10-
} from '../../styled-components/main-styled-components';
11-
import { Tema, TemaKey } from '../../types/tema';
12-
import { LenkepanelBase } from 'nav-frontend-lenkepanel';
13-
import Lenke from 'nav-frontend-lenker';
14+
} from '../../styled-components/common';
1415
import MobilePhone from '../../assets/images/icons/MobilePhone';
15-
import { KlageLinkPanel } from '../link/link';
16-
import { useLocation } from 'react-router';
17-
import queryString from 'query-string';
18-
import { getUrlToPaperForm } from '../../types/ytelse';
19-
import { useLogPageView } from '../../utils/logger/use-log-page-view';
20-
import { PageIdentifier } from '../../utils/logger/amplitude';
16+
import { useLogPageView } from '../../logging/use-log-page-view';
17+
import { PageIdentifier } from '../../logging/amplitude';
18+
import { KlageLinkPanel } from '../../link/link';
19+
import { TemaKey, Tema } from '../../tema/tema';
20+
import { getUrlToPaperForm } from '../../tema/ytelse';
2121

2222
interface Props {
2323
temaKey: TemaKey;

‎src/components/inngang/inngang-innsendingsvalg-post.tsx ‎src/routes/inngang/inngang-innsendingsvalg-post.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import { Normaltekst, Sidetittel, Systemtittel } from 'nav-frontend-typografi';
21
import React from 'react';
2+
import { Normaltekst, Sidetittel, Systemtittel } from 'nav-frontend-typografi';
3+
import { LenkepanelBase } from 'nav-frontend-lenkepanel';
4+
import Lenke from 'nav-frontend-lenker';
35
import LetterOpened from '../../assets/images/icons/LetterOpened';
46
import {
57
IconContainer,
68
LenkePanelContentWithImage,
79
Margin40Container,
810
MarginTopContainer
9-
} from '../../styled-components/main-styled-components';
10-
import { Tema, TemaKey } from '../../types/tema';
11-
import { LenkepanelBase } from 'nav-frontend-lenkepanel';
12-
import Lenke from 'nav-frontend-lenker';
13-
import { getUrlToPaperForm } from '../../types/ytelse';
14-
import { useLogPageView } from '../../utils/logger/use-log-page-view';
15-
import { PageIdentifier } from '../../utils/logger/amplitude';
11+
} from '../../styled-components/common';
12+
import { useLogPageView } from '../../logging/use-log-page-view';
13+
import { PageIdentifier } from '../../logging/amplitude';
14+
import { TemaKey, Tema } from '../../tema/tema';
15+
import { getUrlToPaperForm } from '../../tema/ytelse';
1616

1717
interface Props {
1818
temaKey: TemaKey;

‎src/components/inngang/inngang-kategorier.tsx ‎src/routes/inngang/inngang-kategorier.tsx

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import React from 'react';
22
import { Sidetittel, Systemtittel, Undertittel } from 'nav-frontend-typografi';
3-
import { InngangKategori } from '../../data/kategorier';
4-
import {
5-
Margin40Container,
6-
Margin40TopContainer,
7-
PointsFlexListContainer
8-
} from '../../styled-components/main-styled-components';
9-
import { PageIdentifier } from '../../utils/logger/amplitude';
10-
import { useLogPageView } from '../../utils/logger/use-log-page-view';
11-
import { KlageFlexLinkPanel } from '../link/link';
3+
import { InngangKategori } from '../../kategorier/kategorier';
4+
import { Margin40Container, Margin40TopContainer, PointsFlexListContainer } from '../../styled-components/common';
5+
import { PageIdentifier } from '../../logging/amplitude';
6+
import { useLogPageView } from '../../logging/use-log-page-view';
7+
import { KlageFlexLinkPanel } from '../../link/link';
128

139
interface Props {
1410
inngangkategori: InngangKategori;

‎src/components/begrunnelse/attachment-preview.tsx ‎src/routes/klageskjema/begrunnelse/attachment-preview.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import React, { useEffect, useState } from 'react';
2-
import { AttachmentFile } from '../../types/attachment';
3-
import { matchMediaQueries, CenterOnMobile, FileFlexItem } from '../../styled-components/main-styled-components';
42
import styled from 'styled-components/macro';
3+
import { AttachmentFile } from '../../../klage/attachment';
4+
import { FileFlexItem, CenterOnMobile } from '../../../styled-components/common';
5+
import { matchMediaQueries } from '../../../styled-components/media-queries';
56

67
interface Props {
78
attachments: AttachmentFile[];

‎src/components/begrunnelse/begrunnelse.tsx ‎src/routes/klageskjema/begrunnelse/begrunnelse.tsx

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
22
import { useHistory } from 'react-router-dom';
3+
import styled from 'styled-components/macro';
34
import { RadioPanelGruppe, Textarea } from 'nav-frontend-skjema';
45
import { Hovedknapp, Knapp } from 'nav-frontend-knapper';
56
import { Normaltekst, Undertittel, Element, Undertekst } from 'nav-frontend-typografi';
@@ -16,16 +17,15 @@ import {
1617
MarginTopContainer,
1718
NoMarginParagraph,
1819
NoMarginUndertekst
19-
} from '../../styled-components/main-styled-components';
20-
import { getAttachmentErrorMessage, Attachment, AttachmentFile, toFiles } from '../../types/attachment';
20+
} from '../../../styled-components/common';
21+
import { getAttachmentErrorMessage, Attachment, AttachmentFile, toFiles } from '../../../klage/attachment';
2122
import AttachmentPreview from './attachment-preview';
22-
import { updateKlage, addAttachment, deleteAttachment } from '../../services/base-service';
23-
import { DateOption, datoValg } from './datoValg';
24-
import { dateToVedtakText, UpdateKlage, parseVedtakText, Klage, KlageStatus } from '../../types/klage';
25-
import { ApiError, CustomError } from '../../utils/fetch/errors';
26-
import { ISODateTime } from '../../utils/date';
27-
import { AppContext } from '../app-context/app-context';
28-
import styled from 'styled-components/macro';
23+
import { updateKlage, addAttachment, deleteAttachment } from '../../../api/api';
24+
import { DateOption, datoValg } from './date-option';
25+
import { ApiError, CustomError } from '../../../api/errors';
26+
import { AppContext } from '../../../app-context/app-context';
27+
import { ISODateTime } from '../../../date/date';
28+
import { Klage, parseVedtakText, KlageStatus, UpdateKlage, dateToVedtakText } from '../../../klage/klage';
2929

3030
interface UploadError {
3131
timestamp: ISODateTime;

‎src/components/begrunnelse/datoValg.tsx ‎src/routes/klageskjema/begrunnelse/date-option.tsx

File renamed without changes.

‎src/components/form-container/form-container.tsx ‎src/routes/klageskjema/form-container.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from 'react';
2-
import KvitteringPage from '../../pages/kvittering/kvittering-page';
3-
import Oppsummering from '../../pages/oppsummering/oppsummering';
4-
import { MarginContainer } from '../../styled-components/main-styled-components';
5-
import { Klage } from '../../types/klage';
6-
import Begrunnelse from '../begrunnelse/begrunnelse';
7-
import Steps from '../steps/steps';
2+
import KvitteringPage from './kvittering/kvittering-page';
3+
import Oppsummering from './oppsummering';
4+
import { MarginContainer } from '../../styled-components/common';
5+
import Begrunnelse from './begrunnelse/begrunnelse';
6+
import Steps from './steps';
7+
import { Klage } from '../../klage/klage';
88

99
interface Props {
1010
activeStep: number;

‎src/pages/kvittering/kvittering-page.tsx ‎src/routes/klageskjema/kvittering/kvittering-page.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React, { useState, useEffect } from 'react';
2-
import Kvittering from '../../components/kvittering/kvittering';
3-
import KvitteringLoading from '../../components/kvittering/kvitteringLoading';
4-
import { getJournalpostId } from '../../services/base-service';
5-
import { Klage } from '../../types/klage';
6-
import { PageIdentifier } from '../../utils/logger/amplitude';
7-
import { useLogPageView } from '../../utils/logger/use-log-page-view';
2+
import Kvittering from './kvittering';
3+
import KvitteringLoading from './kvitteringLoading';
4+
import { getJournalpostId } from '../../../api/api';
5+
import { PageIdentifier } from '../../../logging/amplitude';
6+
import { useLogPageView } from '../../../logging/use-log-page-view';
7+
import { Klage } from '../../../klage/klage';
88

99
interface Props {
1010
klage: Klage;

‎src/components/kvittering/kvittering.tsx ‎src/routes/klageskjema/kvittering/kvittering.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import React from 'react';
2-
import Envelope from '../../assets/images/icons/Envelope';
2+
import styled from 'styled-components/macro';
3+
import { Systemtittel, Normaltekst, Element } from 'nav-frontend-typografi';
4+
import { AlertStripeSuksess } from 'nav-frontend-alertstriper';
5+
import Lenke from 'nav-frontend-lenker';
6+
import Envelope from '../../../assets/images/icons/Envelope';
37
import {
48
ContentContainer,
59
MarginContainer,
610
CenteredContainer,
711
Margin40Container,
812
Margin32Container
9-
} from '../../styled-components/main-styled-components';
10-
import { Systemtittel, Normaltekst, Element } from 'nav-frontend-typografi';
11-
import { AlertStripeSuksess } from 'nav-frontend-alertstriper';
12-
import Lenke from 'nav-frontend-lenker';
13-
import { ISODate, isoDateToPretty } from '../../utils/date';
14-
import { environment } from '../../utils/environment';
15-
import styled from 'styled-components/macro';
13+
} from '../../../styled-components/common';
14+
import { environment } from '../../../environment/environment';
15+
import { ISODate, isoDateToPretty } from '../../../date/date';
1616

1717
interface Props {
1818
klageId: string | number;

0 commit comments

Comments
 (0)