From d2a14166807daaa8e0919823319c3d36539a1002 Mon Sep 17 00:00:00 2001 From: Pooria Mehregan Date: Thu, 14 Sep 2023 14:35:40 +0200 Subject: [PATCH] refactor: move pages from components to pages dir --- src/app/app.jsx | 16 ++++----- src/app/connected-app.js | 2 +- .../components/details-page/index.tsx | 2 +- .../search-entities.component.tsx | 2 +- src/pages/ai-project-page/index.tsx | 2 +- .../cms-article-page/cms-article-page.ts | 2 +- src/pages/cms-information-page/index.tsx | 2 +- src/pages/cms-transport-page/index.tsx | 2 +- .../connected-concept-compare-page.jsx | 2 +- .../RelatedConcepts/index.tsx | 2 +- .../concept-details-page/index.tsx | 30 ++++++++-------- .../concept-details-page/styled.ts | 0 .../data-service-details-page/index.tsx | 18 +++++----- .../data-service-details-page/styled.ts | 0 .../dataset-details-page/index.tsx | 36 ++++++++++++------- .../dataset-details-page/styled.ts | 0 .../error-page/components/error-400/index.tsx | 0 .../error-page/components/error-400/styled.ts | 0 .../error-page/components/error-500/index.tsx | 0 .../error-page/components/error-500/styled.ts | 0 .../error-page/index.tsx | 4 +-- .../error-page/styled.ts | 0 .../event-details-page/index.tsx | 14 ++++---- .../event-details-page/styled.ts | 0 .../information-model-details-page/index.tsx | 24 +++++++------ .../information-model-details-page/styled.ts | 0 .../news-archive-page/news-archive-page.ts | 2 +- .../news-article-page.tsx | 2 +- .../news-article-page/news-article-page.ts | 2 +- .../pages/dataset-page/index.tsx | 2 +- .../pages/datasets-page/index.tsx | 2 +- .../pages/organization-page/index.tsx | 2 +- .../pages/organizations-page/index.tsx | 2 +- .../public-service-details-page/index.tsx | 28 +++++++++------ .../public-service-details-page/styled.ts | 0 src/pages/report-page/report-page.ts | 2 +- src/pages/search-page/search-page.ts | 2 +- .../sparql-page/index.tsx | 0 .../sparql-page/styled.ts | 0 39 files changed, 116 insertions(+), 90 deletions(-) rename src/{components => pages}/concept-details-page/RelatedConcepts/index.tsx (99%) rename src/{components => pages}/concept-details-page/index.tsx (93%) rename src/{components => pages}/concept-details-page/styled.ts (100%) rename src/{components => pages}/data-service-details-page/index.tsx (96%) rename src/{components => pages}/data-service-details-page/styled.ts (100%) rename src/{components => pages}/dataset-details-page/index.tsx (97%) rename src/{components => pages}/dataset-details-page/styled.ts (100%) rename src/{components => pages}/error-page/components/error-400/index.tsx (100%) rename src/{components => pages}/error-page/components/error-400/styled.ts (100%) rename src/{components => pages}/error-page/components/error-500/index.tsx (100%) rename src/{components => pages}/error-page/components/error-500/styled.ts (100%) rename src/{components => pages}/error-page/index.tsx (93%) rename src/{components => pages}/error-page/styled.ts (100%) rename src/{components => pages}/event-details-page/index.tsx (94%) rename src/{components => pages}/event-details-page/styled.ts (100%) rename src/{components => pages}/information-model-details-page/index.tsx (98%) rename src/{components => pages}/information-model-details-page/styled.ts (100%) rename src/{components => pages}/public-service-details-page/index.tsx (98%) rename src/{components => pages}/public-service-details-page/styled.ts (100%) rename src/{components => pages}/sparql-page/index.tsx (100%) rename src/{components => pages}/sparql-page/styled.ts (100%) diff --git a/src/app/app.jsx b/src/app/app.jsx index 6b13bc624..d4028008f 100644 --- a/src/app/app.jsx +++ b/src/app/app.jsx @@ -6,16 +6,16 @@ import cx from 'classnames'; import localization from '../lib/localization'; import { MainPage } from '../pages/main-page/main-page'; import { SearchPage } from '../pages/search-page/search-page'; -import DatasetDetailsPage from '../components/dataset-details-page'; -import DataServiceDetailsPage from '../components/data-service-details-page'; -import ConceptDetailsPage from '../components/concept-details-page'; -import InformationModelDetailsPage from '../components/information-model-details-page'; -import PublicServiceDetailsPage from '../components/public-service-details-page'; -import EventDetailsPage from '../components/event-details-page'; +import DatasetDetailsPage from '../pages/dataset-details-page'; +import DataServiceDetailsPage from '../pages/data-service-details-page'; +import ConceptDetailsPage from '../pages/concept-details-page'; +import InformationModelDetailsPage from '../pages/information-model-details-page'; +import PublicServiceDetailsPage from '../pages/public-service-details-page'; +import EventDetailsPage from '../pages/event-details-page'; import { ConnectedConceptComparePage } from '../pages/concept-compare-page/connected-concept-compare-page'; import { ReportPage } from '../pages/report-page/report-page'; -import ErrorPage from '../components/error-page'; -import SparqlPage from '../components/sparql-page'; +import ErrorPage from '../pages/error-page'; +import SparqlPage from '../pages/sparql-page'; import Header from '../components/header'; import { Breadcrumbs } from './breadcrumbs/breadcrumbs.component'; import Footer from '../components/footer'; diff --git a/src/app/connected-app.js b/src/app/connected-app.js index bb2f2b63a..0a9bf8acb 100644 --- a/src/app/connected-app.js +++ b/src/app/connected-app.js @@ -4,7 +4,7 @@ import { App } from './app'; import { setLanguageAction } from '../redux/modules/settings'; import withErrorBoundary from '../components/with-error-boundary'; -import ErrorPage from '../components/error-page'; +import ErrorPage from '../pages/error-page'; const mapStateToProps = state => ({ // react-localization module designed to be stateful, so we have to re-render the app when the selected language is changed diff --git a/src/components/details-page/components/details-page/index.tsx b/src/components/details-page/components/details-page/index.tsx index 0ee3e95a0..3811ffb64 100755 --- a/src/components/details-page/components/details-page/index.tsx +++ b/src/components/details-page/components/details-page/index.tsx @@ -60,7 +60,7 @@ import withCommunity, { Props as CommunityProps } from '../../../with-community'; import Aside from '../aside'; -import RelationsContainer from '../../../concept-details-page/RelatedConcepts'; +import RelationsContainer from '../../../../pages/concept-details-page/RelatedConcepts'; interface ExternalProps { entity: Entity; diff --git a/src/components/search-entities/search-entities.component.tsx b/src/components/search-entities/search-entities.component.tsx index 8aa376821..e41839faf 100644 --- a/src/components/search-entities/search-entities.component.tsx +++ b/src/components/search-entities/search-entities.component.tsx @@ -12,7 +12,7 @@ import { InformationModelItem } from '../informationmodel-item/informationmodel- import { PublicServiceItem } from '../public-service-item/public-service-item'; import EventItem from '../event-item'; import withErrorBoundary from '../with-error-boundary'; -import ErrorPage from '../error-page'; +import ErrorPage from '../../pages/error-page'; import type { Entity as EntityType, Concept } from '../../types'; import { Entity } from '../../types/enums'; diff --git a/src/pages/ai-project-page/index.tsx b/src/pages/ai-project-page/index.tsx index 14be4d580..84a5a9c88 100644 --- a/src/pages/ai-project-page/index.tsx +++ b/src/pages/ai-project-page/index.tsx @@ -4,7 +4,7 @@ import SvgIcon from '@fellesdatakatalog/icons'; import Button, { Variant } from '@fellesdatakatalog/button'; import Link from '@fellesdatakatalog/link'; import Spinner from '../../components/spinner'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import withErrorBoundary from '../../components/with-error-boundary'; import Project from './components/project'; import localization from '../../lib/localization'; diff --git a/src/pages/cms-article-page/cms-article-page.ts b/src/pages/cms-article-page/cms-article-page.ts index 034b7b6f1..7cfe27ac1 100644 --- a/src/pages/cms-article-page/cms-article-page.ts +++ b/src/pages/cms-article-page/cms-article-page.ts @@ -2,7 +2,7 @@ import { compose } from 'redux'; import CmsArticlePagePure from './cms-article-page-pure'; import { cmsArticlePageResolver } from './cms-article-page-resolver'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import withErrorBoundary from '../../components/with-error-boundary'; const enhance = compose(cmsArticlePageResolver, withErrorBoundary(ErrorPage)); diff --git a/src/pages/cms-information-page/index.tsx b/src/pages/cms-information-page/index.tsx index fbfaf1063..717f473d1 100644 --- a/src/pages/cms-information-page/index.tsx +++ b/src/pages/cms-information-page/index.tsx @@ -16,7 +16,7 @@ import { PATHNAME_ABOUT_INFORMATIONMODELS } from '../../constants/constants'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import { isBasicImage, isBasicParagraph } from '../../lib/strapi'; import Markdown from '../../components/markdown'; diff --git a/src/pages/cms-transport-page/index.tsx b/src/pages/cms-transport-page/index.tsx index 20403785c..d4895a87f 100644 --- a/src/pages/cms-transport-page/index.tsx +++ b/src/pages/cms-transport-page/index.tsx @@ -11,7 +11,7 @@ import { useGetTransportArticleQuery } from '../../api/generated/cms/graphql'; import { PATHNAME_TRANSPORT } from '../../constants/constants'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import { isBasicImage, diff --git a/src/pages/concept-compare-page/connected-concept-compare-page.jsx b/src/pages/concept-compare-page/connected-concept-compare-page.jsx index 216506072..36649a137 100644 --- a/src/pages/concept-compare-page/connected-concept-compare-page.jsx +++ b/src/pages/concept-compare-page/connected-concept-compare-page.jsx @@ -6,7 +6,7 @@ import { removeConceptAction } from '../../redux/modules/conceptsCompare'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import withErrorBoundary from '../../components/with-error-boundary'; import { ConceptComparePage } from './concept-compare-page'; diff --git a/src/components/concept-details-page/RelatedConcepts/index.tsx b/src/pages/concept-details-page/RelatedConcepts/index.tsx similarity index 99% rename from src/components/concept-details-page/RelatedConcepts/index.tsx rename to src/pages/concept-details-page/RelatedConcepts/index.tsx index a8cfd60fa..218d82df9 100644 --- a/src/components/concept-details-page/RelatedConcepts/index.tsx +++ b/src/pages/concept-details-page/RelatedConcepts/index.tsx @@ -5,7 +5,7 @@ import { ContentSection, KeyValueList, KeyValueListItem -} from '../../details-page'; +} from '../../../components/details-page'; import translations from '../../../lib/localization'; import { Entity } from '../../../types/enums'; import { PATHNAME_CONCEPTS } from '../../../constants/constants'; diff --git a/src/components/concept-details-page/index.tsx b/src/pages/concept-details-page/index.tsx similarity index 93% rename from src/components/concept-details-page/index.tsx rename to src/pages/concept-details-page/index.tsx index 66f7d3f90..29c2e8429 100755 --- a/src/components/concept-details-page/index.tsx +++ b/src/pages/concept-details-page/index.tsx @@ -11,27 +11,27 @@ import { deepKeys } from '../../lib/deep-keys'; import { languageSorter } from '../../lib/languageSorter'; import { themeFDK } from '../../app/theme'; -import type { Props as ConceptProps } from '../with-concept'; -import withConcept from '../with-concept'; -import type { Props as DatasetsProps } from '../with-datasets'; -import withDatasets from '../with-datasets'; -import type { Props as InformationModelsProps } from '../with-information-models'; -import withInformationModels from '../with-information-models'; -import type { Props as ConceptsProps } from '../with-concepts'; -import withConcepts from '../with-concepts'; -import type { Props as PublicServicesProps } from '../with-public-services'; -import withPublicServices from '../with-public-services'; -import withErrorBoundary from '../with-error-boundary'; +import type { Props as ConceptProps } from '../../components/with-concept'; +import withConcept from '../../components/with-concept'; +import type { Props as DatasetsProps } from '../../components/with-datasets'; +import withDatasets from '../../components/with-datasets'; +import type { Props as InformationModelsProps } from '../../components/with-information-models'; +import withInformationModels from '../../components/with-information-models'; +import type { Props as ConceptsProps } from '../../components/with-concepts'; +import withConcepts from '../../components/with-concepts'; +import type { Props as PublicServicesProps } from '../../components/with-public-services'; +import withPublicServices from '../../components/with-public-services'; +import withErrorBoundary from '../../components/with-error-boundary'; import DetailsPage, { ContentSection, KeyValueList, KeyValueListItem -} from '../details-page'; +} from '../../components/details-page'; import ErrorPage from '../error-page'; -import MultiLingualField from '../multilingual-field'; -import type { ItemWithRelationType } from '../relation-list'; -import RelationList from '../relation-list'; +import MultiLingualField from '../../components/multilingual-field'; +import type { ItemWithRelationType } from '../../components/relation-list'; +import RelationList from '../../components/relation-list'; import SC from './styled'; diff --git a/src/components/concept-details-page/styled.ts b/src/pages/concept-details-page/styled.ts similarity index 100% rename from src/components/concept-details-page/styled.ts rename to src/pages/concept-details-page/styled.ts diff --git a/src/components/data-service-details-page/index.tsx b/src/pages/data-service-details-page/index.tsx similarity index 96% rename from src/components/data-service-details-page/index.tsx rename to src/pages/data-service-details-page/index.tsx index fe060b676..db89c00ea 100755 --- a/src/components/data-service-details-page/index.tsx +++ b/src/pages/data-service-details-page/index.tsx @@ -17,30 +17,32 @@ import { themeFDK } from '../../app/theme'; import withDataService, { Props as DataServiceProps -} from '../with-data-service'; +} from '../../components/with-data-service'; import withReferenceData, { Props as ReferenceDataProps -} from '../with-reference-data'; -import withDatasets, { Props as DatasetsProps } from '../with-datasets'; +} from '../../components/with-reference-data'; +import withDatasets, { + Props as DatasetsProps +} from '../../components/with-datasets'; import withInformationModels, { Props as InformationModelsProps -} from '../with-information-models'; -import withErrorBoundary from '../with-error-boundary'; +} from '../../components/with-information-models'; +import withErrorBoundary from '../../components/with-error-boundary'; import DetailsPage, { ContentSection, KeyValueList, KeyValueListItem, InlineList -} from '../details-page'; +} from '../../components/details-page'; import ErrorPage from '../error-page'; -import RelationList from '../relation-list'; +import RelationList from '../../components/relation-list'; import SC from './styled'; import type { Theme } from '../../types'; import { Entity } from '../../types/enums'; -import Markdown from '../markdown'; +import Markdown from '../../components/markdown'; interface RouteParams { dataServiceId: string; diff --git a/src/components/data-service-details-page/styled.ts b/src/pages/data-service-details-page/styled.ts similarity index 100% rename from src/components/data-service-details-page/styled.ts rename to src/pages/data-service-details-page/styled.ts diff --git a/src/components/dataset-details-page/index.tsx b/src/pages/dataset-details-page/index.tsx similarity index 97% rename from src/components/dataset-details-page/index.tsx rename to src/pages/dataset-details-page/index.tsx index 3fafee95e..9f103d889 100755 --- a/src/components/dataset-details-page/index.tsx +++ b/src/pages/dataset-details-page/index.tsx @@ -22,41 +22,51 @@ import { import { themeFDK, themeNAP } from '../../app/theme'; -import withDataset, { Props as DatasetProps } from '../with-dataset'; +import withDataset, { + Props as DatasetProps +} from '../../components/with-dataset'; import withReferenceData, { Props as ReferenceDataProps -} from '../with-reference-data'; -import withConcepts, { Props as ConceptsProps } from '../with-concepts'; -import withDatasets, { Props as DatasetsProps } from '../with-datasets'; +} from '../../components/with-reference-data'; +import withConcepts, { + Props as ConceptsProps +} from '../../components/with-concepts'; +import withDatasets, { + Props as DatasetsProps +} from '../../components/with-datasets'; import withPublicServices, { Props as PublicServicesProps -} from '../with-public-services'; +} from '../../components/with-public-services'; import withDataServices, { Props as DataServicesProps -} from '../with-data-services'; -import withKartverket, { Props as KartverketProps } from '../with-kartverket'; -import withErrorBoundary from '../with-error-boundary'; +} from '../../components/with-data-services'; +import withKartverket, { + Props as KartverketProps +} from '../../components/with-kartverket'; +import withErrorBoundary from '../../components/with-error-boundary'; import DetailsPage, { ContentSection, InlineList, KeyValueList, KeyValueListItem -} from '../details-page'; +} from '../../components/details-page'; import ErrorPage from '../error-page'; -import DatasetDistribution from '../dataset-distribution'; -import RelationList, { ItemWithRelationType } from '../relation-list'; +import DatasetDistribution from '../../components/dataset-distribution'; +import RelationList, { + ItemWithRelationType +} from '../../components/relation-list'; import DownloadIcon from '../../images/icon-download-sm.svg'; import EyeIcon from '../../images/icon-eye.svg'; -import Preview from '../dataset-distribution/components/preview'; +import Preview from '../../components/dataset-distribution/components/preview'; import SC from './styled'; import { Entity } from '../../types/enums'; import { AccessService, Distribution, MediaTypeOrExtent } from '../../types'; -import Markdown from '../markdown'; +import Markdown from '../../components/markdown'; interface RouteParams { datasetId?: string; diff --git a/src/components/dataset-details-page/styled.ts b/src/pages/dataset-details-page/styled.ts similarity index 100% rename from src/components/dataset-details-page/styled.ts rename to src/pages/dataset-details-page/styled.ts diff --git a/src/components/error-page/components/error-400/index.tsx b/src/pages/error-page/components/error-400/index.tsx similarity index 100% rename from src/components/error-page/components/error-400/index.tsx rename to src/pages/error-page/components/error-400/index.tsx diff --git a/src/components/error-page/components/error-400/styled.ts b/src/pages/error-page/components/error-400/styled.ts similarity index 100% rename from src/components/error-page/components/error-400/styled.ts rename to src/pages/error-page/components/error-400/styled.ts diff --git a/src/components/error-page/components/error-500/index.tsx b/src/pages/error-page/components/error-500/index.tsx similarity index 100% rename from src/components/error-page/components/error-500/index.tsx rename to src/pages/error-page/components/error-500/index.tsx diff --git a/src/components/error-page/components/error-500/styled.ts b/src/pages/error-page/components/error-500/styled.ts similarity index 100% rename from src/components/error-page/components/error-500/styled.ts rename to src/pages/error-page/components/error-500/styled.ts diff --git a/src/components/error-page/index.tsx b/src/pages/error-page/index.tsx similarity index 93% rename from src/components/error-page/index.tsx rename to src/pages/error-page/index.tsx index be610aaf3..82421fcbb 100644 --- a/src/components/error-page/index.tsx +++ b/src/pages/error-page/index.tsx @@ -8,8 +8,8 @@ import Error400 from './components/error-400'; import Error500 from './components/error-500'; import SC from './styled'; -import Header from '../header'; -import Footer from '../footer'; +import Header from '../../components/header'; +import Footer from '../../components/footer'; interface Props { errorCode?: string; diff --git a/src/components/error-page/styled.ts b/src/pages/error-page/styled.ts similarity index 100% rename from src/components/error-page/styled.ts rename to src/pages/error-page/styled.ts diff --git a/src/components/event-details-page/index.tsx b/src/pages/event-details-page/index.tsx similarity index 94% rename from src/components/event-details-page/index.tsx rename to src/pages/event-details-page/index.tsx index 0790ef425..c5f5e0a27 100644 --- a/src/components/event-details-page/index.tsx +++ b/src/pages/event-details-page/index.tsx @@ -11,26 +11,28 @@ import { dateStringToDate, formatDate } from '../../lib/date-utils'; import { themeFDK } from '../../app/theme'; -import withEvent, { Props as EventProps } from '../with-event'; +import withEvent, { Props as EventProps } from '../../components/with-event'; import withPublicServices, { Props as PublicServicesProps -} from '../with-public-services'; -import withErrorBoundary from '../with-error-boundary'; +} from '../../components/with-public-services'; +import withErrorBoundary from '../../components/with-error-boundary'; import DetailsPage, { ContentSection, KeyValueList, KeyValueListItem -} from '../details-page'; +} from '../../components/details-page'; import ErrorPage from '../error-page'; -import RelationList, { ItemWithRelationType } from '../relation-list'; +import RelationList, { + ItemWithRelationType +} from '../../components/relation-list'; import type { Theme } from '../../types'; import { Entity, SpecializedEventType } from '../../types/enums'; import { PATHNAME_PUBLIC_SERVICES } from '../../constants/constants'; import SC from './styled'; -import Markdown from '../markdown'; +import Markdown from '../../components/markdown'; interface RouteParams { eventId: string; diff --git a/src/components/event-details-page/styled.ts b/src/pages/event-details-page/styled.ts similarity index 100% rename from src/components/event-details-page/styled.ts rename to src/pages/event-details-page/styled.ts diff --git a/src/components/information-model-details-page/index.tsx b/src/pages/information-model-details-page/index.tsx similarity index 98% rename from src/components/information-model-details-page/index.tsx rename to src/pages/information-model-details-page/index.tsx index 64add3e3b..30cf1d9b2 100755 --- a/src/components/information-model-details-page/index.tsx +++ b/src/pages/information-model-details-page/index.tsx @@ -18,33 +18,37 @@ import { themeFDK } from '../../app/theme'; import withInformationModel, { Props as InformationModelProps -} from '../with-information-model'; -import withConcepts, { Props as ConceptsProps } from '../with-concepts'; +} from '../../components/with-information-model'; +import withConcepts, { + Props as ConceptsProps +} from '../../components/with-concepts'; import withInformationModels, { Props as InformationModelsProps -} from '../with-information-models'; -import withDatasets, { Props as DatasetProps } from '../with-datasets'; +} from '../../components/with-information-models'; +import withDatasets, { + Props as DatasetProps +} from '../../components/with-datasets'; import withDataServices, { Props as DataServicesProps -} from '../with-data-services'; -import withErrorBoundary from '../with-error-boundary'; +} from '../../components/with-data-services'; +import withErrorBoundary from '../../components/with-error-boundary'; import DetailsPage, { ContentSection, InlineList, KeyValueList, KeyValueListItem -} from '../details-page'; +} from '../../components/details-page'; import ErrorPage from '../error-page'; -import InfoModelStructure from '../infomodel-structure'; -import RelationList from '../relation-list'; +import InfoModelStructure from '../../components/infomodel-structure'; +import RelationList from '../../components/relation-list'; import SC from './styled'; import type { InformationModel } from '../../types'; import { Entity, DataFormat } from '../../types/enums'; import { getConfig } from '../../config'; -import Markdown from '../markdown'; +import Markdown from '../../components/markdown'; interface RouteParams { informationModelId: string; diff --git a/src/components/information-model-details-page/styled.ts b/src/pages/information-model-details-page/styled.ts similarity index 100% rename from src/components/information-model-details-page/styled.ts rename to src/pages/information-model-details-page/styled.ts diff --git a/src/pages/news-archive-page/news-archive-page.ts b/src/pages/news-archive-page/news-archive-page.ts index be9e67af9..a598c3040 100644 --- a/src/pages/news-archive-page/news-archive-page.ts +++ b/src/pages/news-archive-page/news-archive-page.ts @@ -3,7 +3,7 @@ import { compose } from 'redux'; import NewsArchivePagePure from './news-archive-page-pure'; import { newsArchivePageResolver } from './news-archive-page-resolver'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import withErrorBoundary from '../../components/with-error-boundary'; const enhance = compose(newsArchivePageResolver, withErrorBoundary(ErrorPage)); diff --git a/src/pages/news-article-page-v2/news-article-page.tsx b/src/pages/news-article-page-v2/news-article-page.tsx index 13daac9d3..d210f38dd 100644 --- a/src/pages/news-article-page-v2/news-article-page.tsx +++ b/src/pages/news-article-page-v2/news-article-page.tsx @@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom'; import { compose } from 'redux'; import Moment from 'react-moment'; import { useGetArticleQuery } from '../../api/generated/cms/graphql'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import withErrorBoundary from '../../components/with-error-boundary'; import localization from '../../lib/localization'; // import Article from '../../components/article/components/article/article.component'; diff --git a/src/pages/news-article-page/news-article-page.ts b/src/pages/news-article-page/news-article-page.ts index a888b2730..960a92516 100644 --- a/src/pages/news-article-page/news-article-page.ts +++ b/src/pages/news-article-page/news-article-page.ts @@ -2,7 +2,7 @@ import { compose } from 'redux'; import NewsArticlePure from './news-article-page-pure'; import { newsArticlePageResolver } from './news-article-page-resolver'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; import withErrorBoundary from '../../components/with-error-boundary'; const enhance = compose(newsArticlePageResolver, withErrorBoundary(ErrorPage)); diff --git a/src/pages/organizations/pages/dataset-page/index.tsx b/src/pages/organizations/pages/dataset-page/index.tsx index 62f0c88d6..0e3710ae9 100755 --- a/src/pages/organizations/pages/dataset-page/index.tsx +++ b/src/pages/organizations/pages/dataset-page/index.tsx @@ -25,7 +25,7 @@ import type { Props as DatasetScoresProps } from '../../../../components/with-da import withOrganization from '../../../../components/with-organization'; import type { Props as OrganizationProps } from '../../../../components/with-organization'; import withErrorBoundary from '../../../../components/with-error-boundary'; -import ErrorPage from '../../../../components/error-page'; +import ErrorPage from '../../../error-page'; import SC from './styled'; diff --git a/src/pages/organizations/pages/datasets-page/index.tsx b/src/pages/organizations/pages/datasets-page/index.tsx index 1c8a0c5fb..2236833ca 100755 --- a/src/pages/organizations/pages/datasets-page/index.tsx +++ b/src/pages/organizations/pages/datasets-page/index.tsx @@ -14,7 +14,7 @@ import withOrganization, { Props as OrganizationProps } from '../../../../components/with-organization'; import withErrorBoundary from '../../../../components/with-error-boundary'; -import ErrorPage from '../../../../components/error-page'; +import ErrorPage from '../../../error-page'; import { getTranslateText as translate } from '../../../../lib/translateText'; import translations from '../../../../lib/localization'; diff --git a/src/pages/organizations/pages/organization-page/index.tsx b/src/pages/organizations/pages/organization-page/index.tsx index 2bb2a59a0..594885496 100755 --- a/src/pages/organizations/pages/organization-page/index.tsx +++ b/src/pages/organizations/pages/organization-page/index.tsx @@ -14,7 +14,7 @@ import withReport, { Props as ReportProps } from '../../../../components/with-report'; import withErrorBoundary from '../../../../components/with-error-boundary'; -import ErrorPage from '../../../../components/error-page'; +import ErrorPage from '../../../error-page'; import { getTranslateText as translate } from '../../../../lib/translateText'; import translations from '../../../../lib/localization'; diff --git a/src/pages/organizations/pages/organizations-page/index.tsx b/src/pages/organizations/pages/organizations-page/index.tsx index 13477f44a..4ea07e23b 100755 --- a/src/pages/organizations/pages/organizations-page/index.tsx +++ b/src/pages/organizations/pages/organizations-page/index.tsx @@ -18,7 +18,7 @@ import withOrganizationCategories, { import Spinner from '../../../../components/spinner'; import withErrorBoundary from '../../../../components/with-error-boundary'; -import ErrorPage from '../../../../components/error-page'; +import ErrorPage from '../../../error-page'; import SC from './styled'; diff --git a/src/components/public-service-details-page/index.tsx b/src/pages/public-service-details-page/index.tsx similarity index 98% rename from src/components/public-service-details-page/index.tsx rename to src/pages/public-service-details-page/index.tsx index 175016fd7..60331cb36 100644 --- a/src/components/public-service-details-page/index.tsx +++ b/src/pages/public-service-details-page/index.tsx @@ -17,15 +17,21 @@ import { themeFDK } from '../../app/theme'; import withPublicService, { Props as PublicServiceProps -} from '../with-public-service'; +} from '../../components/with-public-service'; import withPublicServices, { Props as PublicServicesProps -} from '../with-public-services'; -import withConcepts, { Props as ConceptsProps } from '../with-concepts'; -import withDatasets, { Props as DatasetsProps } from '../with-datasets'; -import withEvents, { Props as EventsProps } from '../with-events'; -import withKartverket, { Props as KartverketProps } from '../with-kartverket'; -import withErrorBoundary from '../with-error-boundary'; +} from '../../components/with-public-services'; +import withConcepts, { + Props as ConceptsProps +} from '../../components/with-concepts'; +import withDatasets, { + Props as DatasetsProps +} from '../../components/with-datasets'; +import withEvents, { Props as EventsProps } from '../../components/with-events'; +import withKartverket, { + Props as KartverketProps +} from '../../components/with-kartverket'; +import withErrorBoundary from '../../components/with-error-boundary'; import DetailsPage, { CatalogTypeBox, @@ -34,9 +40,11 @@ import DetailsPage, { List, KeyValueList, KeyValueListItem -} from '../details-page'; +} from '../../components/details-page'; import ErrorPage from '../error-page'; -import RelationList, { ItemWithRelationType } from '../relation-list'; +import RelationList, { + ItemWithRelationType +} from '../../components/relation-list'; import type { TextLanguage, Theme } from '../../types'; import { Entity, Vocabulary } from '../../types/enums'; @@ -49,7 +57,7 @@ import { PATHNAME_PUBLIC_SERVICES_AND_EVENTS } from '../../constants/constants'; import SC from './styled'; -import Markdown from '../markdown'; +import Markdown from '../../components/markdown'; interface RouteParams { publicServiceId: string; diff --git a/src/components/public-service-details-page/styled.ts b/src/pages/public-service-details-page/styled.ts similarity index 100% rename from src/components/public-service-details-page/styled.ts rename to src/pages/public-service-details-page/styled.ts diff --git a/src/pages/report-page/report-page.ts b/src/pages/report-page/report-page.ts index 183db179b..e8422d354 100644 --- a/src/pages/report-page/report-page.ts +++ b/src/pages/report-page/report-page.ts @@ -4,7 +4,7 @@ import { ReportPagePure } from './report-page-pure'; import { reportPageConnector } from './report-page-connector'; import { reportPageResolver } from './report-page-resolver'; import withErrorBoundary from '../../components/with-error-boundary'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; const enhance = compose( reportPageConnector, diff --git a/src/pages/search-page/search-page.ts b/src/pages/search-page/search-page.ts index 3a6ada58a..fba6e41c8 100644 --- a/src/pages/search-page/search-page.ts +++ b/src/pages/search-page/search-page.ts @@ -5,7 +5,7 @@ import { searchPageConnector } from './search-page-connector'; import { searchPageResolver } from './search-page-resolver'; import withErrorBoundary from '../../components/with-error-boundary'; -import ErrorPage from '../../components/error-page'; +import ErrorPage from '../error-page'; const enhance = compose( searchPageResolver, diff --git a/src/components/sparql-page/index.tsx b/src/pages/sparql-page/index.tsx similarity index 100% rename from src/components/sparql-page/index.tsx rename to src/pages/sparql-page/index.tsx diff --git a/src/components/sparql-page/styled.ts b/src/pages/sparql-page/styled.ts similarity index 100% rename from src/components/sparql-page/styled.ts rename to src/pages/sparql-page/styled.ts