diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a47b97a91e10..6caaa1782adf 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -14,7 +14,7 @@ /apps/application-system/ @island-is/norda-applications /apps/web*/ @island-is/juni @island-is/stefna /libs/application/ @island-is/norda-applications -/libs/service-portal/ @island-is/hugsmidjan +/libs/portals/my-pages/ @island-is/hugsmidjan /libs/portals/admin/ @island-is/aranja /libs/portals/core/ @island-is/aranja @island-is/hugsmidjan /libs/shared/connected/ @island-is/stefna @@ -36,13 +36,13 @@ /libs/clients/rsk/ @island-is/juni /libs/clients/zendesk/ @island-is/juni /libs/icelandic-names-registry/ @island-is/juni -/libs/service-portal/petitions/ @island-is/juni -/libs/service-portal/signature-collection/ @island-is/juni -/libs/service-portal/education/ @island-is/juni @island-is/hugsmidjan -/libs/service-portal/education-career/ @island-is/juni @island-is/hugsmidjan -/libs/service-portal/education-degree/ @island-is/juni @island-is/hugsmidjan -/libs/service-portal/education-license/ @island-is/juni @island-is/hugsmidjan -/libs/service-portal/education-student-assessment/ @island-is/juni @island-is/norda @island-is/hugsmidjan +/libs/portals/my-pages/petitions/ @island-is/juni +/libs/portals/my-pages/signature-collection/ @island-is/juni +/libs/portals/my-pages/education/ @island-is/juni @island-is/hugsmidjan +/libs/portals/my-pages/education-career/ @island-is/juni @island-is/hugsmidjan +/libs/portals/my-pages/education-degree/ @island-is/juni @island-is/hugsmidjan +/libs/portals/my-pages/education-license/ @island-is/juni @island-is/hugsmidjan +/libs/portals/my-pages/education-student-assessment/ @island-is/juni @island-is/norda @island-is/hugsmidjan /libs/clients/driving-license/ @island-is/juni /libs/clients/judicial-administration/ @island-is/juni /libs/application/templates/announcement-of-death/ @island-is/juni @@ -104,9 +104,9 @@ libs/clients/rsk/relationships/ /libs/clients/sessions @island-is/aranja /libs/portals/shared-modules/delegations @island-is/aranja /libs/portals/admin/ids-admin @island-is/aranja -/libs/service-portal/consent @island-is/aranja -/libs/service-portal/restrictions @island-is/aranja -/libs/service-portal/sessions @island-is/aranja +/libs/portals/my-pages/consent @island-is/aranja +/libs/portals/my-pages/restrictions @island-is/aranja +/libs/portals/my-pages/sessions @island-is/aranja /apps/native/app/ @island-is/aranja-app codemagic.yaml @island-is/aranja-app /apps/web/public/.well-known/ @island-is/aranja-app @@ -230,7 +230,7 @@ codemagic.yaml /libs/application/template-api-modules/src/lib/modules/templates/data-protection-complaint/ @island-is/norda /libs/shared/form-fields/ @island-is/norda @island-is/island-ui -/libs/service-portal/applications/ @island-is/norda-applications +/libs/portals/my-pages/applications/ @island-is/norda-applications /libs/portals/admin/application-system/ @island-is/norda-applications /libs/api/domains/application/ @island-is/norda-applications /libs/api/domains/payment/ @island-is/norda-applications diff --git a/apps/portals/my-pages/src/app/App.tsx b/apps/portals/my-pages/src/app/App.tsx index c1cb0c1ec286..1d16f6f017dc 100644 --- a/apps/portals/my-pages/src/app/App.tsx +++ b/apps/portals/my-pages/src/app/App.tsx @@ -1,9 +1,9 @@ import { AuthProvider } from '@island.is/auth/react' import { ApolloProvider } from '@apollo/client' -import { client } from '@island.is/service-portal/graphql' +import { client } from '@island.is/portals/my-pages/graphql' import { LocaleProvider } from '@island.is/localization' import { defaultLanguage } from '@island.is/shared/constants' -import { ServicePortalPaths } from '@island.is/service-portal/core' +import { ServicePortalPaths } from '@island.is/portals/my-pages/core' import { FeatureFlagProvider } from '@island.is/react/feature-flags' import { ApplicationErrorBoundary, PortalRouter } from '@island.is/portals/core' import { modules } from '../lib/modules' diff --git a/apps/portals/my-pages/src/components/AlertBanners/Banners.css.ts b/apps/portals/my-pages/src/components/AlertBanners/Banners.css.ts index eae5006bd1ec..2a99ee2a633f 100644 --- a/apps/portals/my-pages/src/components/AlertBanners/Banners.css.ts +++ b/apps/portals/my-pages/src/components/AlertBanners/Banners.css.ts @@ -1,4 +1,4 @@ -import { zIndex } from '@island.is/service-portal/constants' +import { zIndex } from '@island.is/portals/my-pages/constants' import { style } from '@vanilla-extract/css' export const container = style({ diff --git a/apps/portals/my-pages/src/components/AlertBanners/GlobalAlertBannerSection.tsx b/apps/portals/my-pages/src/components/AlertBanners/GlobalAlertBannerSection.tsx index b3a172e1f33b..944c06353f42 100644 --- a/apps/portals/my-pages/src/components/AlertBanners/GlobalAlertBannerSection.tsx +++ b/apps/portals/my-pages/src/components/AlertBanners/GlobalAlertBannerSection.tsx @@ -1,7 +1,7 @@ import Cookies from 'js-cookie' import { AlertBanner, Box, Stack } from '@island.is/island-ui/core' import { AlertBannerVariants } from '@island.is/island-ui/core' -import { AlertBannerType } from '@island.is/service-portal/graphql' +import { AlertBannerType } from '@island.is/portals/my-pages/graphql' import { forwardRef } from 'react' import * as styles from './Banners.css' diff --git a/apps/portals/my-pages/src/components/ContentBreadcrumbs/ContentBreadcrumbs.tsx b/apps/portals/my-pages/src/components/ContentBreadcrumbs/ContentBreadcrumbs.tsx index 58f9ea47b936..24ab3d75554b 100644 --- a/apps/portals/my-pages/src/components/ContentBreadcrumbs/ContentBreadcrumbs.tsx +++ b/apps/portals/my-pages/src/components/ContentBreadcrumbs/ContentBreadcrumbs.tsx @@ -13,7 +13,7 @@ import { ServicePortalNavigationItem, m, useDynamicRoutesWithNavigation, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { theme } from '@island.is/island-ui/theme' import { isDefined } from '@island.is/shared/utils' diff --git a/apps/portals/my-pages/src/components/DocumentsEmpty/DocumentsEmpty.tsx b/apps/portals/my-pages/src/components/DocumentsEmpty/DocumentsEmpty.tsx index 545cfa65235c..3694411935a3 100644 --- a/apps/portals/my-pages/src/components/DocumentsEmpty/DocumentsEmpty.tsx +++ b/apps/portals/my-pages/src/components/DocumentsEmpty/DocumentsEmpty.tsx @@ -1,6 +1,6 @@ import { Box, Icon, Text } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import * as styles from './DocumentsEmpty.css' interface Props { diff --git a/apps/portals/my-pages/src/components/Greeting/Greeting.tsx b/apps/portals/my-pages/src/components/Greeting/Greeting.tsx index 5325a33704ae..39c3afdf4d14 100644 --- a/apps/portals/my-pages/src/components/Greeting/Greeting.tsx +++ b/apps/portals/my-pages/src/components/Greeting/Greeting.tsx @@ -9,7 +9,7 @@ import { } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' import { useAuth } from '@island.is/auth/react' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import * as styles from './Greeting.css' const Greeting: FC> = () => { diff --git a/apps/portals/my-pages/src/components/Header/Header.css.ts b/apps/portals/my-pages/src/components/Header/Header.css.ts index 26bd5a447b7f..bc620e2873b1 100644 --- a/apps/portals/my-pages/src/components/Header/Header.css.ts +++ b/apps/portals/my-pages/src/components/Header/Header.css.ts @@ -3,7 +3,7 @@ import { SERVICE_PORTAL_HEADER_HEIGHT_LG, SERVICE_PORTAL_HEADER_HEIGHT_SM, zIndex, -} from '@island.is/service-portal/constants' +} from '@island.is/portals/my-pages/constants' import { theme, themeUtils } from '@island.is/island-ui/theme' export const header = style({ diff --git a/apps/portals/my-pages/src/components/Header/Header.tsx b/apps/portals/my-pages/src/components/Header/Header.tsx index f3d09e9f596d..e8b8485f2ba1 100644 --- a/apps/portals/my-pages/src/components/Header/Header.tsx +++ b/apps/portals/my-pages/src/components/Header/Header.tsx @@ -17,8 +17,8 @@ import { LinkResolver, ServicePortalPaths, m, -} from '@island.is/service-portal/core' -import { DocumentsPaths } from '@island.is/service-portal/documents' +} from '@island.is/portals/my-pages/core' +import { DocumentsPaths } from '@island.is/portals/my-pages/documents' import { UserLanguageSwitcher, UserMenu } from '@island.is/shared/components' import { useEffect, useRef, useState } from 'react' import { Link } from 'react-router-dom' diff --git a/apps/portals/my-pages/src/components/Layout/FullWidthLayout.tsx b/apps/portals/my-pages/src/components/Layout/FullWidthLayout.tsx index fccf3c39bd76..72cf6d83093c 100644 --- a/apps/portals/my-pages/src/components/Layout/FullWidthLayout.tsx +++ b/apps/portals/my-pages/src/components/Layout/FullWidthLayout.tsx @@ -11,17 +11,20 @@ import { m, ModuleAlertBannerSection, TabNavigation, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import * as styles from './Layout.css' import { useLocale } from '@island.is/localization' import { PortalNavigationItem } from '@island.is/portals/core' -import { IntroHeader, ServicePortalPaths } from '@island.is/service-portal/core' +import { + IntroHeader, + ServicePortalPaths, +} from '@island.is/portals/my-pages/core' import { Link, matchPath, useNavigate } from 'react-router-dom' -import { DocumentsPaths } from '@island.is/service-portal/documents' +import { DocumentsPaths } from '@island.is/portals/my-pages/documents' import { theme } from '@island.is/island-ui/theme' import { useAuth } from '@island.is/auth/react' import { DocumentsScope } from '@island.is/auth/scopes' -import { FinancePaths } from '@island.is/service-portal/finance' +import { FinancePaths } from '@island.is/portals/my-pages/finance' interface FullWidthLayoutWrapperProps { activeParent?: PortalNavigationItem diff --git a/apps/portals/my-pages/src/components/Layout/Layout.tsx b/apps/portals/my-pages/src/components/Layout/Layout.tsx index 7a206e81bc33..ca3a4305e99f 100644 --- a/apps/portals/my-pages/src/components/Layout/Layout.tsx +++ b/apps/portals/my-pages/src/components/Layout/Layout.tsx @@ -5,9 +5,9 @@ import AuthOverlay from '../Loaders/AuthOverlay/AuthOverlay' import { useLocation } from 'react-router-dom' import { useNamespaces } from '@island.is/localization' import { GlobalAlertBannerSection } from '../AlertBanners/GlobalAlertBannerSection' -import { useAlertBanners } from '@island.is/service-portal/graphql' +import { useAlertBanners } from '@island.is/portals/my-pages/graphql' import { useMeasure } from 'react-use' -import { useDynamicRoutesWithNavigation } from '@island.is/service-portal/core' +import { useDynamicRoutesWithNavigation } from '@island.is/portals/my-pages/core' import { useActiveModule } from '@island.is/portals/core' import { MAIN_NAVIGATION } from '../../lib/masterNavigation' import FullWidthLayout from './FullWidthLayout' diff --git a/apps/portals/my-pages/src/components/Layout/NarrowLayout.tsx b/apps/portals/my-pages/src/components/Layout/NarrowLayout.tsx index b72361f0bb58..27c139af7ec7 100644 --- a/apps/portals/my-pages/src/components/Layout/NarrowLayout.tsx +++ b/apps/portals/my-pages/src/components/Layout/NarrowLayout.tsx @@ -11,7 +11,7 @@ import { ServicePortalNavigationItem, ModuleAlertBannerSection, GoBack, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale } from '@island.is/localization' import { useWindowSize } from 'react-use' import SidebarLayout from './SidebarLayout' diff --git a/apps/portals/my-pages/src/components/Layout/SidebarLayout.css.ts b/apps/portals/my-pages/src/components/Layout/SidebarLayout.css.ts index 705bf8d9cfb4..0d28ae9366e2 100644 --- a/apps/portals/my-pages/src/components/Layout/SidebarLayout.css.ts +++ b/apps/portals/my-pages/src/components/Layout/SidebarLayout.css.ts @@ -1,6 +1,6 @@ import { style } from '@vanilla-extract/css' import { theme, themeUtils } from '@island.is/island-ui/theme' -import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/service-portal/constants' +import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/portals/my-pages/constants' const top = SERVICE_PORTAL_HEADER_HEIGHT_LG const sidebarWidth = { desktop: '318px', diff --git a/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.css.ts b/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.css.ts index 077e8edc9a6a..59bbb37b3ab7 100644 --- a/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.css.ts +++ b/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.css.ts @@ -1,5 +1,5 @@ import { keyframes, style } from '@vanilla-extract/css' -import { zIndex } from '@island.is/service-portal/constants' +import { zIndex } from '@island.is/portals/my-pages/constants' const overlayAnimation = keyframes({ '0%': { diff --git a/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.tsx b/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.tsx index 1765e5493fcd..b7cafb6566e7 100644 --- a/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.tsx +++ b/apps/portals/my-pages/src/components/Loaders/AuthOverlay/AuthOverlay.tsx @@ -1,7 +1,7 @@ import { useAuth } from '@island.is/auth/react' import { Text } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import * as styles from './AuthOverlay.css' diff --git a/apps/portals/my-pages/src/components/Notifications/NotificationButton.tsx b/apps/portals/my-pages/src/components/Notifications/NotificationButton.tsx index 0657c6a1bb5b..2e1607afe955 100644 --- a/apps/portals/my-pages/src/components/Notifications/NotificationButton.tsx +++ b/apps/portals/my-pages/src/components/Notifications/NotificationButton.tsx @@ -4,14 +4,14 @@ import { Box, Button } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' import { theme } from '@island.is/island-ui/theme' import { useWindowSize } from 'react-use' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import NotificationMenu from './NotificationMenu' import { MenuTypes } from '../Header/Header' import * as styles from './Notifications.css' import { useGetUserNotificationsOverviewQuery, useMarkAllNotificationsAsSeenMutation, -} from '@island.is/service-portal/information' +} from '@island.is/portals/my-pages/information' interface Props { setMenuState: (val: MenuTypes) => void diff --git a/apps/portals/my-pages/src/components/Notifications/NotificationLine.tsx b/apps/portals/my-pages/src/components/Notifications/NotificationLine.tsx index bb1dde899f58..3eaa46afa5ce 100644 --- a/apps/portals/my-pages/src/components/Notifications/NotificationLine.tsx +++ b/apps/portals/my-pages/src/components/Notifications/NotificationLine.tsx @@ -1,7 +1,7 @@ import { FC, useRef } from 'react' import { Box, Text } from '@island.is/island-ui/core' import { dateFormat } from '@island.is/shared/constants' -import { LinkResolver } from '@island.is/service-portal/core' +import { LinkResolver } from '@island.is/portals/my-pages/core' import format from 'date-fns/format' import cn from 'classnames' import * as styles from './Notifications.css' @@ -10,11 +10,11 @@ import { NotificationMetadata, NotificationSender, } from '@island.is/api/schema' -import { AvatarImage } from '@island.is/service-portal/documents' +import { AvatarImage } from '@island.is/portals/my-pages/documents' import { COAT_OF_ARMS, resolveLink, -} from '@island.is/service-portal/information' +} from '@island.is/portals/my-pages/information' interface Props { data: { diff --git a/apps/portals/my-pages/src/components/Notifications/NotificationMenu.tsx b/apps/portals/my-pages/src/components/Notifications/NotificationMenu.tsx index 35806e33d7d4..ea2789d48ba9 100644 --- a/apps/portals/my-pages/src/components/Notifications/NotificationMenu.tsx +++ b/apps/portals/my-pages/src/components/Notifications/NotificationMenu.tsx @@ -8,16 +8,16 @@ import { ModalBase, Text, } from '@island.is/island-ui/core' -import { LinkResolver } from '@island.is/service-portal/core' +import { LinkResolver } from '@island.is/portals/my-pages/core' import { GetUserNotificationsOverviewQuery, InformationPaths, -} from '@island.is/service-portal/information' +} from '@island.is/portals/my-pages/information' import { sharedMessages } from '@island.is/shared/translations' import { useLocale, useNamespaces } from '@island.is/localization' import { theme } from '@island.is/island-ui/theme' import { useWindowSize } from 'react-use' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import NotificationLine from './NotificationLine' import cn from 'classnames' import * as styles from './Notifications.css' diff --git a/apps/portals/my-pages/src/components/Root.tsx b/apps/portals/my-pages/src/components/Root.tsx index fcaf9bd95991..042190c38607 100644 --- a/apps/portals/my-pages/src/components/Root.tsx +++ b/apps/portals/my-pages/src/components/Root.tsx @@ -1,7 +1,7 @@ import { Suspense } from 'react' import { Outlet } from 'react-router-dom' import { UserProfileLocale } from '@island.is/shared/components' -import { UserOnboarding } from '@island.is/service-portal/information' +import { UserOnboarding } from '@island.is/portals/my-pages/information' import { Layout } from './Layout/Layout' export const Root = () => ( diff --git a/apps/portals/my-pages/src/components/Sidemenu/Sidemenu.tsx b/apps/portals/my-pages/src/components/Sidemenu/Sidemenu.tsx index ae17b9dc87c5..1a1833d16522 100644 --- a/apps/portals/my-pages/src/components/Sidemenu/Sidemenu.tsx +++ b/apps/portals/my-pages/src/components/Sidemenu/Sidemenu.tsx @@ -10,7 +10,7 @@ import { import { ServicePortalPaths, useDynamicRoutesWithNavigation, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import * as styles from './Sidemenu.css' import { sharedMessages } from '@island.is/shared/translations' import { useLocale, useNamespaces } from '@island.is/localization' @@ -19,7 +19,7 @@ import { theme } from '@island.is/island-ui/theme' import { useWindowSize } from 'react-use' import cn from 'classnames' import SidemenuItem from './SidemenuItem' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' interface Props { setSideMenuOpen: (status: boolean) => void diff --git a/apps/portals/my-pages/src/components/Sticky/Sticky.tsx b/apps/portals/my-pages/src/components/Sticky/Sticky.tsx index 96d16c5a6c70..436aa0f03de2 100644 --- a/apps/portals/my-pages/src/components/Sticky/Sticky.tsx +++ b/apps/portals/my-pages/src/components/Sticky/Sticky.tsx @@ -7,7 +7,7 @@ import React, { useState, } from 'react' import { theme } from '@island.is/island-ui/theme' -import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/service-portal/constants' +import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/portals/my-pages/constants' interface Props { top?: number constantSticky?: boolean diff --git a/apps/portals/my-pages/src/lib/masterNavigation.ts b/apps/portals/my-pages/src/lib/masterNavigation.ts index 2193cbcb9d64..2ef2405e6932 100644 --- a/apps/portals/my-pages/src/lib/masterNavigation.ts +++ b/apps/portals/my-pages/src/lib/masterNavigation.ts @@ -1,28 +1,28 @@ import { PortalNavigationItem, m } from '@island.is/portals/core' -import { restrictionsNavigation } from '@island.is/service-portal/restrictions' -import { documentsNavigation } from '@island.is/service-portal/documents' -import { financeNavigation } from '@island.is/service-portal/finance' -import { applicationsNavigation } from '@island.is/service-portal/applications' -import { assetsNavigation } from '@island.is/service-portal/assets' -import { educationNavigation } from '@island.is/service-portal/education' +import { restrictionsNavigation } from '@island.is/portals/my-pages/restrictions' +import { documentsNavigation } from '@island.is/portals/my-pages/documents' +import { financeNavigation } from '@island.is/portals/my-pages/finance' +import { applicationsNavigation } from '@island.is/portals/my-pages/applications' +import { assetsNavigation } from '@island.is/portals/my-pages/assets' +import { educationNavigation } from '@island.is/portals/my-pages/education' import { companyNavigation, informationNavigation, -} from '@island.is/service-portal/information' -import { licenseNavigation } from '@island.is/service-portal/licenses' -import { occupationalLicensesNavigation } from '@island.is/service-portal/occupational-licenses' -import { airDiscountNavigation } from '@island.is/service-portal/air-discount' -import { healthNavigation } from '@island.is/service-portal/health' +} from '@island.is/portals/my-pages/information' +import { licenseNavigation } from '@island.is/portals/my-pages/licenses' +import { occupationalLicensesNavigation } from '@island.is/portals/my-pages/occupational-licenses' +import { airDiscountNavigation } from '@island.is/portals/my-pages/air-discount' +import { healthNavigation } from '@island.is/portals/my-pages/health' import { delegationsNavigation, delegationsNavigationChildren, } from '@island.is/portals/shared-modules/delegations' -import { sessionsNavigation } from '@island.is/service-portal/sessions' -import { consentNavigation } from '@island.is/service-portal/consent' -import { ServicePortalPaths } from '@island.is/service-portal/core' -import { socialInsuranceMaintenanceNavigation } from '@island.is/service-portal/social-insurance-maintenance' -import { lawAndOrderNavigation } from '@island.is/service-portal/law-and-order' -import { companySignatureCollectionNavigation } from '@island.is/service-portal/signature-collection' +import { sessionsNavigation } from '@island.is/portals/my-pages/sessions' +import { consentNavigation } from '@island.is/portals/my-pages/consent' +import { ServicePortalPaths } from '@island.is/portals/my-pages/core' +import { socialInsuranceMaintenanceNavigation } from '@island.is/portals/my-pages/social-insurance-maintenance' +import { lawAndOrderNavigation } from '@island.is/portals/my-pages/law-and-order' +import { companySignatureCollectionNavigation } from '@island.is/portals/my-pages/signature-collection' export const rootNavigationItem: PortalNavigationItem = { name: m.overview, diff --git a/apps/portals/my-pages/src/lib/modules.ts b/apps/portals/my-pages/src/lib/modules.ts index abffbe74fa5e..f30d98327298 100644 --- a/apps/portals/my-pages/src/lib/modules.ts +++ b/apps/portals/my-pages/src/lib/modules.ts @@ -1,25 +1,25 @@ import { PortalModule } from '@island.is/portals/core' -import { restrictionsModule } from '@island.is/service-portal/restrictions' -import { sessionsModule } from '@island.is/service-portal/sessions' -import { applicationsModule } from '@island.is/service-portal/applications' -import { assetsModule } from '@island.is/service-portal/assets' -import { documentsModule } from '@island.is/service-portal/documents' -import { educationModule } from '@island.is/service-portal/education' -import { educationCareerModule } from '@island.is/service-portal/education-career' -import { educationStudentAssessmentModule } from '@island.is/service-portal/education-student-assessment' -import { financeModule } from '@island.is/service-portal/finance' -import { petitionsModule } from '@island.is/service-portal/petitions' -import { informationModule } from '@island.is/service-portal/information' -import { licensesModule } from '@island.is/service-portal/licenses' -import { airDiscountModule } from '@island.is/service-portal/air-discount' +import { restrictionsModule } from '@island.is/portals/my-pages/restrictions' +import { sessionsModule } from '@island.is/portals/my-pages/sessions' +import { applicationsModule } from '@island.is/portals/my-pages/applications' +import { assetsModule } from '@island.is/portals/my-pages/assets' +import { documentsModule } from '@island.is/portals/my-pages/documents' +import { educationModule } from '@island.is/portals/my-pages/education' +import { educationCareerModule } from '@island.is/portals/my-pages/education-career' +import { educationStudentAssessmentModule } from '@island.is/portals/my-pages/education-student-assessment' +import { financeModule } from '@island.is/portals/my-pages/finance' +import { petitionsModule } from '@island.is/portals/my-pages/petitions' +import { informationModule } from '@island.is/portals/my-pages/information' +import { licensesModule } from '@island.is/portals/my-pages/licenses' +import { airDiscountModule } from '@island.is/portals/my-pages/air-discount' import { delegationsModule } from '@island.is/portals/shared-modules/delegations' -import { healthModule } from '@island.is/service-portal/health' +import { healthModule } from '@island.is/portals/my-pages/health' import { indexModule } from '../screens/Dashboard/module' -import { consentModule } from '@island.is/service-portal/consent' -import { occupationalLicensesModule } from '@island.is/service-portal/occupational-licenses' -import { signatureCollectionModule } from '@island.is/service-portal/signature-collection' -import { socialInsuranceMaintenanceModule } from '@island.is/service-portal/social-insurance-maintenance' -import { lawAndOrderModule } from '@island.is/service-portal/law-and-order' +import { consentModule } from '@island.is/portals/my-pages/consent' +import { occupationalLicensesModule } from '@island.is/portals/my-pages/occupational-licenses' +import { signatureCollectionModule } from '@island.is/portals/my-pages/signature-collection' +import { socialInsuranceMaintenanceModule } from '@island.is/portals/my-pages/social-insurance-maintenance' +import { lawAndOrderModule } from '@island.is/portals/my-pages/law-and-order' /** * NOTE: diff --git a/apps/portals/my-pages/src/screens/Dashboard/Dashboard.tsx b/apps/portals/my-pages/src/screens/Dashboard/Dashboard.tsx index 4dcec472ff69..51261316bca3 100644 --- a/apps/portals/my-pages/src/screens/Dashboard/Dashboard.tsx +++ b/apps/portals/my-pages/src/screens/Dashboard/Dashboard.tsx @@ -18,21 +18,21 @@ import { DocumentLine, DocumentLineV3, useDocumentListV3, -} from '@island.is/service-portal/documents' +} from '@island.is/portals/my-pages/documents' import { LinkResolver, PlausiblePageviewDetail, ServicePortalPaths, m, useDynamicRoutesWithNavigation, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import Greeting from '../../components/Greeting/Greeting' import DocumentsEmpty from '../../components/DocumentsEmpty/DocumentsEmpty' import { iconIdMapper, iconTypeToSVG } from '../../utils/Icons/idMapper' import { useWindowSize } from 'react-use' import { theme } from '@island.is/island-ui/theme' import { MAIN_NAVIGATION } from '../../lib/masterNavigation' -import { useOrganizations } from '@island.is/service-portal/graphql' +import { useOrganizations } from '@island.is/portals/my-pages/graphql' import * as styles from './Dashboard.css' import cn from 'classnames' import { getOrganizationLogoUrl } from '@island.is/shared/utils' diff --git a/apps/portals/my-pages/tsconfig.app.json b/apps/portals/my-pages/tsconfig.app.json index fd8d416789dd..c8a4d7e7d8e5 100644 --- a/apps/portals/my-pages/tsconfig.app.json +++ b/apps/portals/my-pages/tsconfig.app.json @@ -1,8 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "sourceMap": true, - "outDir": "../../dist/out-tsc", + "outDir": "../../../dist/out-tsc", "types": [ "node", "@nx/react/typings/cssmodule.d.ts", @@ -18,6 +17,10 @@ "**/*.test.ts", "**/*.spec.tsx", "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", "jest.config.ts" ], "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] diff --git a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/assets.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/assets.spec.ts index e25f763d12b1..23ab53341da0 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/assets.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/assets.spec.ts @@ -4,7 +4,7 @@ import { setupXroadMocks } from './setup-xroad.mocks' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { messages } from '@island.is/service-portal/assets/messages' +import { messages } from '@island.is/portals/my-pages/assets/messages' import { disableI18n } from '../../../../support/disablers' test.use({ baseURL: urls.islandisBaseUrl }) diff --git a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/health.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/health.spec.ts index 38573f8ee58c..9c4e4a57ed9f 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/health.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/health.spec.ts @@ -2,7 +2,7 @@ import { test, BrowserContext, expect } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { messages } from '@island.is/service-portal/health/messages' +import { messages } from '@island.is/portals/my-pages/health/messages' import { disableI18n } from '../../../../support/disablers' import { setupXroadMocks } from './setup-xroad.mocks' diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/company-delegation.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/company-delegation.spec.ts index 1f5afd8a2b34..cb4f9f4e0694 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/company-delegation.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/company-delegation.spec.ts @@ -5,8 +5,8 @@ import { helpers } from '../../../../support/locator-helpers' import { label } from '../../../../support/i18n' import { coreDelegationsMessages } from '@island.is/application/core/messages' import { m } from '@island.is/portals/shared-modules/delegations/messages' -import { m as coreMessages } from '@island.is/service-portal/core/messages' -import { mCompany } from '@island.is/service-portal/information/messages' +import { m as coreMessages } from '@island.is/portals/my-pages/core/messages' +import { mCompany } from '@island.is/portals/my-pages/information/messages' import { disableI18n } from '../../../../support/disablers' import { switchDelegation } from './auth.spec' diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/financial-payment-application.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/financial-payment-application.spec.ts index 9185bd181026..0e9c978e1fba 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/financial-payment-application.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/financial-payment-application.spec.ts @@ -2,7 +2,7 @@ import { test, BrowserContext, expect } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/finance/messages' +import { m } from '@island.is/portals/my-pages/finance/messages' import { disableI18n } from '../../../../support/disablers' test.use({ baseURL: urls.islandisBaseUrl }) diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/financials.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/financials.spec.ts index f6e25c75fec1..8da0b156706c 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/financials.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/financials.spec.ts @@ -2,7 +2,7 @@ import { test, BrowserContext, expect } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/core/messages' +import { m } from '@island.is/portals/my-pages/core/messages' import { disableI18n } from '../../../../support/disablers' const timeout = 15000 diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/inbox.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/inbox.spec.ts index 05824c2e117a..c7a21b76c6a7 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/inbox.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/inbox.spec.ts @@ -3,8 +3,8 @@ import { sleep } from '../../../../support/utils' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { messages } from '@island.is/service-portal/documents/messages' -import { m } from '@island.is/service-portal/core/messages' +import { messages } from '@island.is/portals/my-pages/documents/messages' +import { m } from '@island.is/portals/my-pages/core/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/information.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/information.spec.ts index 17bb7ed5d1d3..3d7c21297ac6 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/information.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/information.spec.ts @@ -2,8 +2,8 @@ import { BrowserContext, expect, test } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/core/messages' -import { spmm } from '@island.is/service-portal/information/messages' +import { m } from '@island.is/portals/my-pages/core/messages' +import { spmm } from '@island.is/portals/my-pages/information/messages' import { disableI18n } from '../../../../support/disablers' test.use({ baseURL: urls.islandisBaseUrl }) diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/licenses.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/licenses.spec.ts index 66afc130ed63..721caaa19ab2 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/licenses.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/licenses.spec.ts @@ -2,7 +2,7 @@ import { test, BrowserContext, expect } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/licenses/messages' +import { m } from '@island.is/portals/my-pages/licenses/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/notification-settings.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/notification-settings.spec.ts index 558259b424c3..52cb6a80c5db 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/notification-settings.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/notification-settings.spec.ts @@ -1,6 +1,6 @@ import { test, BrowserContext, expect } from '@playwright/test' -import { mNotifications } from '@island.is/service-portal/information/messages' +import { mNotifications } from '@island.is/portals/my-pages/information/messages' import { session } from '../../../../support/session' import { disableI18n } from '../../../../support/disablers' diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/occupational-licenses.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/occupational-licenses.spec.ts index 95dda242e02b..b093a630b1d9 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/occupational-licenses.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/occupational-licenses.spec.ts @@ -2,7 +2,7 @@ import { BrowserContext, expect, test } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/core/messages' +import { m } from '@island.is/portals/my-pages/core/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/service-portal.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/service-portal.spec.ts index 95787cd3c0fa..9382cbad3f8d 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/service-portal.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/service-portal.spec.ts @@ -1,5 +1,5 @@ import { BrowserContext, expect, test } from '@playwright/test' -import { messages as m } from '@island.is/service-portal/documents/messages' +import { messages as m } from '@island.is/portals/my-pages/documents/messages' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/university.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/university.spec.ts index 8a7193d28203..ace10b6cb038 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/university.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/university.spec.ts @@ -2,7 +2,7 @@ import { BrowserContext, expect, test } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/core/messages' +import { m } from '@island.is/portals/my-pages/core/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/vehicles.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/vehicles.spec.ts index 8a764d2ac024..b6231858716b 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/vehicles.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/vehicles.spec.ts @@ -5,8 +5,7 @@ import { label } from '../../../../support/i18n' import { vehicleMessage, messages, -} from '@island.is/service-portal/assets/messages' -import { m } from '@island.is/service-portal/core/messages' +} from '@island.is/portals/my-pages/assets/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-license.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-license.spec.ts index 96f597c08b4e..325895e78cf2 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-license.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-license.spec.ts @@ -2,7 +2,7 @@ import { BrowserContext, expect, test } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { m } from '@island.is/service-portal/core/messages' +import { m } from '@island.is/portals/my-pages/core/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-machines.spec.ts b/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-machines.spec.ts index 470f9346b843..4787fba55062 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-machines.spec.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/smoke/work-machines.spec.ts @@ -2,8 +2,8 @@ import { test, BrowserContext, expect } from '@playwright/test' import { icelandicAndNoPopupUrl, urls } from '../../../../support/urls' import { session } from '../../../../support/session' import { label } from '../../../../support/i18n' -import { messages } from '@island.is/service-portal/assets/messages' -import { m } from '@island.is/service-portal/core/messages' +import { messages } from '@island.is/portals/my-pages/assets/messages' +import { m } from '@island.is/portals/my-pages/core/messages' import { disableI18n } from '../../../../support/disablers' const homeUrl = `${urls.islandisBaseUrl}/minarsidur` diff --git a/libs/service-portal/air-discount/.babelrc b/libs/portals/my-pages/air-discount/.babelrc similarity index 100% rename from libs/service-portal/air-discount/.babelrc rename to libs/portals/my-pages/air-discount/.babelrc diff --git a/libs/service-portal/air-discount/.eslintrc.json b/libs/portals/my-pages/air-discount/.eslintrc.json similarity index 80% rename from libs/service-portal/air-discount/.eslintrc.json rename to libs/portals/my-pages/air-discount/.eslintrc.json index 75b85077debb..772a43d27834 100644 --- a/libs/service-portal/air-discount/.eslintrc.json +++ b/libs/portals/my-pages/air-discount/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/libs/service-portal/assets/README.md b/libs/portals/my-pages/air-discount/README.md similarity index 55% rename from libs/service-portal/assets/README.md rename to libs/portals/my-pages/air-discount/README.md index a98e12a08954..b19781539efc 100644 --- a/libs/service-portal/assets/README.md +++ b/libs/portals/my-pages/air-discount/README.md @@ -1,7 +1,7 @@ -# service-portal-assets +# My Pages Air Discount This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-assets` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test my-pages-air-discount` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/air-discount/jest.config.ts b/libs/portals/my-pages/air-discount/jest.config.ts similarity index 61% rename from libs/service-portal/air-discount/jest.config.ts rename to libs/portals/my-pages/air-discount/jest.config.ts index bf85bf3a2255..d838415029a8 100644 --- a/libs/service-portal/air-discount/jest.config.ts +++ b/libs/portals/my-pages/air-discount/jest.config.ts @@ -1,12 +1,12 @@ /* eslint-disable */ export default { - displayName: 'service-portal-air-discount', + displayName: 'my-pages-air-discount', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/air-discount', + coverageDirectory: '/coverage/libs/portals/my-pages/air-discount', } diff --git a/libs/service-portal/air-discount/project.json b/libs/portals/my-pages/air-discount/project.json similarity index 56% rename from libs/service-portal/air-discount/project.json rename to libs/portals/my-pages/air-discount/project.json index 69fbf39324fe..3c858801825c 100644 --- a/libs/service-portal/air-discount/project.json +++ b/libs/portals/my-pages/air-discount/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-air-discount", + "name": "my-pages-air-discount", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/air-discount/src", + "sourceRoot": "libs/portals/my-pages/air-discount/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -11,15 +11,17 @@ }, "test": { "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/air-discount"], + "outputs": [ + "{workspaceRoot}/coverage/libs/portals/my-pages/air-discount" + ], "options": { - "jestConfig": "libs/service-portal/air-discount/jest.config.ts" + "jestConfig": "libs/portals/my-pages/air-discount/jest.config.ts" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/air-discount/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/air-discount/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } } } diff --git a/libs/service-portal/air-discount/src/components/UsageTable/UsageTable.tsx b/libs/portals/my-pages/air-discount/src/components/UsageTable/UsageTable.tsx similarity index 96% rename from libs/service-portal/air-discount/src/components/UsageTable/UsageTable.tsx rename to libs/portals/my-pages/air-discount/src/components/UsageTable/UsageTable.tsx index cefc48e968f5..a1385926f021 100644 --- a/libs/service-portal/air-discount/src/components/UsageTable/UsageTable.tsx +++ b/libs/portals/my-pages/air-discount/src/components/UsageTable/UsageTable.tsx @@ -3,7 +3,7 @@ import { useLocale, useNamespaces } from '@island.is/localization' import { Box, Table as T, Text } from '@island.is/island-ui/core' import { AirDiscountSchemeFlightLeg } from '@island.is/api/schema' import { messages as m } from '../../lib/messages' -import { formatDateWithTime } from '@island.is/service-portal/core' +import { formatDateWithTime } from '@island.is/portals/my-pages/core' interface PropTypes { data: AirDiscountSchemeFlightLeg[] diff --git a/libs/service-portal/air-discount/src/index.ts b/libs/portals/my-pages/air-discount/src/index.ts similarity index 100% rename from libs/service-portal/air-discount/src/index.ts rename to libs/portals/my-pages/air-discount/src/index.ts diff --git a/libs/service-portal/air-discount/src/lib/messages.ts b/libs/portals/my-pages/air-discount/src/lib/messages.ts similarity index 100% rename from libs/service-portal/air-discount/src/lib/messages.ts rename to libs/portals/my-pages/air-discount/src/lib/messages.ts diff --git a/libs/service-portal/air-discount/src/lib/navigation.ts b/libs/portals/my-pages/air-discount/src/lib/navigation.ts similarity index 88% rename from libs/service-portal/air-discount/src/lib/navigation.ts rename to libs/portals/my-pages/air-discount/src/lib/navigation.ts index e41e9e6a9359..1ecd15f3ad98 100644 --- a/libs/service-portal/air-discount/src/lib/navigation.ts +++ b/libs/portals/my-pages/air-discount/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { AirDiscountPaths } from './paths' export const airDiscountNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/air-discount/src/lib/paths.ts b/libs/portals/my-pages/air-discount/src/lib/paths.ts similarity index 100% rename from libs/service-portal/air-discount/src/lib/paths.ts rename to libs/portals/my-pages/air-discount/src/lib/paths.ts diff --git a/libs/service-portal/air-discount/src/module.tsx b/libs/portals/my-pages/air-discount/src/module.tsx similarity index 93% rename from libs/service-portal/air-discount/src/module.tsx rename to libs/portals/my-pages/air-discount/src/module.tsx index 3876d479cdca..00789859441d 100644 --- a/libs/service-portal/air-discount/src/module.tsx +++ b/libs/portals/my-pages/air-discount/src/module.tsx @@ -1,7 +1,7 @@ import React, { lazy } from 'react' import { defineMessage } from 'react-intl' import { ApiScope } from '@island.is/auth/scopes' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule } from '@island.is/portals/core' import { AirDiscountPaths } from './lib/paths' diff --git a/libs/service-portal/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx b/libs/portals/my-pages/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx similarity index 97% rename from libs/service-portal/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx rename to libs/portals/my-pages/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx index fb337d50664e..06b7fd7fd594 100644 --- a/libs/service-portal/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx +++ b/libs/portals/my-pages/air-discount/src/screens/AirDiscountOverview/AirDiscountOverview.tsx @@ -7,7 +7,8 @@ import { FootNote, IntroHeader, VEGAGERDIN_SLUG, -} from '@island.is/service-portal/core' + formatDateWithTime, +} from '@island.is/portals/my-pages/core' import { gql, useQuery } from '@apollo/client' import { Query } from '@island.is/api/schema' import { @@ -24,8 +25,7 @@ import { import { messages as m } from '../../lib/messages' import copyToClipboard from 'copy-to-clipboard' import UsageTable from '../../components/UsageTable/UsageTable' -import { formatDateWithTime } from '@island.is/service-portal/core' -import { AirDiscountSchemeDiscount } from '@island.is/service-portal/graphql' +import { AirDiscountSchemeDiscount } from '@island.is/portals/my-pages/graphql' import { Problem } from '@island.is/react-spa/shared' const AirDiscountQuery = gql` diff --git a/libs/service-portal/air-discount/tsconfig.json b/libs/portals/my-pages/air-discount/tsconfig.json similarity index 100% rename from libs/service-portal/air-discount/tsconfig.json rename to libs/portals/my-pages/air-discount/tsconfig.json diff --git a/libs/service-portal/air-discount/tsconfig.lib.json b/libs/portals/my-pages/air-discount/tsconfig.lib.json similarity index 92% rename from libs/service-portal/air-discount/tsconfig.lib.json rename to libs/portals/my-pages/air-discount/tsconfig.lib.json index 5a443a6513c5..b1fdab0f8413 100644 --- a/libs/service-portal/air-discount/tsconfig.lib.json +++ b/libs/portals/my-pages/air-discount/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/service-portal/education-career/tsconfig.spec.json b/libs/portals/my-pages/air-discount/tsconfig.spec.json similarity index 89% rename from libs/service-portal/education-career/tsconfig.spec.json rename to libs/portals/my-pages/air-discount/tsconfig.spec.json index e1535ba9d07c..ef88b556acb9 100644 --- a/libs/service-portal/education-career/tsconfig.spec.json +++ b/libs/portals/my-pages/air-discount/tsconfig.spec.json @@ -1,19 +1,19 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, "include": [ - "**/*.spec.ts", "**/*.test.ts", - "**/*.spec.tsx", + "**/*.spec.ts", "**/*.test.tsx", - "**/*.spec.js", + "**/*.spec.tsx", "**/*.test.js", - "**/*.spec.jsx", + "**/*.spec.js", "**/*.test.jsx", + "**/*.spec.jsx", "**/*.d.ts", "jest.config.ts" ] diff --git a/libs/service-portal/applications/.babelrc b/libs/portals/my-pages/applications/.babelrc similarity index 100% rename from libs/service-portal/applications/.babelrc rename to libs/portals/my-pages/applications/.babelrc diff --git a/libs/service-portal/applications/.eslintrc.json b/libs/portals/my-pages/applications/.eslintrc.json similarity index 93% rename from libs/service-portal/applications/.eslintrc.json rename to libs/portals/my-pages/applications/.eslintrc.json index b35e3c4b1b52..28663fe7e305 100644 --- a/libs/service-portal/applications/.eslintrc.json +++ b/libs/portals/my-pages/applications/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "rules": {}, "overrides": [ diff --git a/libs/service-portal/applications/README.md b/libs/portals/my-pages/applications/README.md similarity index 100% rename from libs/service-portal/applications/README.md rename to libs/portals/my-pages/applications/README.md diff --git a/libs/portals/my-pages/applications/jest.config.ts b/libs/portals/my-pages/applications/jest.config.ts new file mode 100644 index 000000000000..90ea068cb2b9 --- /dev/null +++ b/libs/portals/my-pages/applications/jest.config.ts @@ -0,0 +1,16 @@ +/* eslint-disable */ +export default { + preset: './jest.preset.js', + rootDir: '../../../..', + roots: [__dirname], + transform: { + '^.+\\.[tj]sx?$': [ + 'ts-jest', + { tsconfig: `${__dirname}/tsconfig.spec.json` }, + ], + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + coverageDirectory: '/coverage/libs/portals/my-pages/applications', + globals: {}, + displayName: 'portals-my-pages-applications', +} diff --git a/libs/service-portal/applications/project.json b/libs/portals/my-pages/applications/project.json similarity index 61% rename from libs/service-portal/applications/project.json rename to libs/portals/my-pages/applications/project.json index e52fc92ba202..a5a35ac5c651 100644 --- a/libs/service-portal/applications/project.json +++ b/libs/portals/my-pages/applications/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-applications", + "name": "portals-my-pages-applications", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/applications/src", + "sourceRoot": "libs/portals/my-pages/applications/src", "projectType": "library", "tags": [ "lib:portals-mypages", @@ -16,15 +16,15 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/applications/jest.config.ts" + "jestConfig": "libs/portals/my-pages/applications/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/applications"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/applications"] }, "extract-strings": { "executor": "nx:run-commands", "options": { "parallel": false, - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/service-portal/applications/src/lib/messages.ts" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/portals/my-pages/applications/src/lib/messages.ts" } } } diff --git a/libs/service-portal/applications/src/components/ApplicationGroup.tsx b/libs/portals/my-pages/applications/src/components/ApplicationGroup.tsx similarity index 100% rename from libs/service-portal/applications/src/components/ApplicationGroup.tsx rename to libs/portals/my-pages/applications/src/components/ApplicationGroup.tsx diff --git a/libs/service-portal/applications/src/index.ts b/libs/portals/my-pages/applications/src/index.ts similarity index 100% rename from libs/service-portal/applications/src/index.ts rename to libs/portals/my-pages/applications/src/index.ts diff --git a/libs/service-portal/applications/src/lib/messages.ts b/libs/portals/my-pages/applications/src/lib/messages.ts similarity index 100% rename from libs/service-portal/applications/src/lib/messages.ts rename to libs/portals/my-pages/applications/src/lib/messages.ts diff --git a/libs/service-portal/applications/src/lib/navigation.ts b/libs/portals/my-pages/applications/src/lib/navigation.ts similarity index 93% rename from libs/service-portal/applications/src/lib/navigation.ts rename to libs/portals/my-pages/applications/src/lib/navigation.ts index 77fb19a0ff15..36664eac7f5a 100644 --- a/libs/service-portal/applications/src/lib/navigation.ts +++ b/libs/portals/my-pages/applications/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { ApplicationsPaths } from './paths' export const applicationsNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/applications/src/lib/paths.ts b/libs/portals/my-pages/applications/src/lib/paths.ts similarity index 100% rename from libs/service-portal/applications/src/lib/paths.ts rename to libs/portals/my-pages/applications/src/lib/paths.ts diff --git a/libs/service-portal/applications/src/module.tsx b/libs/portals/my-pages/applications/src/module.tsx similarity index 95% rename from libs/service-portal/applications/src/module.tsx rename to libs/portals/my-pages/applications/src/module.tsx index aba126191ab4..8a517a2230af 100644 --- a/libs/service-portal/applications/src/module.tsx +++ b/libs/portals/my-pages/applications/src/module.tsx @@ -1,6 +1,6 @@ import { lazy } from 'react' import { ApplicationScope } from '@island.is/auth/scopes' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule } from '@island.is/portals/core' import { ApplicationsPaths } from './lib/paths' diff --git a/libs/service-portal/applications/src/screens/Overview.tsx b/libs/portals/my-pages/applications/src/screens/Overview.tsx similarity index 98% rename from libs/service-portal/applications/src/screens/Overview.tsx rename to libs/portals/my-pages/applications/src/screens/Overview.tsx index 768efd048b59..56a34206a2e8 100644 --- a/libs/service-portal/applications/src/screens/Overview.tsx +++ b/libs/portals/my-pages/applications/src/screens/Overview.tsx @@ -6,7 +6,7 @@ import { FootNote, IntroHeader, m as coreMessage, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, GridRow, @@ -17,7 +17,7 @@ import { import { useApplications, useGetOrganizationsQuery, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { useLocale, useNamespaces } from '@island.is/localization' import { useLocation } from 'react-router-dom' import { m } from '../lib/messages' diff --git a/libs/service-portal/applications/src/shared/types/index.ts b/libs/portals/my-pages/applications/src/shared/types/index.ts similarity index 100% rename from libs/service-portal/applications/src/shared/types/index.ts rename to libs/portals/my-pages/applications/src/shared/types/index.ts diff --git a/libs/service-portal/applications/src/shared/utils/index.ts b/libs/portals/my-pages/applications/src/shared/utils/index.ts similarity index 100% rename from libs/service-portal/applications/src/shared/utils/index.ts rename to libs/portals/my-pages/applications/src/shared/utils/index.ts diff --git a/libs/service-portal/applications/tsconfig.json b/libs/portals/my-pages/applications/tsconfig.json similarity index 100% rename from libs/service-portal/applications/tsconfig.json rename to libs/portals/my-pages/applications/tsconfig.json diff --git a/libs/service-portal/constants/tsconfig.lib.json b/libs/portals/my-pages/applications/tsconfig.lib.json similarity index 90% rename from libs/service-portal/constants/tsconfig.lib.json rename to libs/portals/my-pages/applications/tsconfig.lib.json index 2ebbff79e562..1d50996ab513 100644 --- a/libs/service-portal/constants/tsconfig.lib.json +++ b/libs/portals/my-pages/applications/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "exclude": [ diff --git a/libs/service-portal/applications/tsconfig.spec.json b/libs/portals/my-pages/applications/tsconfig.spec.json similarity index 91% rename from libs/service-portal/applications/tsconfig.spec.json rename to libs/portals/my-pages/applications/tsconfig.spec.json index 639a8e987c80..9c453e8cbe59 100644 --- a/libs/service-portal/applications/tsconfig.spec.json +++ b/libs/portals/my-pages/applications/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/assets/.babelrc b/libs/portals/my-pages/assets/.babelrc similarity index 100% rename from libs/service-portal/assets/.babelrc rename to libs/portals/my-pages/assets/.babelrc diff --git a/libs/service-portal/core/.eslintrc.json b/libs/portals/my-pages/assets/.eslintrc.json similarity index 78% rename from libs/service-portal/core/.eslintrc.json rename to libs/portals/my-pages/assets/.eslintrc.json index 4f027ee445be..97a68cca0c27 100644 --- a/libs/service-portal/core/.eslintrc.json +++ b/libs/portals/my-pages/assets/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "rules": {}, "overrides": [ diff --git a/libs/portals/my-pages/assets/README.md b/libs/portals/my-pages/assets/README.md new file mode 100644 index 000000000000..b54a3fa59b56 --- /dev/null +++ b/libs/portals/my-pages/assets/README.md @@ -0,0 +1,7 @@ +# portals-my-pages-assets + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test portals-my-pages-assets` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/assets/codegen.yml b/libs/portals/my-pages/assets/codegen.yml similarity index 79% rename from libs/service-portal/assets/codegen.yml rename to libs/portals/my-pages/assets/codegen.yml index 43c4219776c5..f0e285788929 100644 --- a/libs/service-portal/assets/codegen.yml +++ b/libs/portals/my-pages/assets/codegen.yml @@ -1,9 +1,9 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/assets/src/**/*.graphql + - libs/portals/my-pages/assets/src/**/*.graphql generates: - libs/service-portal/assets/src/: + libs/portals/my-pages/assets/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' diff --git a/libs/service-portal/constants/jest.config.ts b/libs/portals/my-pages/assets/jest.config.ts similarity index 67% rename from libs/service-portal/constants/jest.config.ts rename to libs/portals/my-pages/assets/jest.config.ts index 563ab28f0a42..8cd635f05408 100644 --- a/libs/service-portal/constants/jest.config.ts +++ b/libs/portals/my-pages/assets/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -10,7 +10,7 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/constants', + coverageDirectory: '/coverage/libs/portals/my-pages/assets', globals: {}, - displayName: 'service-portal-constants', + displayName: 'portals-my-pages-assets', } diff --git a/libs/service-portal/assets/project.json b/libs/portals/my-pages/assets/project.json similarity index 60% rename from libs/service-portal/assets/project.json rename to libs/portals/my-pages/assets/project.json index 8c58a23035a8..cd2fc9b60a79 100644 --- a/libs/service-portal/assets/project.json +++ b/libs/portals/my-pages/assets/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-assets", + "name": "portals-my-pages-assets", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/assets/src", + "sourceRoot": "libs/portals/my-pages/assets/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,20 +12,20 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/assets/jest.config.ts" + "jestConfig": "libs/portals/my-pages/assets/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/assets"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/assets"] }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/assets/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/assets/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "command": "graphql-codegen --config libs/service-portal/assets/codegen.yml" + "command": "graphql-codegen --config libs/portals/my-pages/assets/codegen.yml" }, "outputs": ["{projectRoot}/src/**/*.generated.ts"] } diff --git a/libs/service-portal/assets/src/components/AssetCardLoader/AssetCardLoader.css.ts b/libs/portals/my-pages/assets/src/components/AssetCardLoader/AssetCardLoader.css.ts similarity index 100% rename from libs/service-portal/assets/src/components/AssetCardLoader/AssetCardLoader.css.ts rename to libs/portals/my-pages/assets/src/components/AssetCardLoader/AssetCardLoader.css.ts diff --git a/libs/service-portal/assets/src/components/AssetCardLoader/index.tsx b/libs/portals/my-pages/assets/src/components/AssetCardLoader/index.tsx similarity index 79% rename from libs/service-portal/assets/src/components/AssetCardLoader/index.tsx rename to libs/portals/my-pages/assets/src/components/AssetCardLoader/index.tsx index 342e32761e71..d1211331c17b 100644 --- a/libs/service-portal/assets/src/components/AssetCardLoader/index.tsx +++ b/libs/portals/my-pages/assets/src/components/AssetCardLoader/index.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Box } from '@island.is/island-ui/core' import * as styles from './AssetCardLoader.css' -import { CardLoader } from '@island.is/service-portal/core' +import { CardLoader } from '@island.is/portals/my-pages/core' export const AssetCardLoader = () => ( diff --git a/libs/service-portal/assets/src/components/AssetGrid/index.tsx b/libs/portals/my-pages/assets/src/components/AssetGrid/index.tsx similarity index 96% rename from libs/service-portal/assets/src/components/AssetGrid/index.tsx rename to libs/portals/my-pages/assets/src/components/AssetGrid/index.tsx index fe1437eb0331..08293db39904 100644 --- a/libs/service-portal/assets/src/components/AssetGrid/index.tsx +++ b/libs/portals/my-pages/assets/src/components/AssetGrid/index.tsx @@ -2,10 +2,10 @@ import React, { FC } from 'react' import { unitsOfUseFragment, pagingFragment, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { useLazyQuery, gql } from '@apollo/client' import { useLocale } from '@island.is/localization' -import { m, TableGrid } from '@island.is/service-portal/core' +import { m, TableGrid } from '@island.is/portals/my-pages/core' import { Query, UnitsOfUseModel, PropertyLocation } from '@island.is/api/schema' import { Text, Box, Button } from '@island.is/island-ui/core' import { unitsArray } from '../../utils/createUnits' diff --git a/libs/service-portal/assets/src/components/AssetListCards/index.tsx b/libs/portals/my-pages/assets/src/components/AssetListCards/index.tsx similarity index 93% rename from libs/service-portal/assets/src/components/AssetListCards/index.tsx rename to libs/portals/my-pages/assets/src/components/AssetListCards/index.tsx index 4626be1d3c98..54402e5f5342 100644 --- a/libs/service-portal/assets/src/components/AssetListCards/index.tsx +++ b/libs/portals/my-pages/assets/src/components/AssetListCards/index.tsx @@ -1,9 +1,9 @@ import React, { FC } from 'react' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { Box, Button } from '@island.is/island-ui/core' import { PropertyOverview } from '@island.is/api/schema' -import { ActionCard } from '@island.is/service-portal/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import { AssetsPaths } from '../../lib/paths' interface Props { diff --git a/libs/service-portal/assets/src/components/AssetLoader/index.tsx b/libs/portals/my-pages/assets/src/components/AssetLoader/index.tsx similarity index 100% rename from libs/service-portal/assets/src/components/AssetLoader/index.tsx rename to libs/portals/my-pages/assets/src/components/AssetLoader/index.tsx diff --git a/libs/service-portal/assets/src/components/DetailTable/AxleTable.tsx b/libs/portals/my-pages/assets/src/components/DetailTable/AxleTable.tsx similarity index 100% rename from libs/service-portal/assets/src/components/DetailTable/AxleTable.tsx rename to libs/portals/my-pages/assets/src/components/DetailTable/AxleTable.tsx diff --git a/libs/service-portal/assets/src/components/DetailTable/OwnersTable.tsx b/libs/portals/my-pages/assets/src/components/DetailTable/OwnersTable.tsx similarity index 100% rename from libs/service-portal/assets/src/components/DetailTable/OwnersTable.tsx rename to libs/portals/my-pages/assets/src/components/DetailTable/OwnersTable.tsx diff --git a/libs/service-portal/assets/src/components/Dropdown/Dropdown.css.ts b/libs/portals/my-pages/assets/src/components/Dropdown/Dropdown.css.ts similarity index 100% rename from libs/service-portal/assets/src/components/Dropdown/Dropdown.css.ts rename to libs/portals/my-pages/assets/src/components/Dropdown/Dropdown.css.ts diff --git a/libs/service-portal/assets/src/components/Dropdown/Dropdown.tsx b/libs/portals/my-pages/assets/src/components/Dropdown/Dropdown.tsx similarity index 100% rename from libs/service-portal/assets/src/components/Dropdown/Dropdown.tsx rename to libs/portals/my-pages/assets/src/components/Dropdown/Dropdown.tsx diff --git a/libs/service-portal/assets/src/components/DropdownExport/DisabledItem.tsx b/libs/portals/my-pages/assets/src/components/DropdownExport/DisabledItem.tsx similarity index 100% rename from libs/service-portal/assets/src/components/DropdownExport/DisabledItem.tsx rename to libs/portals/my-pages/assets/src/components/DropdownExport/DisabledItem.tsx diff --git a/libs/service-portal/assets/src/components/DropdownExport/DropdownExport.css.ts b/libs/portals/my-pages/assets/src/components/DropdownExport/DropdownExport.css.ts similarity index 100% rename from libs/service-portal/assets/src/components/DropdownExport/DropdownExport.css.ts rename to libs/portals/my-pages/assets/src/components/DropdownExport/DropdownExport.css.ts diff --git a/libs/service-portal/assets/src/components/DropdownExport/DropdownExport.tsx b/libs/portals/my-pages/assets/src/components/DropdownExport/DropdownExport.tsx similarity index 100% rename from libs/service-portal/assets/src/components/DropdownExport/DropdownExport.tsx rename to libs/portals/my-pages/assets/src/components/DropdownExport/DropdownExport.tsx diff --git a/libs/service-portal/assets/src/components/Image/Image.css.ts b/libs/portals/my-pages/assets/src/components/Image/Image.css.ts similarity index 100% rename from libs/service-portal/assets/src/components/Image/Image.css.ts rename to libs/portals/my-pages/assets/src/components/Image/Image.css.ts diff --git a/libs/service-portal/assets/src/components/Image/Image.tsx b/libs/portals/my-pages/assets/src/components/Image/Image.tsx similarity index 100% rename from libs/service-portal/assets/src/components/Image/Image.tsx rename to libs/portals/my-pages/assets/src/components/Image/Image.tsx diff --git a/libs/service-portal/assets/src/components/LookupOperator/index.tsx b/libs/portals/my-pages/assets/src/components/LookupOperator/index.tsx similarity index 100% rename from libs/service-portal/assets/src/components/LookupOperator/index.tsx rename to libs/portals/my-pages/assets/src/components/LookupOperator/index.tsx diff --git a/libs/service-portal/assets/src/components/Timeline/Timeline.css.ts b/libs/portals/my-pages/assets/src/components/Timeline/Timeline.css.ts similarity index 100% rename from libs/service-portal/assets/src/components/Timeline/Timeline.css.ts rename to libs/portals/my-pages/assets/src/components/Timeline/Timeline.css.ts diff --git a/libs/service-portal/assets/src/components/Timeline/Timeline.tsx b/libs/portals/my-pages/assets/src/components/Timeline/Timeline.tsx similarity index 97% rename from libs/service-portal/assets/src/components/Timeline/Timeline.tsx rename to libs/portals/my-pages/assets/src/components/Timeline/Timeline.tsx index e0b6e3d037c2..12b75cd151d0 100644 --- a/libs/service-portal/assets/src/components/Timeline/Timeline.tsx +++ b/libs/portals/my-pages/assets/src/components/Timeline/Timeline.tsx @@ -12,7 +12,7 @@ import { UseBoxStylesProps, } from '@island.is/island-ui/core' import differenceInCalendarDays from 'date-fns/differenceInCalendarDays' -import { ProgressBar, useIsMobile } from '@island.is/service-portal/core' +import { ProgressBar, useIsMobile } from '@island.is/portals/my-pages/core' interface Props { children?: Array diff --git a/libs/service-portal/assets/src/components/VehicleCard.tsx b/libs/portals/my-pages/assets/src/components/VehicleCard.tsx similarity index 95% rename from libs/service-portal/assets/src/components/VehicleCard.tsx rename to libs/portals/my-pages/assets/src/components/VehicleCard.tsx index 15425b1c6877..9c5b5322a9ec 100644 --- a/libs/service-portal/assets/src/components/VehicleCard.tsx +++ b/libs/portals/my-pages/assets/src/components/VehicleCard.tsx @@ -1,10 +1,10 @@ import { VehicleListed } from '@island.is/api/schema' import { useLocale } from '@island.is/localization' import React, { FC, useEffect, useState } from 'react' -import { formatDate } from '@island.is/service-portal/core' +import { formatDate } from '@island.is/portals/my-pages/core' import differenceInMonths from 'date-fns/differenceInMonths' import { messages, vehicleMessage } from '../lib/messages' -import { ActionCard } from '@island.is/service-portal/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import { AssetsPaths } from '../lib/paths' import { useFeatureFlagClient } from '@island.is/react/feature-flags' diff --git a/libs/service-portal/assets/src/index.ts b/libs/portals/my-pages/assets/src/index.ts similarity index 100% rename from libs/service-portal/assets/src/index.ts rename to libs/portals/my-pages/assets/src/index.ts diff --git a/libs/service-portal/assets/src/lib/messages.ts b/libs/portals/my-pages/assets/src/lib/messages.ts similarity index 100% rename from libs/service-portal/assets/src/lib/messages.ts rename to libs/portals/my-pages/assets/src/lib/messages.ts diff --git a/libs/service-portal/assets/src/lib/navigation.ts b/libs/portals/my-pages/assets/src/lib/navigation.ts similarity index 98% rename from libs/service-portal/assets/src/lib/navigation.ts rename to libs/portals/my-pages/assets/src/lib/navigation.ts index 5c9e98a530b7..150c8dd15d07 100644 --- a/libs/service-portal/assets/src/lib/navigation.ts +++ b/libs/portals/my-pages/assets/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { AssetsPaths } from './paths' export const assetsNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/assets/src/lib/paths.ts b/libs/portals/my-pages/assets/src/lib/paths.ts similarity index 100% rename from libs/service-portal/assets/src/lib/paths.ts rename to libs/portals/my-pages/assets/src/lib/paths.ts diff --git a/libs/service-portal/assets/src/module.tsx b/libs/portals/my-pages/assets/src/module.tsx similarity index 99% rename from libs/service-portal/assets/src/module.tsx rename to libs/portals/my-pages/assets/src/module.tsx index 6237c03c3fca..75dfa86edc84 100644 --- a/libs/service-portal/assets/src/module.tsx +++ b/libs/portals/my-pages/assets/src/module.tsx @@ -1,6 +1,6 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule, PortalRoute } from '@island.is/portals/core' import { AssetsPaths } from './lib/paths' import { translationLoader } from './screens/Translation.loader' diff --git a/libs/service-portal/assets/src/screens/AssetsOverview/AssetsOverview.tsx b/libs/portals/my-pages/assets/src/screens/AssetsOverview/AssetsOverview.tsx similarity index 97% rename from libs/service-portal/assets/src/screens/AssetsOverview/AssetsOverview.tsx rename to libs/portals/my-pages/assets/src/screens/AssetsOverview/AssetsOverview.tsx index 5e911752e588..8c71d122083a 100644 --- a/libs/service-portal/assets/src/screens/AssetsOverview/AssetsOverview.tsx +++ b/libs/portals/my-pages/assets/src/screens/AssetsOverview/AssetsOverview.tsx @@ -2,7 +2,7 @@ import { gql, useQuery } from '@apollo/client' import { pagingFragment, addressFragment, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { Query } from '@island.is/api/schema' import { Box, Button, GridColumn, GridRow } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' @@ -11,7 +11,7 @@ import { HMS_SLUG, IntroHeader, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { AssetCardLoader } from '../../components/AssetCardLoader' import AssetListCards from '../../components/AssetListCards' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.graphql b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.graphql rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.graphql diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.tsx index d7f9adb06475..8b268edf48da 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesDesignDetail/IntellectualPropertiesDesignDetail.tsx @@ -9,7 +9,7 @@ import { UserInfoLine, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, Divider, Stack, Text } from '@island.is/island-ui/core' import Timeline from '../../components/Timeline/Timeline' import chunk from 'lodash/chunk' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.graphql b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.graphql rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.graphql diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.tsx similarity index 98% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.tsx index 7bd8a3f9acf6..8c671457b872 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesOverview/IntellectualPropertiesOverview.tsx @@ -5,7 +5,7 @@ import { HUGVERKASTOFAN_SLUG, IntroHeader, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box } from '@island.is/island-ui/core' import { ipMessages } from '../../lib/messages' import { useGetIntellectualPropertiesQuery } from './IntellectualPropertiesOverview.generated' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.graphql b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.graphql rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.graphql diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.tsx similarity index 98% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.tsx index 52d3dcdc4861..69f9dfd8bddf 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/IntellectualPropertiesPatentDetail.tsx @@ -4,7 +4,7 @@ import { HUGVERKASTOFAN_SLUG, IntroHeader, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, SkeletonLoader, Stack } from '@island.is/island-ui/core' import { useGetIntellectualPropertiesPatentByIdQuery } from './IntellectualPropertiesPatentDetail.generated' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/EP.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/EP.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/EP.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/EP.tsx index 8e0ca00b43d9..b8f75cdabc86 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/EP.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/EP.tsx @@ -5,7 +5,7 @@ import { m as coreMessages, StackOrTableBlock, StackWithBottomDivider, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { IntellectualPropertiesPatentEp } from '@island.is/api/schema' import { Stack, Text, Divider } from '@island.is/island-ui/core' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/IS.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/IS.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/IS.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/IS.tsx index a4980f64b2c4..35a68fc47521 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/IS.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/IS.tsx @@ -5,7 +5,7 @@ import { m as coreMessages, StackOrTableBlock, StackWithBottomDivider, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { IntellectualPropertiesPatentIs } from '@island.is/api/schema' import { Divider, Stack, Text } from '@island.is/island-ui/core' import { ipMessages } from '../../../lib/messages' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/SPC.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/SPC.tsx similarity index 98% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/SPC.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/SPC.tsx index 33140cbf5337..838630a3fedd 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/SPC.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesPatentDetail/patentVariations/SPC.tsx @@ -4,9 +4,9 @@ import { StackOrTableBlock, UserInfoLine, formatDate, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { ipMessages } from '../../../lib/messages' -import { m as coreMessages } from '@island.is/service-portal/core' +import { m as coreMessages } from '@island.is/portals/my-pages/core' import { Box, Divider, Stack, Text } from '@island.is/island-ui/core' import { useMemo } from 'react' import { IntellectualPropertiesSpc } from '@island.is/api/schema' diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.graphql b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.graphql rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.graphql diff --git a/libs/service-portal/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.tsx b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.tsx similarity index 98% rename from libs/service-portal/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.tsx rename to libs/portals/my-pages/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.tsx index baf463b746f1..a87d80688636 100644 --- a/libs/service-portal/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/IntellectualPropertiesTrademarkDetail/IntellectualPropertiesTrademarkDetail.tsx @@ -7,7 +7,7 @@ import { UserInfoLine, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { ipMessages } from '../../lib/messages' import { Accordion, @@ -20,7 +20,7 @@ import { import Timeline from '../../components/Timeline/Timeline' import Image from '../../components/Image/Image' import chunk from 'lodash/chunk' -import { AudioPlayer, VideoPlayer } from '@island.is/service-portal/core' +import { AudioPlayer, VideoPlayer } from '@island.is/portals/my-pages/core' import { TrademarkType } from '@island.is/api/schema' import { isDefined } from '@island.is/shared/utils' import { useGetIntellectualPropertiesTrademarkByIdQuery } from './IntellectualPropertiesTrademarkDetail.generated' diff --git a/libs/service-portal/assets/src/screens/Lookup/Lookup.graphql b/libs/portals/my-pages/assets/src/screens/Lookup/Lookup.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/Lookup/Lookup.graphql rename to libs/portals/my-pages/assets/src/screens/Lookup/Lookup.graphql diff --git a/libs/service-portal/assets/src/screens/Lookup/Lookup.tsx b/libs/portals/my-pages/assets/src/screens/Lookup/Lookup.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/Lookup/Lookup.tsx rename to libs/portals/my-pages/assets/src/screens/Lookup/Lookup.tsx index ea06426c20d9..b8f6b8f7f68b 100644 --- a/libs/service-portal/assets/src/screens/Lookup/Lookup.tsx +++ b/libs/portals/my-pages/assets/src/screens/Lookup/Lookup.tsx @@ -20,7 +20,7 @@ import { ExcludesFalse, FootNote, SAMGONGUSTOFA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { vehicleMessage as messages } from '../../lib/messages' import chunk from 'lodash/chunk' diff --git a/libs/service-portal/assets/src/screens/Overview/Overview.graphql b/libs/portals/my-pages/assets/src/screens/Overview/Overview.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/Overview/Overview.graphql rename to libs/portals/my-pages/assets/src/screens/Overview/Overview.graphql diff --git a/libs/service-portal/assets/src/screens/Overview/Overview.tsx b/libs/portals/my-pages/assets/src/screens/Overview/Overview.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/Overview/Overview.tsx rename to libs/portals/my-pages/assets/src/screens/Overview/Overview.tsx index 5a57594efd9f..a82c0c953f01 100644 --- a/libs/service-portal/assets/src/screens/Overview/Overview.tsx +++ b/libs/portals/my-pages/assets/src/screens/Overview/Overview.tsx @@ -19,7 +19,7 @@ import { IntroHeader, m, SAMGONGUSTOFA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useUserInfo } from '@island.is/auth/react' import { VehicleCard } from '../../components/VehicleCard' diff --git a/libs/service-portal/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.graphql b/libs/portals/my-pages/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.graphql rename to libs/portals/my-pages/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.graphql diff --git a/libs/service-portal/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.tsx b/libs/portals/my-pages/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.tsx similarity index 97% rename from libs/service-portal/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.tsx rename to libs/portals/my-pages/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.tsx index 7fffc5a3a34e..1de3a5f4792f 100644 --- a/libs/service-portal/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/RealEstateAssetDetail/RealEstateAssetDetail.tsx @@ -4,7 +4,7 @@ import { pagingFragment, appraisalFragment, addressFragment, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { useQuery, useLazyQuery, gql } from '@apollo/client' import { Query, PropertyOwner } from '@island.is/api/schema' import { useNamespaces, useLocale } from '@island.is/localization' @@ -14,14 +14,14 @@ import { HMS_SLUG, IntroHeader, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import AssetGrid from '../../components/AssetGrid' import AssetLoader from '../../components/AssetLoader' import { ownersArray } from '../../utils/createUnits' import { messages } from '../../lib/messages' import { DEFAULT_PAGING_ITEMS } from '../../utils/const' -import { TableGrid, TableUnits } from '@island.is/service-portal/core' -import { FootNote } from '@island.is/service-portal/core' +import { TableGrid, TableUnits } from '@island.is/portals/my-pages/core' +import { FootNote } from '@island.is/portals/my-pages/core' import { Problem } from '@island.is/react-spa/shared' export const ownerFragment = gql` diff --git a/libs/service-portal/assets/src/screens/Translation.loader.ts b/libs/portals/my-pages/assets/src/screens/Translation.loader.ts similarity index 100% rename from libs/service-portal/assets/src/screens/Translation.loader.ts rename to libs/portals/my-pages/assets/src/screens/Translation.loader.ts diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.css.ts b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.css.ts similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.css.ts rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.css.ts diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.graphql b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.tsx similarity index 98% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.tsx index 787ab421d3a7..85fb5453b46f 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileage.tsx @@ -5,7 +5,7 @@ import { SAMGONGUSTOFA_SLUG, LinkButton, IntroWrapper, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { vehicleMessage as messages, vehicleMessage } from '../../lib/messages' import * as styles from './VehicleBulkMileage.css' import { useEffect, useState } from 'react' diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx similarity index 94% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx index 4e36ea3792f6..5bb3e62d2996 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageFileDownloader.tsx @@ -1,7 +1,7 @@ import { DropdownMenu } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' import { vehicleMessage } from '../../lib/messages' -import { downloadFile } from '@island.is/service-portal/core' +import { downloadFile } from '@island.is/portals/my-pages/core' interface Props { onError: (error: string) => void diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageRow.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageRow.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageRow.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageRow.tsx index 93a18bbae7c5..de057a5a71c4 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageRow.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageRow.tsx @@ -14,7 +14,7 @@ import { NestedFullTable, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { AlertMessage, Box } from '@island.is/island-ui/core' import { vehicleMessage } from '../../lib/messages' import { VehicleBulkMileageSaveButton } from './VehicleBulkMileageSaveButton' diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageSaveButton.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageSaveButton.tsx similarity index 94% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageSaveButton.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageSaveButton.tsx index 39061b620d13..9aa8cbbd71cb 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageSaveButton.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageSaveButton.tsx @@ -1,6 +1,6 @@ import { Button } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m as coreMessages } from '@island.is/service-portal/core' +import { m as coreMessages } from '@island.is/portals/my-pages/core' import { useMemo } from 'react' import { type SubmissionStatus } from './types' diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageTable.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageTable.tsx similarity index 95% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageTable.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageTable.tsx index ded16e14e749..5206f451f31a 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageTable.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/VehicleBulkMileageTable.tsx @@ -1,6 +1,6 @@ import { Table as T, Box } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { EmptyTable, ExpandHeader } from '@island.is/service-portal/core' +import { EmptyTable, ExpandHeader } from '@island.is/portals/my-pages/core' import { vehicleMessage } from '../../lib/messages' import { useMemo } from 'react' import { VehicleType } from './types' diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/mocks/propsDummy.ts b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/mocks/propsDummy.ts similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/mocks/propsDummy.ts rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/mocks/propsDummy.ts diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileage/types.ts b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/types.ts similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileage/types.ts rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileage/types.ts diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.graphql b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.tsx index a82691339e33..1fc24db58a4b 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobDetail/VehicleBulkMileageJobDetail.tsx @@ -14,7 +14,7 @@ import { TableGrid, downloadFile, IntroWrapper, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Problem } from '@island.is/react-spa/shared' import { VehiclesBulkMileageRegistrationRequestStatus } from '@island.is/api/schema' import { useParams } from 'react-router-dom' @@ -22,7 +22,7 @@ import { useGetJobRegistrationsQuery, useGetJobsStatusQuery, } from './VehicleBulkMileageJobDetail.generated' -import { VehiclesBulkMileageRegistrationRequestOverview } from '@island.is/service-portal/graphql' +import { VehiclesBulkMileageRegistrationRequestOverview } from '@island.is/portals/my-pages/graphql' import { displayWithUnit } from '../../utils/displayWithUnit' import { isDefined } from '@island.is/shared/utils' import { vehicleMessage } from '../../lib/messages' diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.graphql b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.tsx index ae2b5f970c30..a8704829b614 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageJobOverview/VehicleBulkMileageJobOverview.tsx @@ -8,7 +8,7 @@ import { EmptyTable, formatDateWithTime, IntroWrapper, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Problem } from '@island.is/react-spa/shared' import { useGetRequestsStatusQuery } from './VehicleBulkMileageJobOverview.generated' import { VehiclesBulkMileageRegistrationJob } from '@island.is/api/schema' diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.graphql b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx index a822c80f359b..f1e2585ae319 100644 --- a/libs/service-portal/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleBulkMileageUpload/VehicleBulkMileageUpload.tsx @@ -19,7 +19,7 @@ import { LinkButton, SAMGONGUSTOFA_SLUG, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import VehicleBulkMileageFileDownloader from '../VehicleBulkMileage/VehicleBulkMileageFileDownloader' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.graphql b/libs/portals/my-pages/assets/src/screens/VehicleDetail/VehicleDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleDetail/VehicleDetail.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx b/libs/portals/my-pages/assets/src/screens/VehicleDetail/VehicleDetail.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleDetail/VehicleDetail.tsx index d85a8a573372..f17c15f30488 100644 --- a/libs/service-portal/assets/src/screens/VehicleDetail/VehicleDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleDetail/VehicleDetail.tsx @@ -28,7 +28,7 @@ import { SAMGONGUSTOFA_SLUG, LinkButton, getDateLocale, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import OwnersTable from '../../components/DetailTable/OwnersTable' import { vehicleMessage as messages, urls } from '../../lib/messages' diff --git a/libs/service-portal/assets/src/screens/VehicleHistory/HistoryTableData.tsx b/libs/portals/my-pages/assets/src/screens/VehicleHistory/HistoryTableData.tsx similarity index 96% rename from libs/service-portal/assets/src/screens/VehicleHistory/HistoryTableData.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleHistory/HistoryTableData.tsx index 3871f2b45cda..24a15690f3d3 100644 --- a/libs/service-portal/assets/src/screens/VehicleHistory/HistoryTableData.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleHistory/HistoryTableData.tsx @@ -3,7 +3,7 @@ import React, { FC } from 'react' import { Locale } from '@island.is/shared/types' import { Text, Table as T } from '@island.is/island-ui/core' import { VehiclesVehicle } from '@island.is/api/schema' -import { getDateLocale } from '@island.is/service-portal/core' +import { getDateLocale } from '@island.is/portals/my-pages/core' interface Props { vehicle: VehiclesVehicle diff --git a/libs/service-portal/assets/src/screens/VehicleHistory/HistoryTableHeader.tsx b/libs/portals/my-pages/assets/src/screens/VehicleHistory/HistoryTableHeader.tsx similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleHistory/HistoryTableHeader.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleHistory/HistoryTableHeader.tsx diff --git a/libs/service-portal/assets/src/screens/VehicleHistory/TabContent.tsx b/libs/portals/my-pages/assets/src/screens/VehicleHistory/TabContent.tsx similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleHistory/TabContent.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleHistory/TabContent.tsx diff --git a/libs/service-portal/assets/src/screens/VehicleHistory/VehicleHistory.graphql b/libs/portals/my-pages/assets/src/screens/VehicleHistory/VehicleHistory.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleHistory/VehicleHistory.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleHistory/VehicleHistory.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleHistory/VehicleHistory.tsx b/libs/portals/my-pages/assets/src/screens/VehicleHistory/VehicleHistory.tsx similarity index 98% rename from libs/service-portal/assets/src/screens/VehicleHistory/VehicleHistory.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleHistory/VehicleHistory.tsx index 1e6920e00a37..e586c4a2d3fc 100644 --- a/libs/service-portal/assets/src/screens/VehicleHistory/VehicleHistory.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleHistory/VehicleHistory.tsx @@ -14,7 +14,7 @@ import { IntroHeader, m, SAMGONGUSTOFA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { vehicleMessage as messages } from '../../lib/messages' import TabContent from './TabContent' diff --git a/libs/service-portal/assets/src/screens/VehicleMileage/VehicleDetail.graphql b/libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleMileage/VehicleDetail.graphql rename to libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleDetail.graphql diff --git a/libs/service-portal/assets/src/screens/VehicleMileage/VehicleMileage.css.ts b/libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleMileage.css.ts similarity index 100% rename from libs/service-portal/assets/src/screens/VehicleMileage/VehicleMileage.css.ts rename to libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleMileage.css.ts diff --git a/libs/service-portal/assets/src/screens/VehicleMileage/VehicleMileage.tsx b/libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleMileage.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/VehicleMileage/VehicleMileage.tsx rename to libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleMileage.tsx index 28ac8325ae7a..6b7aee95f6c7 100644 --- a/libs/service-portal/assets/src/screens/VehicleMileage/VehicleMileage.tsx +++ b/libs/portals/my-pages/assets/src/screens/VehicleMileage/VehicleMileage.tsx @@ -21,7 +21,7 @@ import { SAMGONGUSTOFA_SLUG, IntroHeader, icelandLocalTime, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { isReadDateToday } from '../../utils/readDate' import { vehicleMessage as messages } from '../../lib/messages' diff --git a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql b/libs/portals/my-pages/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql rename to libs/portals/my-pages/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.graphql diff --git a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx b/libs/portals/my-pages/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx rename to libs/portals/my-pages/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx index 7ffa17e2abd4..b1e40cba9af7 100644 --- a/libs/service-portal/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx +++ b/libs/portals/my-pages/assets/src/screens/WorkMachinesDetail/WorkMachinesDetail.tsx @@ -10,7 +10,7 @@ import { m, VINNUEFTIRLITID_SLUG, InfoLineStack, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages, vehicleMessage } from '../../lib/messages' import { Box, diff --git a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql b/libs/portals/my-pages/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql similarity index 100% rename from libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql rename to libs/portals/my-pages/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.graphql diff --git a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx b/libs/portals/my-pages/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx similarity index 99% rename from libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx rename to libs/portals/my-pages/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx index 6ec865fd72a7..9d8d8b4f2b6b 100644 --- a/libs/service-portal/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx +++ b/libs/portals/my-pages/assets/src/screens/WorkMachinesOverview/WorkMachinesOverview.tsx @@ -14,7 +14,7 @@ import { FootNote, VINNUEFTIRLITID_SLUG, formatDate, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, Checkbox, diff --git a/libs/service-portal/assets/src/utils/VehicleExcel.graphql b/libs/portals/my-pages/assets/src/utils/VehicleExcel.graphql similarity index 100% rename from libs/service-portal/assets/src/utils/VehicleExcel.graphql rename to libs/portals/my-pages/assets/src/utils/VehicleExcel.graphql diff --git a/libs/service-portal/assets/src/utils/const.ts b/libs/portals/my-pages/assets/src/utils/const.ts similarity index 100% rename from libs/service-portal/assets/src/utils/const.ts rename to libs/portals/my-pages/assets/src/utils/const.ts diff --git a/libs/service-portal/assets/src/utils/constants.ts b/libs/portals/my-pages/assets/src/utils/constants.ts similarity index 100% rename from libs/service-portal/assets/src/utils/constants.ts rename to libs/portals/my-pages/assets/src/utils/constants.ts diff --git a/libs/service-portal/assets/src/utils/createUnits.ts b/libs/portals/my-pages/assets/src/utils/createUnits.ts similarity index 97% rename from libs/service-portal/assets/src/utils/createUnits.ts rename to libs/portals/my-pages/assets/src/utils/createUnits.ts index 1fc4a34dc561..e4d99ad47bce 100644 --- a/libs/service-portal/assets/src/utils/createUnits.ts +++ b/libs/portals/my-pages/assets/src/utils/createUnits.ts @@ -1,7 +1,7 @@ import chunk from 'lodash/chunk' import isNumber from 'lodash/isNumber' import { format as formatKennitala } from 'kennitala' -import { amountFormat } from '@island.is/service-portal/core' +import { amountFormat } from '@island.is/portals/my-pages/core' import { messages } from '../lib/messages' import { FormatMessage } from '@island.is/localization' diff --git a/libs/service-portal/assets/src/utils/createVehicleUnits.ts b/libs/portals/my-pages/assets/src/utils/createVehicleUnits.ts similarity index 99% rename from libs/service-portal/assets/src/utils/createVehicleUnits.ts rename to libs/portals/my-pages/assets/src/utils/createVehicleUnits.ts index a5f9e59df382..b9fd80549671 100644 --- a/libs/service-portal/assets/src/utils/createVehicleUnits.ts +++ b/libs/portals/my-pages/assets/src/utils/createVehicleUnits.ts @@ -4,7 +4,7 @@ import { amountFormat, ExcludesFalse, formatNationalId, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { vehicleMessage as messages } from '../lib/messages' import { FormatMessage } from '@island.is/localization' diff --git a/libs/service-portal/assets/src/utils/dataHeaders.ts b/libs/portals/my-pages/assets/src/utils/dataHeaders.ts similarity index 100% rename from libs/service-portal/assets/src/utils/dataHeaders.ts rename to libs/portals/my-pages/assets/src/utils/dataHeaders.ts diff --git a/libs/service-portal/assets/src/utils/displayWithUnit.ts b/libs/portals/my-pages/assets/src/utils/displayWithUnit.ts similarity index 80% rename from libs/service-portal/assets/src/utils/displayWithUnit.ts rename to libs/portals/my-pages/assets/src/utils/displayWithUnit.ts index 910806b3e6bb..aa310d4e7d77 100644 --- a/libs/service-portal/assets/src/utils/displayWithUnit.ts +++ b/libs/portals/my-pages/assets/src/utils/displayWithUnit.ts @@ -1,4 +1,4 @@ -import { numberFormat } from '@island.is/service-portal/core' +import { numberFormat } from '@island.is/portals/my-pages/core' export const displayWithUnit = ( value: string | undefined | null | number, diff --git a/libs/service-portal/assets/src/utils/downloadVehicleOwnedFile.ts b/libs/portals/my-pages/assets/src/utils/downloadVehicleOwnedFile.ts similarity index 100% rename from libs/service-portal/assets/src/utils/downloadVehicleOwnedFile.ts rename to libs/portals/my-pages/assets/src/utils/downloadVehicleOwnedFile.ts diff --git a/libs/service-portal/assets/src/utils/makeArrayEven.ts b/libs/portals/my-pages/assets/src/utils/makeArrayEven.ts similarity index 100% rename from libs/service-portal/assets/src/utils/makeArrayEven.ts rename to libs/portals/my-pages/assets/src/utils/makeArrayEven.ts diff --git a/libs/service-portal/assets/src/utils/parseFileToMileage.ts b/libs/portals/my-pages/assets/src/utils/parseFileToMileage.ts similarity index 100% rename from libs/service-portal/assets/src/utils/parseFileToMileage.ts rename to libs/portals/my-pages/assets/src/utils/parseFileToMileage.ts diff --git a/libs/service-portal/assets/src/utils/readDate.ts b/libs/portals/my-pages/assets/src/utils/readDate.ts similarity index 100% rename from libs/service-portal/assets/src/utils/readDate.ts rename to libs/portals/my-pages/assets/src/utils/readDate.ts diff --git a/libs/service-portal/assets/src/utils/timelineMapper.ts b/libs/portals/my-pages/assets/src/utils/timelineMapper.ts similarity index 100% rename from libs/service-portal/assets/src/utils/timelineMapper.ts rename to libs/portals/my-pages/assets/src/utils/timelineMapper.ts diff --git a/libs/service-portal/assets/src/utils/vehicleOwnedMapper.ts b/libs/portals/my-pages/assets/src/utils/vehicleOwnedMapper.ts similarity index 100% rename from libs/service-portal/assets/src/utils/vehicleOwnedMapper.ts rename to libs/portals/my-pages/assets/src/utils/vehicleOwnedMapper.ts diff --git a/libs/service-portal/assets/src/widgets/AssetsCards.tsx b/libs/portals/my-pages/assets/src/widgets/AssetsCards.tsx similarity index 95% rename from libs/service-portal/assets/src/widgets/AssetsCards.tsx rename to libs/portals/my-pages/assets/src/widgets/AssetsCards.tsx index 097115c2e4a8..9875f9ff5b63 100644 --- a/libs/service-portal/assets/src/widgets/AssetsCards.tsx +++ b/libs/portals/my-pages/assets/src/widgets/AssetsCards.tsx @@ -2,7 +2,7 @@ import React from 'react' import { ServicePortalModuleComponent, EventCard, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, Columns, Column, Text } from '@island.is/island-ui/core' const AssetsCards: ServicePortalModuleComponent = () => { diff --git a/libs/service-portal/assets/tsconfig.json b/libs/portals/my-pages/assets/tsconfig.json similarity index 100% rename from libs/service-portal/assets/tsconfig.json rename to libs/portals/my-pages/assets/tsconfig.json diff --git a/libs/portals/my-pages/assets/tsconfig.lib.json b/libs/portals/my-pages/assets/tsconfig.lib.json new file mode 100644 index 000000000000..df044b77b9a5 --- /dev/null +++ b/libs/portals/my-pages/assets/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], + "files": [ + "../../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../../node_modules/@nx/react/typings/image.d.ts" + ] +} diff --git a/libs/service-portal/constants/tsconfig.spec.json b/libs/portals/my-pages/assets/tsconfig.spec.json similarity index 91% rename from libs/service-portal/constants/tsconfig.spec.json rename to libs/portals/my-pages/assets/tsconfig.spec.json index 639a8e987c80..9c453e8cbe59 100644 --- a/libs/service-portal/constants/tsconfig.spec.json +++ b/libs/portals/my-pages/assets/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/consent/.babelrc b/libs/portals/my-pages/consent/.babelrc similarity index 100% rename from libs/service-portal/consent/.babelrc rename to libs/portals/my-pages/consent/.babelrc diff --git a/libs/service-portal/restrictions/.eslintrc.json b/libs/portals/my-pages/consent/.eslintrc.json similarity index 80% rename from libs/service-portal/restrictions/.eslintrc.json rename to libs/portals/my-pages/consent/.eslintrc.json index 75b85077debb..772a43d27834 100644 --- a/libs/service-portal/restrictions/.eslintrc.json +++ b/libs/portals/my-pages/consent/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/libs/service-portal/consent/README.md b/libs/portals/my-pages/consent/README.md similarity index 100% rename from libs/service-portal/consent/README.md rename to libs/portals/my-pages/consent/README.md diff --git a/libs/service-portal/education/codegen.yml b/libs/portals/my-pages/consent/codegen.yml similarity index 79% rename from libs/service-portal/education/codegen.yml rename to libs/portals/my-pages/consent/codegen.yml index c90ae970e818..64c53122b3e5 100644 --- a/libs/service-portal/education/codegen.yml +++ b/libs/portals/my-pages/consent/codegen.yml @@ -1,9 +1,9 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/education/src/**/*.graphql + - libs/portals/my-pages/consent/src/**/*.graphql generates: - libs/service-portal/education/src/: + libs/portals/my-pages/consent/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' diff --git a/libs/service-portal/sessions/jest.config.ts b/libs/portals/my-pages/consent/jest.config.ts similarity index 62% rename from libs/service-portal/sessions/jest.config.ts rename to libs/portals/my-pages/consent/jest.config.ts index d72b779c1e1e..dbd973fab928 100644 --- a/libs/service-portal/sessions/jest.config.ts +++ b/libs/portals/my-pages/consent/jest.config.ts @@ -1,12 +1,12 @@ /* eslint-disable */ export default { - displayName: 'service-portal-sessions', + displayName: 'portals-my-pages-consent', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/sessions', + coverageDirectory: '/coverage/libs/portals/my-pages/consent', } diff --git a/libs/service-portal/consent/project.json b/libs/portals/my-pages/consent/project.json similarity index 54% rename from libs/service-portal/consent/project.json rename to libs/portals/my-pages/consent/project.json index 84637d11d997..828c0fa17d54 100644 --- a/libs/service-portal/consent/project.json +++ b/libs/portals/my-pages/consent/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-consent", + "name": "portals-my-pages-consent", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/consent/src", + "sourceRoot": "libs/portals/my-pages/consent/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { @@ -11,21 +11,21 @@ "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/consent/src/**/*.{ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/consent/src/**/*.{ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/consent/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/consent/codegen.yml" + "output": "libs/portals/my-pages/consent/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/consent/codegen.yml" } }, "test": { "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/consent"], + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/consent"], "options": { - "jestConfig": "libs/service-portal/consent/jest.config.ts" + "jestConfig": "libs/portals/my-pages/consent/jest.config.ts" } } } diff --git a/libs/service-portal/consent/src/index.ts b/libs/portals/my-pages/consent/src/index.ts similarity index 100% rename from libs/service-portal/consent/src/index.ts rename to libs/portals/my-pages/consent/src/index.ts diff --git a/libs/service-portal/consent/src/lib/messages.ts b/libs/portals/my-pages/consent/src/lib/messages.ts similarity index 100% rename from libs/service-portal/consent/src/lib/messages.ts rename to libs/portals/my-pages/consent/src/lib/messages.ts diff --git a/libs/service-portal/consent/src/lib/navigation.ts b/libs/portals/my-pages/consent/src/lib/navigation.ts similarity index 80% rename from libs/service-portal/consent/src/lib/navigation.ts rename to libs/portals/my-pages/consent/src/lib/navigation.ts index 6161abc09393..5ea6601ab1bd 100644 --- a/libs/service-portal/consent/src/lib/navigation.ts +++ b/libs/portals/my-pages/consent/src/lib/navigation.ts @@ -1,5 +1,5 @@ import type { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { ConsentPaths } from './paths' diff --git a/libs/service-portal/consent/src/lib/paths.ts b/libs/portals/my-pages/consent/src/lib/paths.ts similarity index 100% rename from libs/service-portal/consent/src/lib/paths.ts rename to libs/portals/my-pages/consent/src/lib/paths.ts diff --git a/libs/service-portal/consent/src/module.tsx b/libs/portals/my-pages/consent/src/module.tsx similarity index 93% rename from libs/service-portal/consent/src/module.tsx rename to libs/portals/my-pages/consent/src/module.tsx index 98f4e3f5bb5c..89089b1bf7dc 100644 --- a/libs/service-portal/consent/src/module.tsx +++ b/libs/portals/my-pages/consent/src/module.tsx @@ -3,7 +3,7 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' import { PortalModule } from '@island.is/portals/core' import { Features } from '@island.is/react/feature-flags' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { ConsentPaths } from './lib/paths' diff --git a/libs/service-portal/consent/src/screens/Consent/Consent.css.ts b/libs/portals/my-pages/consent/src/screens/Consent/Consent.css.ts similarity index 100% rename from libs/service-portal/consent/src/screens/Consent/Consent.css.ts rename to libs/portals/my-pages/consent/src/screens/Consent/Consent.css.ts diff --git a/libs/service-portal/consent/src/screens/Consent/Consent.graphql b/libs/portals/my-pages/consent/src/screens/Consent/Consent.graphql similarity index 100% rename from libs/service-portal/consent/src/screens/Consent/Consent.graphql rename to libs/portals/my-pages/consent/src/screens/Consent/Consent.graphql diff --git a/libs/service-portal/consent/src/screens/Consent/Consent.tsx b/libs/portals/my-pages/consent/src/screens/Consent/Consent.tsx similarity index 100% rename from libs/service-portal/consent/src/screens/Consent/Consent.tsx rename to libs/portals/my-pages/consent/src/screens/Consent/Consent.tsx diff --git a/libs/service-portal/consent/src/screens/Consent/types.ts b/libs/portals/my-pages/consent/src/screens/Consent/types.ts similarity index 100% rename from libs/service-portal/consent/src/screens/Consent/types.ts rename to libs/portals/my-pages/consent/src/screens/Consent/types.ts diff --git a/libs/service-portal/consent/tsconfig.json b/libs/portals/my-pages/consent/tsconfig.json similarity index 100% rename from libs/service-portal/consent/tsconfig.json rename to libs/portals/my-pages/consent/tsconfig.json diff --git a/libs/service-portal/sessions/tsconfig.lib.json b/libs/portals/my-pages/consent/tsconfig.lib.json similarity index 92% rename from libs/service-portal/sessions/tsconfig.lib.json rename to libs/portals/my-pages/consent/tsconfig.lib.json index 5a443a6513c5..b1fdab0f8413 100644 --- a/libs/service-portal/sessions/tsconfig.lib.json +++ b/libs/portals/my-pages/consent/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/service-portal/air-discount/tsconfig.spec.json b/libs/portals/my-pages/consent/tsconfig.spec.json similarity index 89% rename from libs/service-portal/air-discount/tsconfig.spec.json rename to libs/portals/my-pages/consent/tsconfig.spec.json index 83cd0e830ed2..ef88b556acb9 100644 --- a/libs/service-portal/air-discount/tsconfig.spec.json +++ b/libs/portals/my-pages/consent/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/constants/.babelrc b/libs/portals/my-pages/constants/.babelrc similarity index 100% rename from libs/service-portal/constants/.babelrc rename to libs/portals/my-pages/constants/.babelrc diff --git a/libs/service-portal/assets/.eslintrc.json b/libs/portals/my-pages/constants/.eslintrc.json similarity index 78% rename from libs/service-portal/assets/.eslintrc.json rename to libs/portals/my-pages/constants/.eslintrc.json index 4f027ee445be..97a68cca0c27 100644 --- a/libs/service-portal/assets/.eslintrc.json +++ b/libs/portals/my-pages/constants/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "rules": {}, "overrides": [ diff --git a/libs/service-portal/information/README.md b/libs/portals/my-pages/constants/README.md similarity index 54% rename from libs/service-portal/information/README.md rename to libs/portals/my-pages/constants/README.md index dd469ca78c94..15dc80d786b5 100644 --- a/libs/service-portal/information/README.md +++ b/libs/portals/my-pages/constants/README.md @@ -1,7 +1,7 @@ -# service-portal-information +# portals-my-pages-constants This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-information` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-constants` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/applications/jest.config.ts b/libs/portals/my-pages/constants/jest.config.ts similarity index 66% rename from libs/service-portal/applications/jest.config.ts rename to libs/portals/my-pages/constants/jest.config.ts index 793d1705324f..3a1ce5c639c7 100644 --- a/libs/service-portal/applications/jest.config.ts +++ b/libs/portals/my-pages/constants/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -10,7 +10,7 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/applications', + coverageDirectory: '/coverage/libs/portals/my-pages/constants', globals: {}, - displayName: 'service-portal-applications', + displayName: 'portals-my-pages-constants', } diff --git a/libs/service-portal/constants/project.json b/libs/portals/my-pages/constants/project.json similarity index 58% rename from libs/service-portal/constants/project.json rename to libs/portals/my-pages/constants/project.json index 79a80a5ff2fe..858faf9509a5 100644 --- a/libs/service-portal/constants/project.json +++ b/libs/portals/my-pages/constants/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-constants", + "name": "portals-my-pages-constants", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/constants/src", + "sourceRoot": "libs/portals/my-pages/constants/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,9 +12,9 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/constants/jest.config.ts" + "jestConfig": "libs/portals/my-pages/constants/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/constants"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/constants"] } } } diff --git a/libs/service-portal/constants/src/index.ts b/libs/portals/my-pages/constants/src/index.ts similarity index 100% rename from libs/service-portal/constants/src/index.ts rename to libs/portals/my-pages/constants/src/index.ts diff --git a/libs/service-portal/constants/src/lib/api.ts b/libs/portals/my-pages/constants/src/lib/api.ts similarity index 100% rename from libs/service-portal/constants/src/lib/api.ts rename to libs/portals/my-pages/constants/src/lib/api.ts diff --git a/libs/service-portal/constants/src/lib/application.ts b/libs/portals/my-pages/constants/src/lib/application.ts similarity index 100% rename from libs/service-portal/constants/src/lib/application.ts rename to libs/portals/my-pages/constants/src/lib/application.ts diff --git a/libs/service-portal/constants/tsconfig.json b/libs/portals/my-pages/constants/tsconfig.json similarity index 100% rename from libs/service-portal/constants/tsconfig.json rename to libs/portals/my-pages/constants/tsconfig.json diff --git a/libs/service-portal/assets/tsconfig.lib.json b/libs/portals/my-pages/constants/tsconfig.lib.json similarity index 90% rename from libs/service-portal/assets/tsconfig.lib.json rename to libs/portals/my-pages/constants/tsconfig.lib.json index 2ebbff79e562..1d50996ab513 100644 --- a/libs/service-portal/assets/tsconfig.lib.json +++ b/libs/portals/my-pages/constants/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "exclude": [ diff --git a/libs/service-portal/assets/tsconfig.spec.json b/libs/portals/my-pages/constants/tsconfig.spec.json similarity index 91% rename from libs/service-portal/assets/tsconfig.spec.json rename to libs/portals/my-pages/constants/tsconfig.spec.json index 639a8e987c80..9c453e8cbe59 100644 --- a/libs/service-portal/assets/tsconfig.spec.json +++ b/libs/portals/my-pages/constants/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/core/.babelrc b/libs/portals/my-pages/core/.babelrc similarity index 100% rename from libs/service-portal/core/.babelrc rename to libs/portals/my-pages/core/.babelrc diff --git a/libs/service-portal/constants/.eslintrc.json b/libs/portals/my-pages/core/.eslintrc.json similarity index 78% rename from libs/service-portal/constants/.eslintrc.json rename to libs/portals/my-pages/core/.eslintrc.json index 4f027ee445be..97a68cca0c27 100644 --- a/libs/service-portal/constants/.eslintrc.json +++ b/libs/portals/my-pages/core/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "rules": {}, "overrides": [ diff --git a/libs/service-portal/core/README.md b/libs/portals/my-pages/core/README.md similarity index 100% rename from libs/service-portal/core/README.md rename to libs/portals/my-pages/core/README.md diff --git a/libs/portals/my-pages/core/jest.config.ts b/libs/portals/my-pages/core/jest.config.ts new file mode 100644 index 000000000000..571b87ef960f --- /dev/null +++ b/libs/portals/my-pages/core/jest.config.ts @@ -0,0 +1,13 @@ +/* eslint-disable */ +export default { + preset: './jest.preset.js', + rootDir: '../../../..', + roots: [__dirname], + transform: { + '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + coverageDirectory: '/coverage/libs/portals/my-pages/core', + globals: {}, + displayName: 'portals-my-pages-core', +} diff --git a/libs/portals/my-pages/core/project.json b/libs/portals/my-pages/core/project.json new file mode 100644 index 000000000000..b86deb1c3412 --- /dev/null +++ b/libs/portals/my-pages/core/project.json @@ -0,0 +1,25 @@ +{ + "name": "portals-my-pages-core", + "$schema": "../../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/portals/my-pages/core/src", + "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], + "targets": { + "lint": { + "executor": "@nx/eslint:lint" + }, + "test": { + "executor": "@nx/jest:jest", + "options": { + "jestConfig": "libs/portals/my-pages/core/jest.config.ts" + }, + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/core"] + }, + "extract-strings": { + "executor": "nx:run-commands", + "options": { + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/core/src/{lib,components,helpers,screens}/**/*.{js,ts,tsx}'" + } + } + } +} diff --git a/libs/service-portal/core/src/components/ActionCard/ActionCard.css.ts b/libs/portals/my-pages/core/src/components/ActionCard/ActionCard.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ActionCard/ActionCard.css.ts rename to libs/portals/my-pages/core/src/components/ActionCard/ActionCard.css.ts diff --git a/libs/service-portal/core/src/components/ActionCard/ActionCard.tsx b/libs/portals/my-pages/core/src/components/ActionCard/ActionCard.tsx similarity index 100% rename from libs/service-portal/core/src/components/ActionCard/ActionCard.tsx rename to libs/portals/my-pages/core/src/components/ActionCard/ActionCard.tsx diff --git a/libs/service-portal/core/src/components/ActionCard/ActionCardLoader.tsx b/libs/portals/my-pages/core/src/components/ActionCard/ActionCardLoader.tsx similarity index 100% rename from libs/service-portal/core/src/components/ActionCard/ActionCardLoader.tsx rename to libs/portals/my-pages/core/src/components/ActionCard/ActionCardLoader.tsx diff --git a/libs/service-portal/core/src/components/ActionMenu/ActionMenu.css.ts b/libs/portals/my-pages/core/src/components/ActionMenu/ActionMenu.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ActionMenu/ActionMenu.css.ts rename to libs/portals/my-pages/core/src/components/ActionMenu/ActionMenu.css.ts diff --git a/libs/service-portal/core/src/components/ActionMenu/ActionMenu.tsx b/libs/portals/my-pages/core/src/components/ActionMenu/ActionMenu.tsx similarity index 100% rename from libs/service-portal/core/src/components/ActionMenu/ActionMenu.tsx rename to libs/portals/my-pages/core/src/components/ActionMenu/ActionMenu.tsx diff --git a/libs/service-portal/core/src/components/ActionSidebar/ActionSidebar.css.ts b/libs/portals/my-pages/core/src/components/ActionSidebar/ActionSidebar.css.ts similarity index 95% rename from libs/service-portal/core/src/components/ActionSidebar/ActionSidebar.css.ts rename to libs/portals/my-pages/core/src/components/ActionSidebar/ActionSidebar.css.ts index 0885f36a92e5..f271dbad36ae 100644 --- a/libs/service-portal/core/src/components/ActionSidebar/ActionSidebar.css.ts +++ b/libs/portals/my-pages/core/src/components/ActionSidebar/ActionSidebar.css.ts @@ -1,5 +1,5 @@ import { keyframes, style } from '@vanilla-extract/css' -import { zIndex } from '@island.is/service-portal/constants' +import { zIndex } from '@island.is/portals/my-pages/constants' import { themeUtils } from '@island.is/island-ui/theme' export const actionSidebarTransitionTiming = 400 diff --git a/libs/service-portal/core/src/components/ActionSidebar/ActionSidebar.tsx b/libs/portals/my-pages/core/src/components/ActionSidebar/ActionSidebar.tsx similarity index 100% rename from libs/service-portal/core/src/components/ActionSidebar/ActionSidebar.tsx rename to libs/portals/my-pages/core/src/components/ActionSidebar/ActionSidebar.tsx diff --git a/libs/service-portal/core/src/components/ActionSidebar/index.ts b/libs/portals/my-pages/core/src/components/ActionSidebar/index.ts similarity index 100% rename from libs/service-portal/core/src/components/ActionSidebar/index.ts rename to libs/portals/my-pages/core/src/components/ActionSidebar/index.ts diff --git a/libs/service-portal/core/src/components/AlertMessage/ModuleAlertMessageSection.tsx b/libs/portals/my-pages/core/src/components/AlertMessage/ModuleAlertMessageSection.tsx similarity index 95% rename from libs/service-portal/core/src/components/AlertMessage/ModuleAlertMessageSection.tsx rename to libs/portals/my-pages/core/src/components/AlertMessage/ModuleAlertMessageSection.tsx index abbbecddce4a..70a7d7a12d31 100644 --- a/libs/service-portal/core/src/components/AlertMessage/ModuleAlertMessageSection.tsx +++ b/libs/portals/my-pages/core/src/components/AlertMessage/ModuleAlertMessageSection.tsx @@ -6,7 +6,7 @@ import { Link, Stack, } from '@island.is/island-ui/core' -import { useAlertBanners } from '@island.is/service-portal/graphql' +import { useAlertBanners } from '@island.is/portals/my-pages/graphql' type Props = { paddingTop?: BoxProps['paddingTop'] diff --git a/libs/service-portal/core/src/components/AudioPlayer/AudioPlayer.css.ts b/libs/portals/my-pages/core/src/components/AudioPlayer/AudioPlayer.css.ts similarity index 100% rename from libs/service-portal/core/src/components/AudioPlayer/AudioPlayer.css.ts rename to libs/portals/my-pages/core/src/components/AudioPlayer/AudioPlayer.css.ts diff --git a/libs/service-portal/core/src/components/AudioPlayer/AudioPlayer.tsx b/libs/portals/my-pages/core/src/components/AudioPlayer/AudioPlayer.tsx similarity index 100% rename from libs/service-portal/core/src/components/AudioPlayer/AudioPlayer.tsx rename to libs/portals/my-pages/core/src/components/AudioPlayer/AudioPlayer.tsx diff --git a/libs/service-portal/core/src/components/CardLoader/CardLoader.tsx b/libs/portals/my-pages/core/src/components/CardLoader/CardLoader.tsx similarity index 100% rename from libs/service-portal/core/src/components/CardLoader/CardLoader.tsx rename to libs/portals/my-pages/core/src/components/CardLoader/CardLoader.tsx diff --git a/libs/service-portal/core/src/components/ConfirmationModal/ConfirmationModal.css.ts b/libs/portals/my-pages/core/src/components/ConfirmationModal/ConfirmationModal.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ConfirmationModal/ConfirmationModal.css.ts rename to libs/portals/my-pages/core/src/components/ConfirmationModal/ConfirmationModal.css.ts diff --git a/libs/service-portal/core/src/components/ConfirmationModal/ConfirmationModal.tsx b/libs/portals/my-pages/core/src/components/ConfirmationModal/ConfirmationModal.tsx similarity index 100% rename from libs/service-portal/core/src/components/ConfirmationModal/ConfirmationModal.tsx rename to libs/portals/my-pages/core/src/components/ConfirmationModal/ConfirmationModal.tsx diff --git a/libs/service-portal/core/src/components/DownloadFileButtons/DownloadFileButtons.tsx b/libs/portals/my-pages/core/src/components/DownloadFileButtons/DownloadFileButtons.tsx similarity index 100% rename from libs/service-portal/core/src/components/DownloadFileButtons/DownloadFileButtons.tsx rename to libs/portals/my-pages/core/src/components/DownloadFileButtons/DownloadFileButtons.tsx diff --git a/libs/service-portal/core/src/components/EducationCard/EducationCard.css.ts b/libs/portals/my-pages/core/src/components/EducationCard/EducationCard.css.ts similarity index 100% rename from libs/service-portal/core/src/components/EducationCard/EducationCard.css.ts rename to libs/portals/my-pages/core/src/components/EducationCard/EducationCard.css.ts diff --git a/libs/service-portal/core/src/components/EducationCard/EducationCard.tsx b/libs/portals/my-pages/core/src/components/EducationCard/EducationCard.tsx similarity index 99% rename from libs/service-portal/core/src/components/EducationCard/EducationCard.tsx rename to libs/portals/my-pages/core/src/components/EducationCard/EducationCard.tsx index a033f13092f7..48dacd559708 100644 --- a/libs/service-portal/core/src/components/EducationCard/EducationCard.tsx +++ b/libs/portals/my-pages/core/src/components/EducationCard/EducationCard.tsx @@ -11,7 +11,7 @@ interface ActionCard { imgPlaceholder?: string } -// TODO: Move to a central location, at the moment there are Action cards in use that do not fit our current use case. should look into changing our card or one of the current cards (island-ui, service-portal) +// TODO: Move to a central location, at the moment there are Action cards in use that do not fit our current use case. should look into changing our card or one of the current cards (island-ui, portals-my-pages) export const EducationCard = ({ eyebrow, title, diff --git a/libs/service-portal/core/src/components/EmptyState/EmptyImage.tsx b/libs/portals/my-pages/core/src/components/EmptyState/EmptyImage.tsx similarity index 100% rename from libs/service-portal/core/src/components/EmptyState/EmptyImage.tsx rename to libs/portals/my-pages/core/src/components/EmptyState/EmptyImage.tsx diff --git a/libs/service-portal/core/src/components/EmptyState/EmptyImgSmall.tsx b/libs/portals/my-pages/core/src/components/EmptyState/EmptyImgSmall.tsx similarity index 100% rename from libs/service-portal/core/src/components/EmptyState/EmptyImgSmall.tsx rename to libs/portals/my-pages/core/src/components/EmptyState/EmptyImgSmall.tsx diff --git a/libs/service-portal/core/src/components/EmptyState/EmptyState.tsx b/libs/portals/my-pages/core/src/components/EmptyState/EmptyState.tsx similarity index 100% rename from libs/service-portal/core/src/components/EmptyState/EmptyState.tsx rename to libs/portals/my-pages/core/src/components/EmptyState/EmptyState.tsx diff --git a/libs/service-portal/core/src/components/EmptyTable/EmptyTable.css.ts b/libs/portals/my-pages/core/src/components/EmptyTable/EmptyTable.css.ts similarity index 100% rename from libs/service-portal/core/src/components/EmptyTable/EmptyTable.css.ts rename to libs/portals/my-pages/core/src/components/EmptyTable/EmptyTable.css.ts diff --git a/libs/service-portal/core/src/components/EmptyTable/EmptyTable.tsx b/libs/portals/my-pages/core/src/components/EmptyTable/EmptyTable.tsx similarity index 100% rename from libs/service-portal/core/src/components/EmptyTable/EmptyTable.tsx rename to libs/portals/my-pages/core/src/components/EmptyTable/EmptyTable.tsx diff --git a/libs/service-portal/core/src/components/EventCard/EventCard.css.ts b/libs/portals/my-pages/core/src/components/EventCard/EventCard.css.ts similarity index 100% rename from libs/service-portal/core/src/components/EventCard/EventCard.css.ts rename to libs/portals/my-pages/core/src/components/EventCard/EventCard.css.ts diff --git a/libs/service-portal/core/src/components/EventCard/EventCard.tsx b/libs/portals/my-pages/core/src/components/EventCard/EventCard.tsx similarity index 100% rename from libs/service-portal/core/src/components/EventCard/EventCard.tsx rename to libs/portals/my-pages/core/src/components/EventCard/EventCard.tsx diff --git a/libs/service-portal/core/src/components/ExpandableTable/ExpandableTable.css.ts b/libs/portals/my-pages/core/src/components/ExpandableTable/ExpandableTable.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ExpandableTable/ExpandableTable.css.ts rename to libs/portals/my-pages/core/src/components/ExpandableTable/ExpandableTable.css.ts diff --git a/libs/service-portal/core/src/components/ExpandableTable/Header.tsx b/libs/portals/my-pages/core/src/components/ExpandableTable/Header.tsx similarity index 100% rename from libs/service-portal/core/src/components/ExpandableTable/Header.tsx rename to libs/portals/my-pages/core/src/components/ExpandableTable/Header.tsx diff --git a/libs/service-portal/core/src/components/ExpandableTable/Row.tsx b/libs/portals/my-pages/core/src/components/ExpandableTable/Row.tsx similarity index 100% rename from libs/service-portal/core/src/components/ExpandableTable/Row.tsx rename to libs/portals/my-pages/core/src/components/ExpandableTable/Row.tsx diff --git a/libs/service-portal/core/src/components/ExpandableTable/index.ts b/libs/portals/my-pages/core/src/components/ExpandableTable/index.ts similarity index 100% rename from libs/service-portal/core/src/components/ExpandableTable/index.ts rename to libs/portals/my-pages/core/src/components/ExpandableTable/index.ts diff --git a/libs/service-portal/core/src/components/Filter/Filter.css.ts b/libs/portals/my-pages/core/src/components/Filter/Filter.css.ts similarity index 100% rename from libs/service-portal/core/src/components/Filter/Filter.css.ts rename to libs/portals/my-pages/core/src/components/Filter/Filter.css.ts diff --git a/libs/service-portal/core/src/components/Filter/Filter.tsx b/libs/portals/my-pages/core/src/components/Filter/Filter.tsx similarity index 100% rename from libs/service-portal/core/src/components/Filter/Filter.tsx rename to libs/portals/my-pages/core/src/components/Filter/Filter.tsx diff --git a/libs/service-portal/core/src/components/FocusableBox/FocusableBox.css.ts b/libs/portals/my-pages/core/src/components/FocusableBox/FocusableBox.css.ts similarity index 100% rename from libs/service-portal/core/src/components/FocusableBox/FocusableBox.css.ts rename to libs/portals/my-pages/core/src/components/FocusableBox/FocusableBox.css.ts diff --git a/libs/service-portal/core/src/components/FocusableBox/FocusableBox.tsx b/libs/portals/my-pages/core/src/components/FocusableBox/FocusableBox.tsx similarity index 100% rename from libs/service-portal/core/src/components/FocusableBox/FocusableBox.tsx rename to libs/portals/my-pages/core/src/components/FocusableBox/FocusableBox.tsx diff --git a/libs/service-portal/core/src/components/FootNote/FootNote.tsx b/libs/portals/my-pages/core/src/components/FootNote/FootNote.tsx similarity index 94% rename from libs/service-portal/core/src/components/FootNote/FootNote.tsx rename to libs/portals/my-pages/core/src/components/FootNote/FootNote.tsx index d2cb34d4c3e8..a5886afe205f 100644 --- a/libs/service-portal/core/src/components/FootNote/FootNote.tsx +++ b/libs/portals/my-pages/core/src/components/FootNote/FootNote.tsx @@ -1,5 +1,5 @@ import { Box, Hidden, Text } from '@island.is/island-ui/core' -import { useOrganization } from '@island.is/service-portal/graphql' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import InstitutionPanel from '../InstitutionPanel/InstitutionPanel' import { OrganizationSlugType } from '@island.is/shared/constants' diff --git a/libs/service-portal/core/src/components/Gallery/Gallery.css.ts b/libs/portals/my-pages/core/src/components/Gallery/Gallery.css.ts similarity index 100% rename from libs/service-portal/core/src/components/Gallery/Gallery.css.ts rename to libs/portals/my-pages/core/src/components/Gallery/Gallery.css.ts diff --git a/libs/service-portal/core/src/components/Gallery/Gallery.tsx b/libs/portals/my-pages/core/src/components/Gallery/Gallery.tsx similarity index 100% rename from libs/service-portal/core/src/components/Gallery/Gallery.tsx rename to libs/portals/my-pages/core/src/components/Gallery/Gallery.tsx diff --git a/libs/service-portal/core/src/components/Gallery/GalleryItem.css.ts b/libs/portals/my-pages/core/src/components/Gallery/GalleryItem.css.ts similarity index 100% rename from libs/service-portal/core/src/components/Gallery/GalleryItem.css.ts rename to libs/portals/my-pages/core/src/components/Gallery/GalleryItem.css.ts diff --git a/libs/service-portal/core/src/components/Gallery/GalleryItem.tsx b/libs/portals/my-pages/core/src/components/Gallery/GalleryItem.tsx similarity index 100% rename from libs/service-portal/core/src/components/Gallery/GalleryItem.tsx rename to libs/portals/my-pages/core/src/components/Gallery/GalleryItem.tsx diff --git a/libs/service-portal/core/src/components/Gallery/GalleryModal.css.ts b/libs/portals/my-pages/core/src/components/Gallery/GalleryModal.css.ts similarity index 100% rename from libs/service-portal/core/src/components/Gallery/GalleryModal.css.ts rename to libs/portals/my-pages/core/src/components/Gallery/GalleryModal.css.ts diff --git a/libs/service-portal/core/src/components/Gallery/GalleryModal.tsx b/libs/portals/my-pages/core/src/components/Gallery/GalleryModal.tsx similarity index 100% rename from libs/service-portal/core/src/components/Gallery/GalleryModal.tsx rename to libs/portals/my-pages/core/src/components/Gallery/GalleryModal.tsx diff --git a/libs/service-portal/core/src/components/GeneralButton/GeneralButton.tsx b/libs/portals/my-pages/core/src/components/GeneralButton/GeneralButton.tsx similarity index 100% rename from libs/service-portal/core/src/components/GeneralButton/GeneralButton.tsx rename to libs/portals/my-pages/core/src/components/GeneralButton/GeneralButton.tsx diff --git a/libs/service-portal/core/src/components/GoBack/GoBack.css.ts b/libs/portals/my-pages/core/src/components/GoBack/GoBack.css.ts similarity index 100% rename from libs/service-portal/core/src/components/GoBack/GoBack.css.ts rename to libs/portals/my-pages/core/src/components/GoBack/GoBack.css.ts diff --git a/libs/service-portal/core/src/components/GoBack/GoBack.tsx b/libs/portals/my-pages/core/src/components/GoBack/GoBack.tsx similarity index 100% rename from libs/service-portal/core/src/components/GoBack/GoBack.tsx rename to libs/portals/my-pages/core/src/components/GoBack/GoBack.tsx diff --git a/libs/service-portal/core/src/components/InfoLine/InfoLine.css.ts b/libs/portals/my-pages/core/src/components/InfoLine/InfoLine.css.ts similarity index 100% rename from libs/service-portal/core/src/components/InfoLine/InfoLine.css.ts rename to libs/portals/my-pages/core/src/components/InfoLine/InfoLine.css.ts diff --git a/libs/service-portal/core/src/components/InfoLine/InfoLine.tsx b/libs/portals/my-pages/core/src/components/InfoLine/InfoLine.tsx similarity index 100% rename from libs/service-portal/core/src/components/InfoLine/InfoLine.tsx rename to libs/portals/my-pages/core/src/components/InfoLine/InfoLine.tsx diff --git a/libs/service-portal/core/src/components/InfoLine/InfoLineStack.tsx b/libs/portals/my-pages/core/src/components/InfoLine/InfoLineStack.tsx similarity index 100% rename from libs/service-portal/core/src/components/InfoLine/InfoLineStack.tsx rename to libs/portals/my-pages/core/src/components/InfoLine/InfoLineStack.tsx diff --git a/libs/service-portal/core/src/components/InstitutionPanel/InstitutionPanel.css.ts b/libs/portals/my-pages/core/src/components/InstitutionPanel/InstitutionPanel.css.ts similarity index 100% rename from libs/service-portal/core/src/components/InstitutionPanel/InstitutionPanel.css.ts rename to libs/portals/my-pages/core/src/components/InstitutionPanel/InstitutionPanel.css.ts diff --git a/libs/service-portal/core/src/components/InstitutionPanel/InstitutionPanel.tsx b/libs/portals/my-pages/core/src/components/InstitutionPanel/InstitutionPanel.tsx similarity index 100% rename from libs/service-portal/core/src/components/InstitutionPanel/InstitutionPanel.tsx rename to libs/portals/my-pages/core/src/components/InstitutionPanel/InstitutionPanel.tsx diff --git a/libs/service-portal/core/src/components/IntroHeader/IntroHeader.tsx b/libs/portals/my-pages/core/src/components/IntroHeader/IntroHeader.tsx similarity index 97% rename from libs/service-portal/core/src/components/IntroHeader/IntroHeader.tsx rename to libs/portals/my-pages/core/src/components/IntroHeader/IntroHeader.tsx index 691307cc80b4..5849af6f9489 100644 --- a/libs/service-portal/core/src/components/IntroHeader/IntroHeader.tsx +++ b/libs/portals/my-pages/core/src/components/IntroHeader/IntroHeader.tsx @@ -10,7 +10,7 @@ import { } from '@island.is/island-ui/core' import { IntroHeaderProps } from '@island.is/portals/core' import InstitutionPanel from '../InstitutionPanel/InstitutionPanel' -import { useOrganization } from '@island.is/service-portal/graphql' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import { useLocale } from '@island.is/localization' import { useWindowSize } from 'react-use' import { theme } from '@island.is/island-ui/theme' diff --git a/libs/service-portal/core/src/components/IntroWrapper/IntroWrapper.tsx b/libs/portals/my-pages/core/src/components/IntroWrapper/IntroWrapper.tsx similarity index 98% rename from libs/service-portal/core/src/components/IntroWrapper/IntroWrapper.tsx rename to libs/portals/my-pages/core/src/components/IntroWrapper/IntroWrapper.tsx index 8235a378047a..ada8014b94df 100644 --- a/libs/service-portal/core/src/components/IntroWrapper/IntroWrapper.tsx +++ b/libs/portals/my-pages/core/src/components/IntroWrapper/IntroWrapper.tsx @@ -14,7 +14,7 @@ import { OrganizationSlugType } from '@island.is/shared/constants' import { useLocale } from '@island.is/localization' import { useWindowSize } from 'react-use' import { theme } from '@island.is/island-ui/theme' -import { useOrganization } from '@island.is/service-portal/graphql' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import { ISLANDIS_SLUG } from '../../utils/constants' import InstitutionPanel from '../InstitutionPanel/InstitutionPanel' import { m } from '../../lib/messages' diff --git a/libs/service-portal/core/src/components/LinkButton/LinkButton.css.ts b/libs/portals/my-pages/core/src/components/LinkButton/LinkButton.css.ts similarity index 100% rename from libs/service-portal/core/src/components/LinkButton/LinkButton.css.ts rename to libs/portals/my-pages/core/src/components/LinkButton/LinkButton.css.ts diff --git a/libs/service-portal/core/src/components/LinkButton/LinkButton.tsx b/libs/portals/my-pages/core/src/components/LinkButton/LinkButton.tsx similarity index 100% rename from libs/service-portal/core/src/components/LinkButton/LinkButton.tsx rename to libs/portals/my-pages/core/src/components/LinkButton/LinkButton.tsx diff --git a/libs/service-portal/core/src/components/LinkResolver/LinkResolver.css.ts b/libs/portals/my-pages/core/src/components/LinkResolver/LinkResolver.css.ts similarity index 100% rename from libs/service-portal/core/src/components/LinkResolver/LinkResolver.css.ts rename to libs/portals/my-pages/core/src/components/LinkResolver/LinkResolver.css.ts diff --git a/libs/service-portal/core/src/components/LinkResolver/LinkResolver.tsx b/libs/portals/my-pages/core/src/components/LinkResolver/LinkResolver.tsx similarity index 100% rename from libs/service-portal/core/src/components/LinkResolver/LinkResolver.tsx rename to libs/portals/my-pages/core/src/components/LinkResolver/LinkResolver.tsx diff --git a/libs/service-portal/core/src/components/LoadModal/LoadModal.css.ts b/libs/portals/my-pages/core/src/components/LoadModal/LoadModal.css.ts similarity index 100% rename from libs/service-portal/core/src/components/LoadModal/LoadModal.css.ts rename to libs/portals/my-pages/core/src/components/LoadModal/LoadModal.css.ts diff --git a/libs/service-portal/core/src/components/LoadModal/LoadModal.tsx b/libs/portals/my-pages/core/src/components/LoadModal/LoadModal.tsx similarity index 100% rename from libs/service-portal/core/src/components/LoadModal/LoadModal.tsx rename to libs/portals/my-pages/core/src/components/LoadModal/LoadModal.tsx diff --git a/libs/service-portal/core/src/components/Menu/Menu.css.ts b/libs/portals/my-pages/core/src/components/Menu/Menu.css.ts similarity index 97% rename from libs/service-portal/core/src/components/Menu/Menu.css.ts rename to libs/portals/my-pages/core/src/components/Menu/Menu.css.ts index 064543184a8b..1b202eee7e31 100644 --- a/libs/service-portal/core/src/components/Menu/Menu.css.ts +++ b/libs/portals/my-pages/core/src/components/Menu/Menu.css.ts @@ -1,6 +1,6 @@ import { style } from '@vanilla-extract/css' import { theme, themeUtils } from '@island.is/island-ui/theme' -import { zIndex } from '@island.is/service-portal/constants' +import { zIndex } from '@island.is/portals/my-pages/constants' const hexToRgb = (hex: string) => { const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex) diff --git a/libs/service-portal/core/src/components/Menu/Menu.tsx b/libs/portals/my-pages/core/src/components/Menu/Menu.tsx similarity index 100% rename from libs/service-portal/core/src/components/Menu/Menu.tsx rename to libs/portals/my-pages/core/src/components/Menu/Menu.tsx diff --git a/libs/service-portal/core/src/components/Modal/Modal.css.ts b/libs/portals/my-pages/core/src/components/Modal/Modal.css.ts similarity index 100% rename from libs/service-portal/core/src/components/Modal/Modal.css.ts rename to libs/portals/my-pages/core/src/components/Modal/Modal.css.ts diff --git a/libs/service-portal/core/src/components/Modal/Modal.tsx b/libs/portals/my-pages/core/src/components/Modal/Modal.tsx similarity index 100% rename from libs/service-portal/core/src/components/Modal/Modal.tsx rename to libs/portals/my-pages/core/src/components/Modal/Modal.tsx diff --git a/libs/service-portal/core/src/components/NestedTable/NestedFullTable.tsx b/libs/portals/my-pages/core/src/components/NestedTable/NestedFullTable.tsx similarity index 100% rename from libs/service-portal/core/src/components/NestedTable/NestedFullTable.tsx rename to libs/portals/my-pages/core/src/components/NestedTable/NestedFullTable.tsx diff --git a/libs/service-portal/core/src/components/NestedTable/NestedTable.css.ts b/libs/portals/my-pages/core/src/components/NestedTable/NestedTable.css.ts similarity index 100% rename from libs/service-portal/core/src/components/NestedTable/NestedTable.css.ts rename to libs/portals/my-pages/core/src/components/NestedTable/NestedTable.css.ts diff --git a/libs/service-portal/core/src/components/NestedTable/NestedTable.tsx b/libs/portals/my-pages/core/src/components/NestedTable/NestedTable.tsx similarity index 100% rename from libs/service-portal/core/src/components/NestedTable/NestedTable.tsx rename to libs/portals/my-pages/core/src/components/NestedTable/NestedTable.tsx diff --git a/libs/service-portal/core/src/components/ProgressBar/ProgressBar.css.ts b/libs/portals/my-pages/core/src/components/ProgressBar/ProgressBar.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ProgressBar/ProgressBar.css.ts rename to libs/portals/my-pages/core/src/components/ProgressBar/ProgressBar.css.ts diff --git a/libs/service-portal/core/src/components/ProgressBar/ProgressBar.tsx b/libs/portals/my-pages/core/src/components/ProgressBar/ProgressBar.tsx similarity index 100% rename from libs/service-portal/core/src/components/ProgressBar/ProgressBar.tsx rename to libs/portals/my-pages/core/src/components/ProgressBar/ProgressBar.tsx diff --git a/libs/service-portal/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.css.ts b/libs/portals/my-pages/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.css.ts rename to libs/portals/my-pages/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.css.ts diff --git a/libs/service-portal/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.tsx b/libs/portals/my-pages/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.tsx similarity index 100% rename from libs/service-portal/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.tsx rename to libs/portals/my-pages/core/src/components/ScrollableMiddleTable/ScrollableMiddleTable.tsx diff --git a/libs/service-portal/core/src/components/SortableTable/SortableTable.css.ts b/libs/portals/my-pages/core/src/components/SortableTable/SortableTable.css.ts similarity index 100% rename from libs/service-portal/core/src/components/SortableTable/SortableTable.css.ts rename to libs/portals/my-pages/core/src/components/SortableTable/SortableTable.css.ts diff --git a/libs/service-portal/core/src/components/SortableTable/SortableTable.tsx b/libs/portals/my-pages/core/src/components/SortableTable/SortableTable.tsx similarity index 100% rename from libs/service-portal/core/src/components/SortableTable/SortableTable.tsx rename to libs/portals/my-pages/core/src/components/SortableTable/SortableTable.tsx diff --git a/libs/service-portal/core/src/components/StackOrTableBlock/StackOrTableBlock.tsx b/libs/portals/my-pages/core/src/components/StackOrTableBlock/StackOrTableBlock.tsx similarity index 100% rename from libs/service-portal/core/src/components/StackOrTableBlock/StackOrTableBlock.tsx rename to libs/portals/my-pages/core/src/components/StackOrTableBlock/StackOrTableBlock.tsx diff --git a/libs/service-portal/core/src/components/StackWithBottomDivider/StackWithBottomDivider.tsx b/libs/portals/my-pages/core/src/components/StackWithBottomDivider/StackWithBottomDivider.tsx similarity index 100% rename from libs/service-portal/core/src/components/StackWithBottomDivider/StackWithBottomDivider.tsx rename to libs/portals/my-pages/core/src/components/StackWithBottomDivider/StackWithBottomDivider.tsx diff --git a/libs/service-portal/core/src/components/TabNavigation/SubTabItem.css.ts b/libs/portals/my-pages/core/src/components/TabNavigation/SubTabItem.css.ts similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/SubTabItem.css.ts rename to libs/portals/my-pages/core/src/components/TabNavigation/SubTabItem.css.ts diff --git a/libs/service-portal/core/src/components/TabNavigation/SubTabItem.tsx b/libs/portals/my-pages/core/src/components/TabNavigation/SubTabItem.tsx similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/SubTabItem.tsx rename to libs/portals/my-pages/core/src/components/TabNavigation/SubTabItem.tsx diff --git a/libs/service-portal/core/src/components/TabNavigation/TabBar.css.ts b/libs/portals/my-pages/core/src/components/TabNavigation/TabBar.css.ts similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/TabBar.css.ts rename to libs/portals/my-pages/core/src/components/TabNavigation/TabBar.css.ts diff --git a/libs/service-portal/core/src/components/TabNavigation/TabBar.tsx b/libs/portals/my-pages/core/src/components/TabNavigation/TabBar.tsx similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/TabBar.tsx rename to libs/portals/my-pages/core/src/components/TabNavigation/TabBar.tsx diff --git a/libs/service-portal/core/src/components/TabNavigation/TabItem.css.ts b/libs/portals/my-pages/core/src/components/TabNavigation/TabItem.css.ts similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/TabItem.css.ts rename to libs/portals/my-pages/core/src/components/TabNavigation/TabItem.css.ts diff --git a/libs/service-portal/core/src/components/TabNavigation/TabItem.tsx b/libs/portals/my-pages/core/src/components/TabNavigation/TabItem.tsx similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/TabItem.tsx rename to libs/portals/my-pages/core/src/components/TabNavigation/TabItem.tsx diff --git a/libs/service-portal/core/src/components/TabNavigation/TabNavigation.css.ts b/libs/portals/my-pages/core/src/components/TabNavigation/TabNavigation.css.ts similarity index 100% rename from libs/service-portal/core/src/components/TabNavigation/TabNavigation.css.ts rename to libs/portals/my-pages/core/src/components/TabNavigation/TabNavigation.css.ts diff --git a/libs/service-portal/core/src/components/TabNavigation/TabNavigation.tsx b/libs/portals/my-pages/core/src/components/TabNavigation/TabNavigation.tsx similarity index 98% rename from libs/service-portal/core/src/components/TabNavigation/TabNavigation.tsx rename to libs/portals/my-pages/core/src/components/TabNavigation/TabNavigation.tsx index a08bfe67c73d..e910e5bd8cbb 100644 --- a/libs/service-portal/core/src/components/TabNavigation/TabNavigation.tsx +++ b/libs/portals/my-pages/core/src/components/TabNavigation/TabNavigation.tsx @@ -9,7 +9,7 @@ import { import { theme } from '@island.is/island-ui/theme' import { useLocale } from '@island.is/localization' import { PortalNavigationItem } from '@island.is/portals/core' -import { useOrganization } from '@island.is/service-portal/graphql' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import { useMemo } from 'react' import { useNavigate } from 'react-router-dom' import { useWindowSize } from 'react-use' diff --git a/libs/service-portal/core/src/components/TabNavigation/TabNavigationInstitutionPanel.tsx b/libs/portals/my-pages/core/src/components/TabNavigation/TabNavigationInstitutionPanel.tsx similarity index 94% rename from libs/service-portal/core/src/components/TabNavigation/TabNavigationInstitutionPanel.tsx rename to libs/portals/my-pages/core/src/components/TabNavigation/TabNavigationInstitutionPanel.tsx index 343849cc1431..b73c612f20c2 100644 --- a/libs/service-portal/core/src/components/TabNavigation/TabNavigationInstitutionPanel.tsx +++ b/libs/portals/my-pages/core/src/components/TabNavigation/TabNavigationInstitutionPanel.tsx @@ -1,5 +1,5 @@ import { GridColumn } from '@island.is/island-ui/core' -import { useOrganization } from '@island.is/service-portal/graphql' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import InstitutionPanel from '../InstitutionPanel/InstitutionPanel' import { MessageDescriptor } from 'react-intl' import { OrganizationSlugType } from '@island.is/shared/constants' diff --git a/libs/service-portal/core/src/components/TableBox/TableBox.css.ts b/libs/portals/my-pages/core/src/components/TableBox/TableBox.css.ts similarity index 100% rename from libs/service-portal/core/src/components/TableBox/TableBox.css.ts rename to libs/portals/my-pages/core/src/components/TableBox/TableBox.css.ts diff --git a/libs/service-portal/core/src/components/TableBox/TableBox.tsx b/libs/portals/my-pages/core/src/components/TableBox/TableBox.tsx similarity index 100% rename from libs/service-portal/core/src/components/TableBox/TableBox.tsx rename to libs/portals/my-pages/core/src/components/TableBox/TableBox.tsx diff --git a/libs/service-portal/core/src/components/TableGrid/TableGrid.tsx b/libs/portals/my-pages/core/src/components/TableGrid/TableGrid.tsx similarity index 100% rename from libs/service-portal/core/src/components/TableGrid/TableGrid.tsx rename to libs/portals/my-pages/core/src/components/TableGrid/TableGrid.tsx diff --git a/libs/service-portal/core/src/components/TableUnits/TableUnits.tsx b/libs/portals/my-pages/core/src/components/TableUnits/TableUnits.tsx similarity index 100% rename from libs/service-portal/core/src/components/TableUnits/TableUnits.tsx rename to libs/portals/my-pages/core/src/components/TableUnits/TableUnits.tsx diff --git a/libs/service-portal/core/src/components/ToolTip/ToolTip.css.ts b/libs/portals/my-pages/core/src/components/ToolTip/ToolTip.css.ts similarity index 100% rename from libs/service-portal/core/src/components/ToolTip/ToolTip.css.ts rename to libs/portals/my-pages/core/src/components/ToolTip/ToolTip.css.ts diff --git a/libs/service-portal/core/src/components/ToolTip/ToolTip.tsx b/libs/portals/my-pages/core/src/components/ToolTip/ToolTip.tsx similarity index 100% rename from libs/service-portal/core/src/components/ToolTip/ToolTip.tsx rename to libs/portals/my-pages/core/src/components/ToolTip/ToolTip.tsx diff --git a/libs/service-portal/core/src/components/UserInfoLine/UserInfoLine.css.ts b/libs/portals/my-pages/core/src/components/UserInfoLine/UserInfoLine.css.ts similarity index 100% rename from libs/service-portal/core/src/components/UserInfoLine/UserInfoLine.css.ts rename to libs/portals/my-pages/core/src/components/UserInfoLine/UserInfoLine.css.ts diff --git a/libs/service-portal/core/src/components/UserInfoLine/UserInfoLine.tsx b/libs/portals/my-pages/core/src/components/UserInfoLine/UserInfoLine.tsx similarity index 100% rename from libs/service-portal/core/src/components/UserInfoLine/UserInfoLine.tsx rename to libs/portals/my-pages/core/src/components/UserInfoLine/UserInfoLine.tsx diff --git a/libs/service-portal/core/src/components/VideoPlayer/VideoPlayer.css.ts b/libs/portals/my-pages/core/src/components/VideoPlayer/VideoPlayer.css.ts similarity index 100% rename from libs/service-portal/core/src/components/VideoPlayer/VideoPlayer.css.ts rename to libs/portals/my-pages/core/src/components/VideoPlayer/VideoPlayer.css.ts diff --git a/libs/service-portal/core/src/components/VideoPlayer/VideoPlayer.tsx b/libs/portals/my-pages/core/src/components/VideoPlayer/VideoPlayer.tsx similarity index 100% rename from libs/service-portal/core/src/components/VideoPlayer/VideoPlayer.tsx rename to libs/portals/my-pages/core/src/components/VideoPlayer/VideoPlayer.tsx diff --git a/libs/service-portal/core/src/hooks/useDynamicRoutes/paths.ts b/libs/portals/my-pages/core/src/hooks/useDynamicRoutes/paths.ts similarity index 100% rename from libs/service-portal/core/src/hooks/useDynamicRoutes/paths.ts rename to libs/portals/my-pages/core/src/hooks/useDynamicRoutes/paths.ts diff --git a/libs/service-portal/core/src/hooks/useDynamicRoutes/useDynamicRoutes.ts b/libs/portals/my-pages/core/src/hooks/useDynamicRoutes/useDynamicRoutes.ts similarity index 97% rename from libs/service-portal/core/src/hooks/useDynamicRoutes/useDynamicRoutes.ts rename to libs/portals/my-pages/core/src/hooks/useDynamicRoutes/useDynamicRoutes.ts index 76d0ef26c5a0..92e5fb502077 100644 --- a/libs/service-portal/core/src/hooks/useDynamicRoutes/useDynamicRoutes.ts +++ b/libs/portals/my-pages/core/src/hooks/useDynamicRoutes/useDynamicRoutes.ts @@ -43,7 +43,7 @@ export const useDynamicRoutes = () => { const dynamicPathArray = [] /** - * service-portal/finance + * portals-my-pages/finance * Tabs control for finance routes. Transactions, claims, tax, finance schedule. */ const tabData = data?.getCustomerTapControl @@ -63,7 +63,7 @@ export const useDynamicRoutes = () => { } /** - * service-portal/vehicles + * portals-my-pages/vehicles * Tabs control for driving lessons. */ const licenseBookData = licenseBook?.drivingLicenseBookUserBook diff --git a/libs/service-portal/core/src/hooks/useIsMobile/useIsMobile.ts b/libs/portals/my-pages/core/src/hooks/useIsMobile/useIsMobile.ts similarity index 100% rename from libs/service-portal/core/src/hooks/useIsMobile/useIsMobile.ts rename to libs/portals/my-pages/core/src/hooks/useIsMobile/useIsMobile.ts diff --git a/libs/service-portal/core/src/hooks/usePlausibleDetailPageview/usePlausibleDetailPageview.ts b/libs/portals/my-pages/core/src/hooks/usePlausibleDetailPageview/usePlausibleDetailPageview.ts similarity index 100% rename from libs/service-portal/core/src/hooks/usePlausibleDetailPageview/usePlausibleDetailPageview.ts rename to libs/portals/my-pages/core/src/hooks/usePlausibleDetailPageview/usePlausibleDetailPageview.ts diff --git a/libs/service-portal/core/src/hooks/useQueryParam.ts b/libs/portals/my-pages/core/src/hooks/useQueryParam.ts similarity index 100% rename from libs/service-portal/core/src/hooks/useQueryParam.ts rename to libs/portals/my-pages/core/src/hooks/useQueryParam.ts diff --git a/libs/service-portal/core/src/hooks/useScrollToRefOnUpdate/useScrollToRefOnUpdate.ts b/libs/portals/my-pages/core/src/hooks/useScrollToRefOnUpdate/useScrollToRefOnUpdate.ts similarity index 100% rename from libs/service-portal/core/src/hooks/useScrollToRefOnUpdate/useScrollToRefOnUpdate.ts rename to libs/portals/my-pages/core/src/hooks/useScrollToRefOnUpdate/useScrollToRefOnUpdate.ts diff --git a/libs/service-portal/core/src/hooks/useScrollTopOnUpdate/useScrollTopOnUpdate.ts b/libs/portals/my-pages/core/src/hooks/useScrollTopOnUpdate/useScrollTopOnUpdate.ts similarity index 100% rename from libs/service-portal/core/src/hooks/useScrollTopOnUpdate/useScrollTopOnUpdate.ts rename to libs/portals/my-pages/core/src/hooks/useScrollTopOnUpdate/useScrollTopOnUpdate.ts diff --git a/libs/service-portal/core/src/index.ts b/libs/portals/my-pages/core/src/index.ts similarity index 98% rename from libs/service-portal/core/src/index.ts rename to libs/portals/my-pages/core/src/index.ts index 5ffbd248a9b2..f87e890391dc 100644 --- a/libs/service-portal/core/src/index.ts +++ b/libs/portals/my-pages/core/src/index.ts @@ -1,4 +1,4 @@ -export * from './lib/service-portal-core' +export * from './lib/my-pages-core' export * from './lib/navigation/paths' export * from './components/ActionCard/ActionCard' export * from './components/ActionCard/ActionCardLoader' diff --git a/libs/service-portal/core/src/lib/messages.ts b/libs/portals/my-pages/core/src/lib/messages.ts similarity index 100% rename from libs/service-portal/core/src/lib/messages.ts rename to libs/portals/my-pages/core/src/lib/messages.ts diff --git a/libs/service-portal/core/src/lib/service-portal-core.ts b/libs/portals/my-pages/core/src/lib/my-pages-core.ts similarity index 100% rename from libs/service-portal/core/src/lib/service-portal-core.ts rename to libs/portals/my-pages/core/src/lib/my-pages-core.ts diff --git a/libs/service-portal/core/src/lib/navigation/paths.ts b/libs/portals/my-pages/core/src/lib/navigation/paths.ts similarity index 100% rename from libs/service-portal/core/src/lib/navigation/paths.ts rename to libs/portals/my-pages/core/src/lib/navigation/paths.ts diff --git a/libs/service-portal/core/src/screens/DynamicWrapper/DynamicWrapper.tsx b/libs/portals/my-pages/core/src/screens/DynamicWrapper/DynamicWrapper.tsx similarity index 100% rename from libs/service-portal/core/src/screens/DynamicWrapper/DynamicWrapper.tsx rename to libs/portals/my-pages/core/src/screens/DynamicWrapper/DynamicWrapper.tsx diff --git a/libs/service-portal/core/src/screens/ErrorScreen/ErrorScreen.css.ts b/libs/portals/my-pages/core/src/screens/ErrorScreen/ErrorScreen.css.ts similarity index 100% rename from libs/service-portal/core/src/screens/ErrorScreen/ErrorScreen.css.ts rename to libs/portals/my-pages/core/src/screens/ErrorScreen/ErrorScreen.css.ts diff --git a/libs/service-portal/core/src/screens/ErrorScreen/ErrorScreen.tsx b/libs/portals/my-pages/core/src/screens/ErrorScreen/ErrorScreen.tsx similarity index 100% rename from libs/service-portal/core/src/screens/ErrorScreen/ErrorScreen.tsx rename to libs/portals/my-pages/core/src/screens/ErrorScreen/ErrorScreen.tsx diff --git a/libs/service-portal/core/src/screens/NoDataScreen/NoDataScreen.tsx b/libs/portals/my-pages/core/src/screens/NoDataScreen/NoDataScreen.tsx similarity index 100% rename from libs/service-portal/core/src/screens/NoDataScreen/NoDataScreen.tsx rename to libs/portals/my-pages/core/src/screens/NoDataScreen/NoDataScreen.tsx diff --git a/libs/service-portal/core/src/screens/NotFound/NotFound.tsx b/libs/portals/my-pages/core/src/screens/NotFound/NotFound.tsx similarity index 100% rename from libs/service-portal/core/src/screens/NotFound/NotFound.tsx rename to libs/portals/my-pages/core/src/screens/NotFound/NotFound.tsx diff --git a/libs/service-portal/core/src/utils/addArray.ts b/libs/portals/my-pages/core/src/utils/addArray.ts similarity index 100% rename from libs/service-portal/core/src/utils/addArray.ts rename to libs/portals/my-pages/core/src/utils/addArray.ts diff --git a/libs/service-portal/core/src/utils/amountFormat.ts b/libs/portals/my-pages/core/src/utils/amountFormat.ts similarity index 100% rename from libs/service-portal/core/src/utils/amountFormat.ts rename to libs/portals/my-pages/core/src/utils/amountFormat.ts diff --git a/libs/service-portal/core/src/utils/constants.ts b/libs/portals/my-pages/core/src/utils/constants.ts similarity index 100% rename from libs/service-portal/core/src/utils/constants.ts rename to libs/portals/my-pages/core/src/utils/constants.ts diff --git a/libs/service-portal/core/src/utils/dateUtils.ts b/libs/portals/my-pages/core/src/utils/dateUtils.ts similarity index 100% rename from libs/service-portal/core/src/utils/dateUtils.ts rename to libs/portals/my-pages/core/src/utils/dateUtils.ts diff --git a/libs/service-portal/core/src/utils/documentFormSubmission.ts b/libs/portals/my-pages/core/src/utils/documentFormSubmission.ts similarity index 100% rename from libs/service-portal/core/src/utils/documentFormSubmission.ts rename to libs/portals/my-pages/core/src/utils/documentFormSubmission.ts diff --git a/libs/service-portal/core/src/utils/downloadDataFile.ts b/libs/portals/my-pages/core/src/utils/downloadDataFile.ts similarity index 100% rename from libs/service-portal/core/src/utils/downloadDataFile.ts rename to libs/portals/my-pages/core/src/utils/downloadDataFile.ts diff --git a/libs/service-portal/core/src/utils/downloadLink.ts b/libs/portals/my-pages/core/src/utils/downloadLink.ts similarity index 100% rename from libs/service-portal/core/src/utils/downloadLink.ts rename to libs/portals/my-pages/core/src/utils/downloadLink.ts diff --git a/libs/service-portal/core/src/utils/formatPlausiblePathToParams.spec.tsx b/libs/portals/my-pages/core/src/utils/formatPlausiblePathToParams.spec.tsx similarity index 95% rename from libs/service-portal/core/src/utils/formatPlausiblePathToParams.spec.tsx rename to libs/portals/my-pages/core/src/utils/formatPlausiblePathToParams.spec.tsx index 80092689ff8d..ea92edd38001 100644 --- a/libs/service-portal/core/src/utils/formatPlausiblePathToParams.spec.tsx +++ b/libs/portals/my-pages/core/src/utils/formatPlausiblePathToParams.spec.tsx @@ -29,7 +29,7 @@ describe('formatPlausiblePathToParams', () => { }) }) - it('should match non identifiable service-portal path when given identifiable path', async () => { + it('should match non identifiable portals-my-pages path when given identifiable path', async () => { // arrange const anyPath = AssetDetailPath.replace(':id', '123') const pageOrigin = window.location.origin diff --git a/libs/service-portal/core/src/utils/formatPlausiblePathToParams.ts b/libs/portals/my-pages/core/src/utils/formatPlausiblePathToParams.ts similarity index 100% rename from libs/service-portal/core/src/utils/formatPlausiblePathToParams.ts rename to libs/portals/my-pages/core/src/utils/formatPlausiblePathToParams.ts diff --git a/libs/service-portal/core/src/utils/isExternalLink.ts b/libs/portals/my-pages/core/src/utils/isExternalLink.ts similarity index 100% rename from libs/service-portal/core/src/utils/isExternalLink.ts rename to libs/portals/my-pages/core/src/utils/isExternalLink.ts diff --git a/libs/service-portal/core/src/utils/numberFormat.ts b/libs/portals/my-pages/core/src/utils/numberFormat.ts similarity index 100% rename from libs/service-portal/core/src/utils/numberFormat.ts rename to libs/portals/my-pages/core/src/utils/numberFormat.ts diff --git a/libs/service-portal/core/src/utils/periodFormat.ts b/libs/portals/my-pages/core/src/utils/periodFormat.ts similarity index 100% rename from libs/service-portal/core/src/utils/periodFormat.ts rename to libs/portals/my-pages/core/src/utils/periodFormat.ts diff --git a/libs/service-portal/core/src/utils/phoneHelper.ts b/libs/portals/my-pages/core/src/utils/phoneHelper.ts similarity index 100% rename from libs/service-portal/core/src/utils/phoneHelper.ts rename to libs/portals/my-pages/core/src/utils/phoneHelper.ts diff --git a/libs/service-portal/core/src/utils/utils.ts b/libs/portals/my-pages/core/src/utils/utils.ts similarity index 100% rename from libs/service-portal/core/src/utils/utils.ts rename to libs/portals/my-pages/core/src/utils/utils.ts diff --git a/libs/service-portal/core/tsconfig.json b/libs/portals/my-pages/core/tsconfig.json similarity index 100% rename from libs/service-portal/core/tsconfig.json rename to libs/portals/my-pages/core/tsconfig.json diff --git a/libs/portals/my-pages/core/tsconfig.lib.json b/libs/portals/my-pages/core/tsconfig.lib.json new file mode 100644 index 000000000000..9668c0996130 --- /dev/null +++ b/libs/portals/my-pages/core/tsconfig.lib.json @@ -0,0 +1,23 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../../node_modules/@nx/react/typings/image.d.ts" + ], + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/service-portal/education-degree/tsconfig.spec.json b/libs/portals/my-pages/core/tsconfig.spec.json similarity index 89% rename from libs/service-portal/education-degree/tsconfig.spec.json rename to libs/portals/my-pages/core/tsconfig.spec.json index e1535ba9d07c..ef88b556acb9 100644 --- a/libs/service-portal/education-degree/tsconfig.spec.json +++ b/libs/portals/my-pages/core/tsconfig.spec.json @@ -1,19 +1,19 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, "include": [ - "**/*.spec.ts", "**/*.test.ts", - "**/*.spec.tsx", + "**/*.spec.ts", "**/*.test.tsx", - "**/*.spec.js", + "**/*.spec.tsx", "**/*.test.js", - "**/*.spec.jsx", + "**/*.spec.js", "**/*.test.jsx", + "**/*.spec.jsx", "**/*.d.ts", "jest.config.ts" ] diff --git a/libs/service-portal/documents/.babelrc b/libs/portals/my-pages/documents/.babelrc similarity index 100% rename from libs/service-portal/documents/.babelrc rename to libs/portals/my-pages/documents/.babelrc diff --git a/libs/service-portal/documents/.eslintrc.json b/libs/portals/my-pages/documents/.eslintrc.json similarity index 78% rename from libs/service-portal/documents/.eslintrc.json rename to libs/portals/my-pages/documents/.eslintrc.json index 4f027ee445be..97a68cca0c27 100644 --- a/libs/service-portal/documents/.eslintrc.json +++ b/libs/portals/my-pages/documents/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "rules": {}, "overrides": [ diff --git a/libs/portals/my-pages/documents/README.md b/libs/portals/my-pages/documents/README.md new file mode 100644 index 000000000000..a20941987226 --- /dev/null +++ b/libs/portals/my-pages/documents/README.md @@ -0,0 +1,7 @@ +# portals-my-pages-documents + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test portals-my-pages-documents` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/documents/codegen.yml b/libs/portals/my-pages/documents/codegen.yml similarity index 74% rename from libs/service-portal/documents/codegen.yml rename to libs/portals/my-pages/documents/codegen.yml index 41eebb45e281..f8338d8dff22 100644 --- a/libs/service-portal/documents/codegen.yml +++ b/libs/portals/my-pages/documents/codegen.yml @@ -1,9 +1,9 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/documents/src/**/**/*.graphql + - libs/portals/my-pages/documents/src/**/**/*.graphql generates: - libs/service-portal/documents/src/: + libs/portals/my-pages/documents/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' diff --git a/libs/portals/my-pages/documents/jest.config.ts b/libs/portals/my-pages/documents/jest.config.ts new file mode 100644 index 000000000000..c9d1605db226 --- /dev/null +++ b/libs/portals/my-pages/documents/jest.config.ts @@ -0,0 +1,16 @@ +/* eslint-disable */ +export default { + preset: './jest.preset.js', + rootDir: '../../../..', + roots: [__dirname], + transform: { + '^.+\\.[tj]sx?$': [ + 'ts-jest', + { tsconfig: `${__dirname}/tsconfig.spec.json` }, + ], + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + coverageDirectory: '/coverage/libs/portals/my-pages/documents', + globals: {}, + displayName: 'portals-my-pages-documents', +} diff --git a/libs/service-portal/documents/project.json b/libs/portals/my-pages/documents/project.json similarity index 58% rename from libs/service-portal/documents/project.json rename to libs/portals/my-pages/documents/project.json index f811b4e8168c..506c237ce509 100644 --- a/libs/service-portal/documents/project.json +++ b/libs/portals/my-pages/documents/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-documents", + "name": "portals-my-pages-documents", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/documents/src", + "sourceRoot": "libs/portals/my-pages/documents/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,20 +12,20 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/documents/jest.config.ts" + "jestConfig": "libs/portals/my-pages/documents/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/documents"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/documents"] }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/documents/src/{lib,components,screens,utils}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/documents/src/{lib,components,screens,utils}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "command": "graphql-codegen --config libs/service-portal/documents/codegen.yml" + "command": "graphql-codegen --config libs/portals/my-pages/documents/codegen.yml" }, "outputs": ["{projectRoot}/src/**/*.generated.ts"] } diff --git a/libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBar.css.ts b/libs/portals/my-pages/documents/src/components/DocumentActionBar/DocumentActionBar.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBar.css.ts rename to libs/portals/my-pages/documents/src/components/DocumentActionBar/DocumentActionBar.css.ts diff --git a/libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBarV2.tsx b/libs/portals/my-pages/documents/src/components/DocumentActionBar/DocumentActionBarV2.tsx similarity index 98% rename from libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBarV2.tsx rename to libs/portals/my-pages/documents/src/components/DocumentActionBar/DocumentActionBarV2.tsx index c2807fdd2572..b9ad8589805b 100644 --- a/libs/service-portal/documents/src/components/DocumentActionBar/DocumentActionBarV2.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentActionBar/DocumentActionBarV2.tsx @@ -6,7 +6,7 @@ import { Button, } from '@island.is/island-ui/core' import { useUserInfo } from '@island.is/auth/react' -import { Tooltip, m } from '@island.is/service-portal/core' +import { Tooltip, m } from '@island.is/portals/my-pages/core' import { useLocale } from '@island.is/localization' import { ActiveDocumentType2 } from '../../lib/types' import { useDocumentContext } from '../../screens/Overview/DocumentContext' diff --git a/libs/service-portal/documents/src/components/DocumentActions/DocumentActionsV3.tsx b/libs/portals/my-pages/documents/src/components/DocumentActions/DocumentActionsV3.tsx similarity index 100% rename from libs/service-portal/documents/src/components/DocumentActions/DocumentActionsV3.tsx rename to libs/portals/my-pages/documents/src/components/DocumentActions/DocumentActionsV3.tsx diff --git a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilter.css.ts b/libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilter.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilter.css.ts rename to libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilter.css.ts diff --git a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterTagsV2.tsx b/libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilterTagsV2.tsx similarity index 98% rename from libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterTagsV2.tsx rename to libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilterTagsV2.tsx index ef1097cf5ef9..e3e9d01a4739 100644 --- a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterTagsV2.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilterTagsV2.tsx @@ -1,7 +1,7 @@ import React from 'react' import { Box, Button } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import format from 'date-fns/format' import { dateFormat } from '@island.is/shared/constants' import FilterTag from '../FilterTag/FilterTag' diff --git a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterV2.tsx b/libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilterV2.tsx similarity index 99% rename from libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterV2.tsx rename to libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilterV2.tsx index 68d830f19055..7ccfabe09b7d 100644 --- a/libs/service-portal/documents/src/components/DocumentFilter/DocumentsFilterV2.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentFilter/DocumentsFilterV2.tsx @@ -10,7 +10,7 @@ import { Hidden, Text, } from '@island.is/island-ui/core' -import { m, Filter } from '@island.is/service-portal/core' +import { m, Filter } from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { messages } from '../../utils/messages' import * as styles from './DocumentsFilter.css' diff --git a/libs/service-portal/documents/src/components/DocumentHeader/DocumentHeader.css.ts b/libs/portals/my-pages/documents/src/components/DocumentHeader/DocumentHeader.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/DocumentHeader/DocumentHeader.css.ts rename to libs/portals/my-pages/documents/src/components/DocumentHeader/DocumentHeader.css.ts diff --git a/libs/service-portal/documents/src/components/DocumentHeader/DocumentHeaderV2.tsx b/libs/portals/my-pages/documents/src/components/DocumentHeader/DocumentHeaderV2.tsx similarity index 100% rename from libs/service-portal/documents/src/components/DocumentHeader/DocumentHeaderV2.tsx rename to libs/portals/my-pages/documents/src/components/DocumentHeader/DocumentHeaderV2.tsx diff --git a/libs/service-portal/documents/src/components/DocumentHeader/DocumentHeaderV3.tsx b/libs/portals/my-pages/documents/src/components/DocumentHeader/DocumentHeaderV3.tsx similarity index 100% rename from libs/service-portal/documents/src/components/DocumentHeader/DocumentHeaderV3.tsx rename to libs/portals/my-pages/documents/src/components/DocumentHeader/DocumentHeaderV3.tsx diff --git a/libs/service-portal/documents/src/components/DocumentLine/AvatarImage.tsx b/libs/portals/my-pages/documents/src/components/DocumentLine/AvatarImage.tsx similarity index 100% rename from libs/service-portal/documents/src/components/DocumentLine/AvatarImage.tsx rename to libs/portals/my-pages/documents/src/components/DocumentLine/AvatarImage.tsx diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.css.ts b/libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLine.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/DocumentLine/DocumentLine.css.ts rename to libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLine.css.ts diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx b/libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLineV2.tsx similarity index 99% rename from libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx rename to libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLineV2.tsx index 31e4158d50f9..1a6e50d85bb7 100644 --- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLineV2.tsx @@ -5,7 +5,7 @@ import { FC, useEffect, useRef, useState } from 'react' import { DocumentV2, DocumentV2Content } from '@island.is/api/schema' import { Box, Text, LoadingDots, Icon, toast } from '@island.is/island-ui/core' import { dateFormat } from '@island.is/shared/constants' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import * as styles from './DocumentLine.css' import { useLocale } from '@island.is/localization' import { messages } from '../../utils/messages' diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV3.tsx b/libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLineV3.tsx similarity index 99% rename from libs/service-portal/documents/src/components/DocumentLine/DocumentLineV3.tsx rename to libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLineV3.tsx index 25ea3e646023..df21179d04a6 100644 --- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV3.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentLine/DocumentLineV3.tsx @@ -9,7 +9,7 @@ import { } from '@island.is/api/schema' import { Box, Icon, LoadingDots, Text, toast } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { ConfirmationModal, m } from '@island.is/service-portal/core' +import { ConfirmationModal, m } from '@island.is/portals/my-pages/core' import { dateFormat } from '@island.is/shared/constants' import { matchPath, diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRenderer.css.ts b/libs/portals/my-pages/documents/src/components/DocumentRenderer/DocumentRenderer.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/DocumentRenderer/DocumentRenderer.css.ts rename to libs/portals/my-pages/documents/src/components/DocumentRenderer/DocumentRenderer.css.ts diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx b/libs/portals/my-pages/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx similarity index 100% rename from libs/service-portal/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx rename to libs/portals/my-pages/documents/src/components/DocumentRenderer/DocumentRendererV2.tsx diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/HTMLDocument.tsx b/libs/portals/my-pages/documents/src/components/DocumentRenderer/HTMLDocument.tsx similarity index 100% rename from libs/service-portal/documents/src/components/DocumentRenderer/HTMLDocument.tsx rename to libs/portals/my-pages/documents/src/components/DocumentRenderer/HTMLDocument.tsx diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx b/libs/portals/my-pages/documents/src/components/DocumentRenderer/PdfDocument.tsx similarity index 98% rename from libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx rename to libs/portals/my-pages/documents/src/components/DocumentRenderer/PdfDocument.tsx index c28333da0e53..832fbaf8f4d5 100644 --- a/libs/service-portal/documents/src/components/DocumentRenderer/PdfDocument.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentRenderer/PdfDocument.tsx @@ -1,7 +1,7 @@ import { useRef, useState, useEffect } from 'react' import { useLocale } from '@island.is/localization' import { Box, Button, PdfViewer, Text } from '@island.is/island-ui/core' -import { Modal, m } from '@island.is/service-portal/core' +import { Modal, m } from '@island.is/portals/my-pages/core' import { useUserInfo } from '@island.is/auth/react' import { ActiveDocumentType2 } from '../../lib/types' import { downloadFile } from '../../utils/downloadDocumentV2' diff --git a/libs/service-portal/documents/src/components/DocumentRenderer/UrlDocment.tsx b/libs/portals/my-pages/documents/src/components/DocumentRenderer/UrlDocment.tsx similarity index 88% rename from libs/service-portal/documents/src/components/DocumentRenderer/UrlDocment.tsx rename to libs/portals/my-pages/documents/src/components/DocumentRenderer/UrlDocment.tsx index 9c834b2555fc..22d7a5d4f77b 100644 --- a/libs/service-portal/documents/src/components/DocumentRenderer/UrlDocment.tsx +++ b/libs/portals/my-pages/documents/src/components/DocumentRenderer/UrlDocment.tsx @@ -1,6 +1,6 @@ import { Button } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { LinkResolver, m } from '@island.is/service-portal/core' +import { LinkResolver, m } from '@island.is/portals/my-pages/core' type UrlDocumentProps = { url: string } diff --git a/libs/service-portal/documents/src/components/FavAndStash/FavAndStash.css.ts b/libs/portals/my-pages/documents/src/components/FavAndStash/FavAndStash.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/FavAndStash/FavAndStash.css.ts rename to libs/portals/my-pages/documents/src/components/FavAndStash/FavAndStash.css.ts diff --git a/libs/service-portal/documents/src/components/FavAndStash/FavAndStashV3.tsx b/libs/portals/my-pages/documents/src/components/FavAndStash/FavAndStashV3.tsx similarity index 96% rename from libs/service-portal/documents/src/components/FavAndStash/FavAndStashV3.tsx rename to libs/portals/my-pages/documents/src/components/FavAndStash/FavAndStashV3.tsx index 04fda5f7b742..51591e7d416a 100644 --- a/libs/service-portal/documents/src/components/FavAndStash/FavAndStashV3.tsx +++ b/libs/portals/my-pages/documents/src/components/FavAndStash/FavAndStashV3.tsx @@ -1,6 +1,6 @@ import { Box, Button, LoadingDots } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { Tooltip, m } from '@island.is/service-portal/core' +import { Tooltip, m } from '@island.is/portals/my-pages/core' import React, { MouseEvent } from 'react' import * as styles from './FavAndStash.css' diff --git a/libs/service-portal/documents/src/components/FavAndStash/index.tsx b/libs/portals/my-pages/documents/src/components/FavAndStash/index.tsx similarity index 96% rename from libs/service-portal/documents/src/components/FavAndStash/index.tsx rename to libs/portals/my-pages/documents/src/components/FavAndStash/index.tsx index ed5c56721104..71cfd1a99034 100644 --- a/libs/service-portal/documents/src/components/FavAndStash/index.tsx +++ b/libs/portals/my-pages/documents/src/components/FavAndStash/index.tsx @@ -1,7 +1,7 @@ import React, { MouseEvent } from 'react' import { Box, Button, LoadingDots } from '@island.is/island-ui/core' import * as styles from './FavAndStash.css' -import { Tooltip, m } from '@island.is/service-portal/core' +import { Tooltip, m } from '@island.is/portals/my-pages/core' import { useLocale } from '@island.is/localization' type FavAndStashProps = { diff --git a/libs/service-portal/documents/src/components/FilterTag/FilterTag.css.ts b/libs/portals/my-pages/documents/src/components/FilterTag/FilterTag.css.ts similarity index 100% rename from libs/service-portal/documents/src/components/FilterTag/FilterTag.css.ts rename to libs/portals/my-pages/documents/src/components/FilterTag/FilterTag.css.ts diff --git a/libs/service-portal/documents/src/components/FilterTag/FilterTag.tsx b/libs/portals/my-pages/documents/src/components/FilterTag/FilterTag.tsx similarity index 100% rename from libs/service-portal/documents/src/components/FilterTag/FilterTag.tsx rename to libs/portals/my-pages/documents/src/components/FilterTag/FilterTag.tsx diff --git a/libs/service-portal/documents/src/components/NoPDF/EmptyImage.tsx b/libs/portals/my-pages/documents/src/components/NoPDF/EmptyImage.tsx similarity index 100% rename from libs/service-portal/documents/src/components/NoPDF/EmptyImage.tsx rename to libs/portals/my-pages/documents/src/components/NoPDF/EmptyImage.tsx diff --git a/libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx b/libs/portals/my-pages/documents/src/components/NoPDF/NoPDF.tsx similarity index 96% rename from libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx rename to libs/portals/my-pages/documents/src/components/NoPDF/NoPDF.tsx index f927cc923ec3..df3c3fc018fa 100644 --- a/libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx +++ b/libs/portals/my-pages/documents/src/components/NoPDF/NoPDF.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { Text, Box } from '@island.is/island-ui/core' import { EmptyImageSmall } from './EmptyImage' import { messages } from '../../utils/messages' diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverviewV2.tsx b/libs/portals/my-pages/documents/src/components/OverviewDisplay/DesktopOverviewV2.tsx similarity index 94% rename from libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverviewV2.tsx rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/DesktopOverviewV2.tsx index e0d853780af1..33c42443d6b4 100644 --- a/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverviewV2.tsx +++ b/libs/portals/my-pages/documents/src/components/OverviewDisplay/DesktopOverviewV2.tsx @@ -1,12 +1,12 @@ import { FC } from 'react' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { Box, LoadingDots } from '@island.is/island-ui/core' import { DocumentsV2Category } from '@island.is/api/schema' import { useLocale, useNamespaces } from '@island.is/localization' import { DocumentRenderer } from '../DocumentRenderer/DocumentRendererV2' import { DocumentHeader } from '../DocumentHeader/DocumentHeaderV2' import NoPDF from '../NoPDF/NoPDF' -import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/service-portal/constants' +import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/portals/my-pages/constants' import { useDocumentContext } from '../../screens/Overview/DocumentContext' import * as styles from './OverviewDisplay.css' import { useDocumentList } from '../../hooks/useDocumentList' diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverviewV3.tsx b/libs/portals/my-pages/documents/src/components/OverviewDisplay/DesktopOverviewV3.tsx similarity index 94% rename from libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverviewV3.tsx rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/DesktopOverviewV3.tsx index a618dead8479..cb2067870d42 100644 --- a/libs/service-portal/documents/src/components/OverviewDisplay/DesktopOverviewV3.tsx +++ b/libs/portals/my-pages/documents/src/components/OverviewDisplay/DesktopOverviewV3.tsx @@ -1,12 +1,12 @@ import { FC } from 'react' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { Box, LoadingDots } from '@island.is/island-ui/core' import { DocumentsV2Category } from '@island.is/api/schema' import { useLocale, useNamespaces } from '@island.is/localization' import { DocumentRenderer } from '../DocumentRenderer/DocumentRendererV2' import { DocumentHeader } from '../DocumentHeader/DocumentHeaderV3' import NoPDF from '../NoPDF/NoPDF' -import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/service-portal/constants' +import { SERVICE_PORTAL_HEADER_HEIGHT_LG } from '@island.is/portals/my-pages/constants' import { useDocumentContext } from '../../screens/Overview/DocumentContext' import * as styles from './OverviewDisplay.css' import { useDocumentListV3 } from '../../hooks/useDocumentListV3' diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverviewV2.tsx b/libs/portals/my-pages/documents/src/components/OverviewDisplay/MobileOverviewV2.tsx similarity index 97% rename from libs/service-portal/documents/src/components/OverviewDisplay/MobileOverviewV2.tsx rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/MobileOverviewV2.tsx index db88c10f3f4a..d33d62a232e6 100644 --- a/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverviewV2.tsx +++ b/libs/portals/my-pages/documents/src/components/OverviewDisplay/MobileOverviewV2.tsx @@ -1,6 +1,6 @@ import { FC } from 'react' import FocusLock from 'react-focus-lock' -import { LoadModal, m } from '@island.is/service-portal/core' +import { LoadModal, m } from '@island.is/portals/my-pages/core' import { Box, Text, GridColumn, GridRow } from '@island.is/island-ui/core' import { DocumentsV2Category } from '@island.is/api/schema' import { useLocale, useNamespaces } from '@island.is/localization' diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverviewV3.tsx b/libs/portals/my-pages/documents/src/components/OverviewDisplay/MobileOverviewV3.tsx similarity index 97% rename from libs/service-portal/documents/src/components/OverviewDisplay/MobileOverviewV3.tsx rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/MobileOverviewV3.tsx index c98d4a65c5d0..fa8bb27b6632 100644 --- a/libs/service-portal/documents/src/components/OverviewDisplay/MobileOverviewV3.tsx +++ b/libs/portals/my-pages/documents/src/components/OverviewDisplay/MobileOverviewV3.tsx @@ -1,6 +1,6 @@ import { FC } from 'react' import FocusLock from 'react-focus-lock' -import { LoadModal, m } from '@island.is/service-portal/core' +import { LoadModal, m } from '@island.is/portals/my-pages/core' import { Box, Text, GridColumn, GridRow } from '@island.is/island-ui/core' import { DocumentsV2Category } from '@island.is/api/schema' import { useLocale, useNamespaces } from '@island.is/localization' diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDisplay.css.ts b/libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDisplay.css.ts similarity index 97% rename from libs/service-portal/documents/src/components/OverviewDisplay/OverviewDisplay.css.ts rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDisplay.css.ts index 8c407e22320b..e9ab35e8af21 100644 --- a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDisplay.css.ts +++ b/libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDisplay.css.ts @@ -1,6 +1,6 @@ import { theme, themeUtils } from '@island.is/island-ui/theme' import { globalStyle, style } from '@vanilla-extract/css' -import { SERVICE_PORTAL_HEADER_HEIGHT_SM as hheight } from '@island.is/service-portal/constants' +import { SERVICE_PORTAL_HEADER_HEIGHT_SM as hheight } from '@island.is/portals/my-pages/constants' export const modalBase = style({ width: '100%', diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx b/libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx similarity index 100% rename from libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV2.tsx diff --git a/libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV3.tsx b/libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV3.tsx similarity index 100% rename from libs/service-portal/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV3.tsx rename to libs/portals/my-pages/documents/src/components/OverviewDisplay/OverviewDocumentDisplayV3.tsx diff --git a/libs/service-portal/documents/src/components/UrgentTag/UrgentTag.tsx b/libs/portals/my-pages/documents/src/components/UrgentTag/UrgentTag.tsx similarity index 93% rename from libs/service-portal/documents/src/components/UrgentTag/UrgentTag.tsx rename to libs/portals/my-pages/documents/src/components/UrgentTag/UrgentTag.tsx index c7fdf9f8854f..1fa525586983 100644 --- a/libs/service-portal/documents/src/components/UrgentTag/UrgentTag.tsx +++ b/libs/portals/my-pages/documents/src/components/UrgentTag/UrgentTag.tsx @@ -1,6 +1,6 @@ import { Box, Icon, Text } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' const UrgentTag = () => { const { formatMessage } = useLocale() diff --git a/libs/service-portal/documents/src/hooks/useDocumentFilters.ts b/libs/portals/my-pages/documents/src/hooks/useDocumentFilters.ts similarity index 97% rename from libs/service-portal/documents/src/hooks/useDocumentFilters.ts rename to libs/portals/my-pages/documents/src/hooks/useDocumentFilters.ts index cd59a49dc20a..8f92dc124170 100644 --- a/libs/service-portal/documents/src/hooks/useDocumentFilters.ts +++ b/libs/portals/my-pages/documents/src/hooks/useDocumentFilters.ts @@ -4,7 +4,7 @@ import { documentsSearchDocumentsInitialized } from '@island.is/plausible' import isAfter from 'date-fns/isAfter' import { defaultFilterValues } from '../utils/types' import { DocumentsPaths } from '../lib/paths' -import { formatPlausiblePathToParams } from '@island.is/service-portal/core' +import { formatPlausiblePathToParams } from '@island.is/portals/my-pages/core' export const useDocumentFilters = () => { const { setFilterValue, setPage } = useDocumentContext() diff --git a/libs/service-portal/documents/src/hooks/useDocumentList.ts b/libs/portals/my-pages/documents/src/hooks/useDocumentList.ts similarity index 100% rename from libs/service-portal/documents/src/hooks/useDocumentList.ts rename to libs/portals/my-pages/documents/src/hooks/useDocumentList.ts diff --git a/libs/service-portal/documents/src/hooks/useDocumentListV3.ts b/libs/portals/my-pages/documents/src/hooks/useDocumentListV3.ts similarity index 100% rename from libs/service-portal/documents/src/hooks/useDocumentListV3.ts rename to libs/portals/my-pages/documents/src/hooks/useDocumentListV3.ts diff --git a/libs/service-portal/documents/src/hooks/useIsChildFocused.ts b/libs/portals/my-pages/documents/src/hooks/useIsChildFocused.ts similarity index 100% rename from libs/service-portal/documents/src/hooks/useIsChildFocused.ts rename to libs/portals/my-pages/documents/src/hooks/useIsChildFocused.ts diff --git a/libs/service-portal/documents/src/hooks/useKeyDown.tsx b/libs/portals/my-pages/documents/src/hooks/useKeyDown.tsx similarity index 100% rename from libs/service-portal/documents/src/hooks/useKeyDown.tsx rename to libs/portals/my-pages/documents/src/hooks/useKeyDown.tsx diff --git a/libs/service-portal/documents/src/hooks/useMailActionV2.ts b/libs/portals/my-pages/documents/src/hooks/useMailActionV2.ts similarity index 98% rename from libs/service-portal/documents/src/hooks/useMailActionV2.ts rename to libs/portals/my-pages/documents/src/hooks/useMailActionV2.ts index 40b09d945808..16ffc4067b7d 100644 --- a/libs/service-portal/documents/src/hooks/useMailActionV2.ts +++ b/libs/portals/my-pages/documents/src/hooks/useMailActionV2.ts @@ -1,7 +1,7 @@ import { useState } from 'react' import { toast } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { useMailActionV2Mutation } from '../screens/Overview/Overview.generated' import { MailActions } from '../utils/types' import { useDocumentList } from './useDocumentList' diff --git a/libs/service-portal/documents/src/index.ts b/libs/portals/my-pages/documents/src/index.ts similarity index 100% rename from libs/service-portal/documents/src/index.ts rename to libs/portals/my-pages/documents/src/index.ts diff --git a/libs/service-portal/documents/src/lib/navigation.ts b/libs/portals/my-pages/documents/src/lib/navigation.ts similarity index 88% rename from libs/service-portal/documents/src/lib/navigation.ts rename to libs/portals/my-pages/documents/src/lib/navigation.ts index 8b88579f419b..317a0514674d 100644 --- a/libs/service-portal/documents/src/lib/navigation.ts +++ b/libs/portals/my-pages/documents/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { messages } from '../utils/messages' import { DocumentsPaths } from './paths' diff --git a/libs/service-portal/documents/src/lib/paths.ts b/libs/portals/my-pages/documents/src/lib/paths.ts similarity index 100% rename from libs/service-portal/documents/src/lib/paths.ts rename to libs/portals/my-pages/documents/src/lib/paths.ts diff --git a/libs/service-portal/documents/src/lib/types.ts b/libs/portals/my-pages/documents/src/lib/types.ts similarity index 100% rename from libs/service-portal/documents/src/lib/types.ts rename to libs/portals/my-pages/documents/src/lib/types.ts diff --git a/libs/service-portal/documents/src/module.tsx b/libs/portals/my-pages/documents/src/module.tsx similarity index 100% rename from libs/service-portal/documents/src/module.tsx rename to libs/portals/my-pages/documents/src/module.tsx diff --git a/libs/service-portal/documents/src/screens/Documents.loader.ts b/libs/portals/my-pages/documents/src/screens/Documents.loader.ts similarity index 94% rename from libs/service-portal/documents/src/screens/Documents.loader.ts rename to libs/portals/my-pages/documents/src/screens/Documents.loader.ts index cfe38ab394eb..04edba8dec9d 100644 --- a/libs/service-portal/documents/src/screens/Documents.loader.ts +++ b/libs/portals/my-pages/documents/src/screens/Documents.loader.ts @@ -3,7 +3,7 @@ import { gql } from '@apollo/client' import { matchPath } from 'react-router' import type { WrappedLoaderFn } from '@island.is/portals/core' import { DocumentsPaths } from '../lib/paths' -import { ServicePortalPaths } from '@island.is/service-portal/core' +import { ServicePortalPaths } from '@island.is/portals/my-pages/core' import { pageSize } from '../hooks/useDocumentList' export const GET_PAGE_NUMBER_QUERY = gql` diff --git a/libs/service-portal/documents/src/screens/Overview/BatchMailAction.graphql b/libs/portals/my-pages/documents/src/screens/Overview/BatchMailAction.graphql similarity index 100% rename from libs/service-portal/documents/src/screens/Overview/BatchMailAction.graphql rename to libs/portals/my-pages/documents/src/screens/Overview/BatchMailAction.graphql diff --git a/libs/service-portal/documents/src/screens/Overview/DocumentContext.tsx b/libs/portals/my-pages/documents/src/screens/Overview/DocumentContext.tsx similarity index 100% rename from libs/service-portal/documents/src/screens/Overview/DocumentContext.tsx rename to libs/portals/my-pages/documents/src/screens/Overview/DocumentContext.tsx diff --git a/libs/service-portal/documents/src/screens/Overview/DocumentExtra.graphql b/libs/portals/my-pages/documents/src/screens/Overview/DocumentExtra.graphql similarity index 100% rename from libs/service-portal/documents/src/screens/Overview/DocumentExtra.graphql rename to libs/portals/my-pages/documents/src/screens/Overview/DocumentExtra.graphql diff --git a/libs/service-portal/documents/src/screens/Overview/Overview.css.ts b/libs/portals/my-pages/documents/src/screens/Overview/Overview.css.ts similarity index 100% rename from libs/service-portal/documents/src/screens/Overview/Overview.css.ts rename to libs/portals/my-pages/documents/src/screens/Overview/Overview.css.ts diff --git a/libs/service-portal/documents/src/screens/Overview/Overview.graphql b/libs/portals/my-pages/documents/src/screens/Overview/Overview.graphql similarity index 100% rename from libs/service-portal/documents/src/screens/Overview/Overview.graphql rename to libs/portals/my-pages/documents/src/screens/Overview/Overview.graphql diff --git a/libs/service-portal/documents/src/screens/Overview/OverviewV2.tsx b/libs/portals/my-pages/documents/src/screens/Overview/OverviewV2.tsx similarity index 98% rename from libs/service-portal/documents/src/screens/Overview/OverviewV2.tsx rename to libs/portals/my-pages/documents/src/screens/Overview/OverviewV2.tsx index e525a348fa29..3a7edf481e65 100644 --- a/libs/service-portal/documents/src/screens/Overview/OverviewV2.tsx +++ b/libs/portals/my-pages/documents/src/screens/Overview/OverviewV2.tsx @@ -10,8 +10,12 @@ import { SkeletonLoader, Checkbox, } from '@island.is/island-ui/core' -import { useOrganizations } from '@island.is/service-portal/graphql' -import { GoBack, m, useScrollTopOnUpdate } from '@island.is/service-portal/core' +import { useOrganizations } from '@island.is/portals/my-pages/graphql' +import { + GoBack, + m, + useScrollTopOnUpdate, +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { useLocation, useNavigate } from 'react-router-dom' import { getOrganizationLogoUrl } from '@island.is/shared/utils' diff --git a/libs/service-portal/documents/src/screens/Overview/OverviewV3.tsx b/libs/portals/my-pages/documents/src/screens/Overview/OverviewV3.tsx similarity index 98% rename from libs/service-portal/documents/src/screens/Overview/OverviewV3.tsx rename to libs/portals/my-pages/documents/src/screens/Overview/OverviewV3.tsx index 427be66fccdc..7c7ef2c37ccc 100644 --- a/libs/service-portal/documents/src/screens/Overview/OverviewV3.tsx +++ b/libs/portals/my-pages/documents/src/screens/Overview/OverviewV3.tsx @@ -10,8 +10,12 @@ import { Text, } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' -import { GoBack, m, useScrollTopOnUpdate } from '@island.is/service-portal/core' -import { useOrganizations } from '@island.is/service-portal/graphql' +import { + GoBack, + m, + useScrollTopOnUpdate, +} from '@island.is/portals/my-pages/core' +import { useOrganizations } from '@island.is/portals/my-pages/graphql' import { getOrganizationLogoUrl } from '@island.is/shared/utils' import debounce from 'lodash/debounce' import { useEffect, useMemo } from 'react' diff --git a/libs/service-portal/documents/src/screens/Overview/index.tsx b/libs/portals/my-pages/documents/src/screens/Overview/index.tsx similarity index 100% rename from libs/service-portal/documents/src/screens/Overview/index.tsx rename to libs/portals/my-pages/documents/src/screens/Overview/index.tsx diff --git a/libs/service-portal/documents/src/utils/customUrlHandler.ts b/libs/portals/my-pages/documents/src/utils/customUrlHandler.ts similarity index 100% rename from libs/service-portal/documents/src/utils/customUrlHandler.ts rename to libs/portals/my-pages/documents/src/utils/customUrlHandler.ts diff --git a/libs/service-portal/documents/src/utils/downloadDocumentV2.ts b/libs/portals/my-pages/documents/src/utils/downloadDocumentV2.ts similarity index 100% rename from libs/service-portal/documents/src/utils/downloadDocumentV2.ts rename to libs/portals/my-pages/documents/src/utils/downloadDocumentV2.ts diff --git a/libs/service-portal/documents/src/utils/messages.ts b/libs/portals/my-pages/documents/src/utils/messages.ts similarity index 100% rename from libs/service-portal/documents/src/utils/messages.ts rename to libs/portals/my-pages/documents/src/utils/messages.ts diff --git a/libs/service-portal/documents/src/utils/types.ts b/libs/portals/my-pages/documents/src/utils/types.ts similarity index 100% rename from libs/service-portal/documents/src/utils/types.ts rename to libs/portals/my-pages/documents/src/utils/types.ts diff --git a/libs/service-portal/documents/tsconfig.json b/libs/portals/my-pages/documents/tsconfig.json similarity index 100% rename from libs/service-portal/documents/tsconfig.json rename to libs/portals/my-pages/documents/tsconfig.json diff --git a/libs/service-portal/applications/tsconfig.lib.json b/libs/portals/my-pages/documents/tsconfig.lib.json similarity index 90% rename from libs/service-portal/applications/tsconfig.lib.json rename to libs/portals/my-pages/documents/tsconfig.lib.json index 2ebbff79e562..1d50996ab513 100644 --- a/libs/service-portal/applications/tsconfig.lib.json +++ b/libs/portals/my-pages/documents/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "exclude": [ diff --git a/libs/portals/my-pages/documents/tsconfig.spec.json b/libs/portals/my-pages/documents/tsconfig.spec.json new file mode 100644 index 000000000000..47e877796468 --- /dev/null +++ b/libs/portals/my-pages/documents/tsconfig.spec.json @@ -0,0 +1,24 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ], + "files": [ + "../../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../../node_modules/@nx/react/typings/image.d.ts" + ] +} diff --git a/libs/service-portal/education-career/.babelrc b/libs/portals/my-pages/education-career/.babelrc similarity index 100% rename from libs/service-portal/education-career/.babelrc rename to libs/portals/my-pages/education-career/.babelrc diff --git a/libs/portals/my-pages/education-career/.eslintrc.json b/libs/portals/my-pages/education-career/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/education-career/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/education-career/README.md b/libs/portals/my-pages/education-career/README.md similarity index 51% rename from libs/service-portal/education-career/README.md rename to libs/portals/my-pages/education-career/README.md index 335be1dc5997..9b12a1222c25 100644 --- a/libs/service-portal/education-career/README.md +++ b/libs/portals/my-pages/education-career/README.md @@ -4,4 +4,4 @@ This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-education-career` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-education-career` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/education-career/babel-jest.config.json b/libs/portals/my-pages/education-career/babel-jest.config.json similarity index 100% rename from libs/service-portal/education-career/babel-jest.config.json rename to libs/portals/my-pages/education-career/babel-jest.config.json diff --git a/libs/service-portal/education-student-assessment/jest.config.ts b/libs/portals/my-pages/education-career/jest.config.ts similarity index 66% rename from libs/service-portal/education-student-assessment/jest.config.ts rename to libs/portals/my-pages/education-career/jest.config.ts index 12c47e429d26..e9ef51ce7d52 100644 --- a/libs/service-portal/education-student-assessment/jest.config.ts +++ b/libs/portals/my-pages/education-career/jest.config.ts @@ -1,8 +1,8 @@ /* eslint-disable */ export default { - displayName: 'service-portal-education-student-assessment', + displayName: 'portals-my-pages-education-career', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -12,5 +12,5 @@ export default { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: - '/coverage/libs/service-portal/education-student-assessment', + '/coverage/libs/portals/my-pages/education-career', } diff --git a/libs/service-portal/education-license/project.json b/libs/portals/my-pages/education-career/project.json similarity index 58% rename from libs/service-portal/education-license/project.json rename to libs/portals/my-pages/education-career/project.json index 87a736e9f056..b313703900c8 100644 --- a/libs/service-portal/education-license/project.json +++ b/libs/portals/my-pages/education-career/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-education-license", + "name": "portals-my-pages-education-career", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/education-license/src", + "sourceRoot": "libs/portals/my-pages/education-career/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,10 +12,10 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-license/jest.config.ts" + "jestConfig": "libs/portals/my-pages/education-career/jest.config.ts" }, "outputs": [ - "{workspaceRoot}/coverage/libs/service-portal/education-license" + "{workspaceRoot}/coverage/libs/portals/my-pages/education-career" ] } } diff --git a/libs/service-portal/education-career/src/index.ts b/libs/portals/my-pages/education-career/src/index.ts similarity index 100% rename from libs/service-portal/education-career/src/index.ts rename to libs/portals/my-pages/education-career/src/index.ts diff --git a/libs/service-portal/education-career/src/lib/paths.ts b/libs/portals/my-pages/education-career/src/lib/paths.ts similarity index 100% rename from libs/service-portal/education-career/src/lib/paths.ts rename to libs/portals/my-pages/education-career/src/lib/paths.ts diff --git a/libs/service-portal/education-career/src/module.tsx b/libs/portals/my-pages/education-career/src/module.tsx similarity index 92% rename from libs/service-portal/education-career/src/module.tsx rename to libs/portals/my-pages/education-career/src/module.tsx index 5c87a3783916..f84ff19df00a 100644 --- a/libs/service-portal/education-career/src/module.tsx +++ b/libs/portals/my-pages/education-career/src/module.tsx @@ -2,7 +2,7 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' import { PortalModule } from '@island.is/portals/core' import { EducationCareerPaths } from './lib/paths' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' const EducationCareer = lazy(() => import('./screens/EducationCareer/EducationCareer'), diff --git a/libs/service-portal/education-career/src/screens/EducationCareer/EducationCareer.tsx b/libs/portals/my-pages/education-career/src/screens/EducationCareer/EducationCareer.tsx similarity index 96% rename from libs/service-portal/education-career/src/screens/EducationCareer/EducationCareer.tsx rename to libs/portals/my-pages/education-career/src/screens/EducationCareer/EducationCareer.tsx index 6600c43a3e1e..2ba3470394cf 100644 --- a/libs/service-portal/education-career/src/screens/EducationCareer/EducationCareer.tsx +++ b/libs/portals/my-pages/education-career/src/screens/EducationCareer/EducationCareer.tsx @@ -7,7 +7,7 @@ import { IntroHeader, MENNTAMALASTOFNUN_SLUG, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { CareerCards } from './components/CareerCards' const EducationCareer = () => { diff --git a/libs/service-portal/education-career/src/screens/EducationCareer/components/CareerCards/CareerCards.tsx b/libs/portals/my-pages/education-career/src/screens/EducationCareer/components/CareerCards/CareerCards.tsx similarity index 92% rename from libs/service-portal/education-career/src/screens/EducationCareer/components/CareerCards/CareerCards.tsx rename to libs/portals/my-pages/education-career/src/screens/EducationCareer/components/CareerCards/CareerCards.tsx index 92ab2c3c258e..d964f35fa001 100644 --- a/libs/service-portal/education-career/src/screens/EducationCareer/components/CareerCards/CareerCards.tsx +++ b/libs/portals/my-pages/education-career/src/screens/EducationCareer/components/CareerCards/CareerCards.tsx @@ -3,10 +3,10 @@ import { gql, useQuery } from '@apollo/client' import { Box, SkeletonLoader, Text } from '@island.is/island-ui/core' import { Query } from '@island.is/api/schema' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' -import { ActionCard } from '@island.is/service-portal/core' -import { EducationStudentAssessmentPaths } from '@island.is/service-portal/education-student-assessment' +import { ActionCard } from '@island.is/portals/my-pages/core' +import { EducationStudentAssessmentPaths } from '@island.is/portals/my-pages/education-student-assessment' import { Problem } from '@island.is/react-spa/shared' const EducationExamFamilyOverviewsQuery = gql` diff --git a/libs/service-portal/education-career/src/screens/EducationCareer/components/CareerCards/index.ts b/libs/portals/my-pages/education-career/src/screens/EducationCareer/components/CareerCards/index.ts similarity index 100% rename from libs/service-portal/education-career/src/screens/EducationCareer/components/CareerCards/index.ts rename to libs/portals/my-pages/education-career/src/screens/EducationCareer/components/CareerCards/index.ts diff --git a/libs/service-portal/education-career/tsconfig.json b/libs/portals/my-pages/education-career/tsconfig.json similarity index 100% rename from libs/service-portal/education-career/tsconfig.json rename to libs/portals/my-pages/education-career/tsconfig.json diff --git a/libs/service-portal/education-career/tsconfig.lib.json b/libs/portals/my-pages/education-career/tsconfig.lib.json similarity index 90% rename from libs/service-portal/education-career/tsconfig.lib.json rename to libs/portals/my-pages/education-career/tsconfig.lib.json index 7da3e9d24116..bc322cb27aa7 100644 --- a/libs/service-portal/education-career/tsconfig.lib.json +++ b/libs/portals/my-pages/education-career/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/service-portal/consent/tsconfig.spec.json b/libs/portals/my-pages/education-career/tsconfig.spec.json similarity index 89% rename from libs/service-portal/consent/tsconfig.spec.json rename to libs/portals/my-pages/education-career/tsconfig.spec.json index 83cd0e830ed2..515fdb6e5dd4 100644 --- a/libs/service-portal/consent/tsconfig.spec.json +++ b/libs/portals/my-pages/education-career/tsconfig.spec.json @@ -1,19 +1,19 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, "include": [ - "**/*.test.ts", "**/*.spec.ts", - "**/*.test.tsx", + "**/*.test.ts", "**/*.spec.tsx", - "**/*.test.js", + "**/*.test.tsx", "**/*.spec.js", - "**/*.test.jsx", + "**/*.test.js", "**/*.spec.jsx", + "**/*.test.jsx", "**/*.d.ts", "jest.config.ts" ] diff --git a/libs/service-portal/education-degree/.babelrc b/libs/portals/my-pages/education-degree/.babelrc similarity index 100% rename from libs/service-portal/education-degree/.babelrc rename to libs/portals/my-pages/education-degree/.babelrc diff --git a/libs/portals/my-pages/education-degree/.eslintrc.json b/libs/portals/my-pages/education-degree/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/education-degree/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/education-degree/README.md b/libs/portals/my-pages/education-degree/README.md similarity index 51% rename from libs/service-portal/education-degree/README.md rename to libs/portals/my-pages/education-degree/README.md index 5a97ddb3edef..708aac7f3669 100644 --- a/libs/service-portal/education-degree/README.md +++ b/libs/portals/my-pages/education-degree/README.md @@ -4,4 +4,4 @@ This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-education-degree` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-education-degree` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/education-degree/babel-jest.config.json b/libs/portals/my-pages/education-degree/babel-jest.config.json similarity index 100% rename from libs/service-portal/education-degree/babel-jest.config.json rename to libs/portals/my-pages/education-degree/babel-jest.config.json diff --git a/libs/service-portal/education-career/jest.config.ts b/libs/portals/my-pages/education-degree/jest.config.ts similarity index 64% rename from libs/service-portal/education-career/jest.config.ts rename to libs/portals/my-pages/education-degree/jest.config.ts index c995bff82ed2..f7a10beb9002 100644 --- a/libs/service-portal/education-career/jest.config.ts +++ b/libs/portals/my-pages/education-degree/jest.config.ts @@ -1,8 +1,8 @@ /* eslint-disable */ export default { - displayName: 'service-portal-education-career', + displayName: 'portals-my-pages-education-degree', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,5 +11,6 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/education-career', + coverageDirectory: + '/coverage/libs/portals/my-pages/education-degree', } diff --git a/libs/service-portal/education-career/project.json b/libs/portals/my-pages/education-degree/project.json similarity index 58% rename from libs/service-portal/education-career/project.json rename to libs/portals/my-pages/education-degree/project.json index 663312e1ced8..3e0de40798bf 100644 --- a/libs/service-portal/education-career/project.json +++ b/libs/portals/my-pages/education-degree/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-education-career", + "name": "portals-my-pages-education-degree", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/education-career/src", + "sourceRoot": "libs/portals/my-pages/education-degree/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,10 +12,10 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-career/jest.config.ts" + "jestConfig": "libs/portals/my-pages/education-degree/jest.config.ts" }, "outputs": [ - "{workspaceRoot}/coverage/libs/service-portal/education-career" + "{workspaceRoot}/coverage/libs/portals/my-pages/education-degree" ] } } diff --git a/libs/service-portal/education-degree/src/index.ts b/libs/portals/my-pages/education-degree/src/index.ts similarity index 100% rename from libs/service-portal/education-degree/src/index.ts rename to libs/portals/my-pages/education-degree/src/index.ts diff --git a/libs/service-portal/education-degree/src/lib/paths.ts b/libs/portals/my-pages/education-degree/src/lib/paths.ts similarity index 100% rename from libs/service-portal/education-degree/src/lib/paths.ts rename to libs/portals/my-pages/education-degree/src/lib/paths.ts diff --git a/libs/service-portal/education-degree/src/module.tsx b/libs/portals/my-pages/education-degree/src/module.tsx similarity index 88% rename from libs/service-portal/education-degree/src/module.tsx rename to libs/portals/my-pages/education-degree/src/module.tsx index 9eda51f1ef3e..51a26615e60f 100644 --- a/libs/service-portal/education-degree/src/module.tsx +++ b/libs/portals/my-pages/education-degree/src/module.tsx @@ -1,7 +1,7 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' -import { ServicePortalModule, m } from '@island.is/service-portal/core' +import { ServicePortalModule, m } from '@island.is/portals/my-pages/core' import { EducationDegreePaths } from './lib/paths' const EducationDegree = lazy(() => diff --git a/libs/service-portal/education-degree/src/screens/EducationDegree/EducationDegree.tsx b/libs/portals/my-pages/education-degree/src/screens/EducationDegree/EducationDegree.tsx similarity index 96% rename from libs/service-portal/education-degree/src/screens/EducationDegree/EducationDegree.tsx rename to libs/portals/my-pages/education-degree/src/screens/EducationDegree/EducationDegree.tsx index 68a80629ecc9..7042e81c75eb 100644 --- a/libs/service-portal/education-degree/src/screens/EducationDegree/EducationDegree.tsx +++ b/libs/portals/my-pages/education-degree/src/screens/EducationDegree/EducationDegree.tsx @@ -6,7 +6,7 @@ import { FootNote, IntroHeader, MENNTAMALASTOFNUN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { DegreeCards } from './components/DegreeCards' function EducationDegree() { diff --git a/libs/service-portal/education-degree/src/screens/EducationDegree/components/DegreeCards/DegreeCards.tsx b/libs/portals/my-pages/education-degree/src/screens/EducationDegree/components/DegreeCards/DegreeCards.tsx similarity index 91% rename from libs/service-portal/education-degree/src/screens/EducationDegree/components/DegreeCards/DegreeCards.tsx rename to libs/portals/my-pages/education-degree/src/screens/EducationDegree/components/DegreeCards/DegreeCards.tsx index ea247e746ede..9a48c8fed063 100644 --- a/libs/service-portal/education-degree/src/screens/EducationDegree/components/DegreeCards/DegreeCards.tsx +++ b/libs/portals/my-pages/education-degree/src/screens/EducationDegree/components/DegreeCards/DegreeCards.tsx @@ -1,8 +1,8 @@ import React from 'react' import { Box } from '@island.is/island-ui/core' -import { EmptyState, m } from '@island.is/service-portal/core' -import { ActionCard } from '@island.is/service-portal/core' +import { EmptyState, m } from '@island.is/portals/my-pages/core' +import { ActionCard } from '@island.is/portals/my-pages/core' const educationDegrees = [ { diff --git a/libs/service-portal/education-degree/src/screens/EducationDegree/components/DegreeCards/index.ts b/libs/portals/my-pages/education-degree/src/screens/EducationDegree/components/DegreeCards/index.ts similarity index 100% rename from libs/service-portal/education-degree/src/screens/EducationDegree/components/DegreeCards/index.ts rename to libs/portals/my-pages/education-degree/src/screens/EducationDegree/components/DegreeCards/index.ts diff --git a/libs/service-portal/education-degree/tsconfig.json b/libs/portals/my-pages/education-degree/tsconfig.json similarity index 100% rename from libs/service-portal/education-degree/tsconfig.json rename to libs/portals/my-pages/education-degree/tsconfig.json diff --git a/libs/service-portal/education-degree/tsconfig.lib.json b/libs/portals/my-pages/education-degree/tsconfig.lib.json similarity index 90% rename from libs/service-portal/education-degree/tsconfig.lib.json rename to libs/portals/my-pages/education-degree/tsconfig.lib.json index 7da3e9d24116..bc322cb27aa7 100644 --- a/libs/service-portal/education-degree/tsconfig.lib.json +++ b/libs/portals/my-pages/education-degree/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/portals/my-pages/education-degree/tsconfig.spec.json b/libs/portals/my-pages/education-degree/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/education-degree/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/education-license/.babelrc b/libs/portals/my-pages/education-license/.babelrc similarity index 100% rename from libs/service-portal/education-license/.babelrc rename to libs/portals/my-pages/education-license/.babelrc diff --git a/libs/portals/my-pages/education-license/.eslintrc.json b/libs/portals/my-pages/education-license/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/education-license/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/education-license/README.md b/libs/portals/my-pages/education-license/README.md similarity index 51% rename from libs/service-portal/education-license/README.md rename to libs/portals/my-pages/education-license/README.md index 822063738c94..380cb3dac089 100644 --- a/libs/service-portal/education-license/README.md +++ b/libs/portals/my-pages/education-license/README.md @@ -4,4 +4,4 @@ This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-education-license` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-education-license` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/education-license/babel-jest.config.json b/libs/portals/my-pages/education-license/babel-jest.config.json similarity index 100% rename from libs/service-portal/education-license/babel-jest.config.json rename to libs/portals/my-pages/education-license/babel-jest.config.json diff --git a/libs/service-portal/education-degree/jest.config.ts b/libs/portals/my-pages/education-license/jest.config.ts similarity index 63% rename from libs/service-portal/education-degree/jest.config.ts rename to libs/portals/my-pages/education-license/jest.config.ts index f118e770b47d..5c149ee04dc8 100644 --- a/libs/service-portal/education-degree/jest.config.ts +++ b/libs/portals/my-pages/education-license/jest.config.ts @@ -1,8 +1,8 @@ /* eslint-disable */ export default { - displayName: 'service-portal-education-degree', + displayName: 'portals-my-pages-education-license', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,5 +11,6 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/education-degree', + coverageDirectory: + '/coverage/libs/portals/my-pages/education-license', } diff --git a/libs/service-portal/education-degree/project.json b/libs/portals/my-pages/education-license/project.json similarity index 58% rename from libs/service-portal/education-degree/project.json rename to libs/portals/my-pages/education-license/project.json index 15ddfb4a047e..682d226df2d9 100644 --- a/libs/service-portal/education-degree/project.json +++ b/libs/portals/my-pages/education-license/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-education-degree", + "name": "portals-my-pages-education-license", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/education-degree/src", + "sourceRoot": "libs/portals/my-pages/education-license/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,10 +12,10 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-degree/jest.config.ts" + "jestConfig": "libs/portals/my-pages/education-license/jest.config.ts" }, "outputs": [ - "{workspaceRoot}/coverage/libs/service-portal/education-degree" + "{workspaceRoot}/coverage/libs/portals/my-pages/education-license" ] } } diff --git a/libs/service-portal/education-license/src/index.ts b/libs/portals/my-pages/education-license/src/index.ts similarity index 100% rename from libs/service-portal/education-license/src/index.ts rename to libs/portals/my-pages/education-license/src/index.ts diff --git a/libs/service-portal/education-license/src/lib/navigation.ts b/libs/portals/my-pages/education-license/src/lib/navigation.ts similarity index 89% rename from libs/service-portal/education-license/src/lib/navigation.ts rename to libs/portals/my-pages/education-license/src/lib/navigation.ts index ccae1673ec8c..ba29019b12b0 100644 --- a/libs/service-portal/education-license/src/lib/navigation.ts +++ b/libs/portals/my-pages/education-license/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { EducationLicensePaths } from './paths' export const educationLicenseNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/education-license/src/lib/paths.ts b/libs/portals/my-pages/education-license/src/lib/paths.ts similarity index 100% rename from libs/service-portal/education-license/src/lib/paths.ts rename to libs/portals/my-pages/education-license/src/lib/paths.ts diff --git a/libs/service-portal/education-license/src/module.tsx b/libs/portals/my-pages/education-license/src/module.tsx similarity index 92% rename from libs/service-portal/education-license/src/module.tsx rename to libs/portals/my-pages/education-license/src/module.tsx index 706da97d0661..c9eff37f6195 100644 --- a/libs/service-portal/education-license/src/module.tsx +++ b/libs/portals/my-pages/education-license/src/module.tsx @@ -2,7 +2,7 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' import { PortalModule } from '@island.is/portals/core' import { EducationLicensePaths } from './lib/paths' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' const EducationLicense = lazy(() => import('./screens/EducationLicense/EducationLicense'), diff --git a/libs/service-portal/education-license/src/screens/EducationLicense/EducationLicense.tsx b/libs/portals/my-pages/education-license/src/screens/EducationLicense/EducationLicense.tsx similarity index 88% rename from libs/service-portal/education-license/src/screens/EducationLicense/EducationLicense.tsx rename to libs/portals/my-pages/education-license/src/screens/EducationLicense/EducationLicense.tsx index 3021683e568f..0f51946b8839 100644 --- a/libs/service-portal/education-license/src/screens/EducationLicense/EducationLicense.tsx +++ b/libs/portals/my-pages/education-license/src/screens/EducationLicense/EducationLicense.tsx @@ -2,8 +2,8 @@ import { defineMessage } from 'react-intl' import { Box } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' -import { FootNote, SYSLUMENN_SLUG, m } from '@island.is/service-portal/core' -import { IntroHeader } from '@island.is/service-portal/core' +import { FootNote, SYSLUMENN_SLUG, m } from '@island.is/portals/my-pages/core' +import { IntroHeader } from '@island.is/portals/my-pages/core' import { LicenseCards } from './components/LicenseCards' function EducationLicense() { diff --git a/libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.css.ts b/libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.css.ts similarity index 100% rename from libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.css.ts rename to libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.css.ts diff --git a/libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.tsx b/libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.tsx similarity index 97% rename from libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.tsx rename to libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.tsx index f12e09b751c3..fdb410d3eea4 100644 --- a/libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.tsx +++ b/libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/LicenseCards.tsx @@ -5,8 +5,8 @@ import is from 'date-fns/locale/is' import { Query, Mutation, EducationLicense } from '@island.is/api/schema' import { Box, Button, ModalBase, Stack, Text } from '@island.is/island-ui/core' -import { CardLoader, EmptyState, m } from '@island.is/service-portal/core' -import { ActionCard } from '@island.is/service-portal/core' +import { CardLoader, EmptyState, m } from '@island.is/portals/my-pages/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import * as styles from './LicenseCards.css' import { useLocale, useNamespaces } from '@island.is/localization' diff --git a/libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/index.ts b/libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/index.ts similarity index 100% rename from libs/service-portal/education-license/src/screens/EducationLicense/components/LicenseCards/index.ts rename to libs/portals/my-pages/education-license/src/screens/EducationLicense/components/LicenseCards/index.ts diff --git a/libs/service-portal/education-license/tsconfig.json b/libs/portals/my-pages/education-license/tsconfig.json similarity index 100% rename from libs/service-portal/education-license/tsconfig.json rename to libs/portals/my-pages/education-license/tsconfig.json diff --git a/libs/service-portal/education-license/tsconfig.lib.json b/libs/portals/my-pages/education-license/tsconfig.lib.json similarity index 90% rename from libs/service-portal/education-license/tsconfig.lib.json rename to libs/portals/my-pages/education-license/tsconfig.lib.json index 7da3e9d24116..bc322cb27aa7 100644 --- a/libs/service-portal/education-license/tsconfig.lib.json +++ b/libs/portals/my-pages/education-license/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/portals/my-pages/education-license/tsconfig.spec.json b/libs/portals/my-pages/education-license/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/education-license/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/education-student-assessment/.babelrc b/libs/portals/my-pages/education-student-assessment/.babelrc similarity index 100% rename from libs/service-portal/education-student-assessment/.babelrc rename to libs/portals/my-pages/education-student-assessment/.babelrc diff --git a/libs/portals/my-pages/education-student-assessment/.eslintrc.json b/libs/portals/my-pages/education-student-assessment/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/education-student-assessment/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/education-student-assessment/README.md b/libs/portals/my-pages/education-student-assessment/README.md similarity index 53% rename from libs/service-portal/education-student-assessment/README.md rename to libs/portals/my-pages/education-student-assessment/README.md index c99e71d64de0..7303c0b214f1 100644 --- a/libs/service-portal/education-student-assessment/README.md +++ b/libs/portals/my-pages/education-student-assessment/README.md @@ -4,4 +4,4 @@ This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-student-assessment` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-student-assessment` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/education-student-assessment/babel-jest.config.json b/libs/portals/my-pages/education-student-assessment/babel-jest.config.json similarity index 100% rename from libs/service-portal/education-student-assessment/babel-jest.config.json rename to libs/portals/my-pages/education-student-assessment/babel-jest.config.json diff --git a/libs/service-portal/education-license/jest.config.ts b/libs/portals/my-pages/education-student-assessment/jest.config.ts similarity index 60% rename from libs/service-portal/education-license/jest.config.ts rename to libs/portals/my-pages/education-student-assessment/jest.config.ts index f7f20f71f70e..1cf529a5f3d1 100644 --- a/libs/service-portal/education-license/jest.config.ts +++ b/libs/portals/my-pages/education-student-assessment/jest.config.ts @@ -1,8 +1,8 @@ /* eslint-disable */ export default { - displayName: 'service-portal-education-license', + displayName: 'portals-my-pages-education-student-assessment', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,5 +11,6 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/education-license', + coverageDirectory: + '/coverage/libs/portals/my-pages/education-student-assessment', } diff --git a/libs/service-portal/education-student-assessment/project.json b/libs/portals/my-pages/education-student-assessment/project.json similarity index 54% rename from libs/service-portal/education-student-assessment/project.json rename to libs/portals/my-pages/education-student-assessment/project.json index 3e36e26e836d..cda22104caf2 100644 --- a/libs/service-portal/education-student-assessment/project.json +++ b/libs/portals/my-pages/education-student-assessment/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-education-student-assessment", + "name": "portals-my-pages-education-student-assessment", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/education-student-assessment/src", + "sourceRoot": "libs/portals/my-pages/education-student-assessment/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,10 +12,10 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-student-assessment/jest.config.ts" + "jestConfig": "libs/portals/my-pages/education-student-assessment/jest.config.ts" }, "outputs": [ - "{workspaceRoot}/coverage/libs/service-portal/education-student-assessment" + "{workspaceRoot}/coverage/libs/portals/my-pages/education-student-assessment" ] } } diff --git a/libs/service-portal/education-student-assessment/src/index.ts b/libs/portals/my-pages/education-student-assessment/src/index.ts similarity index 100% rename from libs/service-portal/education-student-assessment/src/index.ts rename to libs/portals/my-pages/education-student-assessment/src/index.ts diff --git a/libs/service-portal/education-student-assessment/src/lib/paths.ts b/libs/portals/my-pages/education-student-assessment/src/lib/paths.ts similarity index 100% rename from libs/service-portal/education-student-assessment/src/lib/paths.ts rename to libs/portals/my-pages/education-student-assessment/src/lib/paths.ts diff --git a/libs/service-portal/education-student-assessment/src/module.tsx b/libs/portals/my-pages/education-student-assessment/src/module.tsx similarity index 93% rename from libs/service-portal/education-student-assessment/src/module.tsx rename to libs/portals/my-pages/education-student-assessment/src/module.tsx index 22e2b39dc549..6f99112c4486 100644 --- a/libs/service-portal/education-student-assessment/src/module.tsx +++ b/libs/portals/my-pages/education-student-assessment/src/module.tsx @@ -2,7 +2,7 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' import { PortalModule } from '@island.is/portals/core' import { EducationStudentAssessmentPaths } from './lib/paths' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' const EducationStudentAssessment = lazy(() => import('./screens/EducationStudentAssessment/EducationStudentAssessment'), diff --git a/libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/EducationStudentAssessment.tsx b/libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/EducationStudentAssessment.tsx similarity index 92% rename from libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/EducationStudentAssessment.tsx rename to libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/EducationStudentAssessment.tsx index c64bb9f0d926..6ba6fc95e3d9 100644 --- a/libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/EducationStudentAssessment.tsx +++ b/libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/EducationStudentAssessment.tsx @@ -6,7 +6,7 @@ import { StudentAssessmentTable } from './components/StudentAssessmentTable' import { FootNote, MENNTAMALASTOFNUN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' const EducationStudentAssessment = () => { useNamespaces('sp.education-student-assessment') diff --git a/libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/StudentAssessmentTable.tsx b/libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/StudentAssessmentTable.tsx similarity index 99% rename from libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/StudentAssessmentTable.tsx rename to libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/StudentAssessmentTable.tsx index ca6e137fee68..8a26c11e0b8d 100644 --- a/libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/StudentAssessmentTable.tsx +++ b/libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/StudentAssessmentTable.tsx @@ -14,7 +14,7 @@ import { IntroHeader, MENNTAMALASTOFNUN_SLUG, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/index.ts b/libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/index.ts similarity index 100% rename from libs/service-portal/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/index.ts rename to libs/portals/my-pages/education-student-assessment/src/screens/EducationStudentAssessment/components/StudentAssessmentTable/index.ts diff --git a/libs/service-portal/education-student-assessment/tsconfig.json b/libs/portals/my-pages/education-student-assessment/tsconfig.json similarity index 100% rename from libs/service-portal/education-student-assessment/tsconfig.json rename to libs/portals/my-pages/education-student-assessment/tsconfig.json diff --git a/libs/service-portal/education-student-assessment/tsconfig.lib.json b/libs/portals/my-pages/education-student-assessment/tsconfig.lib.json similarity index 90% rename from libs/service-portal/education-student-assessment/tsconfig.lib.json rename to libs/portals/my-pages/education-student-assessment/tsconfig.lib.json index 7da3e9d24116..bc322cb27aa7 100644 --- a/libs/service-portal/education-student-assessment/tsconfig.lib.json +++ b/libs/portals/my-pages/education-student-assessment/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/portals/my-pages/education-student-assessment/tsconfig.spec.json b/libs/portals/my-pages/education-student-assessment/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/education-student-assessment/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/education/.babelrc b/libs/portals/my-pages/education/.babelrc similarity index 100% rename from libs/service-portal/education/.babelrc rename to libs/portals/my-pages/education/.babelrc diff --git a/libs/service-portal/education/.eslintrc.json b/libs/portals/my-pages/education/.eslintrc.json similarity index 88% rename from libs/service-portal/education/.eslintrc.json rename to libs/portals/my-pages/education/.eslintrc.json index ecf48ffe8474..9791c4f35754 100644 --- a/libs/service-portal/education/.eslintrc.json +++ b/libs/portals/my-pages/education/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "rules": {}, "overrides": [ diff --git a/libs/portals/my-pages/education/README.md b/libs/portals/my-pages/education/README.md new file mode 100644 index 000000000000..a42e1dbaee5c --- /dev/null +++ b/libs/portals/my-pages/education/README.md @@ -0,0 +1,7 @@ +# portals-my-pages-education + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test portals-my-pages-education` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/portals/my-pages/education/codegen.yml b/libs/portals/my-pages/education/codegen.yml new file mode 100644 index 000000000000..e8b8c03c358f --- /dev/null +++ b/libs/portals/my-pages/education/codegen.yml @@ -0,0 +1,18 @@ +schema: + - apps/api/src/api.graphql +documents: + - libs/portals/my-pages/education/src/**/*.graphql +generates: + libs/portals/my-pages/education/src/: + preset: 'near-operation-file' + presetConfig: + baseTypesPath: '~@island.is/api/schema' + plugins: + - typescript-operations + - typescript-react-apollo + config: + scalars: + DateTime: string +hooks: + afterAllFileWrite: + - prettier --write diff --git a/libs/portals/my-pages/education/jest.config.ts b/libs/portals/my-pages/education/jest.config.ts new file mode 100644 index 000000000000..dc80b5296f5d --- /dev/null +++ b/libs/portals/my-pages/education/jest.config.ts @@ -0,0 +1,12 @@ +/* eslint-disable */ +export default { + displayName: 'portals-my-pages-education', + preset: './jest.preset.js', + rootDir: '../../../..', + roots: [__dirname], + transform: { + '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + coverageDirectory: '/coverage/libs/portals/my-pages/education', +} diff --git a/libs/service-portal/education/project.json b/libs/portals/my-pages/education/project.json similarity index 70% rename from libs/service-portal/education/project.json rename to libs/portals/my-pages/education/project.json index 1859b1b41cb1..40e90d78393a 100644 --- a/libs/service-portal/education/project.json +++ b/libs/portals/my-pages/education/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-education", + "name": "portals-my-pages-education", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/education/src", + "sourceRoot": "libs/portals/my-pages/education/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,14 +12,14 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education/jest.config.ts" + "jestConfig": "libs/portals/my-pages/education/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/education"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/education"] }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/education/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/education/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } }, "init": { @@ -49,8 +49,8 @@ "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/education/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/education/codegen.yml" + "output": "libs/portals/my-pages/education/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/education/codegen.yml" } } } diff --git a/libs/service-portal/education/src/components/DrivingLessonsTables/DrivingLessonsSchools.tsx b/libs/portals/my-pages/education/src/components/DrivingLessonsTables/DrivingLessonsSchools.tsx similarity index 93% rename from libs/service-portal/education/src/components/DrivingLessonsTables/DrivingLessonsSchools.tsx rename to libs/portals/my-pages/education/src/components/DrivingLessonsTables/DrivingLessonsSchools.tsx index 06909276d795..5337de3302ff 100644 --- a/libs/service-portal/education/src/components/DrivingLessonsTables/DrivingLessonsSchools.tsx +++ b/libs/portals/my-pages/education/src/components/DrivingLessonsTables/DrivingLessonsSchools.tsx @@ -2,8 +2,8 @@ import React from 'react' import { useLocale, useNamespaces } from '@island.is/localization' import { Box, Table as T, Text } from '@island.is/island-ui/core' import { DrivingSchoolExam } from '@island.is/api/schema' -import { vehicleMessage as messages } from '@island.is/service-portal/assets/messages' -import { formatDate } from '@island.is/service-portal/core' +import { vehicleMessage as messages } from '@island.is/portals/my-pages/assets/messages' +import { formatDate } from '@island.is/portals/my-pages/core' interface PropTypes { data: DrivingSchoolExam[] diff --git a/libs/service-portal/education/src/components/DrivingLessonsTables/Exams.tsx b/libs/portals/my-pages/education/src/components/DrivingLessonsTables/Exams.tsx similarity index 93% rename from libs/service-portal/education/src/components/DrivingLessonsTables/Exams.tsx rename to libs/portals/my-pages/education/src/components/DrivingLessonsTables/Exams.tsx index 0f534eb6e4c3..1fc6110cd8b2 100644 --- a/libs/service-portal/education/src/components/DrivingLessonsTables/Exams.tsx +++ b/libs/portals/my-pages/education/src/components/DrivingLessonsTables/Exams.tsx @@ -2,8 +2,8 @@ import React from 'react' import { useLocale, useNamespaces } from '@island.is/localization' import { Box, Table as T, Text } from '@island.is/island-ui/core' import { DrivingLicenceTestResult } from '@island.is/api/schema' -import { vehicleMessage as messages } from '@island.is/service-portal/assets/messages' -import { formatDate } from '@island.is/service-portal/core' +import { vehicleMessage as messages } from '@island.is/portals/my-pages/assets/messages' +import { formatDate } from '@island.is/portals/my-pages/core' interface PropTypes { data: DrivingLicenceTestResult[] diff --git a/libs/service-portal/education/src/components/DrivingLessonsTables/PhysicalLessons.tsx b/libs/portals/my-pages/education/src/components/DrivingLessonsTables/PhysicalLessons.tsx similarity index 93% rename from libs/service-portal/education/src/components/DrivingLessonsTables/PhysicalLessons.tsx rename to libs/portals/my-pages/education/src/components/DrivingLessonsTables/PhysicalLessons.tsx index 65a042933322..080af15d23d6 100644 --- a/libs/service-portal/education/src/components/DrivingLessonsTables/PhysicalLessons.tsx +++ b/libs/portals/my-pages/education/src/components/DrivingLessonsTables/PhysicalLessons.tsx @@ -2,8 +2,8 @@ import React from 'react' import { useLocale, useNamespaces } from '@island.is/localization' import { Box, Table as T, Text } from '@island.is/island-ui/core' import { DrivingBookLesson } from '@island.is/api/schema' -import { vehicleMessage as messages } from '@island.is/service-portal/assets/messages' -import { formatDate } from '@island.is/service-portal/core' +import { vehicleMessage as messages } from '@island.is/portals/my-pages/assets/messages' +import { formatDate } from '@island.is/portals/my-pages/core' interface PropTypes { data: DrivingBookLesson[] diff --git a/libs/service-portal/education/src/index.ts b/libs/portals/my-pages/education/src/index.ts similarity index 100% rename from libs/service-portal/education/src/index.ts rename to libs/portals/my-pages/education/src/index.ts diff --git a/libs/service-portal/education/src/lib/messages.ts b/libs/portals/my-pages/education/src/lib/messages.ts similarity index 100% rename from libs/service-portal/education/src/lib/messages.ts rename to libs/portals/my-pages/education/src/lib/messages.ts diff --git a/libs/service-portal/education/src/lib/navigation.ts b/libs/portals/my-pages/education/src/lib/navigation.ts similarity index 97% rename from libs/service-portal/education/src/lib/navigation.ts rename to libs/portals/my-pages/education/src/lib/navigation.ts index 948132866ce0..3b80380cc287 100644 --- a/libs/service-portal/education/src/lib/navigation.ts +++ b/libs/portals/my-pages/education/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { EducationPaths } from './paths' export const educationNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/education/src/lib/paths.ts b/libs/portals/my-pages/education/src/lib/paths.ts similarity index 100% rename from libs/service-portal/education/src/lib/paths.ts rename to libs/portals/my-pages/education/src/lib/paths.ts diff --git a/libs/service-portal/education/src/module.tsx b/libs/portals/my-pages/education/src/module.tsx similarity index 100% rename from libs/service-portal/education/src/module.tsx rename to libs/portals/my-pages/education/src/module.tsx diff --git a/libs/service-portal/education/src/screens/DrivingLessonsBook/DrivingLessonsBook.tsx b/libs/portals/my-pages/education/src/screens/DrivingLessonsBook/DrivingLessonsBook.tsx similarity index 98% rename from libs/service-portal/education/src/screens/DrivingLessonsBook/DrivingLessonsBook.tsx rename to libs/portals/my-pages/education/src/screens/DrivingLessonsBook/DrivingLessonsBook.tsx index 0a6a258ba475..b6a32cd51732 100644 --- a/libs/service-portal/education/src/screens/DrivingLessonsBook/DrivingLessonsBook.tsx +++ b/libs/portals/my-pages/education/src/screens/DrivingLessonsBook/DrivingLessonsBook.tsx @@ -19,12 +19,12 @@ import { FootNote, LinkResolver, SAMGONGUSTOFA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { vehicleMessage as messages, urls, -} from '@island.is/service-portal/assets/messages' +} from '@island.is/portals/my-pages/assets/messages' import PhysicalLessons from '../../components/DrivingLessonsTables/PhysicalLessons' import DrivingLessonsSchools from '../../components/DrivingLessonsTables/DrivingLessonsSchools' import Exams from '../../components/DrivingLessonsTables/Exams' diff --git a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.graphql b/libs/portals/my-pages/education/src/screens/EducationGraduation/EducationGraduation.graphql similarity index 100% rename from libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.graphql rename to libs/portals/my-pages/education/src/screens/EducationGraduation/EducationGraduation.graphql diff --git a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx b/libs/portals/my-pages/education/src/screens/EducationGraduation/EducationGraduation.tsx similarity index 99% rename from libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx rename to libs/portals/my-pages/education/src/screens/EducationGraduation/EducationGraduation.tsx index 61c9b776f81c..956badaba26e 100644 --- a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx +++ b/libs/portals/my-pages/education/src/screens/EducationGraduation/EducationGraduation.tsx @@ -7,7 +7,7 @@ import { IntroHeader, IntroWrapper, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { isDefined } from '@island.is/shared/utils' import { EducationPaths } from '../../lib/paths' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.graphql b/libs/portals/my-pages/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.graphql similarity index 100% rename from libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.graphql rename to libs/portals/my-pages/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.graphql diff --git a/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx b/libs/portals/my-pages/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx similarity index 99% rename from libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx rename to libs/portals/my-pages/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx index ac45c6fc9fba..0a44645de214 100644 --- a/libs/service-portal/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx +++ b/libs/portals/my-pages/education/src/screens/EducationGraduationDetail/EducationGraduationDetail.tsx @@ -20,7 +20,7 @@ import { formatDate, m, IntroWrapper, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useParams } from 'react-router-dom' import { mapSlugToContentfulSlug, diff --git a/libs/service-portal/education/src/screens/SecondarySchoolCareer/Diplomas.graphql b/libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/Diplomas.graphql similarity index 100% rename from libs/service-portal/education/src/screens/SecondarySchoolCareer/Diplomas.graphql rename to libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/Diplomas.graphql diff --git a/libs/service-portal/education/src/screens/SecondarySchoolCareer/Periods.graphql b/libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/Periods.graphql similarity index 100% rename from libs/service-portal/education/src/screens/SecondarySchoolCareer/Periods.graphql rename to libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/Periods.graphql diff --git a/libs/service-portal/education/src/screens/SecondarySchoolCareer/SecondarySchoolCareer.tsx b/libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/SecondarySchoolCareer.tsx similarity index 98% rename from libs/service-portal/education/src/screens/SecondarySchoolCareer/SecondarySchoolCareer.tsx rename to libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/SecondarySchoolCareer.tsx index 6ea69f1d2846..2a9a54c42741 100644 --- a/libs/service-portal/education/src/screens/SecondarySchoolCareer/SecondarySchoolCareer.tsx +++ b/libs/portals/my-pages/education/src/screens/SecondarySchoolCareer/SecondarySchoolCareer.tsx @@ -6,7 +6,7 @@ import { m, MENNTAMALASTOFNUN_SLUG, SortableTable, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, Column, SkeletonLoader } from '@island.is/island-ui/core' import { useGetInnaPeriodsQuery } from './Periods.generated' diff --git a/libs/service-portal/education/src/screens/SecondarySchoolGraduationDetail/SecondarySchoolGraduationDetail.tsx b/libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationDetail/SecondarySchoolGraduationDetail.tsx similarity index 99% rename from libs/service-portal/education/src/screens/SecondarySchoolGraduationDetail/SecondarySchoolGraduationDetail.tsx rename to libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationDetail/SecondarySchoolGraduationDetail.tsx index bde29b826eef..4c06f19c30fe 100644 --- a/libs/service-portal/education/src/screens/SecondarySchoolGraduationDetail/SecondarySchoolGraduationDetail.tsx +++ b/libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationDetail/SecondarySchoolGraduationDetail.tsx @@ -5,7 +5,7 @@ import { m, MENNTAMALASTOFNUN_SLUG, SortableTable, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, GridColumn, diff --git a/libs/service-portal/education/src/screens/SecondarySchoolGraduationOverview/SecondarySchoolGraduationOverview.tsx b/libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationOverview/SecondarySchoolGraduationOverview.tsx similarity index 98% rename from libs/service-portal/education/src/screens/SecondarySchoolGraduationOverview/SecondarySchoolGraduationOverview.tsx rename to libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationOverview/SecondarySchoolGraduationOverview.tsx index 3e5f90a29cc5..5c1ef4286896 100644 --- a/libs/service-portal/education/src/screens/SecondarySchoolGraduationOverview/SecondarySchoolGraduationOverview.tsx +++ b/libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationOverview/SecondarySchoolGraduationOverview.tsx @@ -4,7 +4,7 @@ import { IntroHeader, MENNTAMALASTOFNUN_SLUG, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { Box } from '@island.is/island-ui/core' import { EducationPaths } from '../../lib/paths' diff --git a/libs/service-portal/education/src/screens/SecondarySchoolGraduationSingle/SecondarySchoolGraduationSingle.tsx b/libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationSingle/SecondarySchoolGraduationSingle.tsx similarity index 98% rename from libs/service-portal/education/src/screens/SecondarySchoolGraduationSingle/SecondarySchoolGraduationSingle.tsx rename to libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationSingle/SecondarySchoolGraduationSingle.tsx index 1da32ab56031..0441d84c2140 100644 --- a/libs/service-portal/education/src/screens/SecondarySchoolGraduationSingle/SecondarySchoolGraduationSingle.tsx +++ b/libs/portals/my-pages/education/src/screens/SecondarySchoolGraduationSingle/SecondarySchoolGraduationSingle.tsx @@ -4,7 +4,7 @@ import { m, MENNTAMALASTOFNUN_SLUG, UserInfoLine, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { Box, Divider, Stack, Text } from '@island.is/island-ui/core' import { EducationPaths } from '../../lib/paths' diff --git a/libs/service-portal/education/src/utils/addArray.ts b/libs/portals/my-pages/education/src/utils/addArray.ts similarity index 100% rename from libs/service-portal/education/src/utils/addArray.ts rename to libs/portals/my-pages/education/src/utils/addArray.ts diff --git a/libs/service-portal/education/src/utils/mapUniversitySlug.ts b/libs/portals/my-pages/education/src/utils/mapUniversitySlug.ts similarity index 100% rename from libs/service-portal/education/src/utils/mapUniversitySlug.ts rename to libs/portals/my-pages/education/src/utils/mapUniversitySlug.ts diff --git a/libs/service-portal/education/src/utils/tagSelector.ts b/libs/portals/my-pages/education/src/utils/tagSelector.ts similarity index 100% rename from libs/service-portal/education/src/utils/tagSelector.ts rename to libs/portals/my-pages/education/src/utils/tagSelector.ts diff --git a/libs/service-portal/education/tsconfig.json b/libs/portals/my-pages/education/tsconfig.json similarity index 100% rename from libs/service-portal/education/tsconfig.json rename to libs/portals/my-pages/education/tsconfig.json diff --git a/libs/service-portal/core/tsconfig.lib.json b/libs/portals/my-pages/education/tsconfig.lib.json similarity index 90% rename from libs/service-portal/core/tsconfig.lib.json rename to libs/portals/my-pages/education/tsconfig.lib.json index 2ebbff79e562..1d50996ab513 100644 --- a/libs/service-portal/core/tsconfig.lib.json +++ b/libs/portals/my-pages/education/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "exclude": [ diff --git a/libs/service-portal/core/tsconfig.spec.json b/libs/portals/my-pages/education/tsconfig.spec.json similarity index 91% rename from libs/service-portal/core/tsconfig.spec.json rename to libs/portals/my-pages/education/tsconfig.spec.json index 639a8e987c80..9c453e8cbe59 100644 --- a/libs/service-portal/core/tsconfig.spec.json +++ b/libs/portals/my-pages/education/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/finance/.babelrc b/libs/portals/my-pages/finance/.babelrc similarity index 100% rename from libs/service-portal/finance/.babelrc rename to libs/portals/my-pages/finance/.babelrc diff --git a/libs/portals/my-pages/finance/.eslintrc.json b/libs/portals/my-pages/finance/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/finance/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/education/README.md b/libs/portals/my-pages/finance/README.md similarity index 54% rename from libs/service-portal/education/README.md rename to libs/portals/my-pages/finance/README.md index 07dfe0cddd2e..34ad43935bb5 100644 --- a/libs/service-portal/education/README.md +++ b/libs/portals/my-pages/finance/README.md @@ -1,7 +1,7 @@ -# service-portal-education +# portals-my-pages-finance This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-education` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-finance` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/finance/codegen.yml b/libs/portals/my-pages/finance/codegen.yml similarity index 76% rename from libs/service-portal/finance/codegen.yml rename to libs/portals/my-pages/finance/codegen.yml index 5930c0750e08..6d57e058de33 100644 --- a/libs/service-portal/finance/codegen.yml +++ b/libs/portals/my-pages/finance/codegen.yml @@ -1,9 +1,9 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/finance/src/**/*.graphql + - libs/portals/my-pages/finance/src/**/*.graphql generates: - libs/service-portal/finance/src/: + libs/portals/my-pages/finance/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' diff --git a/libs/service-portal/core/jest.config.ts b/libs/portals/my-pages/finance/jest.config.ts similarity index 67% rename from libs/service-portal/core/jest.config.ts rename to libs/portals/my-pages/finance/jest.config.ts index 3d6b7d3cc671..04f32cb98e46 100644 --- a/libs/service-portal/core/jest.config.ts +++ b/libs/portals/my-pages/finance/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -10,7 +10,7 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/core', + coverageDirectory: '/coverage/libs/portals/my-pages/finance', globals: {}, - displayName: 'service-portal-core', + displayName: 'portals-my-pages-finance', } diff --git a/libs/service-portal/finance/project.json b/libs/portals/my-pages/finance/project.json similarity index 53% rename from libs/service-portal/finance/project.json rename to libs/portals/my-pages/finance/project.json index adeb6586ce64..0c0a27fa77c3 100644 --- a/libs/service-portal/finance/project.json +++ b/libs/portals/my-pages/finance/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-finance", + "name": "portals-my-pages-finance", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/finance/src", + "sourceRoot": "libs/portals/my-pages/finance/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,21 +12,21 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/finance/jest.config.ts" + "jestConfig": "libs/portals/my-pages/finance/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/finance"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/finance"] }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/finance/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/finance/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/finance/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/finance/codegen.yml" + "output": "libs/portals/my-pages/finance/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/finance/codegen.yml" } } } diff --git a/libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.graphql b/libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.graphql similarity index 100% rename from libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.graphql rename to libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.graphql diff --git a/libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.tsx b/libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.tsx similarity index 99% rename from libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.tsx rename to libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.tsx index 3f7b71e85cb2..5eb49a32956d 100644 --- a/libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.tsx +++ b/libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.tsx @@ -28,7 +28,7 @@ import { Filter, tableStyles, FJARSYSLAN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { dateFormat } from '@island.is/shared/constants' import { billsFilter } from '../../utils/simpleFilter' diff --git a/libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.types.ts b/libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.types.ts similarity index 100% rename from libs/service-portal/finance/src/components/DocumentScreen/DocumentScreen.types.ts rename to libs/portals/my-pages/finance/src/components/DocumentScreen/DocumentScreen.types.ts diff --git a/libs/service-portal/finance/src/components/DropdownExport/DropdownExport.css.ts b/libs/portals/my-pages/finance/src/components/DropdownExport/DropdownExport.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/DropdownExport/DropdownExport.css.ts rename to libs/portals/my-pages/finance/src/components/DropdownExport/DropdownExport.css.ts diff --git a/libs/service-portal/finance/src/components/DropdownExport/DropdownExport.tsx b/libs/portals/my-pages/finance/src/components/DropdownExport/DropdownExport.tsx similarity index 95% rename from libs/service-portal/finance/src/components/DropdownExport/DropdownExport.tsx rename to libs/portals/my-pages/finance/src/components/DropdownExport/DropdownExport.tsx index 40f45047a3c1..343c3c66369b 100644 --- a/libs/service-portal/finance/src/components/DropdownExport/DropdownExport.tsx +++ b/libs/portals/my-pages/finance/src/components/DropdownExport/DropdownExport.tsx @@ -1,7 +1,7 @@ import { ReactElement } from 'react' import { Box, DropdownMenu } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' interface Props { onGetCSV: () => void diff --git a/libs/service-portal/finance/src/components/FinanceDebtStatus/FinanceDebtStatus.tsx b/libs/portals/my-pages/finance/src/components/FinanceDebtStatus/FinanceDebtStatus.tsx similarity index 100% rename from libs/service-portal/finance/src/components/FinanceDebtStatus/FinanceDebtStatus.tsx rename to libs/portals/my-pages/finance/src/components/FinanceDebtStatus/FinanceDebtStatus.tsx diff --git a/libs/service-portal/finance/src/components/FinanceIntro/index.tsx b/libs/portals/my-pages/finance/src/components/FinanceIntro/index.tsx similarity index 91% rename from libs/service-portal/finance/src/components/FinanceIntro/index.tsx rename to libs/portals/my-pages/finance/src/components/FinanceIntro/index.tsx index 4c67cc615098..d667c1a644ef 100644 --- a/libs/service-portal/finance/src/components/FinanceIntro/index.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceIntro/index.tsx @@ -7,8 +7,11 @@ import { Inline, } from '@island.is/island-ui/core' import { theme } from '@island.is/island-ui/theme' -import { ISLANDIS_SLUG, InstitutionPanel } from '@island.is/service-portal/core' -import { useOrganization } from '@island.is/service-portal/graphql' +import { + ISLANDIS_SLUG, + InstitutionPanel, +} from '@island.is/portals/my-pages/core' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import { useWindowSize } from 'react-use' import { OrganizationSlugType } from '@island.is/shared/constants' diff --git a/libs/service-portal/finance/src/components/FinanceLoans/FinanceLoans.css.ts b/libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoans.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/FinanceLoans/FinanceLoans.css.ts rename to libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoans.css.ts diff --git a/libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansPaymenthistory.tsx b/libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansPaymenthistory.tsx similarity index 98% rename from libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansPaymenthistory.tsx rename to libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansPaymenthistory.tsx index 7e8400237071..5cd65c766112 100644 --- a/libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansPaymenthistory.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansPaymenthistory.tsx @@ -7,7 +7,7 @@ import { Text, } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m, amountFormat, formatDate } from '@island.is/service-portal/core' +import { m, amountFormat, formatDate } from '@island.is/portals/my-pages/core' import * as styles from './FinanceLoans.css' import { m as messages } from '../../lib/messages' import { useGetHmsLoansPaymentHistoryLazyQuery } from '../../screens/FinanceLoans/FinanceLoans.generated' diff --git a/libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansTable.tsx b/libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansTable.tsx similarity index 98% rename from libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansTable.tsx rename to libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansTable.tsx index 9c816e4da9d7..b7b83a5605d0 100644 --- a/libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansTable.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansTable.tsx @@ -8,12 +8,12 @@ import { Text, } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { amountFormat, formatDate, m } from '@island.is/service-portal/core' +import { amountFormat, formatDate, m } from '@island.is/portals/my-pages/core' import { ExpandRow, ExpandHeader, downloadLink, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { GetHmsLoansHistoryQuery, useGetHmsLoansHistoryPdfLazyQuery, diff --git a/libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansTableDetail.tsx b/libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansTableDetail.tsx similarity index 100% rename from libs/service-portal/finance/src/components/FinanceLoans/FinanceLoansTableDetail.tsx rename to libs/portals/my-pages/finance/src/components/FinanceLoans/FinanceLoansTableDetail.tsx diff --git a/libs/service-portal/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.css.ts b/libs/portals/my-pages/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.css.ts rename to libs/portals/my-pages/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.css.ts diff --git a/libs/service-portal/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.tsx b/libs/portals/my-pages/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.tsx similarity index 99% rename from libs/service-portal/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.tsx rename to libs/portals/my-pages/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.tsx index 34ea5869f3d3..7cf015bc088b 100644 --- a/libs/service-portal/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceScheduleDetailTable/FinanceScheduleDetailTable.tsx @@ -7,7 +7,7 @@ import { tableStyles, amountFormat, dateParse, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { DetailedSchedule } from '@island.is/api/schema' import { dateFormat } from '@island.is/shared/constants' import format from 'date-fns/format' diff --git a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.css.ts b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.css.ts rename to libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.css.ts diff --git a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.graphql b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.graphql similarity index 100% rename from libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.graphql rename to libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.graphql diff --git a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.tsx b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.tsx similarity index 96% rename from libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.tsx rename to libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.tsx index c0561b529ab6..162c5c2404f8 100644 --- a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTable.tsx @@ -3,10 +3,10 @@ import format from 'date-fns/format' import { Table as T, Box, Pagination, Tooltip } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { dateFormat } from '@island.is/shared/constants' -import { ExpandHeader, dateParse } from '@island.is/service-portal/core' +import { ExpandHeader, dateParse } from '@island.is/portals/my-pages/core' import FinanceScheduleTableRow from './FinanceScheduleTableRow' import { m as messages } from '../../lib/messages' -import { PaymentSchedule } from '@island.is/service-portal/graphql' +import { PaymentSchedule } from '@island.is/portals/my-pages/graphql' const ITEMS_ON_PAGE = 20 interface Props { diff --git a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRow.tsx b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRow.tsx similarity index 96% rename from libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRow.tsx rename to libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRow.tsx index 6753c6e00b75..2aff1d5cd6ff 100644 --- a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRow.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRow.tsx @@ -2,14 +2,14 @@ import { ExpandRow, formSubmit, amountFormat, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import FinanceScheduleDetailTable from '../FinanceScheduleDetailTable/FinanceScheduleDetailTable' import { DetailedSchedule } from '@island.is/api/schema' import { m as messages } from '../../lib/messages' import { Box, Button } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { useGetPaymentScheduleByIdLazyQuery } from './FinanceScheduleTable.generated' -import { PaymentSchedule } from '@island.is/service-portal/graphql' +import { PaymentSchedule } from '@island.is/portals/my-pages/graphql' interface Props { paymentSchedule: PaymentSchedule diff --git a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRowCompressed.tsx b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRowCompressed.tsx similarity index 97% rename from libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRowCompressed.tsx rename to libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRowCompressed.tsx index 734de46e8fbe..2a8a2a239e12 100644 --- a/libs/service-portal/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRowCompressed.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceScheduleTable/FinanceScheduleTableRowCompressed.tsx @@ -1,4 +1,4 @@ -import { formSubmit, amountFormat } from '@island.is/service-portal/core' +import { formSubmit, amountFormat } from '@island.is/portals/my-pages/core' import { PaymentSchedule } from '@island.is/api/schema' import { Box, Table as T, Text, Button } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' diff --git a/libs/service-portal/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.css.ts b/libs/portals/my-pages/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.css.ts rename to libs/portals/my-pages/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.css.ts diff --git a/libs/service-portal/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.tsx b/libs/portals/my-pages/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.tsx similarity index 99% rename from libs/service-portal/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.tsx rename to libs/portals/my-pages/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.tsx index 39b5f62f679c..b2deb9cb2754 100644 --- a/libs/service-portal/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceStatusDetailTable/FinanceStatusDetailTable.tsx @@ -15,7 +15,7 @@ import { formSubmit, m, tableStyles, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { FinanceStatusDetailsType, diff --git a/libs/service-portal/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.graphql b/libs/portals/my-pages/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.graphql similarity index 100% rename from libs/service-portal/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.graphql rename to libs/portals/my-pages/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.graphql diff --git a/libs/service-portal/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.tsx b/libs/portals/my-pages/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.tsx similarity index 95% rename from libs/service-portal/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.tsx rename to libs/portals/my-pages/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.tsx index 2941a13f880c..622ff1861fad 100644 --- a/libs/service-portal/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceStatusTableRow/FinanceStatusTableRow.tsx @@ -1,4 +1,4 @@ -import { amountFormat, ExpandRow } from '@island.is/service-portal/core' +import { amountFormat, ExpandRow } from '@island.is/portals/my-pages/core' import FinanceStatusDetailTable from '../../components/FinanceStatusDetailTable/FinanceStatusDetailTable' import { diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsContext.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsContext.tsx similarity index 100% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsContext.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsContext.tsx diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter.tsx similarity index 99% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter.tsx index 2659690e22de..7a810d6d3c1d 100644 --- a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter.tsx @@ -12,7 +12,11 @@ import { Text, } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m, Filter, DownloadFileButtons } from '@island.is/service-portal/core' +import { + m, + Filter, + DownloadFileButtons, +} from '@island.is/portals/my-pages/core' import { exportPeriodBreakdownFile } from '../../utils/filesPeriodBreakdown' import { diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTable.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTable.tsx similarity index 91% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTable.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTable.tsx index 5e44d57be485..41adffc50dde 100644 --- a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTable.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTable.tsx @@ -1,8 +1,8 @@ import { Table as T } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import sortBy from 'lodash/sortBy' -import { ExpandHeader } from '@island.is/service-portal/core' +import { ExpandHeader } from '@island.is/portals/my-pages/core' import FinanceTransactionPeriodsTableRow from './FinanceTransactionPeriodsTableRow' import { ChargeTypes } from './FinanceTransactionPeriodsTypes' import { m as messages } from '../../lib/messages' diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.css.ts b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.css.ts rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.css.ts diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.tsx similarity index 99% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.tsx index 571e184e1633..68f9975562c3 100644 --- a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableDetail.tsx @@ -12,9 +12,9 @@ import { amountFormat, formatDate, periodFormat, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { useEffect, useMemo, useState } from 'react' import sortBy from 'lodash/sortBy' import { diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableRow.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableRow.tsx similarity index 96% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableRow.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableRow.tsx index 5c13010ff670..ca19a4113287 100644 --- a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableRow.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTableRow.tsx @@ -1,4 +1,4 @@ -import { ExpandRow, formatDate } from '@island.is/service-portal/core' +import { ExpandRow, formatDate } from '@island.is/portals/my-pages/core' import FinanceTransactionPeriodsTableDetail from './FinanceTransactionPeriodsTableDetail' import { useGetChargeItemSubjectsByYearLazyQuery } from '../../screens/FinanceTransactionPeriods/FinanceTransactionPeriods.generated' import { cropText } from '../../utils/cropText' diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTypes.ts b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTypes.ts similarity index 100% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTypes.ts rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionPeriodsTypes.ts diff --git a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionSelectedPeriod.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionSelectedPeriod.tsx similarity index 99% rename from libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionSelectedPeriod.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionSelectedPeriod.tsx index 9e044e07e075..e68df6d80959 100644 --- a/libs/service-portal/finance/src/components/FinanceTransactionPeriods/FinanceTransactionSelectedPeriod.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceTransactionPeriods/FinanceTransactionSelectedPeriod.tsx @@ -14,7 +14,7 @@ import { m, periodFormat, NestedTable, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useGetChargeTypePeriodSubjectQuery } from '../../screens/FinanceTransactionPeriods/FinanceTransactionPeriods.generated' import { SelectedPeriod } from './FinanceTransactionPeriodsTypes' import { m as messages } from '../../lib/messages' diff --git a/libs/service-portal/finance/src/components/FinanceTransactionsTable/FinanceTransactionsTable.tsx b/libs/portals/my-pages/finance/src/components/FinanceTransactionsTable/FinanceTransactionsTable.tsx similarity index 97% rename from libs/service-portal/finance/src/components/FinanceTransactionsTable/FinanceTransactionsTable.tsx rename to libs/portals/my-pages/finance/src/components/FinanceTransactionsTable/FinanceTransactionsTable.tsx index b2816a6d4b1a..4c131cec748b 100644 --- a/libs/service-portal/finance/src/components/FinanceTransactionsTable/FinanceTransactionsTable.tsx +++ b/libs/portals/my-pages/finance/src/components/FinanceTransactionsTable/FinanceTransactionsTable.tsx @@ -7,9 +7,9 @@ import { periodFormat, formatDate, NestedTable, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import sortBy from 'lodash/sortBy' -import { ExpandRow, ExpandHeader } from '@island.is/service-portal/core' +import { ExpandRow, ExpandHeader } from '@island.is/portals/my-pages/core' import { CustomerRecordsDetails } from '../../screens/FinanceTransactions/FinanceTransactionsData.types' import { m as messages } from '../../lib/messages' diff --git a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefits.css.ts b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefits.css.ts similarity index 100% rename from libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefits.css.ts rename to libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefits.css.ts diff --git a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsFilter.tsx b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsFilter.tsx similarity index 98% rename from libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsFilter.tsx rename to libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsFilter.tsx index a290c100e521..2d91e9a4b8df 100644 --- a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsFilter.tsx +++ b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsFilter.tsx @@ -10,7 +10,7 @@ import { Stack, } from '@island.is/island-ui/core' import { HousingBenefitsPayments } from '@island.is/api/schema' -import { m, Filter, MONTHS } from '@island.is/service-portal/core' +import { m, Filter, MONTHS } from '@island.is/portals/my-pages/core' import { useLocale } from '@island.is/localization' import { exportHousingBenefitFiles } from '../../utils/filesHousingBenefits' import { diff --git a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsFooter.tsx b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsFooter.tsx similarity index 93% rename from libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsFooter.tsx rename to libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsFooter.tsx index 8f553d519b06..82b58e413515 100644 --- a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsFooter.tsx +++ b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsFooter.tsx @@ -1,6 +1,6 @@ import { Table as T, Text } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { m, amountFormat, tableStyles } from '@island.is/service-portal/core' +import { m, amountFormat, tableStyles } from '@island.is/portals/my-pages/core' import { m as messages } from '../../lib/messages' import { HousingBenefitsPayment } from '@island.is/api/schema' import sumBy from 'lodash/sumBy' diff --git a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsTable.tsx b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsTable.tsx similarity index 98% rename from libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsTable.tsx rename to libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsTable.tsx index 4cde60605348..ca5dbf7de8f5 100644 --- a/libs/service-portal/finance/src/components/HousingBenefitsPayments/HousingBenefitsTable.tsx +++ b/libs/portals/my-pages/finance/src/components/HousingBenefitsPayments/HousingBenefitsTable.tsx @@ -7,8 +7,8 @@ import { formatDate, NestedTable, displayMonthOrYear, -} from '@island.is/service-portal/core' -import { ExpandRow, ExpandHeader } from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' +import { ExpandRow, ExpandHeader } from '@island.is/portals/my-pages/core' import { hb, m as messages } from '../../lib/messages' import { HousingBenefitsPayment, diff --git a/libs/service-portal/finance/src/financeRedirects.tsx b/libs/portals/my-pages/finance/src/financeRedirects.tsx similarity index 94% rename from libs/service-portal/finance/src/financeRedirects.tsx rename to libs/portals/my-pages/finance/src/financeRedirects.tsx index d86650a82665..bac103336e4c 100644 --- a/libs/service-portal/finance/src/financeRedirects.tsx +++ b/libs/portals/my-pages/finance/src/financeRedirects.tsx @@ -1,4 +1,4 @@ -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalRoute } from '@island.is/portals/core' import { FinancePaths } from './lib/paths' import { Navigate } from 'react-router-dom' diff --git a/libs/service-portal/finance/src/index.ts b/libs/portals/my-pages/finance/src/index.ts similarity index 100% rename from libs/service-portal/finance/src/index.ts rename to libs/portals/my-pages/finance/src/index.ts diff --git a/libs/service-portal/finance/src/lib/messages.ts b/libs/portals/my-pages/finance/src/lib/messages.ts similarity index 100% rename from libs/service-portal/finance/src/lib/messages.ts rename to libs/portals/my-pages/finance/src/lib/messages.ts diff --git a/libs/service-portal/finance/src/lib/navigation.ts b/libs/portals/my-pages/finance/src/lib/navigation.ts similarity index 97% rename from libs/service-portal/finance/src/lib/navigation.ts rename to libs/portals/my-pages/finance/src/lib/navigation.ts index 3d2a821fddaf..67cb336b2cc7 100644 --- a/libs/service-portal/finance/src/lib/navigation.ts +++ b/libs/portals/my-pages/finance/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { FJARSYSLAN_SLUG, HMS_SLUG, m } from '@island.is/service-portal/core' +import { FJARSYSLAN_SLUG, HMS_SLUG, m } from '@island.is/portals/my-pages/core' import { FinancePaths } from './paths' export const financeNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/finance/src/lib/paths.ts b/libs/portals/my-pages/finance/src/lib/paths.ts similarity index 100% rename from libs/service-portal/finance/src/lib/paths.ts rename to libs/portals/my-pages/finance/src/lib/paths.ts diff --git a/libs/service-portal/finance/src/module.tsx b/libs/portals/my-pages/finance/src/module.tsx similarity index 98% rename from libs/service-portal/finance/src/module.tsx rename to libs/portals/my-pages/finance/src/module.tsx index a766755042d0..368ccbeab2b0 100644 --- a/libs/service-portal/finance/src/module.tsx +++ b/libs/portals/my-pages/finance/src/module.tsx @@ -1,6 +1,6 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule } from '@island.is/portals/core' import { FinancePaths } from './lib/paths' import { Navigate } from 'react-router-dom' diff --git a/libs/service-portal/finance/src/screens/Finance.css.ts b/libs/portals/my-pages/finance/src/screens/Finance.css.ts similarity index 100% rename from libs/service-portal/finance/src/screens/Finance.css.ts rename to libs/portals/my-pages/finance/src/screens/Finance.css.ts diff --git a/libs/service-portal/finance/src/screens/FinanceBills/FinanceBills.tsx b/libs/portals/my-pages/finance/src/screens/FinanceBills/FinanceBills.tsx similarity index 88% rename from libs/service-portal/finance/src/screens/FinanceBills/FinanceBills.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceBills/FinanceBills.tsx index 32d6e6874dcb..563a0449ff3e 100644 --- a/libs/service-portal/finance/src/screens/FinanceBills/FinanceBills.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceBills/FinanceBills.tsx @@ -1,5 +1,5 @@ import { useLocale, useNamespaces } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import DocumentScreen from '../../components/DocumentScreen/DocumentScreen' diff --git a/libs/service-portal/finance/src/screens/FinanceBills/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceBills/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceBills/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceBills/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceEmployeeClaims/FinanceEmployeeClaims.tsx b/libs/portals/my-pages/finance/src/screens/FinanceEmployeeClaims/FinanceEmployeeClaims.tsx similarity index 87% rename from libs/service-portal/finance/src/screens/FinanceEmployeeClaims/FinanceEmployeeClaims.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceEmployeeClaims/FinanceEmployeeClaims.tsx index f3894607ba84..1f73d0c4b200 100644 --- a/libs/service-portal/finance/src/screens/FinanceEmployeeClaims/FinanceEmployeeClaims.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceEmployeeClaims/FinanceEmployeeClaims.tsx @@ -1,5 +1,5 @@ import { useLocale, useNamespaces } from '@island.is/localization' -import { m, DynamicWrapper } from '@island.is/service-portal/core' +import { m, DynamicWrapper } from '@island.is/portals/my-pages/core' import DocumentScreen from '../../components/DocumentScreen/DocumentScreen' diff --git a/libs/service-portal/finance/src/screens/FinanceEmployeeClaims/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceEmployeeClaims/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceEmployeeClaims/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceEmployeeClaims/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceLoans/FinanceLoans.graphql b/libs/portals/my-pages/finance/src/screens/FinanceLoans/FinanceLoans.graphql similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceLoans/FinanceLoans.graphql rename to libs/portals/my-pages/finance/src/screens/FinanceLoans/FinanceLoans.graphql diff --git a/libs/service-portal/finance/src/screens/FinanceLoans/FinanceLoans.tsx b/libs/portals/my-pages/finance/src/screens/FinanceLoans/FinanceLoans.tsx similarity index 97% rename from libs/service-portal/finance/src/screens/FinanceLoans/FinanceLoans.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceLoans/FinanceLoans.tsx index b8a470a2eb1c..c7ab4e620a8d 100644 --- a/libs/service-portal/finance/src/screens/FinanceLoans/FinanceLoans.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceLoans/FinanceLoans.tsx @@ -1,7 +1,7 @@ import { useLocale, useNamespaces } from '@island.is/localization' import { AlertBanner, Box, SkeletonLoader } from '@island.is/island-ui/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { m as messages } from '../../lib/messages' import FinanceIntro from '../../components/FinanceIntro' import { useGetHmsLoansHistoryQuery } from './FinanceLoans.generated' diff --git a/libs/service-portal/finance/src/screens/FinanceLoans/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceLoans/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceLoans/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceLoans/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceLocalTax/LocalTax.tsx b/libs/portals/my-pages/finance/src/screens/FinanceLocalTax/LocalTax.tsx similarity index 87% rename from libs/service-portal/finance/src/screens/FinanceLocalTax/LocalTax.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceLocalTax/LocalTax.tsx index 4fbb0902a954..ad471a97e05f 100644 --- a/libs/service-portal/finance/src/screens/FinanceLocalTax/LocalTax.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceLocalTax/LocalTax.tsx @@ -1,5 +1,5 @@ import { useLocale, useNamespaces } from '@island.is/localization' -import { m, DynamicWrapper } from '@island.is/service-portal/core' +import { m, DynamicWrapper } from '@island.is/portals/my-pages/core' import DocumentScreen from '../../components/DocumentScreen/DocumentScreen' diff --git a/libs/service-portal/finance/src/screens/FinanceLocalTax/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceLocalTax/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceLocalTax/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceLocalTax/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceRoutes.loader.ts b/libs/portals/my-pages/finance/src/screens/FinanceRoutes.loader.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceRoutes.loader.ts rename to libs/portals/my-pages/finance/src/screens/FinanceRoutes.loader.ts diff --git a/libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.graphql b/libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.graphql similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.graphql rename to libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.graphql diff --git a/libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.tsx b/libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.tsx similarity index 99% rename from libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.tsx index 47e0219b7ab9..79a9b99d44d9 100644 --- a/libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.tsx @@ -14,7 +14,7 @@ import { m as coreMessage, FootNote, FJARSYSLAN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { checkDelegation } from '@island.is/shared/utils' import FinanceScheduleTable from '../../components/FinanceScheduleTable/FinanceScheduleTable' diff --git a/libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.types.ts b/libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.types.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceSchedule/FinanceSchedule.types.ts rename to libs/portals/my-pages/finance/src/screens/FinanceSchedule/FinanceSchedule.types.ts diff --git a/libs/service-portal/finance/src/screens/FinanceSchedule/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceSchedule/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceSchedule/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceSchedule/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatus.graphql b/libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatus.graphql similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatus.graphql rename to libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatus.graphql diff --git a/libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatus.tsx b/libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatus.tsx similarity index 99% rename from libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatus.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatus.tsx index 7aebba04c5c3..7ffedef09532 100644 --- a/libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatus.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatus.tsx @@ -24,7 +24,7 @@ import { FootNote, formSubmit, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { checkDelegation } from '@island.is/shared/utils' import DropdownExport from '../../components/DropdownExport/DropdownExport' diff --git a/libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatusData.types.ts b/libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatusData.types.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceStatus/FinanceStatusData.types.ts rename to libs/portals/my-pages/finance/src/screens/FinanceStatus/FinanceStatusData.types.ts diff --git a/libs/service-portal/finance/src/screens/FinanceStatus/Table.css.ts b/libs/portals/my-pages/finance/src/screens/FinanceStatus/Table.css.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceStatus/Table.css.ts rename to libs/portals/my-pages/finance/src/screens/FinanceStatus/Table.css.ts diff --git a/libs/service-portal/finance/src/screens/FinanceStatus/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceStatus/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceStatus/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceStatus/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.graphql b/libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.graphql similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.graphql rename to libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.graphql diff --git a/libs/service-portal/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.tsx b/libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.tsx similarity index 95% rename from libs/service-portal/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.tsx index b7d49082cdbe..af49977708fb 100644 --- a/libs/service-portal/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/FinanceTransactionPeriods.tsx @@ -4,7 +4,7 @@ import { DynamicWrapper, FJARSYSLAN_SLUG, FootNote, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { FinanceTransactionPeriodsProvider } from '../../components/FinanceTransactionPeriods/FinanceTransactionPeriodsContext' import FinanceTransactionPeriodsFilter from '../../components/FinanceTransactionPeriods/FinanceTransactionPeriodsFilter' diff --git a/libs/service-portal/finance/src/screens/FinanceTransactionPeriods/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceTransactionPeriods/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceTransactionPeriods/index.ts diff --git a/libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactions.graphql b/libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactions.graphql similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactions.graphql rename to libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactions.graphql diff --git a/libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactions.tsx b/libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactions.tsx similarity index 99% rename from libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactions.tsx rename to libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactions.tsx index bd06f3d1b4cd..e5c51c3f2bbc 100644 --- a/libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactions.tsx +++ b/libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactions.tsx @@ -20,7 +20,7 @@ import { m, Filter, FJARSYSLAN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m as messages } from '../../lib/messages' import DropdownExport from '../../components/DropdownExport/DropdownExport' diff --git a/libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactionsData.types.ts b/libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactionsData.types.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceTransactions/FinanceTransactionsData.types.ts rename to libs/portals/my-pages/finance/src/screens/FinanceTransactions/FinanceTransactionsData.types.ts diff --git a/libs/service-portal/finance/src/screens/FinanceTransactions/index.ts b/libs/portals/my-pages/finance/src/screens/FinanceTransactions/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/FinanceTransactions/index.ts rename to libs/portals/my-pages/finance/src/screens/FinanceTransactions/index.ts diff --git a/libs/service-portal/finance/src/screens/HousingBenefits/HousingBenefits.graphql b/libs/portals/my-pages/finance/src/screens/HousingBenefits/HousingBenefits.graphql similarity index 100% rename from libs/service-portal/finance/src/screens/HousingBenefits/HousingBenefits.graphql rename to libs/portals/my-pages/finance/src/screens/HousingBenefits/HousingBenefits.graphql diff --git a/libs/service-portal/finance/src/screens/HousingBenefits/HousingBenefits.tsx b/libs/portals/my-pages/finance/src/screens/HousingBenefits/HousingBenefits.tsx similarity index 98% rename from libs/service-portal/finance/src/screens/HousingBenefits/HousingBenefits.tsx rename to libs/portals/my-pages/finance/src/screens/HousingBenefits/HousingBenefits.tsx index 71b6cd150db4..b6e5ef54a437 100644 --- a/libs/service-portal/finance/src/screens/HousingBenefits/HousingBenefits.tsx +++ b/libs/portals/my-pages/finance/src/screens/HousingBenefits/HousingBenefits.tsx @@ -9,7 +9,7 @@ import { } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' -import { FootNote, m } from '@island.is/service-portal/core' +import { FootNote, m } from '@island.is/portals/my-pages/core' import HousingBenefitsTable from '../../components/HousingBenefitsPayments/HousingBenefitsTable' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/finance/src/screens/HousingBenefits/index.ts b/libs/portals/my-pages/finance/src/screens/HousingBenefits/index.ts similarity index 100% rename from libs/service-portal/finance/src/screens/HousingBenefits/index.ts rename to libs/portals/my-pages/finance/src/screens/HousingBenefits/index.ts diff --git a/libs/service-portal/finance/src/screens/HousingBenefits/useHousingBenefitsFilters.ts b/libs/portals/my-pages/finance/src/screens/HousingBenefits/useHousingBenefitsFilters.ts similarity index 100% rename from libs/service-portal/finance/src/screens/HousingBenefits/useHousingBenefitsFilters.ts rename to libs/portals/my-pages/finance/src/screens/HousingBenefits/useHousingBenefitsFilters.ts diff --git a/libs/service-portal/finance/src/utils/cropText.ts b/libs/portals/my-pages/finance/src/utils/cropText.ts similarity index 100% rename from libs/service-portal/finance/src/utils/cropText.ts rename to libs/portals/my-pages/finance/src/utils/cropText.ts diff --git a/libs/service-portal/finance/src/utils/dataHeaders.ts b/libs/portals/my-pages/finance/src/utils/dataHeaders.ts similarity index 100% rename from libs/service-portal/finance/src/utils/dataHeaders.ts rename to libs/portals/my-pages/finance/src/utils/dataHeaders.ts diff --git a/libs/service-portal/finance/src/utils/filesGeneral.ts b/libs/portals/my-pages/finance/src/utils/filesGeneral.ts similarity index 89% rename from libs/service-portal/finance/src/utils/filesGeneral.ts rename to libs/portals/my-pages/finance/src/utils/filesGeneral.ts index b7199ea85a87..5c827bf90283 100644 --- a/libs/service-portal/finance/src/utils/filesGeneral.ts +++ b/libs/portals/my-pages/finance/src/utils/filesGeneral.ts @@ -1,4 +1,4 @@ -import { downloadFile } from '@island.is/service-portal/core' +import { downloadFile } from '@island.is/portals/my-pages/core' import { generalHeaders } from './dataHeaders' import { DocumentsListItemTypes } from '../components/DocumentScreen/DocumentScreen.types' diff --git a/libs/service-portal/finance/src/utils/filesGjoldSundurlidun.ts b/libs/portals/my-pages/finance/src/utils/filesGjoldSundurlidun.ts similarity index 92% rename from libs/service-portal/finance/src/utils/filesGjoldSundurlidun.ts rename to libs/portals/my-pages/finance/src/utils/filesGjoldSundurlidun.ts index 6f36c43a374b..9694d975508a 100644 --- a/libs/service-portal/finance/src/utils/filesGjoldSundurlidun.ts +++ b/libs/portals/my-pages/finance/src/utils/filesGjoldSundurlidun.ts @@ -1,4 +1,4 @@ -import { downloadFile } from '@island.is/service-portal/core' +import { downloadFile } from '@island.is/portals/my-pages/core' import { FinanceStatusDetailsType, FinanceStatusDetailsChangeItem, diff --git a/libs/service-portal/finance/src/utils/filesGreidslustada.ts b/libs/portals/my-pages/finance/src/utils/filesGreidslustada.ts similarity index 92% rename from libs/service-portal/finance/src/utils/filesGreidslustada.ts rename to libs/portals/my-pages/finance/src/utils/filesGreidslustada.ts index 4ea297e3edbb..2af9bf17d606 100644 --- a/libs/service-portal/finance/src/utils/filesGreidslustada.ts +++ b/libs/portals/my-pages/finance/src/utils/filesGreidslustada.ts @@ -1,4 +1,4 @@ -import { downloadFile } from '@island.is/service-portal/core' +import { downloadFile } from '@island.is/portals/my-pages/core' import flatten from 'lodash/flatten' import { FinanceStatusDataType, diff --git a/libs/service-portal/finance/src/utils/filesHousingBenefits.ts b/libs/portals/my-pages/finance/src/utils/filesHousingBenefits.ts similarity index 87% rename from libs/service-portal/finance/src/utils/filesHousingBenefits.ts rename to libs/portals/my-pages/finance/src/utils/filesHousingBenefits.ts index 95a89007a010..0fbd8958082c 100644 --- a/libs/service-portal/finance/src/utils/filesHousingBenefits.ts +++ b/libs/portals/my-pages/finance/src/utils/filesHousingBenefits.ts @@ -1,6 +1,6 @@ -import { downloadFile, formatDate } from '@island.is/service-portal/core' +import { downloadFile, formatDate } from '@island.is/portals/my-pages/core' import { HousingPaymentsHeaders } from './dataHeaders' -import { amountFormat } from '@island.is/service-portal/core' +import { amountFormat } from '@island.is/portals/my-pages/core' import { HousingBenefitsPayment } from '@island.is/api/schema' export const exportHousingBenefitFiles = async ( diff --git a/libs/service-portal/finance/src/utils/filesHreyfingar.ts b/libs/portals/my-pages/finance/src/utils/filesHreyfingar.ts similarity index 93% rename from libs/service-portal/finance/src/utils/filesHreyfingar.ts rename to libs/portals/my-pages/finance/src/utils/filesHreyfingar.ts index 059ff63ab604..13f1df4ff35e 100644 --- a/libs/service-portal/finance/src/utils/filesHreyfingar.ts +++ b/libs/portals/my-pages/finance/src/utils/filesHreyfingar.ts @@ -1,4 +1,4 @@ -import { downloadFile } from '@island.is/service-portal/core' +import { downloadFile } from '@island.is/portals/my-pages/core' import { CustomerRecordsDetails } from '../screens/FinanceTransactions/FinanceTransactionsData.types' import { hreyfingarHeaders } from './dataHeaders' const name = 'Hreyfingar' diff --git a/libs/service-portal/finance/src/utils/filesPeriodBreakdown.ts b/libs/portals/my-pages/finance/src/utils/filesPeriodBreakdown.ts similarity index 88% rename from libs/service-portal/finance/src/utils/filesPeriodBreakdown.ts rename to libs/portals/my-pages/finance/src/utils/filesPeriodBreakdown.ts index ef91b5e92605..2c727b4f9f4f 100644 --- a/libs/service-portal/finance/src/utils/filesPeriodBreakdown.ts +++ b/libs/portals/my-pages/finance/src/utils/filesPeriodBreakdown.ts @@ -1,7 +1,7 @@ -import { downloadFile } from '@island.is/service-portal/core' +import { downloadFile } from '@island.is/portals/my-pages/core' import { PeriodHeaders } from './dataHeaders' import { SelectedPeriod } from '../components/FinanceTransactionPeriods/FinanceTransactionPeriodsTypes' -import { amountFormat } from '@island.is/service-portal/core' +import { amountFormat } from '@island.is/portals/my-pages/core' export const exportPeriodBreakdownFile = async ( periods: SelectedPeriod[], diff --git a/libs/service-portal/finance/src/utils/generateMonthArray.ts b/libs/portals/my-pages/finance/src/utils/generateMonthArray.ts similarity index 100% rename from libs/service-portal/finance/src/utils/generateMonthArray.ts rename to libs/portals/my-pages/finance/src/utils/generateMonthArray.ts diff --git a/libs/service-portal/finance/src/utils/simpleFilter.ts b/libs/portals/my-pages/finance/src/utils/simpleFilter.ts similarity index 100% rename from libs/service-portal/finance/src/utils/simpleFilter.ts rename to libs/portals/my-pages/finance/src/utils/simpleFilter.ts diff --git a/libs/service-portal/finance/tsconfig.json b/libs/portals/my-pages/finance/tsconfig.json similarity index 100% rename from libs/service-portal/finance/tsconfig.json rename to libs/portals/my-pages/finance/tsconfig.json diff --git a/libs/portals/my-pages/finance/tsconfig.lib.json b/libs/portals/my-pages/finance/tsconfig.lib.json new file mode 100644 index 000000000000..1d50996ab513 --- /dev/null +++ b/libs/portals/my-pages/finance/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ] +} diff --git a/libs/portals/my-pages/finance/tsconfig.spec.json b/libs/portals/my-pages/finance/tsconfig.spec.json new file mode 100644 index 000000000000..9c453e8cbe59 --- /dev/null +++ b/libs/portals/my-pages/finance/tsconfig.spec.json @@ -0,0 +1,24 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ], + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ] +} diff --git a/libs/service-portal/graphql/.babelrc b/libs/portals/my-pages/graphql/.babelrc similarity index 100% rename from libs/service-portal/graphql/.babelrc rename to libs/portals/my-pages/graphql/.babelrc diff --git a/libs/service-portal/graphql/.eslintrc.json b/libs/portals/my-pages/graphql/.eslintrc.json similarity index 84% rename from libs/service-portal/graphql/.eslintrc.json rename to libs/portals/my-pages/graphql/.eslintrc.json index 07369d9d89e5..3af6db93cf11 100644 --- a/libs/service-portal/graphql/.eslintrc.json +++ b/libs/portals/my-pages/graphql/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": "../../../.eslintrc.json", + "extends": "../../../../.eslintrc.json", "rules": {}, "ignorePatterns": ["!**/*"], "overrides": [ diff --git a/libs/service-portal/constants/README.md b/libs/portals/my-pages/graphql/README.md similarity index 54% rename from libs/service-portal/constants/README.md rename to libs/portals/my-pages/graphql/README.md index c8951b941117..66d25a25d044 100644 --- a/libs/service-portal/constants/README.md +++ b/libs/portals/my-pages/graphql/README.md @@ -1,7 +1,7 @@ -# service-portal-constants +# portals-my-pages-graphql This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-constants` to execute the unit tests via [Jest](https://jestjs.io). +Run `ng test portals-my-pages-graphql` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/graphql/codegen.yml b/libs/portals/my-pages/graphql/codegen.yml similarity index 69% rename from libs/service-portal/graphql/codegen.yml rename to libs/portals/my-pages/graphql/codegen.yml index d006348adabf..b00bac9de8f0 100644 --- a/libs/service-portal/graphql/codegen.yml +++ b/libs/portals/my-pages/graphql/codegen.yml @@ -1,11 +1,11 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/graphql/src/lib/fragments/*.ts - - libs/service-portal/graphql/src/lib/queries/*.ts - - libs/service-portal/graphql/src/lib/mutations/*.ts + - libs/portals/my-pages/graphql/src/lib/fragments/*.ts + - libs/portals/my-pages/graphql/src/lib/queries/*.ts + - libs/portals/my-pages/graphql/src/lib/mutations/*.ts generates: - libs/service-portal/graphql/src/schema.ts: + libs/portals/my-pages/graphql/src/schema.ts: plugins: - typescript - typescript-operations diff --git a/libs/service-portal/documents/jest.config.ts b/libs/portals/my-pages/graphql/jest.config.ts similarity index 67% rename from libs/service-portal/documents/jest.config.ts rename to libs/portals/my-pages/graphql/jest.config.ts index 668fcac86dc2..201328980cd3 100644 --- a/libs/service-portal/documents/jest.config.ts +++ b/libs/portals/my-pages/graphql/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -10,7 +10,7 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/documents', + coverageDirectory: '/coverage/libs/portals/my-pages/graphql', globals: {}, - displayName: 'service-portal-documents', + displayName: 'portals-my-pages-graphql', } diff --git a/libs/service-portal/graphql/project.json b/libs/portals/my-pages/graphql/project.json similarity index 53% rename from libs/service-portal/graphql/project.json rename to libs/portals/my-pages/graphql/project.json index 6155790d49b5..49e841a0aa78 100644 --- a/libs/service-portal/graphql/project.json +++ b/libs/portals/my-pages/graphql/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-graphql", + "name": "portals-my-pages-graphql", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/graphql/src", + "sourceRoot": "libs/portals/my-pages/graphql/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,15 +12,15 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/graphql/jest.config.ts" + "jestConfig": "libs/portals/my-pages/graphql/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/graphql"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/graphql"] }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/graphql/src/schema.ts", - "command": "graphql-codegen --config libs/service-portal/graphql/codegen.yml" + "output": "libs/portals/my-pages/graphql/src/schema.ts", + "command": "graphql-codegen --config libs/portals/my-pages/graphql/codegen.yml" } } } diff --git a/libs/service-portal/graphql/src/hooks/alertBanners/useAlertBanners.ts b/libs/portals/my-pages/graphql/src/hooks/alertBanners/useAlertBanners.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/alertBanners/useAlertBanners.ts rename to libs/portals/my-pages/graphql/src/hooks/alertBanners/useAlertBanners.ts diff --git a/libs/service-portal/graphql/src/hooks/applications/useApplications.ts b/libs/portals/my-pages/graphql/src/hooks/applications/useApplications.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/applications/useApplications.ts rename to libs/portals/my-pages/graphql/src/hooks/applications/useApplications.ts diff --git a/libs/service-portal/graphql/src/hooks/content/useFooterContent.ts b/libs/portals/my-pages/graphql/src/hooks/content/useFooterContent.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/content/useFooterContent.ts rename to libs/portals/my-pages/graphql/src/hooks/content/useFooterContent.ts diff --git a/libs/service-portal/graphql/src/hooks/documents/useListDocuments.ts b/libs/portals/my-pages/graphql/src/hooks/documents/useListDocuments.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/documents/useListDocuments.ts rename to libs/portals/my-pages/graphql/src/hooks/documents/useListDocuments.ts diff --git a/libs/service-portal/graphql/src/hooks/licenses/useLicenses.ts b/libs/portals/my-pages/graphql/src/hooks/licenses/useLicenses.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/licenses/useLicenses.ts rename to libs/portals/my-pages/graphql/src/hooks/licenses/useLicenses.ts diff --git a/libs/service-portal/graphql/src/hooks/organizations/useOrganization.ts b/libs/portals/my-pages/graphql/src/hooks/organizations/useOrganization.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/organizations/useOrganization.ts rename to libs/portals/my-pages/graphql/src/hooks/organizations/useOrganization.ts diff --git a/libs/service-portal/graphql/src/hooks/organizations/useOrganizations.ts b/libs/portals/my-pages/graphql/src/hooks/organizations/useOrganizations.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/organizations/useOrganizations.ts rename to libs/portals/my-pages/graphql/src/hooks/organizations/useOrganizations.ts diff --git a/libs/service-portal/graphql/src/hooks/passport/useChildrenPassport.ts b/libs/portals/my-pages/graphql/src/hooks/passport/useChildrenPassport.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/passport/useChildrenPassport.ts rename to libs/portals/my-pages/graphql/src/hooks/passport/useChildrenPassport.ts diff --git a/libs/service-portal/graphql/src/hooks/passport/usePassport.ts b/libs/portals/my-pages/graphql/src/hooks/passport/usePassport.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/passport/usePassport.ts rename to libs/portals/my-pages/graphql/src/hooks/passport/usePassport.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useCreateUserProfile.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useCreateUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useCreateUserProfile.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useCreateUserProfile.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useDeleteIslykillValue.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useDeleteIslykillValue.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useDeleteIslykillValue.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useDeleteIslykillValue.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useResendEmailVerification.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useResendEmailVerification.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useResendEmailVerification.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useResendEmailVerification.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useUpdateOrCreateUserProfile.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useUpdateOrCreateUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useUpdateOrCreateUserProfile.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useUpdateOrCreateUserProfile.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useUpdateUserProfile.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useUpdateUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useUpdateUserProfile.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useUpdateUserProfile.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useUserProfile.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useUserProfile.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useUserProfile.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useVerifyEmail.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useVerifyEmail.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useVerifyEmail.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useVerifyEmail.ts diff --git a/libs/service-portal/graphql/src/hooks/profile/useVerifySms.ts b/libs/portals/my-pages/graphql/src/hooks/profile/useVerifySms.ts similarity index 100% rename from libs/service-portal/graphql/src/hooks/profile/useVerifySms.ts rename to libs/portals/my-pages/graphql/src/hooks/profile/useVerifySms.ts diff --git a/libs/service-portal/graphql/src/index.ts b/libs/portals/my-pages/graphql/src/index.ts similarity index 100% rename from libs/service-portal/graphql/src/index.ts rename to libs/portals/my-pages/graphql/src/index.ts diff --git a/libs/service-portal/graphql/src/lib/client.ts b/libs/portals/my-pages/graphql/src/lib/client.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/client.ts rename to libs/portals/my-pages/graphql/src/lib/client.ts diff --git a/libs/service-portal/graphql/src/lib/fragments/application.ts b/libs/portals/my-pages/graphql/src/lib/fragments/application.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/fragments/application.ts rename to libs/portals/my-pages/graphql/src/lib/fragments/application.ts diff --git a/libs/service-portal/graphql/src/lib/fragments/assets.ts b/libs/portals/my-pages/graphql/src/lib/fragments/assets.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/fragments/assets.ts rename to libs/portals/my-pages/graphql/src/lib/fragments/assets.ts diff --git a/libs/service-portal/graphql/src/lib/fragments/license.ts b/libs/portals/my-pages/graphql/src/lib/fragments/license.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/fragments/license.ts rename to libs/portals/my-pages/graphql/src/lib/fragments/license.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/createEmailVerification.ts b/libs/portals/my-pages/graphql/src/lib/mutations/createEmailVerification.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/createEmailVerification.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/createEmailVerification.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/createPkPass.ts b/libs/portals/my-pages/graphql/src/lib/mutations/createPkPass.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/createPkPass.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/createPkPass.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/createSmsVerification.ts b/libs/portals/my-pages/graphql/src/lib/mutations/createSmsVerification.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/createSmsVerification.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/createSmsVerification.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/createUserProfile.ts b/libs/portals/my-pages/graphql/src/lib/mutations/createUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/createUserProfile.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/createUserProfile.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/resendEmailVerification.ts b/libs/portals/my-pages/graphql/src/lib/mutations/resendEmailVerification.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/resendEmailVerification.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/resendEmailVerification.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/updateIslykillSettings.ts b/libs/portals/my-pages/graphql/src/lib/mutations/updateIslykillSettings.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/updateIslykillSettings.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/updateIslykillSettings.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/updateUserProfile.ts b/libs/portals/my-pages/graphql/src/lib/mutations/updateUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/updateUserProfile.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/updateUserProfile.ts diff --git a/libs/service-portal/graphql/src/lib/mutations/verifyPkPass.ts b/libs/portals/my-pages/graphql/src/lib/mutations/verifyPkPass.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/mutations/verifyPkPass.ts rename to libs/portals/my-pages/graphql/src/lib/mutations/verifyPkPass.ts diff --git a/libs/service-portal/graphql/src/lib/queries/alertBanners.ts b/libs/portals/my-pages/graphql/src/lib/queries/alertBanners.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/alertBanners.ts rename to libs/portals/my-pages/graphql/src/lib/queries/alertBanners.ts diff --git a/libs/service-portal/graphql/src/lib/queries/applicationApplications.ts b/libs/portals/my-pages/graphql/src/lib/queries/applicationApplications.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/applicationApplications.ts rename to libs/portals/my-pages/graphql/src/lib/queries/applicationApplications.ts diff --git a/libs/service-portal/graphql/src/lib/queries/getDocument.ts b/libs/portals/my-pages/graphql/src/lib/queries/getDocument.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/getDocument.ts rename to libs/portals/my-pages/graphql/src/lib/queries/getDocument.ts diff --git a/libs/service-portal/graphql/src/lib/queries/getIdentity.ts b/libs/portals/my-pages/graphql/src/lib/queries/getIdentity.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/getIdentity.ts rename to libs/portals/my-pages/graphql/src/lib/queries/getIdentity.ts diff --git a/libs/service-portal/graphql/src/lib/queries/getLicenses.ts b/libs/portals/my-pages/graphql/src/lib/queries/getLicenses.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/getLicenses.ts rename to libs/portals/my-pages/graphql/src/lib/queries/getLicenses.ts diff --git a/libs/service-portal/graphql/src/lib/queries/getMenu.ts b/libs/portals/my-pages/graphql/src/lib/queries/getMenu.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/getMenu.ts rename to libs/portals/my-pages/graphql/src/lib/queries/getMenu.ts diff --git a/libs/service-portal/graphql/src/lib/queries/getOrganizations.ts b/libs/portals/my-pages/graphql/src/lib/queries/getOrganizations.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/getOrganizations.ts rename to libs/portals/my-pages/graphql/src/lib/queries/getOrganizations.ts diff --git a/libs/service-portal/graphql/src/lib/queries/getUserProfile.ts b/libs/portals/my-pages/graphql/src/lib/queries/getUserProfile.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/getUserProfile.ts rename to libs/portals/my-pages/graphql/src/lib/queries/getUserProfile.ts diff --git a/libs/service-portal/graphql/src/lib/queries/listDocuments.ts b/libs/portals/my-pages/graphql/src/lib/queries/listDocuments.ts similarity index 100% rename from libs/service-portal/graphql/src/lib/queries/listDocuments.ts rename to libs/portals/my-pages/graphql/src/lib/queries/listDocuments.ts diff --git a/libs/service-portal/graphql/tsconfig.json b/libs/portals/my-pages/graphql/tsconfig.json similarity index 100% rename from libs/service-portal/graphql/tsconfig.json rename to libs/portals/my-pages/graphql/tsconfig.json diff --git a/libs/service-portal/graphql/tsconfig.lib.json b/libs/portals/my-pages/graphql/tsconfig.lib.json similarity index 84% rename from libs/service-portal/graphql/tsconfig.lib.json rename to libs/portals/my-pages/graphql/tsconfig.lib.json index ff64bb51cff8..17fdb8a339a4 100644 --- a/libs/service-portal/graphql/tsconfig.lib.json +++ b/libs/portals/my-pages/graphql/tsconfig.lib.json @@ -2,7 +2,7 @@ "extends": "./tsconfig.json", "compilerOptions": { "module": "commonjs", - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "declaration": true, "types": ["node"] }, diff --git a/libs/portals/my-pages/graphql/tsconfig.spec.json b/libs/portals/my-pages/graphql/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/graphql/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/health/.babelrc b/libs/portals/my-pages/health/.babelrc similarity index 100% rename from libs/service-portal/health/.babelrc rename to libs/portals/my-pages/health/.babelrc diff --git a/libs/portals/my-pages/health/.eslintrc.json b/libs/portals/my-pages/health/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/health/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/portals/my-pages/health/README.md b/libs/portals/my-pages/health/README.md new file mode 100644 index 000000000000..a5cd12918456 --- /dev/null +++ b/libs/portals/my-pages/health/README.md @@ -0,0 +1,7 @@ +# portals-my-pages-health + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test portals-my-pages-health` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/consent/codegen.yml b/libs/portals/my-pages/health/codegen.yml similarity index 79% rename from libs/service-portal/consent/codegen.yml rename to libs/portals/my-pages/health/codegen.yml index 07cced85736e..4b11f646f9fb 100644 --- a/libs/service-portal/consent/codegen.yml +++ b/libs/portals/my-pages/health/codegen.yml @@ -1,18 +1,18 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/consent/src/**/*.graphql + - libs/portals/my-pages/health/src/**/*.graphql generates: - libs/service-portal/consent/src/: + libs/portals/my-pages/health/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' - plugins: - - typescript-operations - - typescript-react-apollo config: scalars: DateTime: string + plugins: + - typescript-operations + - typescript-react-apollo hooks: afterAllFileWrite: - prettier --write diff --git a/libs/service-portal/assets/jest.config.ts b/libs/portals/my-pages/health/jest.config.ts similarity index 67% rename from libs/service-portal/assets/jest.config.ts rename to libs/portals/my-pages/health/jest.config.ts index 09edb4a26d58..4d55d0b295f5 100644 --- a/libs/service-portal/assets/jest.config.ts +++ b/libs/portals/my-pages/health/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -10,7 +10,7 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/assets', + coverageDirectory: '/coverage/libs/portals/my-pages/health', globals: {}, - displayName: 'service-portal-assets', + displayName: 'portals-my-pages-health', } diff --git a/libs/service-portal/health/project.json b/libs/portals/my-pages/health/project.json similarity index 54% rename from libs/service-portal/health/project.json rename to libs/portals/my-pages/health/project.json index 586aa676ce97..f097b2aaace1 100644 --- a/libs/service-portal/health/project.json +++ b/libs/portals/my-pages/health/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-health", + "name": "portals-my-pages-health", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/health/src", + "sourceRoot": "libs/portals/my-pages/health/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,21 +12,21 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/health/jest.config.ts" + "jestConfig": "libs/portals/my-pages/health/jest.config.ts" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/health"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/health"] }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/health/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/health/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/health/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/health/codegen.yml" + "output": "libs/portals/my-pages/health/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/health/codegen.yml" } } } diff --git a/libs/service-portal/health/src/components/ExtraDoctors/index.tsx b/libs/portals/my-pages/health/src/components/ExtraDoctors/index.tsx similarity index 100% rename from libs/service-portal/health/src/components/ExtraDoctors/index.tsx rename to libs/portals/my-pages/health/src/components/ExtraDoctors/index.tsx diff --git a/libs/service-portal/health/src/components/FootNote/FootNote.tsx b/libs/portals/my-pages/health/src/components/FootNote/FootNote.tsx similarity index 100% rename from libs/service-portal/health/src/components/FootNote/FootNote.tsx rename to libs/portals/my-pages/health/src/components/FootNote/FootNote.tsx diff --git a/libs/service-portal/health/src/components/FootNote/helper.tsx b/libs/portals/my-pages/health/src/components/FootNote/helper.tsx similarity index 97% rename from libs/service-portal/health/src/components/FootNote/helper.tsx rename to libs/portals/my-pages/health/src/components/FootNote/helper.tsx index 07cdaaa0e6e1..95c047bb0ff2 100644 --- a/libs/service-portal/health/src/components/FootNote/helper.tsx +++ b/libs/portals/my-pages/health/src/components/FootNote/helper.tsx @@ -7,7 +7,7 @@ import { PHYSIO_THERAPY, SPEECH_THERAPY, } from '../../utils/constants' -import { LinkButton } from '@island.is/service-portal/core' +import { LinkButton } from '@island.is/portals/my-pages/core' export const getFootNoteByType = ( type: string, diff --git a/libs/service-portal/health/src/components/RegisterModal/RegisterModal.css.ts b/libs/portals/my-pages/health/src/components/RegisterModal/RegisterModal.css.ts similarity index 100% rename from libs/service-portal/health/src/components/RegisterModal/RegisterModal.css.ts rename to libs/portals/my-pages/health/src/components/RegisterModal/RegisterModal.css.ts diff --git a/libs/service-portal/health/src/components/RegisterModal/RegisterModal.tsx b/libs/portals/my-pages/health/src/components/RegisterModal/RegisterModal.tsx similarity index 100% rename from libs/service-portal/health/src/components/RegisterModal/RegisterModal.tsx rename to libs/portals/my-pages/health/src/components/RegisterModal/RegisterModal.tsx diff --git a/libs/service-portal/health/src/components/RegisterModal/index.ts b/libs/portals/my-pages/health/src/components/RegisterModal/index.ts similarity index 100% rename from libs/service-portal/health/src/components/RegisterModal/index.ts rename to libs/portals/my-pages/health/src/components/RegisterModal/index.ts diff --git a/libs/service-portal/health/src/components/TherapiesTabContent/TherapiesTabContent.css.ts b/libs/portals/my-pages/health/src/components/TherapiesTabContent/TherapiesTabContent.css.ts similarity index 100% rename from libs/service-portal/health/src/components/TherapiesTabContent/TherapiesTabContent.css.ts rename to libs/portals/my-pages/health/src/components/TherapiesTabContent/TherapiesTabContent.css.ts diff --git a/libs/service-portal/health/src/components/TherapiesTabContent/TherapiesTabContent.tsx b/libs/portals/my-pages/health/src/components/TherapiesTabContent/TherapiesTabContent.tsx similarity index 99% rename from libs/service-portal/health/src/components/TherapiesTabContent/TherapiesTabContent.tsx rename to libs/portals/my-pages/health/src/components/TherapiesTabContent/TherapiesTabContent.tsx index 0fff3f8abaa5..04b1661a0493 100644 --- a/libs/service-portal/health/src/components/TherapiesTabContent/TherapiesTabContent.tsx +++ b/libs/portals/my-pages/health/src/components/TherapiesTabContent/TherapiesTabContent.tsx @@ -6,7 +6,7 @@ import { formatDate, LinkButton, UserInfoLine, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { FootNote } from '../FootNote/FootNote' import * as styles from './TherapiesTabContent.css' diff --git a/libs/service-portal/health/src/index.ts b/libs/portals/my-pages/health/src/index.ts similarity index 100% rename from libs/service-portal/health/src/index.ts rename to libs/portals/my-pages/health/src/index.ts diff --git a/libs/service-portal/health/src/lib/messages.ts b/libs/portals/my-pages/health/src/lib/messages.ts similarity index 100% rename from libs/service-portal/health/src/lib/messages.ts rename to libs/portals/my-pages/health/src/lib/messages.ts diff --git a/libs/service-portal/health/src/lib/navigation.ts b/libs/portals/my-pages/health/src/lib/navigation.ts similarity index 98% rename from libs/service-portal/health/src/lib/navigation.ts rename to libs/portals/my-pages/health/src/lib/navigation.ts index e971865f72cf..11b93efc9adf 100644 --- a/libs/service-portal/health/src/lib/navigation.ts +++ b/libs/portals/my-pages/health/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { messages } from './messages' import { HealthPaths } from './paths' diff --git a/libs/service-portal/health/src/lib/paths.ts b/libs/portals/my-pages/health/src/lib/paths.ts similarity index 100% rename from libs/service-portal/health/src/lib/paths.ts rename to libs/portals/my-pages/health/src/lib/paths.ts diff --git a/libs/service-portal/health/src/module.tsx b/libs/portals/my-pages/health/src/module.tsx similarity index 99% rename from libs/service-portal/health/src/module.tsx rename to libs/portals/my-pages/health/src/module.tsx index 3889342cefed..5d9cc4fdfccd 100644 --- a/libs/service-portal/health/src/module.tsx +++ b/libs/portals/my-pages/health/src/module.tsx @@ -4,7 +4,7 @@ import { ApiScope } from '@island.is/auth/scopes' import { HealthPaths } from './lib/paths' import { PortalModule } from '@island.is/portals/core' import { messages as hm } from './lib/messages' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { Navigate } from 'react-router-dom' const HealthOverview = lazy(() => diff --git a/libs/service-portal/health/src/screens/AidsAndNutrition/Aids.tsx b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/Aids.tsx similarity index 98% rename from libs/service-portal/health/src/screens/AidsAndNutrition/Aids.tsx rename to libs/portals/my-pages/health/src/screens/AidsAndNutrition/Aids.tsx index 93de2517a44f..9acf28b3ee12 100644 --- a/libs/service-portal/health/src/screens/AidsAndNutrition/Aids.tsx +++ b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/Aids.tsx @@ -9,7 +9,7 @@ import { amountFormat, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { exportAidTable } from '../../utils/FileBreakdown' import { Box, Icon, Table as T, Tooltip, Text } from '@island.is/island-ui/core' diff --git a/libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.css.ts b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.css.ts rename to libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.css.ts diff --git a/libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.graphql b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.graphql similarity index 100% rename from libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.graphql rename to libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.graphql diff --git a/libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.tsx b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.tsx similarity index 98% rename from libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.tsx rename to libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.tsx index 91e5fdff1e4b..0e7d08be0e11 100644 --- a/libs/service-portal/health/src/screens/AidsAndNutrition/AidsAndNutrition.tsx +++ b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/AidsAndNutrition.tsx @@ -3,7 +3,7 @@ import { useLocale, useNamespaces } from '@island.is/localization' import { IntroHeader, SJUKRATRYGGINGAR_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useGetAidsAndNutritionQuery } from './AidsAndNutrition.generated' import { RightsPortalAidOrNutritionType } from '@island.is/api/schema' diff --git a/libs/service-portal/health/src/screens/AidsAndNutrition/Nutrition.tsx b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/Nutrition.tsx similarity index 98% rename from libs/service-portal/health/src/screens/AidsAndNutrition/Nutrition.tsx rename to libs/portals/my-pages/health/src/screens/AidsAndNutrition/Nutrition.tsx index bf3adf236e75..dc89e92a635b 100644 --- a/libs/service-portal/health/src/screens/AidsAndNutrition/Nutrition.tsx +++ b/libs/portals/my-pages/health/src/screens/AidsAndNutrition/Nutrition.tsx @@ -9,7 +9,7 @@ import { amountFormat, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { exportNutritionFile } from '../../utils/FileBreakdown' import { Box, Table as T, Text } from '@island.is/island-ui/core' diff --git a/libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.css.ts b/libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.css.ts rename to libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.css.ts diff --git a/libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.graphql b/libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.graphql similarity index 100% rename from libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.graphql rename to libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.graphql diff --git a/libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.tsx b/libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.tsx similarity index 99% rename from libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.tsx rename to libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.tsx index 878f7c5dbd7c..60d93a418140 100644 --- a/libs/service-portal/health/src/screens/DentistRegistration/DentistRegistration.tsx +++ b/libs/portals/my-pages/health/src/screens/DentistRegistration/DentistRegistration.tsx @@ -13,7 +13,7 @@ import { useGetPaginatedDentistsQuery, useRegisterDentistMutation, } from './DentistRegistration.generated' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { IntroHeader } from '@island.is/portals/core' import { useLocale, useNamespaces } from '@island.is/localization' import { messages } from '../../lib/messages' diff --git a/libs/service-portal/health/src/screens/Dentists/BillsTable.tsx b/libs/portals/my-pages/health/src/screens/Dentists/BillsTable.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Dentists/BillsTable.tsx rename to libs/portals/my-pages/health/src/screens/Dentists/BillsTable.tsx index 6e3e2996c3cf..32bb8a5e45ca 100644 --- a/libs/service-portal/health/src/screens/Dentists/BillsTable.tsx +++ b/libs/portals/my-pages/health/src/screens/Dentists/BillsTable.tsx @@ -4,7 +4,7 @@ import { formatDate, amountFormat, DownloadFileButtons, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box, LoadingDots, Table as T, Text } from '@island.is/island-ui/core' import { messages } from '../../lib/messages' import { RightsPortalDentistBill } from '@island.is/api/schema' diff --git a/libs/service-portal/health/src/screens/Dentists/Dentists.graphql b/libs/portals/my-pages/health/src/screens/Dentists/Dentists.graphql similarity index 100% rename from libs/service-portal/health/src/screens/Dentists/Dentists.graphql rename to libs/portals/my-pages/health/src/screens/Dentists/Dentists.graphql diff --git a/libs/service-portal/health/src/screens/Dentists/Dentists.tsx b/libs/portals/my-pages/health/src/screens/Dentists/Dentists.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Dentists/Dentists.tsx rename to libs/portals/my-pages/health/src/screens/Dentists/Dentists.tsx index 635fa76027d1..c0df026088ab 100644 --- a/libs/service-portal/health/src/screens/Dentists/Dentists.tsx +++ b/libs/portals/my-pages/health/src/screens/Dentists/Dentists.tsx @@ -5,7 +5,7 @@ import { UserInfoLine, IntroHeader, SJUKRATRYGGINGAR_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocation } from 'react-router-dom' import { useGetDentistsQuery } from './Dentists.generated' import { diff --git a/libs/service-portal/health/src/screens/HealthCenter/HealthCenter.graphql b/libs/portals/my-pages/health/src/screens/HealthCenter/HealthCenter.graphql similarity index 100% rename from libs/service-portal/health/src/screens/HealthCenter/HealthCenter.graphql rename to libs/portals/my-pages/health/src/screens/HealthCenter/HealthCenter.graphql diff --git a/libs/service-portal/health/src/screens/HealthCenter/HealthCenter.tsx b/libs/portals/my-pages/health/src/screens/HealthCenter/HealthCenter.tsx similarity index 98% rename from libs/service-portal/health/src/screens/HealthCenter/HealthCenter.tsx rename to libs/portals/my-pages/health/src/screens/HealthCenter/HealthCenter.tsx index b64b53b184db..c9957ca0032f 100644 --- a/libs/service-portal/health/src/screens/HealthCenter/HealthCenter.tsx +++ b/libs/portals/my-pages/health/src/screens/HealthCenter/HealthCenter.tsx @@ -5,7 +5,7 @@ import { IntroHeader, CardLoader, SJUKRATRYGGINGAR_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocation } from 'react-router-dom' import { useGetHealthCenterQuery } from './HealthCenter.generated' import { diff --git a/libs/service-portal/health/src/screens/HealthCenter/HistoryTable.tsx b/libs/portals/my-pages/health/src/screens/HealthCenter/HistoryTable.tsx similarity index 98% rename from libs/service-portal/health/src/screens/HealthCenter/HistoryTable.tsx rename to libs/portals/my-pages/health/src/screens/HealthCenter/HistoryTable.tsx index d6b088e53f25..1e52ecb5505c 100644 --- a/libs/service-portal/health/src/screens/HealthCenter/HistoryTable.tsx +++ b/libs/portals/my-pages/health/src/screens/HealthCenter/HistoryTable.tsx @@ -4,7 +4,7 @@ import { DownloadFileButtons, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { RightsPortalHealthCenterRecord } from '@island.is/api/schema' import { exportHealthCenterFile } from '../../utils/FileBreakdown' diff --git a/libs/service-portal/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.graphql b/libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.graphql similarity index 100% rename from libs/service-portal/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.graphql rename to libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.graphql diff --git a/libs/service-portal/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.tsx b/libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.tsx similarity index 99% rename from libs/service-portal/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.tsx rename to libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.tsx index 482f3994a576..3953111ef991 100644 --- a/libs/service-portal/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.tsx +++ b/libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthCenterRegistration.tsx @@ -16,10 +16,10 @@ import { EmptyState, ErrorScreen, ExcludesFalse, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import * as styles from './HealthRegistration.css' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import groupBy from 'lodash/groupBy' import { useEffect, useMemo, useRef, useState } from 'react' import { RightsPortalHealthCenter } from '@island.is/api/schema' diff --git a/libs/service-portal/health/src/screens/HealthCenterRegistration/HealthRegistration.css.ts b/libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthRegistration.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/HealthCenterRegistration/HealthRegistration.css.ts rename to libs/portals/my-pages/health/src/screens/HealthCenterRegistration/HealthRegistration.css.ts diff --git a/libs/service-portal/health/src/screens/HealthOverview/HealthOverview.graphql b/libs/portals/my-pages/health/src/screens/HealthOverview/HealthOverview.graphql similarity index 100% rename from libs/service-portal/health/src/screens/HealthOverview/HealthOverview.graphql rename to libs/portals/my-pages/health/src/screens/HealthOverview/HealthOverview.graphql diff --git a/libs/service-portal/health/src/screens/HealthOverview/HealthOverview.tsx b/libs/portals/my-pages/health/src/screens/HealthOverview/HealthOverview.tsx similarity index 99% rename from libs/service-portal/health/src/screens/HealthOverview/HealthOverview.tsx rename to libs/portals/my-pages/health/src/screens/HealthOverview/HealthOverview.tsx index 73f27d747ba1..773ffa36a42c 100644 --- a/libs/service-portal/health/src/screens/HealthOverview/HealthOverview.tsx +++ b/libs/portals/my-pages/health/src/screens/HealthOverview/HealthOverview.tsx @@ -23,7 +23,7 @@ import { formatDate, isDateAfterToday, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useEffect, useState } from 'react' import { messages } from '../../lib/messages' import { HealthPaths } from '../../lib/paths' diff --git a/libs/service-portal/health/src/screens/Medicine/Medicine.css.ts b/libs/portals/my-pages/health/src/screens/Medicine/Medicine.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/Medicine/Medicine.css.ts rename to libs/portals/my-pages/health/src/screens/Medicine/Medicine.css.ts diff --git a/libs/service-portal/health/src/screens/Medicine/Medicine.graphql b/libs/portals/my-pages/health/src/screens/Medicine/Medicine.graphql similarity index 100% rename from libs/service-portal/health/src/screens/Medicine/Medicine.graphql rename to libs/portals/my-pages/health/src/screens/Medicine/Medicine.graphql diff --git a/libs/service-portal/health/src/screens/Medicine/MedicineCalculator.tsx b/libs/portals/my-pages/health/src/screens/Medicine/MedicineCalculator.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Medicine/MedicineCalculator.tsx rename to libs/portals/my-pages/health/src/screens/Medicine/MedicineCalculator.tsx index 4062a36ddeba..98cbd189f6af 100644 --- a/libs/service-portal/health/src/screens/Medicine/MedicineCalculator.tsx +++ b/libs/portals/my-pages/health/src/screens/Medicine/MedicineCalculator.tsx @@ -16,7 +16,7 @@ import { CONTENT_GAP_SM, SECTION_GAP, } from './constants' -import { amountFormat, m } from '@island.is/service-portal/core' +import { amountFormat, m } from '@island.is/portals/my-pages/core' import { useEffect, useRef, useState } from 'react' import { useDebounce, useWindowSize } from 'react-use' import { @@ -33,7 +33,7 @@ import { DrugRow } from './components/DrugRow/DrugRow' import { MedicineWrapper } from './wrapper/MedicineWrapper' import { HealthPaths } from '../../lib/paths' import { Problem } from '@island.is/react-spa/shared' -import { EmptyTable } from '@island.is/service-portal/core' +import { EmptyTable } from '@island.is/portals/my-pages/core' import { exportDrugListFile } from '../../utils/FileBreakdown/filesStructure' const DEFAULT_PAGE_NUMBER = 1 diff --git a/libs/service-portal/health/src/screens/Medicine/MedicineLicense.tsx b/libs/portals/my-pages/health/src/screens/Medicine/MedicineLicense.tsx similarity index 98% rename from libs/service-portal/health/src/screens/Medicine/MedicineLicense.tsx rename to libs/portals/my-pages/health/src/screens/Medicine/MedicineLicense.tsx index a1cb6ad03351..6f1c82de3957 100644 --- a/libs/service-portal/health/src/screens/Medicine/MedicineLicense.tsx +++ b/libs/portals/my-pages/health/src/screens/Medicine/MedicineLicense.tsx @@ -9,7 +9,7 @@ import { useLocale } from '@island.is/localization' import { messages } from '../../lib/messages' import { useGetDrugCertificatesQuery } from './Medicine.generated' import { SECTION_GAP } from './constants' -import { ActionCard, m } from '@island.is/service-portal/core' +import { ActionCard, m } from '@island.is/portals/my-pages/core' import { HealthPaths } from '../../lib/paths' import { MedicineWrapper } from './wrapper/MedicineWrapper' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/health/src/screens/Medicine/MedicinePurchase.tsx b/libs/portals/my-pages/health/src/screens/Medicine/MedicinePurchase.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Medicine/MedicinePurchase.tsx rename to libs/portals/my-pages/health/src/screens/Medicine/MedicinePurchase.tsx index 7350d6dc98e5..9d86533de0d5 100644 --- a/libs/service-portal/health/src/screens/Medicine/MedicinePurchase.tsx +++ b/libs/portals/my-pages/health/src/screens/Medicine/MedicinePurchase.tsx @@ -17,7 +17,7 @@ import { UserInfoLine, amountFormat, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { messages } from '../../lib/messages' import { diff --git a/libs/service-portal/health/src/screens/Medicine/components/DrugRow/DrugRow.tsx b/libs/portals/my-pages/health/src/screens/Medicine/components/DrugRow/DrugRow.tsx similarity index 96% rename from libs/service-portal/health/src/screens/Medicine/components/DrugRow/DrugRow.tsx rename to libs/portals/my-pages/health/src/screens/Medicine/components/DrugRow/DrugRow.tsx index ae8dad87f602..be7981278e67 100644 --- a/libs/service-portal/health/src/screens/Medicine/components/DrugRow/DrugRow.tsx +++ b/libs/portals/my-pages/health/src/screens/Medicine/components/DrugRow/DrugRow.tsx @@ -1,7 +1,7 @@ import { Table as T, Icon, Hidden } from '@island.is/island-ui/core' import { QuantityCounter } from '../QuantityCounter/QuantityCounter' import { useState } from 'react' -import { amountFormat } from '@island.is/service-portal/core' +import { amountFormat } from '@island.is/portals/my-pages/core' import { DrugRowDrug } from '../../MedicineCalculator' type Props = { diff --git a/libs/service-portal/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.css.ts b/libs/portals/my-pages/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.css.ts rename to libs/portals/my-pages/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.css.ts diff --git a/libs/service-portal/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.tsx b/libs/portals/my-pages/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.tsx similarity index 100% rename from libs/service-portal/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.tsx rename to libs/portals/my-pages/health/src/screens/Medicine/components/QuantityCounter/QuantityCounter.tsx diff --git a/libs/service-portal/health/src/screens/Medicine/constants.ts b/libs/portals/my-pages/health/src/screens/Medicine/constants.ts similarity index 100% rename from libs/service-portal/health/src/screens/Medicine/constants.ts rename to libs/portals/my-pages/health/src/screens/Medicine/constants.ts diff --git a/libs/service-portal/health/src/screens/Medicine/wrapper/MedicineWrapper.tsx b/libs/portals/my-pages/health/src/screens/Medicine/wrapper/MedicineWrapper.tsx similarity index 96% rename from libs/service-portal/health/src/screens/Medicine/wrapper/MedicineWrapper.tsx rename to libs/portals/my-pages/health/src/screens/Medicine/wrapper/MedicineWrapper.tsx index 4354a87fe619..780fc8b94819 100644 --- a/libs/service-portal/health/src/screens/Medicine/wrapper/MedicineWrapper.tsx +++ b/libs/portals/my-pages/health/src/screens/Medicine/wrapper/MedicineWrapper.tsx @@ -4,7 +4,7 @@ import { IntroHeader, SJUKRATRYGGINGAR_SLUG, TabNavigation, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages as m } from '../../../lib/messages' import { healthNavigation } from '../../../lib/navigation' import { SECTION_GAP } from '../constants' diff --git a/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.graphql b/libs/portals/my-pages/health/src/screens/MedicineCertificate/MedicineCertificate.graphql similarity index 100% rename from libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.graphql rename to libs/portals/my-pages/health/src/screens/MedicineCertificate/MedicineCertificate.graphql diff --git a/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx b/libs/portals/my-pages/health/src/screens/MedicineCertificate/MedicineCertificate.tsx similarity index 98% rename from libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx rename to libs/portals/my-pages/health/src/screens/MedicineCertificate/MedicineCertificate.tsx index 2df649e26c8e..3cdafbd1cbcf 100644 --- a/libs/service-portal/health/src/screens/MedicineCertificate/MedicineCertificate.tsx +++ b/libs/portals/my-pages/health/src/screens/MedicineCertificate/MedicineCertificate.tsx @@ -7,7 +7,7 @@ import { Stack, Text, } from '@island.is/island-ui/core' -import { GoBack, UserInfoLine } from '@island.is/service-portal/core' +import { GoBack, UserInfoLine } from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useLocale } from '@island.is/localization' import { HealthPaths } from '../../lib/paths' diff --git a/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.graphql b/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.graphql similarity index 100% rename from libs/service-portal/health/src/screens/OrganDonation/OrganDonation.graphql rename to libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.graphql diff --git a/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.tsx b/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx similarity index 98% rename from libs/service-portal/health/src/screens/OrganDonation/OrganDonation.tsx rename to libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx index f873974f48ba..7efcd493e3b5 100644 --- a/libs/service-portal/health/src/screens/OrganDonation/OrganDonation.tsx +++ b/libs/portals/my-pages/health/src/screens/OrganDonation/OrganDonation.tsx @@ -4,7 +4,7 @@ import { CardLoader, IntroHeader, LinkResolver, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages as m } from '../../lib/messages' import { Button, Box, Text } from '@island.is/island-ui/core' import { HealthPaths } from '../../lib/paths' diff --git a/libs/service-portal/health/src/screens/OrganDonationRegistration/Limitations.tsx b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/Limitations.tsx similarity index 100% rename from libs/service-portal/health/src/screens/OrganDonationRegistration/Limitations.tsx rename to libs/portals/my-pages/health/src/screens/OrganDonationRegistration/Limitations.tsx diff --git a/libs/service-portal/health/src/screens/OrganDonationRegistration/Loader.tsx b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/Loader.tsx similarity index 92% rename from libs/service-portal/health/src/screens/OrganDonationRegistration/Loader.tsx rename to libs/portals/my-pages/health/src/screens/OrganDonationRegistration/Loader.tsx index fb45c474eb98..b907c382c105 100644 --- a/libs/service-portal/health/src/screens/OrganDonationRegistration/Loader.tsx +++ b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/Loader.tsx @@ -1,6 +1,6 @@ import React from 'react' import { Box, SkeletonLoader, Stack } from '@island.is/island-ui/core' -import { useIsMobile } from '@island.is/service-portal/core' +import { useIsMobile } from '@island.is/portals/my-pages/core' interface Props { amount?: number diff --git a/libs/service-portal/health/src/screens/OrganDonationRegistration/OrganDonationRegistration.css.ts b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/OrganDonationRegistration.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/OrganDonationRegistration/OrganDonationRegistration.css.ts rename to libs/portals/my-pages/health/src/screens/OrganDonationRegistration/OrganDonationRegistration.css.ts diff --git a/libs/service-portal/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx similarity index 99% rename from libs/service-portal/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx rename to libs/portals/my-pages/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx index 7977a58ca3a9..6ef3db623dcf 100644 --- a/libs/service-portal/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx +++ b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/RegistrationForm.tsx @@ -12,7 +12,7 @@ import { IntroHeader, LinkResolver, m as coreMessages, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../..' import { useEffect, useState } from 'react' import React from 'react' diff --git a/libs/service-portal/health/src/screens/Payments/PaymentOverview.tsx b/libs/portals/my-pages/health/src/screens/Payments/PaymentOverview.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Payments/PaymentOverview.tsx rename to libs/portals/my-pages/health/src/screens/Payments/PaymentOverview.tsx index c881506c0d5c..b8c4ea75b5b9 100644 --- a/libs/service-portal/health/src/screens/Payments/PaymentOverview.tsx +++ b/libs/portals/my-pages/health/src/screens/Payments/PaymentOverview.tsx @@ -18,7 +18,7 @@ import { amountFormat, formSubmit, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useLocale } from '@island.is/localization' import { useEffect, useState } from 'react' diff --git a/libs/service-portal/health/src/screens/Payments/PaymentParticipation.tsx b/libs/portals/my-pages/health/src/screens/Payments/PaymentParticipation.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Payments/PaymentParticipation.tsx rename to libs/portals/my-pages/health/src/screens/Payments/PaymentParticipation.tsx index 61ca2c6bf477..45d6ff5ca4f8 100644 --- a/libs/service-portal/health/src/screens/Payments/PaymentParticipation.tsx +++ b/libs/portals/my-pages/health/src/screens/Payments/PaymentParticipation.tsx @@ -16,7 +16,7 @@ import { amountFormat, m, numberFormat, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useLocale } from '@island.is/localization' import { useState } from 'react' diff --git a/libs/service-portal/health/src/screens/Payments/PaymentTableRow.tsx b/libs/portals/my-pages/health/src/screens/Payments/PaymentTableRow.tsx similarity index 99% rename from libs/service-portal/health/src/screens/Payments/PaymentTableRow.tsx rename to libs/portals/my-pages/health/src/screens/Payments/PaymentTableRow.tsx index 1ab6646bc3e9..c30bbf0a0ea6 100644 --- a/libs/service-portal/health/src/screens/Payments/PaymentTableRow.tsx +++ b/libs/portals/my-pages/health/src/screens/Payments/PaymentTableRow.tsx @@ -7,7 +7,7 @@ import { amountFormat, formatDate, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { exportPaymentParticipationFile } from '../../utils/FileBreakdown' import * as styles from './Payments.css' diff --git a/libs/service-portal/health/src/screens/Payments/Payments.css.ts b/libs/portals/my-pages/health/src/screens/Payments/Payments.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/Payments/Payments.css.ts rename to libs/portals/my-pages/health/src/screens/Payments/Payments.css.ts diff --git a/libs/service-portal/health/src/screens/Payments/Payments.graphql b/libs/portals/my-pages/health/src/screens/Payments/Payments.graphql similarity index 100% rename from libs/service-portal/health/src/screens/Payments/Payments.graphql rename to libs/portals/my-pages/health/src/screens/Payments/Payments.graphql diff --git a/libs/service-portal/health/src/screens/Payments/wrapper/PaymentsWrapper.tsx b/libs/portals/my-pages/health/src/screens/Payments/wrapper/PaymentsWrapper.tsx similarity index 96% rename from libs/service-portal/health/src/screens/Payments/wrapper/PaymentsWrapper.tsx rename to libs/portals/my-pages/health/src/screens/Payments/wrapper/PaymentsWrapper.tsx index ac3601b21a3f..8bb60931736d 100644 --- a/libs/service-portal/health/src/screens/Payments/wrapper/PaymentsWrapper.tsx +++ b/libs/portals/my-pages/health/src/screens/Payments/wrapper/PaymentsWrapper.tsx @@ -7,7 +7,7 @@ import { SJUKRATRYGGINGAR_SLUG, TabNavigation, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { healthNavigation } from '../../../lib/navigation' type Props = { diff --git a/libs/service-portal/health/src/screens/Therapies/Therapies.graphql b/libs/portals/my-pages/health/src/screens/Therapies/Therapies.graphql similarity index 100% rename from libs/service-portal/health/src/screens/Therapies/Therapies.graphql rename to libs/portals/my-pages/health/src/screens/Therapies/Therapies.graphql diff --git a/libs/service-portal/health/src/screens/Therapies/TherapiesOccupational.tsx b/libs/portals/my-pages/health/src/screens/Therapies/TherapiesOccupational.tsx similarity index 100% rename from libs/service-portal/health/src/screens/Therapies/TherapiesOccupational.tsx rename to libs/portals/my-pages/health/src/screens/Therapies/TherapiesOccupational.tsx diff --git a/libs/service-portal/health/src/screens/Therapies/TherapiesPhysical.tsx b/libs/portals/my-pages/health/src/screens/Therapies/TherapiesPhysical.tsx similarity index 100% rename from libs/service-portal/health/src/screens/Therapies/TherapiesPhysical.tsx rename to libs/portals/my-pages/health/src/screens/Therapies/TherapiesPhysical.tsx diff --git a/libs/service-portal/health/src/screens/Therapies/TherapiesSpeech.tsx b/libs/portals/my-pages/health/src/screens/Therapies/TherapiesSpeech.tsx similarity index 100% rename from libs/service-portal/health/src/screens/Therapies/TherapiesSpeech.tsx rename to libs/portals/my-pages/health/src/screens/Therapies/TherapiesSpeech.tsx diff --git a/libs/service-portal/health/src/screens/Therapies/wrapper/TherapiesWrapper.tsx b/libs/portals/my-pages/health/src/screens/Therapies/wrapper/TherapiesWrapper.tsx similarity index 97% rename from libs/service-portal/health/src/screens/Therapies/wrapper/TherapiesWrapper.tsx rename to libs/portals/my-pages/health/src/screens/Therapies/wrapper/TherapiesWrapper.tsx index 660a32128df8..c7b7e3421b80 100644 --- a/libs/service-portal/health/src/screens/Therapies/wrapper/TherapiesWrapper.tsx +++ b/libs/portals/my-pages/health/src/screens/Therapies/wrapper/TherapiesWrapper.tsx @@ -7,7 +7,7 @@ import { SJUKRATRYGGINGAR_SLUG, TabNavigation, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../../lib/messages' import { healthNavigation } from '../../../lib/navigation' import { ApolloError } from '@apollo/client' diff --git a/libs/service-portal/health/src/screens/Vaccinations/Vaccinations.graphql b/libs/portals/my-pages/health/src/screens/Vaccinations/Vaccinations.graphql similarity index 100% rename from libs/service-portal/health/src/screens/Vaccinations/Vaccinations.graphql rename to libs/portals/my-pages/health/src/screens/Vaccinations/Vaccinations.graphql diff --git a/libs/service-portal/health/src/screens/Vaccinations/VaccinationsWrapper.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx similarity index 98% rename from libs/service-portal/health/src/screens/Vaccinations/VaccinationsWrapper.tsx rename to libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx index 393be2b9a2e1..82aa962b2be4 100644 --- a/libs/service-portal/health/src/screens/Vaccinations/VaccinationsWrapper.tsx +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/VaccinationsWrapper.tsx @@ -5,7 +5,7 @@ import { IntroHeader, LinkButton, EmptyTable, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages as m } from '../../lib/messages' import { SECTION_GAP } from '../../utils/constants' import { useGetVaccinationsQuery } from './Vaccinations.generated' diff --git a/libs/portals/my-pages/health/src/screens/Vaccinations/dataStructure.ts b/libs/portals/my-pages/health/src/screens/Vaccinations/dataStructure.ts new file mode 100644 index 000000000000..fc6fdd72174e --- /dev/null +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/dataStructure.ts @@ -0,0 +1,370 @@ +export interface VaccinationAge { + years: number + months: number +} + +export interface Vaccination { + id: number + nationalId: string + code: string + vaccineName: string + vaccinationDate: Date + vaccinationAge: VaccinationAge + generalComment: string + rejected: boolean +} + +export interface Vaccine { + diseaseId: string + diseaseName: string + diseaseDescription: string // Markdown + vaccinationStatus: string + vaccinationStatusName: string + lastVaccinationDate: Date | null + vaccinations?: Array | null + comments: Array // Markdown +} + +export const generalVaccinationsData: Array = [ + { + diseaseId: 'influensa', + diseaseName: 'Inflúensa', + diseaseDescription: 'string', + vaccinationStatus: 'expired', + vaccinationStatusName: 'Útrunnið', + lastVaccinationDate: new Date('2020-02-04T11:08:02.178Z'), + vaccinations: [ + { + id: 0, + nationalId: '1234567890', + code: 'J07BJ51', + vaccineName: 'ATC', + vaccinationDate: new Date('2020-02-04'), + vaccinationAge: { + years: 1, + months: 2, + }, + generalComment: 'ATC', + rejected: false, + }, + ], + comments: [ + 'Inflúensa er ekki skemmtileg', + 'Þetta er mikill texti um inflúensu, sjá meira [hér](https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/)', + ], + }, + { + diseaseId: 'covid-19', + diseaseName: 'COVID-19', + diseaseDescription: 'string', + vaccinationStatus: 'expired', + vaccinationStatusName: 'Útrunnið', + lastVaccinationDate: new Date('2024-02-04T11:08:02.178Z'), + vaccinations: [ + { + id: 0, + nationalId: '1234567890', + code: 'J07BJ51', + vaccineName: 'ATC', + vaccinationDate: new Date('2020-02-04'), + vaccinationAge: { + years: 1, + months: 2, + }, + generalComment: 'ATC', + rejected: false, + }, + { + id: 1, + nationalId: '1234567890', + vaccineName: 'ATC', + code: 'J07BJ51', + vaccinationDate: new Date('2024-02-04'), + vaccinationAge: { + years: 1, + months: 2, + }, + generalComment: 'ATC', + rejected: false, + }, + ], + comments: [ + 'Covid-19 er ekki skemmtileg', + 'Þetta er mikill texti um covid-19, sjá meira [hér](https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/)', + ], + }, + { + diseaseId: 'tetanus', + diseaseName: 'Stífkrampi', + diseaseDescription: 'string', + vaccinationStatus: 'vaccinated', + vaccinationStatusName: 'Í gildi', + lastVaccinationDate: new Date('2024-08-09T11:08:02.178Z'), + vaccinations: [ + { + id: 0, + nationalId: '1234567890', + vaccineName: 'ATC', + code: 'J07BJ51', + vaccinationDate: new Date('2021-01-01'), + vaccinationAge: { + years: 1, + months: 2, + }, + generalComment: 'ATC', + rejected: false, + }, + ], + comments: [ + 'Stífkrampi er ekki skemmtilegur', + 'Þetta er mikill texti um stífkrampa, sjá meira [hér](https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/)', + ], + }, + { + diseaseId: 'chicken pox', + diseaseName: 'Hlaupabóla', + diseaseDescription: 'string', + vaccinationStatus: 'unvaccinated', + vaccinationStatusName: 'Óbólusett', + lastVaccinationDate: null, + vaccinations: null, + comments: [ + 'Hlaupabóla er ekki skemmtileg', + 'Þetta er mikill texti um hlaupabólu, sjá meira [hér](https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/)', + ], + }, +] + +export const otherVaccinationsData: Array = [ + { + diseaseId: 'typhoid fever', + diseaseName: 'Taugaveiki', + diseaseDescription: 'string', + vaccinationStatus: 'vaccinated', + vaccinationStatusName: 'Í gildi', + lastVaccinationDate: new Date('2024-08-09T11:08:02.178Z'), + vaccinations: [ + { + id: 0, + nationalId: '1234567890', + code: 'J07BJ51', + vaccineName: 'ATC', + vaccinationDate: new Date('2021-01-01'), + vaccinationAge: { + years: 1, + months: 2, + }, + generalComment: 'ATC', + rejected: false, + }, + ], + comments: [ + 'Taugaveiki er ekki skemmtileg', + 'Þetta er mikill texti um taugaveiki, sjá meira [hér](https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/)', + ], + }, + { + diseaseId: 'yellow fever', + diseaseName: 'Gulusótt', + diseaseDescription: 'string', + vaccinationStatus: 'expired', + vaccinationStatusName: 'Útrunnið', + lastVaccinationDate: new Date('2024-08-09T11:08:02.178Z'), + vaccinations: null, + comments: [ + 'Gulusótt er ekki skemmtileg', + 'Þetta er mikill texti um gulusótt, sjá meira [hér](https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/)', + ], + }, +] + +// TEMP +// const rowDataDetail: Array> = [ +// [ +// { +// value: '1', +// }, +// { +// value: '08.12.2008', +// }, +// { +// value: '20 ára 6 mán', +// }, +// { +// value: 'Typhim VI', +// type: 'link', +// url: 'https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/', +// }, +// { +// value: 'Heilbrigðisstofnun Austurlands', +// }, +// ], +// [ +// { +// value: '2', +// }, +// { +// value: '09.03.2011', +// }, +// { +// value: '23 ára 3 mán', +// }, +// { +// value: 'Typhim VI', +// type: 'link', +// url: 'https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/', +// }, +// { +// value: 'Heilsugæslan á Egilsstöðum', +// }, +// ], +// [ +// { +// value: '3', +// }, +// { +// value: '15.03.2016', +// }, +// { +// value: '27 ára 9 mán', +// }, +// { +// value: 'Typhim VI', +// type: 'link', +// url: 'https://www.heilsuvera.is/efnisflokkar/lyf-og-bolusetningar/', +// }, +// { +// value: 'Heilsugæsla Höfuðborgarsvæðissins', +// }, +// ], +// ] +// const footerTextDetail = [ +// 'Endurbólusetning á 3ja ára fresti ef hætta er á smiti.', +// 'Taugaveiki er landlæg í Asíu, Afríku, Mið- og Suður-Ameríku.', +// ] +// const rowData: Array> = [ +// [ +// { +// value: 'Barnaveiki', +// }, +// { +// value: '19.05.2016', +// }, +// { +// value: ( +// +// Lokið +// +// ), +// align: 'right', +// }, +// ], +// [ +// { +// value: 'COVID-19', +// }, +// { +// value: '03.12.2021', +// }, +// { +// value: ( +// +// Útrunnið +// +// ), +// align: 'right', +// }, +// ], +// [ +// { +// value: 'Hemofilus inflúensa B (Hib)', +// }, +// { +// value: '-', +// }, +// { +// value: ( +// +// Óbólusett +// +// ), +// align: 'right', +// }, +// ], +// [ +// { +// value: 'Hettusótt', +// }, +// { +// value: '-', +// }, +// { +// value: ( +// +// Óbólusett +// +// ), +// align: 'right', +// }, +// ], +// [ +// { +// value: 'Hlaupabóla', +// }, +// { +// value: '-', +// }, +// { +// value: ( +// +// Óbólusett +// +// ), +// }, +// ], +// [ +// { +// value: 'HPV', +// }, +// { +// value: '-', +// }, +// { +// value: ( +// +// Óbólusett +// +// ), +// }, +// ], +// [ +// { +// value: 'Inflúensa', +// }, +// { +// value: '20.12.2022', +// }, +// { +// value: ( +// +// Útrunnið +// +// ), +// }, +// ], +// [ +// { +// value: 'Kíghósti', +// }, +// { +// value: '19.05.2016', +// }, +// { +// value: ( +// +// Í gildi +// +// ), +// }, +// ], +// ] diff --git a/libs/service-portal/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx similarity index 98% rename from libs/service-portal/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx rename to libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx index 7c379877955d..b0918f667bdd 100644 --- a/libs/service-portal/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx @@ -3,7 +3,7 @@ import { EmptyTable, SortableTable, formatDate, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../../lib/messages' import { tagSelector } from '../../../utils/tagSelector' import { VaccinationsDetailTable } from './VaccinationsDetailTable' diff --git a/libs/service-portal/health/src/screens/Vaccinations/tables/VaccinationsDetailTable.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsDetailTable.tsx similarity index 96% rename from libs/service-portal/health/src/screens/Vaccinations/tables/VaccinationsDetailTable.tsx rename to libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsDetailTable.tsx index 31f8b999cfb5..9f0f8356c2ed 100644 --- a/libs/service-portal/health/src/screens/Vaccinations/tables/VaccinationsDetailTable.tsx +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsDetailTable.tsx @@ -1,5 +1,5 @@ import { Box, Table as T, Text } from '@island.is/island-ui/core' -import { EmptyTable, LinkButton } from '@island.is/service-portal/core' +import { EmptyTable, LinkButton } from '@island.is/portals/my-pages/core' import { useNamespaces } from '@island.is/localization' import { Markdown } from '@island.is/shared/components' import { messages as m } from '../../../lib/messages' diff --git a/libs/service-portal/health/src/screens/Vaccinations/tables/VaccinationsTable.css.ts b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsTable.css.ts similarity index 100% rename from libs/service-portal/health/src/screens/Vaccinations/tables/VaccinationsTable.css.ts rename to libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsTable.css.ts diff --git a/libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsTable.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsTable.tsx new file mode 100644 index 000000000000..e2a3b5923d7f --- /dev/null +++ b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/VaccinationsTable.tsx @@ -0,0 +1,134 @@ +import { Box, Table as T, Tag } from '@island.is/island-ui/core' +import { messages } from '../../../lib/messages' +import { useLocale, useNamespaces } from '@island.is/localization' +import { ExpandHeader, ExpandRow } from '@island.is/portals/my-pages/core' +import { VaccinationsDetailTable } from './VaccinationsDetailTable' +import { DetailHeader, DetailRow } from '../../../utils/types' +import { Vaccine } from '../dataStructure' +import { ATC_URL_BASE } from '../../../utils/constants' + +interface Props { + data: Array +} + +export const VaccinationsTable = ({ data }: Props) => { + useNamespaces('sp.health') + const { formatMessage } = useLocale() + const headerData: Array = [ + { + value: '', + }, + { + value: formatMessage(messages.vaccinatedFor), + }, + { + value: formatMessage(messages.vaccinatedLast), + align: 'right', + }, + { + value: formatMessage(messages.vaccinatedStatus), + align: 'right', + }, + ] + + const headerDataDetail: Array = [ + { + value: formatMessage(messages.vaccinesTableHeaderNr), + }, + { + value: formatMessage(messages.vaccinesTableHeaderDate), + }, + { + value: formatMessage(messages.vaccinesTableHeaderAge), + }, + { + value: formatMessage(messages.vaccinesTableHeaderVaccine), + }, + { + value: formatMessage(messages.vaccinesTableHeaderLocation), + }, + ] + + return ( + + + + + {data.map((row, index) => { + return ( + + {row.vaccinationStatusName} + + ), + align: 'right', + }, + ]} + > + => { + return [ + { + value: (i + 1).toString(), + }, + { + value: + vaccination.vaccinationDate.toLocaleDateString( + 'is-IS', + ), + }, + { + value: [ + vaccination.vaccinationAge.years, + formatMessage(messages.years), + vaccination.vaccinationAge.months, + formatMessage(messages.months), + ] + .filter(Boolean) + .join(' '), + }, + { + value: vaccination.vaccineName, + type: 'link', + url: ATC_URL_BASE + vaccination.code, + }, + { + value: vaccination.generalComment, + }, + ] + }, + )} + footerText={row.comments} + /> + + ) + })} + + + + ) +} diff --git a/libs/service-portal/health/src/utils/FileBreakdown/dataHeaders.ts b/libs/portals/my-pages/health/src/utils/FileBreakdown/dataHeaders.ts similarity index 100% rename from libs/service-portal/health/src/utils/FileBreakdown/dataHeaders.ts rename to libs/portals/my-pages/health/src/utils/FileBreakdown/dataHeaders.ts diff --git a/libs/service-portal/health/src/utils/FileBreakdown/filesStructure.ts b/libs/portals/my-pages/health/src/utils/FileBreakdown/filesStructure.ts similarity index 99% rename from libs/service-portal/health/src/utils/FileBreakdown/filesStructure.ts rename to libs/portals/my-pages/health/src/utils/FileBreakdown/filesStructure.ts index 73b58e1b6f75..721262e34124 100644 --- a/libs/service-portal/health/src/utils/FileBreakdown/filesStructure.ts +++ b/libs/portals/my-pages/health/src/utils/FileBreakdown/filesStructure.ts @@ -2,7 +2,7 @@ import { amountFormat, downloadFile, formatDate, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { aidHeaders, dentistHeaders, diff --git a/libs/service-portal/health/src/utils/FileBreakdown/index.ts b/libs/portals/my-pages/health/src/utils/FileBreakdown/index.ts similarity index 100% rename from libs/service-portal/health/src/utils/FileBreakdown/index.ts rename to libs/portals/my-pages/health/src/utils/FileBreakdown/index.ts diff --git a/libs/service-portal/health/src/utils/OrganDonationMock.ts b/libs/portals/my-pages/health/src/utils/OrganDonationMock.ts similarity index 100% rename from libs/service-portal/health/src/utils/OrganDonationMock.ts rename to libs/portals/my-pages/health/src/utils/OrganDonationMock.ts diff --git a/libs/service-portal/health/src/utils/constants.ts b/libs/portals/my-pages/health/src/utils/constants.ts similarity index 100% rename from libs/service-portal/health/src/utils/constants.ts rename to libs/portals/my-pages/health/src/utils/constants.ts diff --git a/libs/service-portal/health/src/utils/format.ts b/libs/portals/my-pages/health/src/utils/format.ts similarity index 91% rename from libs/service-portal/health/src/utils/format.ts rename to libs/portals/my-pages/health/src/utils/format.ts index a136884e15f0..4342c3bb8cb5 100644 --- a/libs/service-portal/health/src/utils/format.ts +++ b/libs/portals/my-pages/health/src/utils/format.ts @@ -1,4 +1,4 @@ -import { amountFormat } from '@island.is/service-portal/core' +import { amountFormat } from '@island.is/portals/my-pages/core' import isNumber from 'lodash/isNumber' export const formatNumberToString = (item?: number) => { diff --git a/libs/service-portal/health/src/utils/tagSelector.ts b/libs/portals/my-pages/health/src/utils/tagSelector.ts similarity index 100% rename from libs/service-portal/health/src/utils/tagSelector.ts rename to libs/portals/my-pages/health/src/utils/tagSelector.ts diff --git a/libs/service-portal/health/src/utils/types.ts b/libs/portals/my-pages/health/src/utils/types.ts similarity index 100% rename from libs/service-portal/health/src/utils/types.ts rename to libs/portals/my-pages/health/src/utils/types.ts diff --git a/libs/service-portal/health/tsconfig.json b/libs/portals/my-pages/health/tsconfig.json similarity index 100% rename from libs/service-portal/health/tsconfig.json rename to libs/portals/my-pages/health/tsconfig.json diff --git a/libs/portals/my-pages/health/tsconfig.lib.json b/libs/portals/my-pages/health/tsconfig.lib.json new file mode 100644 index 000000000000..1d50996ab513 --- /dev/null +++ b/libs/portals/my-pages/health/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ] +} diff --git a/libs/portals/my-pages/health/tsconfig.spec.json b/libs/portals/my-pages/health/tsconfig.spec.json new file mode 100644 index 000000000000..9c453e8cbe59 --- /dev/null +++ b/libs/portals/my-pages/health/tsconfig.spec.json @@ -0,0 +1,24 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ], + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ] +} diff --git a/libs/service-portal/information/.babelrc b/libs/portals/my-pages/information/.babelrc similarity index 100% rename from libs/service-portal/information/.babelrc rename to libs/portals/my-pages/information/.babelrc diff --git a/libs/portals/my-pages/information/.eslintrc.json b/libs/portals/my-pages/information/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/information/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/law-and-order/README.md b/libs/portals/my-pages/information/README.md similarity index 54% rename from libs/service-portal/law-and-order/README.md rename to libs/portals/my-pages/information/README.md index e8dba631e6e3..75420336b790 100644 --- a/libs/service-portal/law-and-order/README.md +++ b/libs/portals/my-pages/information/README.md @@ -1,7 +1,7 @@ -# service-portal-law-and-order +# portals-my-pages-information This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-law-and-order` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-information` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/information/babel-jest.config.json b/libs/portals/my-pages/information/babel-jest.config.json similarity index 100% rename from libs/service-portal/information/babel-jest.config.json rename to libs/portals/my-pages/information/babel-jest.config.json diff --git a/libs/portals/my-pages/information/codegen.yml b/libs/portals/my-pages/information/codegen.yml new file mode 100644 index 000000000000..6a6fb4c7e8af --- /dev/null +++ b/libs/portals/my-pages/information/codegen.yml @@ -0,0 +1,18 @@ +schema: + - apps/api/src/api.graphql +documents: + - libs/portals/my-pages/information/src/**/**/*.graphql +generates: + libs/portals/my-pages/information/src/: + preset: 'near-operation-file' + presetConfig: + baseTypesPath: '~@island.is/api/schema' + plugins: + - typescript-operations + - typescript-react-apollo + config: + scalars: + DateTime: string +hooks: + afterAllFileWrite: + - prettier --write diff --git a/libs/service-portal/information/jest.config.ts b/libs/portals/my-pages/information/jest.config.ts similarity index 73% rename from libs/service-portal/information/jest.config.ts rename to libs/portals/my-pages/information/jest.config.ts index 6ad311fd0f97..2e359e8f2c8f 100644 --- a/libs/service-portal/information/jest.config.ts +++ b/libs/portals/my-pages/information/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest', @@ -11,7 +11,7 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/information', + coverageDirectory: '/coverage/libs/portals/my-pages/information', setupFilesAfterEnv: [`${__dirname}/jest.setup.ts`], - displayName: 'service-portal-information', + displayName: 'portals-my-pages-information', } diff --git a/libs/service-portal/information/jest.setup.ts b/libs/portals/my-pages/information/jest.setup.ts similarity index 100% rename from libs/service-portal/information/jest.setup.ts rename to libs/portals/my-pages/information/jest.setup.ts diff --git a/libs/service-portal/information/project.json b/libs/portals/my-pages/information/project.json similarity index 51% rename from libs/service-portal/information/project.json rename to libs/portals/my-pages/information/project.json index d6a2795ddfa1..d9fd94d9c4c3 100644 --- a/libs/service-portal/information/project.json +++ b/libs/portals/my-pages/information/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-information", + "name": "portals-my-pages-information", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/information/src", + "sourceRoot": "libs/portals/my-pages/information/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { @@ -10,22 +10,22 @@ }, "test": { "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/information"], + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/information"], "options": { - "jestConfig": "libs/service-portal/information/jest.config.ts" + "jestConfig": "libs/portals/my-pages/information/jest.config.ts" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/information/src/{lib,screens,components}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/information/src/{lib,screens,components}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/information/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/information/codegen.yml" + "output": "libs/portals/my-pages/information/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/information/codegen.yml" } } } diff --git a/libs/service-portal/information/src/components/FamilyMemberCard/FamilyMemberCard.tsx b/libs/portals/my-pages/information/src/components/FamilyMemberCard/FamilyMemberCard.tsx similarity index 94% rename from libs/service-portal/information/src/components/FamilyMemberCard/FamilyMemberCard.tsx rename to libs/portals/my-pages/information/src/components/FamilyMemberCard/FamilyMemberCard.tsx index e7a956a4957a..0a2e1dd9d0c1 100644 --- a/libs/service-portal/information/src/components/FamilyMemberCard/FamilyMemberCard.tsx +++ b/libs/portals/my-pages/information/src/components/FamilyMemberCard/FamilyMemberCard.tsx @@ -1,7 +1,7 @@ import { useLocale, useNamespaces } from '@island.is/localization' -import { formatNationalId, m } from '@island.is/service-portal/core' +import { formatNationalId, m } from '@island.is/portals/my-pages/core' import React, { FC, useEffect, useState } from 'react' -import { ActionCard } from '@island.is/service-portal/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import { spmm } from '../../lib/messages' import { InformationPaths } from '../../lib/paths' diff --git a/libs/service-portal/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.css.tsx b/libs/portals/my-pages/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.css.tsx similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.css.tsx rename to libs/portals/my-pages/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.css.tsx diff --git a/libs/service-portal/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.tsx b/libs/portals/my-pages/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.tsx similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.tsx rename to libs/portals/my-pages/information/src/components/NotificationSettings/ActorProfilesNotificationSettings.tsx diff --git a/libs/service-portal/information/src/components/NotificationSettings/UserProfileNotificationSettings.tsx b/libs/portals/my-pages/information/src/components/NotificationSettings/UserProfileNotificationSettings.tsx similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/UserProfileNotificationSettings.tsx rename to libs/portals/my-pages/information/src/components/NotificationSettings/UserProfileNotificationSettings.tsx diff --git a/libs/service-portal/information/src/components/NotificationSettings/cards/ActorProfileSettingsCard.tsx b/libs/portals/my-pages/information/src/components/NotificationSettings/cards/ActorProfileSettingsCard.tsx similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/cards/ActorProfileSettingsCard.tsx rename to libs/portals/my-pages/information/src/components/NotificationSettings/cards/ActorProfileSettingsCard.tsx diff --git a/libs/service-portal/information/src/components/NotificationSettings/cards/NotificationSettingsCard.tsx b/libs/portals/my-pages/information/src/components/NotificationSettings/cards/NotificationSettingsCard.tsx similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/cards/NotificationSettingsCard.tsx rename to libs/portals/my-pages/information/src/components/NotificationSettings/cards/NotificationSettingsCard.tsx diff --git a/libs/service-portal/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.css.ts b/libs/portals/my-pages/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.css.ts similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.css.ts rename to libs/portals/my-pages/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.css.ts diff --git a/libs/service-portal/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.tsx b/libs/portals/my-pages/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.tsx similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.tsx rename to libs/portals/my-pages/information/src/components/NotificationSettings/cards/SettingsCard/SettingsCard.tsx diff --git a/libs/service-portal/information/src/components/NotificationSettings/graphql/ActorProfiles.graphql b/libs/portals/my-pages/information/src/components/NotificationSettings/graphql/ActorProfiles.graphql similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/graphql/ActorProfiles.graphql rename to libs/portals/my-pages/information/src/components/NotificationSettings/graphql/ActorProfiles.graphql diff --git a/libs/service-portal/information/src/components/NotificationSettings/graphql/UserProfile.graphql b/libs/portals/my-pages/information/src/components/NotificationSettings/graphql/UserProfile.graphql similarity index 100% rename from libs/service-portal/information/src/components/NotificationSettings/graphql/UserProfile.graphql rename to libs/portals/my-pages/information/src/components/NotificationSettings/graphql/UserProfile.graphql diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/ProfileForm.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/ProfileForm.tsx similarity index 98% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/ProfileForm.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/ProfileForm.tsx index f85bf6275e9f..943ab7adb8f2 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/ProfileForm.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/ProfileForm.tsx @@ -14,11 +14,11 @@ import { Features, useFeatureFlagClient, } from '@island.is/react/feature-flags' -import { LoadModal, m, parseNumber } from '@island.is/service-portal/core' +import { LoadModal, m, parseNumber } from '@island.is/portals/my-pages/core' import { useDeleteIslykillValue, useUserProfile, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { msg } from '../../../../lib/messages' import { bankInfoObject } from '../../../../utils/bankInfoHelper' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/ContactNotVerified.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/ContactNotVerified.tsx similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/ContactNotVerified.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/ContactNotVerified.tsx diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/DropModal.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/DropModal.tsx similarity index 97% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/DropModal.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/DropModal.tsx index 96f3da126101..f46a9115fb45 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/DropModal.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/DropModal.tsx @@ -1,6 +1,6 @@ import React, { FC, useState } from 'react' import { useLocale, useNamespaces } from '@island.is/localization' -import { Modal } from '@island.is/service-portal/core' +import { Modal } from '@island.is/portals/my-pages/core' import { Text, Button, diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/FormButton.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/FormButton.tsx similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/FormButton.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/FormButton.tsx diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/InputSection.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/InputSection.tsx similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/InputSection.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/InputSection.tsx diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/BankInfoForm.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/BankInfoForm.tsx similarity index 98% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/BankInfoForm.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/BankInfoForm.tsx index 5476279ccf87..0db21501a49a 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/BankInfoForm.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/BankInfoForm.tsx @@ -6,8 +6,8 @@ import { InputError, LoadingDots, } from '@island.is/island-ui/core' -import { m } from '@island.is/service-portal/core' -import { useUpdateOrCreateUserProfile } from '@island.is/service-portal/graphql' +import { m } from '@island.is/portals/my-pages/core' +import { useUpdateOrCreateUserProfile } from '@island.is/portals/my-pages/graphql' import { stringifyBankData } from '../../../../../../utils/bankInfoHelper' import { msg } from '../../../../../../lib/messages' import { InputController } from '@island.is/shared/form-fields' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Email.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Email.tsx similarity index 99% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Email.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Email.tsx index 9f4ce762aafe..08345745a62b 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Email.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Email.tsx @@ -1,6 +1,6 @@ import React, { FC, useState, useEffect } from 'react' import { useForm } from 'react-hook-form' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { msg } from '../../../../../../lib/messages' import { useLocale, useNamespaces } from '@island.is/localization' import { Box, Text, LoadingDots } from '@island.is/island-ui/core' @@ -10,7 +10,7 @@ import { useUpdateOrCreateUserProfile, useDeleteIslykillValue, useUserProfile, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { FormButton } from '../FormButton' import * as styles from './ProfileForms.css' import { ContactNotVerified } from '../ContactNotVerified' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Nudge.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Nudge.tsx similarity index 96% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Nudge.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Nudge.tsx index 623be7b520eb..0618d0bff65a 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Nudge.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Nudge.tsx @@ -10,8 +10,8 @@ import { Icon, LoadingDots, } from '@island.is/island-ui/core' -import { m } from '@island.is/service-portal/core' -import { useUpdateOrCreateUserProfile } from '@island.is/service-portal/graphql' +import { m } from '@island.is/portals/my-pages/core' +import { useUpdateOrCreateUserProfile } from '@island.is/portals/my-pages/graphql' import { useLocale, useNamespaces } from '@island.is/localization' import { FormButton } from '../FormButton' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/PaperMail.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/PaperMail.tsx similarity index 98% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/PaperMail.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/PaperMail.tsx index 907959ef0299..3b1047cba618 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/PaperMail.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/PaperMail.tsx @@ -10,7 +10,7 @@ import { Hidden, LoadingDots, } from '@island.is/island-ui/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { msg } from '../../../../../../lib/messages' import { useLocale, useNamespaces } from '@island.is/localization' import { Controller, useForm } from 'react-hook-form' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Phone.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Phone.tsx similarity index 98% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Phone.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Phone.tsx index abc110446825..8ca536557b1d 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Phone.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/Phone.tsx @@ -1,6 +1,6 @@ import React, { FC, useState, useEffect } from 'react' import { useForm } from 'react-hook-form' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { msg } from '../../../../../../lib/messages' import { @@ -17,9 +17,9 @@ import { useUpdateOrCreateUserProfile, useDeleteIslykillValue, useUserProfile, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { sharedMessages } from '@island.is/shared/translations' -import { parseFullNumber } from '@island.is/service-portal/core' +import { parseFullNumber } from '@island.is/portals/my-pages/core' import { FormButton } from '../FormButton' import * as styles from './ProfileForms.css' import { ContactNotVerified } from '../ContactNotVerified' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ProfileForms.css.ts b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ProfileForms.css.ts similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ProfileForms.css.ts rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ProfileForms.css.ts diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.css.ts b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.css.ts similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.css.ts rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.css.ts diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.tsx similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Inputs/ReadOnlyWithLinks.tsx diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Intro.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Intro.tsx similarity index 95% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Intro.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Intro.tsx index 6c7ac6b286b3..fd6f3b4579f2 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/components/Intro.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/components/Intro.tsx @@ -1,6 +1,6 @@ import React, { FC } from 'react' import { useLocale, useNamespaces } from '@island.is/localization' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { Text, Divider, Box } from '@island.is/island-ui/core' import { msg } from '../../../../../lib/messages' diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/confirmNudge.graphql b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/confirmNudge.graphql similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/confirmNudge.graphql rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/confirmNudge.graphql diff --git a/libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/types/form.ts b/libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/types/form.ts similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/Forms/ProfileForm/types/form.ts rename to libs/portals/my-pages/information/src/components/PersonalInformation/Forms/ProfileForm/types/form.ts diff --git a/libs/service-portal/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.graphql b/libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.graphql similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.graphql rename to libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.graphql diff --git a/libs/service-portal/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.tsx similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboarding/UserOnboarding.tsx diff --git a/libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.css.ts b/libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.css.ts similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.css.ts rename to libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.css.ts diff --git a/libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.tsx similarity index 97% rename from libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.tsx index 7af4a1c9a423..96f7a5c2a51a 100644 --- a/libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.tsx +++ b/libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/UserOnboardingModal.tsx @@ -3,7 +3,7 @@ import { useLocale, useNamespaces } from '@island.is/localization' import { formatPlausiblePathToParams, ServicePortalPaths, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { ModalBase, GridRow, @@ -14,7 +14,7 @@ import { Columns, Column, } from '@island.is/island-ui/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { servicePortalCloseOnBoardingModal } from '@island.is/plausible' import { useLocation } from 'react-router-dom' import { OnboardingHeader } from './components/Header' diff --git a/libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/components/Header.tsx b/libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/components/Header.tsx similarity index 100% rename from libs/service-portal/information/src/components/PersonalInformation/UserOnboardingModal/components/Header.tsx rename to libs/portals/my-pages/information/src/components/PersonalInformation/UserOnboardingModal/components/Header.tsx diff --git a/libs/service-portal/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.css.ts b/libs/portals/my-pages/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.css.ts similarity index 100% rename from libs/service-portal/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.css.ts rename to libs/portals/my-pages/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.css.ts diff --git a/libs/service-portal/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.tsx b/libs/portals/my-pages/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.tsx similarity index 97% rename from libs/service-portal/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.tsx rename to libs/portals/my-pages/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.tsx index 30b33ccc6660..243933717a1e 100644 --- a/libs/service-portal/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.tsx +++ b/libs/portals/my-pages/information/src/components/TwoColumnUserInfoLine/TwoColumnUserInfoLine.tsx @@ -11,7 +11,7 @@ import { import { useLocale } from '@island.is/localization' import { MessageDescriptor } from 'react-intl' import * as styles from './TwoColumnUserInfoLine.css' -import { Maybe } from '@island.is/service-portal/graphql' +import { Maybe } from '@island.is/portals/my-pages/graphql' import cn from 'classnames' interface Props { diff --git a/libs/service-portal/information/src/helpers/familyMember.enum.ts b/libs/portals/my-pages/information/src/helpers/familyMember.enum.ts similarity index 100% rename from libs/service-portal/information/src/helpers/familyMember.enum.ts rename to libs/portals/my-pages/information/src/helpers/familyMember.enum.ts diff --git a/libs/service-portal/information/src/helpers/formatting.ts b/libs/portals/my-pages/information/src/helpers/formatting.ts similarity index 94% rename from libs/service-portal/information/src/helpers/formatting.ts rename to libs/portals/my-pages/information/src/helpers/formatting.ts index 4cb0a28f4064..72f1acad2c57 100644 --- a/libs/service-portal/information/src/helpers/formatting.ts +++ b/libs/portals/my-pages/information/src/helpers/formatting.ts @@ -2,7 +2,7 @@ import { NationalRegistryAddress, NationalRegistryName, } from '@island.is/api/schema' -import { ExcludesFalse } from '@island.is/service-portal/core' +import { ExcludesFalse } from '@island.is/portals/my-pages/core' export const formatNameBreaks = ( user: NationalRegistryName | undefined, diff --git a/libs/service-portal/information/src/helpers/localizationHelpers.ts b/libs/portals/my-pages/information/src/helpers/localizationHelpers.ts similarity index 100% rename from libs/service-portal/information/src/helpers/localizationHelpers.ts rename to libs/portals/my-pages/information/src/helpers/localizationHelpers.ts diff --git a/libs/service-portal/information/src/index.ts b/libs/portals/my-pages/information/src/index.ts similarity index 100% rename from libs/service-portal/information/src/index.ts rename to libs/portals/my-pages/information/src/index.ts diff --git a/libs/service-portal/information/src/lib/messages.ts b/libs/portals/my-pages/information/src/lib/messages.ts similarity index 100% rename from libs/service-portal/information/src/lib/messages.ts rename to libs/portals/my-pages/information/src/lib/messages.ts diff --git a/libs/service-portal/information/src/lib/navigation.ts b/libs/portals/my-pages/information/src/lib/navigation.ts similarity index 93% rename from libs/service-portal/information/src/lib/navigation.ts rename to libs/portals/my-pages/information/src/lib/navigation.ts index 76eb8a594f98..a754d7ca9681 100644 --- a/libs/service-portal/information/src/lib/navigation.ts +++ b/libs/portals/my-pages/information/src/lib/navigation.ts @@ -1,7 +1,7 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' -import { PetitionPaths } from '@island.is/service-portal/petitions' -import { SignatureCollectionPaths } from '@island.is/service-portal/signature-collection' +import { m } from '@island.is/portals/my-pages/core' +import { PetitionPaths } from '@island.is/portals/my-pages/petitions' +import { SignatureCollectionPaths } from '@island.is/portals/my-pages/signature-collection' import { InformationPaths } from './paths' export const informationNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/information/src/lib/paths.ts b/libs/portals/my-pages/information/src/lib/paths.ts similarity index 100% rename from libs/service-portal/information/src/lib/paths.ts rename to libs/portals/my-pages/information/src/lib/paths.ts diff --git a/libs/service-portal/information/src/module.tsx b/libs/portals/my-pages/information/src/module.tsx similarity index 98% rename from libs/service-portal/information/src/module.tsx rename to libs/portals/my-pages/information/src/module.tsx index 08f6e9648b48..001c44fc7753 100644 --- a/libs/service-portal/information/src/module.tsx +++ b/libs/portals/my-pages/information/src/module.tsx @@ -4,7 +4,7 @@ import { DocumentsScope, UserProfileScope, } from '@island.is/auth/scopes' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule } from '@island.is/portals/core' import { InformationPaths } from './lib/paths' import { Navigate } from 'react-router-dom' diff --git a/libs/service-portal/information/src/screens/BioChild/BioChild.graphql b/libs/portals/my-pages/information/src/screens/BioChild/BioChild.graphql similarity index 100% rename from libs/service-portal/information/src/screens/BioChild/BioChild.graphql rename to libs/portals/my-pages/information/src/screens/BioChild/BioChild.graphql diff --git a/libs/service-portal/information/src/screens/BioChild/BioChild.tsx b/libs/portals/my-pages/information/src/screens/BioChild/BioChild.tsx similarity index 99% rename from libs/service-portal/information/src/screens/BioChild/BioChild.tsx rename to libs/portals/my-pages/information/src/screens/BioChild/BioChild.tsx index 0b5153e8870c..412a0500dec7 100644 --- a/libs/service-portal/information/src/screens/BioChild/BioChild.tsx +++ b/libs/portals/my-pages/information/src/screens/BioChild/BioChild.tsx @@ -7,7 +7,7 @@ import { m, IntroHeader, THJODSKRA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { defineMessage } from 'react-intl' import { Box, diff --git a/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.graphql b/libs/portals/my-pages/information/src/screens/ChildCustody/ChildCustody.graphql similarity index 100% rename from libs/service-portal/information/src/screens/ChildCustody/ChildCustody.graphql rename to libs/portals/my-pages/information/src/screens/ChildCustody/ChildCustody.graphql diff --git a/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx b/libs/portals/my-pages/information/src/screens/ChildCustody/ChildCustody.tsx similarity index 99% rename from libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx rename to libs/portals/my-pages/information/src/screens/ChildCustody/ChildCustody.tsx index 4660a6b6c34d..f3ee66e01f70 100644 --- a/libs/service-portal/information/src/screens/ChildCustody/ChildCustody.tsx +++ b/libs/portals/my-pages/information/src/screens/ChildCustody/ChildCustody.tsx @@ -18,7 +18,7 @@ import { m, THJODSKRA_SLUG, UserInfoLine, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { unmaskString } from '@island.is/shared/utils' import { useParams } from 'react-router-dom' import { TwoColumnUserInfoLine } from '../../components/TwoColumnUserInfoLine/TwoColumnUserInfoLine' diff --git a/libs/service-portal/information/src/screens/Company/Company.graphql b/libs/portals/my-pages/information/src/screens/Company/Company.graphql similarity index 100% rename from libs/service-portal/information/src/screens/Company/Company.graphql rename to libs/portals/my-pages/information/src/screens/Company/Company.graphql diff --git a/libs/service-portal/information/src/screens/Company/CompanyInfo.tsx b/libs/portals/my-pages/information/src/screens/Company/CompanyInfo.tsx similarity index 99% rename from libs/service-portal/information/src/screens/Company/CompanyInfo.tsx rename to libs/portals/my-pages/information/src/screens/Company/CompanyInfo.tsx index daf86ffc8cfa..72f8b257e133 100644 --- a/libs/service-portal/information/src/screens/Company/CompanyInfo.tsx +++ b/libs/portals/my-pages/information/src/screens/Company/CompanyInfo.tsx @@ -11,7 +11,7 @@ import { m, SKATTURINN_SLUG, UserInfoLine, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { dateFormat } from '@island.is/shared/constants' import { useUserInfo } from '@island.is/auth/react' diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.graphql b/libs/portals/my-pages/information/src/screens/Notifications/Notifications.graphql similarity index 100% rename from libs/service-portal/information/src/screens/Notifications/Notifications.graphql rename to libs/portals/my-pages/information/src/screens/Notifications/Notifications.graphql diff --git a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx b/libs/portals/my-pages/information/src/screens/Notifications/Notifications.tsx similarity index 97% rename from libs/service-portal/information/src/screens/Notifications/Notifications.tsx rename to libs/portals/my-pages/information/src/screens/Notifications/Notifications.tsx index b1b7e586c25a..757dd463a64a 100644 --- a/libs/service-portal/information/src/screens/Notifications/Notifications.tsx +++ b/libs/portals/my-pages/information/src/screens/Notifications/Notifications.tsx @@ -14,7 +14,7 @@ import { m, ISLANDIS_SLUG, LinkButton, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useGetUserNotificationsListQuery, @@ -23,7 +23,7 @@ import { } from './Notifications.generated' import { mInformationNotifications } from '../../lib/messages' -import { ActionCard, CardLoader } from '@island.is/service-portal/core' +import { ActionCard, CardLoader } from '@island.is/portals/my-pages/core' import { Problem } from '@island.is/react-spa/shared' import { InformationPaths } from '../../lib/paths' import { COAT_OF_ARMS, resolveLink } from '../../utils/notificationLinkResolver' diff --git a/libs/service-portal/information/src/screens/Spouse/Spouse.graphql b/libs/portals/my-pages/information/src/screens/Spouse/Spouse.graphql similarity index 100% rename from libs/service-portal/information/src/screens/Spouse/Spouse.graphql rename to libs/portals/my-pages/information/src/screens/Spouse/Spouse.graphql diff --git a/libs/service-portal/information/src/screens/Spouse/Spouse.tsx b/libs/portals/my-pages/information/src/screens/Spouse/Spouse.tsx similarity index 98% rename from libs/service-portal/information/src/screens/Spouse/Spouse.tsx rename to libs/portals/my-pages/information/src/screens/Spouse/Spouse.tsx index b38bdb05746e..4f82866931ae 100644 --- a/libs/service-portal/information/src/screens/Spouse/Spouse.tsx +++ b/libs/portals/my-pages/information/src/screens/Spouse/Spouse.tsx @@ -10,7 +10,7 @@ import { m, THJODSKRA_SLUG, UserInfoLine, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { spmm } from '../../lib/messages' import { useNationalRegistrySpouseQuery } from './Spouse.generated' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/information/src/screens/UserInfo/UserInfo.graphql b/libs/portals/my-pages/information/src/screens/UserInfo/UserInfo.graphql similarity index 100% rename from libs/service-portal/information/src/screens/UserInfo/UserInfo.graphql rename to libs/portals/my-pages/information/src/screens/UserInfo/UserInfo.graphql diff --git a/libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx b/libs/portals/my-pages/information/src/screens/UserInfo/UserInfo.tsx similarity index 99% rename from libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx rename to libs/portals/my-pages/information/src/screens/UserInfo/UserInfo.tsx index 25876221db72..e9b3c87bd1ab 100644 --- a/libs/service-portal/information/src/screens/UserInfo/UserInfo.tsx +++ b/libs/portals/my-pages/information/src/screens/UserInfo/UserInfo.tsx @@ -12,7 +12,7 @@ import { THJODSKRA_SLUG, InfoLine, InfoLineStack, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useUserInfo } from '@island.is/auth/react' import { diff --git a/libs/service-portal/information/src/screens/UserInfoOverview/UserInfoOverview.graphql b/libs/portals/my-pages/information/src/screens/UserInfoOverview/UserInfoOverview.graphql similarity index 100% rename from libs/service-portal/information/src/screens/UserInfoOverview/UserInfoOverview.graphql rename to libs/portals/my-pages/information/src/screens/UserInfoOverview/UserInfoOverview.graphql diff --git a/libs/service-portal/information/src/screens/UserInfoOverview/UserInfoOverview.tsx b/libs/portals/my-pages/information/src/screens/UserInfoOverview/UserInfoOverview.tsx similarity index 99% rename from libs/service-portal/information/src/screens/UserInfoOverview/UserInfoOverview.tsx rename to libs/portals/my-pages/information/src/screens/UserInfoOverview/UserInfoOverview.tsx index 40baca70c569..57a7d0d46b8a 100644 --- a/libs/service-portal/information/src/screens/UserInfoOverview/UserInfoOverview.tsx +++ b/libs/portals/my-pages/information/src/screens/UserInfoOverview/UserInfoOverview.tsx @@ -6,7 +6,7 @@ import { IntroHeader, m, THJODSKRA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useUserInfo } from '@island.is/auth/react' import { FamilyMemberCard } from '../../components/FamilyMemberCard/FamilyMemberCard' diff --git a/libs/service-portal/information/src/screens/UserInfoOverview/mockUserInfoList.ts b/libs/portals/my-pages/information/src/screens/UserInfoOverview/mockUserInfoList.ts similarity index 96% rename from libs/service-portal/information/src/screens/UserInfoOverview/mockUserInfoList.ts rename to libs/portals/my-pages/information/src/screens/UserInfoOverview/mockUserInfoList.ts index 02a84f960f02..2323b2378109 100644 --- a/libs/service-portal/information/src/screens/UserInfoOverview/mockUserInfoList.ts +++ b/libs/portals/my-pages/information/src/screens/UserInfoOverview/mockUserInfoList.ts @@ -1,4 +1,4 @@ -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { defineMessage } from 'react-intl' import { MessageDescriptor } from 'react-intl' import { InformationPaths } from '../../lib/paths' diff --git a/libs/service-portal/information/src/screens/UserNotifications/UserNotifications.tsx b/libs/portals/my-pages/information/src/screens/UserNotifications/UserNotifications.tsx similarity index 91% rename from libs/service-portal/information/src/screens/UserNotifications/UserNotifications.tsx rename to libs/portals/my-pages/information/src/screens/UserNotifications/UserNotifications.tsx index 41548808f092..8f051f86d256 100644 --- a/libs/service-portal/information/src/screens/UserNotifications/UserNotifications.tsx +++ b/libs/portals/my-pages/information/src/screens/UserNotifications/UserNotifications.tsx @@ -1,4 +1,4 @@ -import { ISLANDIS_SLUG, IntroHeader, m } from '@island.is/service-portal/core' +import { ISLANDIS_SLUG, IntroHeader, m } from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { mNotifications } from '../../lib/messages' diff --git a/libs/service-portal/information/src/screens/UserProfile/UserProfile.tsx b/libs/portals/my-pages/information/src/screens/UserProfile/UserProfile.tsx similarity index 84% rename from libs/service-portal/information/src/screens/UserProfile/UserProfile.tsx rename to libs/portals/my-pages/information/src/screens/UserProfile/UserProfile.tsx index 2dc492564b5d..6d7ad9105236 100644 --- a/libs/service-portal/information/src/screens/UserProfile/UserProfile.tsx +++ b/libs/portals/my-pages/information/src/screens/UserProfile/UserProfile.tsx @@ -1,6 +1,6 @@ -import { ISLANDIS_SLUG, IntroHeader, m } from '@island.is/service-portal/core' +import { ISLANDIS_SLUG, IntroHeader, m } from '@island.is/portals/my-pages/core' import ProfileForm from '../../components/PersonalInformation/Forms/ProfileForm/ProfileForm' -import { useUserProfile } from '@island.is/service-portal/graphql' +import { useUserProfile } from '@island.is/portals/my-pages/graphql' import { useLocale } from '@island.is/localization' import { useUserInfo } from '@island.is/auth/react' import { msg } from '../../lib/messages' diff --git a/libs/service-portal/information/src/utils/bankInfoHelper.ts b/libs/portals/my-pages/information/src/utils/bankInfoHelper.ts similarity index 100% rename from libs/service-portal/information/src/utils/bankInfoHelper.ts rename to libs/portals/my-pages/information/src/utils/bankInfoHelper.ts diff --git a/libs/service-portal/information/src/utils/notificationLinkResolver.ts b/libs/portals/my-pages/information/src/utils/notificationLinkResolver.ts similarity index 92% rename from libs/service-portal/information/src/utils/notificationLinkResolver.ts rename to libs/portals/my-pages/information/src/utils/notificationLinkResolver.ts index ef0cb3666fe4..47660ccc28c3 100644 --- a/libs/service-portal/information/src/utils/notificationLinkResolver.ts +++ b/libs/portals/my-pages/information/src/utils/notificationLinkResolver.ts @@ -1,5 +1,5 @@ import { NotificationLink } from '@island.is/api/schema' -import { ServicePortalPaths } from '@island.is/service-portal/core' +import { ServicePortalPaths } from '@island.is/portals/my-pages/core' function extractPath(url: string): string { try { diff --git a/libs/service-portal/information/src/utils/showUserOnboardingModal.ts b/libs/portals/my-pages/information/src/utils/showUserOnboardingModal.ts similarity index 100% rename from libs/service-portal/information/src/utils/showUserOnboardingModal.ts rename to libs/portals/my-pages/information/src/utils/showUserOnboardingModal.ts diff --git a/libs/service-portal/information/tsconfig.json b/libs/portals/my-pages/information/tsconfig.json similarity index 100% rename from libs/service-portal/information/tsconfig.json rename to libs/portals/my-pages/information/tsconfig.json diff --git a/libs/portals/my-pages/information/tsconfig.lib.json b/libs/portals/my-pages/information/tsconfig.lib.json new file mode 100644 index 000000000000..bc322cb27aa7 --- /dev/null +++ b/libs/portals/my-pages/information/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ], + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/portals/my-pages/information/tsconfig.spec.json b/libs/portals/my-pages/information/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/information/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/law-and-order/.babelrc b/libs/portals/my-pages/law-and-order/.babelrc similarity index 100% rename from libs/service-portal/law-and-order/.babelrc rename to libs/portals/my-pages/law-and-order/.babelrc diff --git a/libs/service-portal/law-and-order/.eslintrc.json b/libs/portals/my-pages/law-and-order/.eslintrc.json similarity index 80% rename from libs/service-portal/law-and-order/.eslintrc.json rename to libs/portals/my-pages/law-and-order/.eslintrc.json index 75b85077debb..772a43d27834 100644 --- a/libs/service-portal/law-and-order/.eslintrc.json +++ b/libs/portals/my-pages/law-and-order/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/libs/portals/my-pages/law-and-order/README.md b/libs/portals/my-pages/law-and-order/README.md new file mode 100644 index 000000000000..b41ae6ea2041 --- /dev/null +++ b/libs/portals/my-pages/law-and-order/README.md @@ -0,0 +1,7 @@ +# portals-my-pages-law-and-order + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test portals-my-pages-law-and-order` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/portals/my-pages/law-and-order/codegen.yml b/libs/portals/my-pages/law-and-order/codegen.yml new file mode 100644 index 000000000000..772231c25819 --- /dev/null +++ b/libs/portals/my-pages/law-and-order/codegen.yml @@ -0,0 +1,18 @@ +schema: + - apps/api/src/api.graphql +documents: + - libs/portals/my-pages/law-and-order/src/**/**/*.graphql +generates: + libs/portals/my-pages/law-and-order/src/: + preset: 'near-operation-file' + presetConfig: + baseTypesPath: '~@island.is/api/schema' + plugins: + - typescript-operations + - typescript-react-apollo + config: + scalars: + DateTime: string +hooks: + afterAllFileWrite: + - prettier --write diff --git a/libs/service-portal/law-and-order/jest.config.ts b/libs/portals/my-pages/law-and-order/jest.config.ts similarity index 61% rename from libs/service-portal/law-and-order/jest.config.ts rename to libs/portals/my-pages/law-and-order/jest.config.ts index a9f362d6ae79..dc55136f78a9 100644 --- a/libs/service-portal/law-and-order/jest.config.ts +++ b/libs/portals/my-pages/law-and-order/jest.config.ts @@ -1,11 +1,12 @@ /* eslint-disable */ export default { - displayName: 'service-portal-law-and-order', - preset: '../../../jest.preset.js', + preset: './jest.preset.js', + rootDir: '../../../..', + roots: [__dirname], transform: { '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest', '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '../../../coverage/libs/service-portal/law-and-order', + coverageDirectory: '/coverage/libs/portals/my-pages/law-and-order', } diff --git a/libs/service-portal/law-and-order/project.json b/libs/portals/my-pages/law-and-order/project.json similarity index 52% rename from libs/service-portal/law-and-order/project.json rename to libs/portals/my-pages/law-and-order/project.json index 9a1d710f440e..22fb0f7b0a1c 100644 --- a/libs/service-portal/law-and-order/project.json +++ b/libs/portals/my-pages/law-and-order/project.json @@ -1,14 +1,14 @@ { - "name": "service-portal-law-and-order", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/law-and-order/src", + "name": "portals-my-pages-law-and-order", + "$schema": "../../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/portals/my-pages/law-and-order/src", "projectType": "library", "targets": { "lint": { "executor": "@nx/linter:eslint", "options": { "lintFilePatterns": [ - "libs/service-portal/law-and-order/**/*.{ts,tsx,js,jsx}" + "libs/portals/my-pages/law-and-order/**/*.{ts,tsx,js,jsx}" ] } }, @@ -16,21 +16,21 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/service-portal/law-and-order/jest.config.ts", + "jestConfig": "libs/portals/my-pages/law-and-order/jest.config.ts", "passWithNoTests": true } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/law-and-order/src/{lib,screens,components}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/law-and-order/src/{lib,screens,components}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/law-and-order/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/law-and-order/codegen.yml" + "output": "libs/portals/my-pages/law-and-order/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/law-and-order/codegen.yml" } } }, diff --git a/libs/service-portal/law-and-order/src/components/DefenderChoices/DefenderChoices.tsx b/libs/portals/my-pages/law-and-order/src/components/DefenderChoices/DefenderChoices.tsx similarity index 100% rename from libs/service-portal/law-and-order/src/components/DefenderChoices/DefenderChoices.tsx rename to libs/portals/my-pages/law-and-order/src/components/DefenderChoices/DefenderChoices.tsx diff --git a/libs/service-portal/law-and-order/src/components/DefenderChoices/Lawyers.graphql b/libs/portals/my-pages/law-and-order/src/components/DefenderChoices/Lawyers.graphql similarity index 100% rename from libs/service-portal/law-and-order/src/components/DefenderChoices/Lawyers.graphql rename to libs/portals/my-pages/law-and-order/src/components/DefenderChoices/Lawyers.graphql diff --git a/libs/service-portal/law-and-order/src/components/InfoLines/InfoLines.tsx b/libs/portals/my-pages/law-and-order/src/components/InfoLines/InfoLines.tsx similarity index 97% rename from libs/service-portal/law-and-order/src/components/InfoLines/InfoLines.tsx rename to libs/portals/my-pages/law-and-order/src/components/InfoLines/InfoLines.tsx index 175adc550031..f863420255ab 100644 --- a/libs/service-portal/law-and-order/src/components/InfoLines/InfoLines.tsx +++ b/libs/portals/my-pages/law-and-order/src/components/InfoLines/InfoLines.tsx @@ -2,7 +2,7 @@ import React from 'react' import { Box, Divider, Link, Stack, Text } from '@island.is/island-ui/core' import { useNamespaces } from '@island.is/localization' -import { InfoLine } from '@island.is/service-portal/core' +import { InfoLine } from '@island.is/portals/my-pages/core' import { LawAndOrderActionTypeEnum, LawAndOrderGroup, diff --git a/libs/service-portal/law-and-order/src/index.ts b/libs/portals/my-pages/law-and-order/src/index.ts similarity index 100% rename from libs/service-portal/law-and-order/src/index.ts rename to libs/portals/my-pages/law-and-order/src/index.ts diff --git a/libs/service-portal/law-and-order/src/lib/messages.ts b/libs/portals/my-pages/law-and-order/src/lib/messages.ts similarity index 100% rename from libs/service-portal/law-and-order/src/lib/messages.ts rename to libs/portals/my-pages/law-and-order/src/lib/messages.ts diff --git a/libs/service-portal/law-and-order/src/lib/navigation.ts b/libs/portals/my-pages/law-and-order/src/lib/navigation.ts similarity index 93% rename from libs/service-portal/law-and-order/src/lib/navigation.ts rename to libs/portals/my-pages/law-and-order/src/lib/navigation.ts index f929f58a9c41..be5d86ba3acb 100644 --- a/libs/service-portal/law-and-order/src/lib/navigation.ts +++ b/libs/portals/my-pages/law-and-order/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { LawAndOrderPaths } from './paths' export const lawAndOrderNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/law-and-order/src/lib/paths.ts b/libs/portals/my-pages/law-and-order/src/lib/paths.ts similarity index 100% rename from libs/service-portal/law-and-order/src/lib/paths.ts rename to libs/portals/my-pages/law-and-order/src/lib/paths.ts diff --git a/libs/service-portal/law-and-order/src/module.tsx b/libs/portals/my-pages/law-and-order/src/module.tsx similarity index 96% rename from libs/service-portal/law-and-order/src/module.tsx rename to libs/portals/my-pages/law-and-order/src/module.tsx index 6de5049bfa00..19c93f402c0a 100644 --- a/libs/service-portal/law-and-order/src/module.tsx +++ b/libs/portals/my-pages/law-and-order/src/module.tsx @@ -2,7 +2,7 @@ import { PortalModule } from '@island.is/portals/core' import { LawAndOrderPaths } from './lib/paths' import { ApiScope } from '@island.is/auth/scopes' import { Navigate } from 'react-router-dom' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { lazy } from 'react' import { Features } from '@island.is/feature-flags' diff --git a/libs/service-portal/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.graphql b/libs/portals/my-pages/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.graphql similarity index 100% rename from libs/service-portal/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.graphql rename to libs/portals/my-pages/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.graphql diff --git a/libs/service-portal/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.tsx b/libs/portals/my-pages/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.tsx similarity index 98% rename from libs/service-portal/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.tsx rename to libs/portals/my-pages/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.tsx index d1dd6ae59674..960b4f780268 100644 --- a/libs/service-portal/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.tsx +++ b/libs/portals/my-pages/law-and-order/src/screens/CourtCaseDetail/CourtCaseDetail.tsx @@ -4,7 +4,7 @@ import { IntroHeader, LinkButton, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useLocale, useNamespaces } from '@island.is/localization' import { useParams } from 'react-router-dom' diff --git a/libs/service-portal/law-and-order/src/screens/CourtCases/CourtCases.graphql b/libs/portals/my-pages/law-and-order/src/screens/CourtCases/CourtCases.graphql similarity index 100% rename from libs/service-portal/law-and-order/src/screens/CourtCases/CourtCases.graphql rename to libs/portals/my-pages/law-and-order/src/screens/CourtCases/CourtCases.graphql diff --git a/libs/service-portal/law-and-order/src/screens/CourtCases/CourtCases.tsx b/libs/portals/my-pages/law-and-order/src/screens/CourtCases/CourtCases.tsx similarity index 98% rename from libs/service-portal/law-and-order/src/screens/CourtCases/CourtCases.tsx rename to libs/portals/my-pages/law-and-order/src/screens/CourtCases/CourtCases.tsx index 6ae1e1ecf6fb..11f6a163cd6b 100644 --- a/libs/service-portal/law-and-order/src/screens/CourtCases/CourtCases.tsx +++ b/libs/portals/my-pages/law-and-order/src/screens/CourtCases/CourtCases.tsx @@ -5,7 +5,7 @@ import { DOMSMALARADUNEYTID_SLUG, IntroHeader, m, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useLocale, useNamespaces } from '@island.is/localization' import { LawAndOrderPaths } from '../../lib/paths' diff --git a/libs/service-portal/law-and-order/src/screens/Overview/LawAndOrderOverview.tsx b/libs/portals/my-pages/law-and-order/src/screens/Overview/LawAndOrderOverview.tsx similarity index 96% rename from libs/service-portal/law-and-order/src/screens/Overview/LawAndOrderOverview.tsx rename to libs/portals/my-pages/law-and-order/src/screens/Overview/LawAndOrderOverview.tsx index 57668f7ac368..f0be54e955b2 100644 --- a/libs/service-portal/law-and-order/src/screens/Overview/LawAndOrderOverview.tsx +++ b/libs/portals/my-pages/law-and-order/src/screens/Overview/LawAndOrderOverview.tsx @@ -4,7 +4,7 @@ import { IntroHeader, m, InfoLine, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { messages } from '../../lib/messages' import { useLocale, useNamespaces } from '@island.is/localization' import { LawAndOrderPaths } from '../../lib/paths' diff --git a/libs/service-portal/law-and-order/src/screens/Subpoena/Subpoena.graphql b/libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.graphql similarity index 100% rename from libs/service-portal/law-and-order/src/screens/Subpoena/Subpoena.graphql rename to libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.graphql diff --git a/libs/service-portal/law-and-order/src/screens/Subpoena/Subpoena.tsx b/libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.tsx similarity index 99% rename from libs/service-portal/law-and-order/src/screens/Subpoena/Subpoena.tsx rename to libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.tsx index 9ea0db2ab251..819da2fc84f4 100644 --- a/libs/service-portal/law-and-order/src/screens/Subpoena/Subpoena.tsx +++ b/libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.tsx @@ -13,7 +13,7 @@ import { LinkResolver, m, Modal, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { isDefined } from '@island.is/shared/utils' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/law-and-order/tsconfig.json b/libs/portals/my-pages/law-and-order/tsconfig.json similarity index 100% rename from libs/service-portal/law-and-order/tsconfig.json rename to libs/portals/my-pages/law-and-order/tsconfig.json diff --git a/libs/service-portal/law-and-order/tsconfig.lib.json b/libs/portals/my-pages/law-and-order/tsconfig.lib.json similarity index 90% rename from libs/service-portal/law-and-order/tsconfig.lib.json rename to libs/portals/my-pages/law-and-order/tsconfig.lib.json index cec257bd9d59..32110a111008 100644 --- a/libs/service-portal/law-and-order/tsconfig.lib.json +++ b/libs/portals/my-pages/law-and-order/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "exclude": [ diff --git a/libs/service-portal/law-and-order/tsconfig.spec.json b/libs/portals/my-pages/law-and-order/tsconfig.spec.json similarity index 89% rename from libs/service-portal/law-and-order/tsconfig.spec.json rename to libs/portals/my-pages/law-and-order/tsconfig.spec.json index 25b7af8f6d00..1033686367b0 100644 --- a/libs/service-portal/law-and-order/tsconfig.spec.json +++ b/libs/portals/my-pages/law-and-order/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/licenses/.babelrc b/libs/portals/my-pages/licenses/.babelrc similarity index 100% rename from libs/service-portal/licenses/.babelrc rename to libs/portals/my-pages/licenses/.babelrc diff --git a/libs/portals/my-pages/licenses/.eslintrc.json b/libs/portals/my-pages/licenses/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/licenses/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/licenses/README.md b/libs/portals/my-pages/licenses/README.md similarity index 83% rename from libs/service-portal/licenses/README.md rename to libs/portals/my-pages/licenses/README.md index 48e07727995f..8ee196e6da18 100644 --- a/libs/service-portal/licenses/README.md +++ b/libs/portals/my-pages/licenses/README.md @@ -15,4 +15,4 @@ User can also generate QR code that can be scanned and there for be able to inst ## Running unit tests -Run `nx test service-portal-licenses` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-licenses` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/licenses/babel-jest.config.json b/libs/portals/my-pages/licenses/babel-jest.config.json similarity index 100% rename from libs/service-portal/licenses/babel-jest.config.json rename to libs/portals/my-pages/licenses/babel-jest.config.json diff --git a/libs/service-portal/licenses/codegen.yml b/libs/portals/my-pages/licenses/codegen.yml similarity index 76% rename from libs/service-portal/licenses/codegen.yml rename to libs/portals/my-pages/licenses/codegen.yml index 8f95b1c259ab..401e3ac0b1e0 100644 --- a/libs/service-portal/licenses/codegen.yml +++ b/libs/portals/my-pages/licenses/codegen.yml @@ -1,9 +1,9 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/licenses/src/screens/v2/**/*.graphql + - libs/portals/my-pages/licenses/src/screens/v2/**/*.graphql generates: - libs/service-portal/licenses/src/: + libs/portals/my-pages/licenses/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' diff --git a/libs/service-portal/licenses/jest.config.ts b/libs/portals/my-pages/licenses/jest.config.ts similarity index 66% rename from libs/service-portal/licenses/jest.config.ts rename to libs/portals/my-pages/licenses/jest.config.ts index 21d6cfd7746e..464f3547d743 100644 --- a/libs/service-portal/licenses/jest.config.ts +++ b/libs/portals/my-pages/licenses/jest.config.ts @@ -1,8 +1,8 @@ /* eslint-disable */ export default { - displayName: 'service-portal-licenses', + displayName: 'portals-my-pages-licenses', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,5 +11,5 @@ export default { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/licenses', + coverageDirectory: '/coverage/libs/portals/my-pages/licenses', } diff --git a/libs/service-portal/licenses/project.json b/libs/portals/my-pages/licenses/project.json similarity index 52% rename from libs/service-portal/licenses/project.json rename to libs/portals/my-pages/licenses/project.json index 5acf2cf1b867..3e57eb6ec20f 100644 --- a/libs/service-portal/licenses/project.json +++ b/libs/portals/my-pages/licenses/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-licenses", + "name": "portals-my-pages-licenses", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/licenses/src", + "sourceRoot": "libs/portals/my-pages/licenses/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { @@ -10,22 +10,22 @@ }, "test": { "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/licenses"], + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/licenses"], "options": { - "jestConfig": "libs/service-portal/licenses/jest.config.ts" + "jestConfig": "libs/portals/my-pages/licenses/jest.config.ts" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/licenses/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/licenses/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/licenses/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/licenses/codegen.yml" + "output": "libs/portals/my-pages/licenses/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/licenses/codegen.yml" } } } diff --git a/libs/service-portal/licenses/src/components/ExpandableLine/ExpandableLine.css.ts b/libs/portals/my-pages/licenses/src/components/ExpandableLine/ExpandableLine.css.ts similarity index 100% rename from libs/service-portal/licenses/src/components/ExpandableLine/ExpandableLine.css.ts rename to libs/portals/my-pages/licenses/src/components/ExpandableLine/ExpandableLine.css.ts diff --git a/libs/service-portal/licenses/src/components/ExpandableLine/ExpandableLine.tsx b/libs/portals/my-pages/licenses/src/components/ExpandableLine/ExpandableLine.tsx similarity index 100% rename from libs/service-portal/licenses/src/components/ExpandableLine/ExpandableLine.tsx rename to libs/portals/my-pages/licenses/src/components/ExpandableLine/ExpandableLine.tsx diff --git a/libs/service-portal/licenses/src/components/LicenseCards/LicenseCards.tsx b/libs/portals/my-pages/licenses/src/components/LicenseCards/LicenseCards.tsx similarity index 100% rename from libs/service-portal/licenses/src/components/LicenseCards/LicenseCards.tsx rename to libs/portals/my-pages/licenses/src/components/LicenseCards/LicenseCards.tsx diff --git a/libs/service-portal/licenses/src/components/LicenseDataFields/LicenseDataFields.tsx b/libs/portals/my-pages/licenses/src/components/LicenseDataFields/LicenseDataFields.tsx similarity index 99% rename from libs/service-portal/licenses/src/components/LicenseDataFields/LicenseDataFields.tsx rename to libs/portals/my-pages/licenses/src/components/LicenseDataFields/LicenseDataFields.tsx index d3d8c18451e2..5772cecb7cb9 100644 --- a/libs/service-portal/licenses/src/components/LicenseDataFields/LicenseDataFields.tsx +++ b/libs/portals/my-pages/licenses/src/components/LicenseDataFields/LicenseDataFields.tsx @@ -12,7 +12,7 @@ import { Table as T, Pagination, } from '@island.is/island-ui/core' -import { UserInfoLine } from '@island.is/service-portal/core' +import { UserInfoLine } from '@island.is/portals/my-pages/core' import { useMemo, useState } from 'react' import ExpandableLine from '../ExpandableLine/ExpandableLine' diff --git a/libs/service-portal/licenses/src/components/LicenseIcon/LicenseIcon.tsx b/libs/portals/my-pages/licenses/src/components/LicenseIcon/LicenseIcon.tsx similarity index 100% rename from libs/service-portal/licenses/src/components/LicenseIcon/LicenseIcon.tsx rename to libs/portals/my-pages/licenses/src/components/LicenseIcon/LicenseIcon.tsx diff --git a/libs/service-portal/licenses/src/components/PassportLicense/PassportLicense.tsx b/libs/portals/my-pages/licenses/src/components/PassportLicense/PassportLicense.tsx similarity index 100% rename from libs/service-portal/licenses/src/components/PassportLicense/PassportLicense.tsx rename to libs/portals/my-pages/licenses/src/components/PassportLicense/PassportLicense.tsx diff --git a/libs/service-portal/licenses/src/components/QRCodeModal/DriversLicensePkPass.tsx b/libs/portals/my-pages/licenses/src/components/QRCodeModal/DriversLicensePkPass.tsx similarity index 98% rename from libs/service-portal/licenses/src/components/QRCodeModal/DriversLicensePkPass.tsx rename to libs/portals/my-pages/licenses/src/components/QRCodeModal/DriversLicensePkPass.tsx index b183b3e4635a..3e8da76d017e 100644 --- a/libs/service-portal/licenses/src/components/QRCodeModal/DriversLicensePkPass.tsx +++ b/libs/portals/my-pages/licenses/src/components/QRCodeModal/DriversLicensePkPass.tsx @@ -7,7 +7,7 @@ import { useMutation } from '@apollo/client' import { CREATE_PK_PASS_QR_CODE, useUserProfile, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { m } from '../../lib/messages' import QRCodeModal from './QRCodeModal' import { hasPassedTimeout } from '../../utils/dateUtils' diff --git a/libs/service-portal/licenses/src/components/QRCodeModal/PkPass.tsx b/libs/portals/my-pages/licenses/src/components/QRCodeModal/PkPass.tsx similarity index 98% rename from libs/service-portal/licenses/src/components/QRCodeModal/PkPass.tsx rename to libs/portals/my-pages/licenses/src/components/QRCodeModal/PkPass.tsx index 8e4fff3f69af..7cc03d173b2f 100644 --- a/libs/service-portal/licenses/src/components/QRCodeModal/PkPass.tsx +++ b/libs/portals/my-pages/licenses/src/components/QRCodeModal/PkPass.tsx @@ -5,7 +5,7 @@ import { hasPassedTimeout } from '../../utils/dateUtils' import { CREATE_PK_PASS, useUserProfile, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { Locale } from '@island.is/shared/types' import { useEffect, useState } from 'react' import { m } from '../../lib/messages' diff --git a/libs/service-portal/licenses/src/components/QRCodeModal/QRCodeModal.css.ts b/libs/portals/my-pages/licenses/src/components/QRCodeModal/QRCodeModal.css.ts similarity index 100% rename from libs/service-portal/licenses/src/components/QRCodeModal/QRCodeModal.css.ts rename to libs/portals/my-pages/licenses/src/components/QRCodeModal/QRCodeModal.css.ts diff --git a/libs/service-portal/licenses/src/components/QRCodeModal/QRCodeModal.tsx b/libs/portals/my-pages/licenses/src/components/QRCodeModal/QRCodeModal.tsx similarity index 100% rename from libs/service-portal/licenses/src/components/QRCodeModal/QRCodeModal.tsx rename to libs/portals/my-pages/licenses/src/components/QRCodeModal/QRCodeModal.tsx diff --git a/libs/service-portal/licenses/src/components/SingleLicenseCard/SingleLicenseCard.css.ts b/libs/portals/my-pages/licenses/src/components/SingleLicenseCard/SingleLicenseCard.css.ts similarity index 100% rename from libs/service-portal/licenses/src/components/SingleLicenseCard/SingleLicenseCard.css.ts rename to libs/portals/my-pages/licenses/src/components/SingleLicenseCard/SingleLicenseCard.css.ts diff --git a/libs/service-portal/licenses/src/components/SingleLicenseCard/SingleLicenseCard.tsx b/libs/portals/my-pages/licenses/src/components/SingleLicenseCard/SingleLicenseCard.tsx similarity index 98% rename from libs/service-portal/licenses/src/components/SingleLicenseCard/SingleLicenseCard.tsx rename to libs/portals/my-pages/licenses/src/components/SingleLicenseCard/SingleLicenseCard.tsx index 77cb8de17245..d34c854b167a 100644 --- a/libs/service-portal/licenses/src/components/SingleLicenseCard/SingleLicenseCard.tsx +++ b/libs/portals/my-pages/licenses/src/components/SingleLicenseCard/SingleLicenseCard.tsx @@ -12,7 +12,7 @@ import { import { Link } from 'react-router-dom' import * as styles from './SingleLicenseCard.css' import { m } from '../../lib/messages' -import { LinkResolver } from '@island.is/service-portal/core' +import { LinkResolver } from '@island.is/portals/my-pages/core' export type tag = { text?: string diff --git a/libs/service-portal/licenses/src/index.ts b/libs/portals/my-pages/licenses/src/index.ts similarity index 100% rename from libs/service-portal/licenses/src/index.ts rename to libs/portals/my-pages/licenses/src/index.ts diff --git a/libs/service-portal/licenses/src/lib/constants.ts b/libs/portals/my-pages/licenses/src/lib/constants.ts similarity index 100% rename from libs/service-portal/licenses/src/lib/constants.ts rename to libs/portals/my-pages/licenses/src/lib/constants.ts diff --git a/libs/service-portal/licenses/src/lib/messages.ts b/libs/portals/my-pages/licenses/src/lib/messages.ts similarity index 100% rename from libs/service-portal/licenses/src/lib/messages.ts rename to libs/portals/my-pages/licenses/src/lib/messages.ts diff --git a/libs/service-portal/licenses/src/lib/navigation.ts b/libs/portals/my-pages/licenses/src/lib/navigation.ts similarity index 93% rename from libs/service-portal/licenses/src/lib/navigation.ts rename to libs/portals/my-pages/licenses/src/lib/navigation.ts index 4a83da63c769..3a77186f1e0d 100644 --- a/libs/service-portal/licenses/src/lib/navigation.ts +++ b/libs/portals/my-pages/licenses/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { LicensePaths } from './paths' export const licenseNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/licenses/src/lib/paths.ts b/libs/portals/my-pages/licenses/src/lib/paths.ts similarity index 100% rename from libs/service-portal/licenses/src/lib/paths.ts rename to libs/portals/my-pages/licenses/src/lib/paths.ts diff --git a/libs/service-portal/licenses/src/lib/service-portal-licenses.tsx b/libs/portals/my-pages/licenses/src/lib/service-portal-licenses.tsx similarity index 55% rename from libs/service-portal/licenses/src/lib/service-portal-licenses.tsx rename to libs/portals/my-pages/licenses/src/lib/service-portal-licenses.tsx index ddebf19627d2..6ed282d91a74 100644 --- a/libs/service-portal/licenses/src/lib/service-portal-licenses.tsx +++ b/libs/portals/my-pages/licenses/src/lib/service-portal-licenses.tsx @@ -1,10 +1,10 @@ import React from 'react' -import { ServicePortalModuleComponent } from '@island.is/service-portal/core' +import { ServicePortalModuleComponent } from '@island.is/portals/my-pages/core' export const ServicePortalLicenses: ServicePortalModuleComponent = () => { return (
-

Welcome to service-portal-licenses component!

+

Welcome to portals-my-pages-licenses component!

) } diff --git a/libs/service-portal/licenses/src/module.tsx b/libs/portals/my-pages/licenses/src/module.tsx similarity index 96% rename from libs/service-portal/licenses/src/module.tsx rename to libs/portals/my-pages/licenses/src/module.tsx index 2eed60a3030d..d722fe90804e 100644 --- a/libs/service-portal/licenses/src/module.tsx +++ b/libs/portals/my-pages/licenses/src/module.tsx @@ -1,6 +1,6 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule } from '@island.is/portals/core' import { LicensePaths } from './lib/paths' import { defineMessage } from 'react-intl' diff --git a/libs/service-portal/licenses/src/screens/LicensesOverview.tsx b/libs/portals/my-pages/licenses/src/screens/LicensesOverview.tsx similarity index 94% rename from libs/service-portal/licenses/src/screens/LicensesOverview.tsx rename to libs/portals/my-pages/licenses/src/screens/LicensesOverview.tsx index 54f081c99e5c..06c01c874d15 100644 --- a/libs/service-portal/licenses/src/screens/LicensesOverview.tsx +++ b/libs/portals/my-pages/licenses/src/screens/LicensesOverview.tsx @@ -5,7 +5,7 @@ import { useFeatureFlagClient } from '@island.is/react/feature-flags' import { useEffect, useState } from 'react' import LicensesOverview from './v1/LicensesOverview' import LicensesOverviewV2 from './v2/LicensesOverview/LicensesOverview' -import { CardLoader } from '@island.is/service-portal/core' +import { CardLoader } from '@island.is/portals/my-pages/core' export type VersionType = 'v1' | 'v2' | 'initial' diff --git a/libs/service-portal/licenses/src/screens/Translation.loader.ts b/libs/portals/my-pages/licenses/src/screens/Translation.loader.ts similarity index 100% rename from libs/service-portal/licenses/src/screens/Translation.loader.ts rename to libs/portals/my-pages/licenses/src/screens/Translation.loader.ts diff --git a/libs/service-portal/licenses/src/screens/v1/LicenseDetail/LicenseDetail.css.ts b/libs/portals/my-pages/licenses/src/screens/v1/LicenseDetail/LicenseDetail.css.ts similarity index 100% rename from libs/service-portal/licenses/src/screens/v1/LicenseDetail/LicenseDetail.css.ts rename to libs/portals/my-pages/licenses/src/screens/v1/LicenseDetail/LicenseDetail.css.ts diff --git a/libs/service-portal/licenses/src/screens/v1/LicenseDetail/LicenseDetail.tsx b/libs/portals/my-pages/licenses/src/screens/v1/LicenseDetail/LicenseDetail.tsx similarity index 99% rename from libs/service-portal/licenses/src/screens/v1/LicenseDetail/LicenseDetail.tsx rename to libs/portals/my-pages/licenses/src/screens/v1/LicenseDetail/LicenseDetail.tsx index cbcf81b00922..32ff1496d797 100644 --- a/libs/service-portal/licenses/src/screens/v1/LicenseDetail/LicenseDetail.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v1/LicenseDetail/LicenseDetail.tsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { useUserProfile } from '@island.is/service-portal/graphql' +import { useUserProfile } from '@island.is/portals/my-pages/graphql' import { useLocale, useNamespaces } from '@island.is/localization' import { Box, @@ -18,7 +18,7 @@ import { CardLoader, ErrorScreen, m as coreMessages, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../../lib/messages' import { gql, useQuery } from '@apollo/client' import { useParams } from 'react-router-dom' diff --git a/libs/service-portal/licenses/src/screens/v1/LicensesOverview/ChildrenLicenses.tsx b/libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/ChildrenLicenses.tsx similarity index 96% rename from libs/service-portal/licenses/src/screens/v1/LicensesOverview/ChildrenLicenses.tsx rename to libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/ChildrenLicenses.tsx index 4f6298997ffd..358c1a957c40 100644 --- a/libs/service-portal/licenses/src/screens/v1/LicensesOverview/ChildrenLicenses.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/ChildrenLicenses.tsx @@ -4,7 +4,7 @@ import { EmptyState, CardLoader, formatNationalId, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Box } from '@island.is/island-ui/core' diff --git a/libs/service-portal/licenses/src/screens/v1/LicensesOverview/UserLicenses.tsx b/libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/UserLicenses.tsx similarity index 97% rename from libs/service-portal/licenses/src/screens/v1/LicensesOverview/UserLicenses.tsx rename to libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/UserLicenses.tsx index ee29a9150e4d..9e0d87e6157a 100644 --- a/libs/service-portal/licenses/src/screens/v1/LicensesOverview/UserLicenses.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/UserLicenses.tsx @@ -5,9 +5,9 @@ import { EmptyState, CardLoader, formatDate, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../../lib/messages' -import { GenericLicenseType } from '@island.is/service-portal/graphql' +import { GenericLicenseType } from '@island.is/portals/my-pages/graphql' import { GenericUserLicense, IdentityDocumentModel, diff --git a/libs/service-portal/licenses/src/screens/v1/LicensesOverview/index.tsx b/libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/index.tsx similarity index 97% rename from libs/service-portal/licenses/src/screens/v1/LicensesOverview/index.tsx rename to libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/index.tsx index c135f33f8969..fb6eb638f6e3 100644 --- a/libs/service-portal/licenses/src/screens/v1/LicensesOverview/index.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v1/LicensesOverview/index.tsx @@ -6,7 +6,7 @@ import { FootNote, m as coreMessage, ISLAND_SYSLUMENN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../../lib/messages' import { gql, useQuery } from '@apollo/client' import { Locale } from '@island.is/shared/types' @@ -15,10 +15,10 @@ import { useChildrenPassport, useUserProfile, GenericLicenseType, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import { Query } from '@island.is/api/schema' import { Box, Tabs } from '@island.is/island-ui/core' -import { usePassport } from '@island.is/service-portal/graphql' +import { usePassport } from '@island.is/portals/my-pages/graphql' import { useFeatureFlagClient } from '@island.is/react/feature-flags' import { useState, useEffect } from 'react' diff --git a/libs/service-portal/licenses/src/screens/v1/PassportDetail/PassportDetail.css.ts b/libs/portals/my-pages/licenses/src/screens/v1/PassportDetail/PassportDetail.css.ts similarity index 100% rename from libs/service-portal/licenses/src/screens/v1/PassportDetail/PassportDetail.css.ts rename to libs/portals/my-pages/licenses/src/screens/v1/PassportDetail/PassportDetail.css.ts diff --git a/libs/service-portal/licenses/src/screens/v1/PassportDetail/PassportDetail.tsx b/libs/portals/my-pages/licenses/src/screens/v1/PassportDetail/PassportDetail.tsx similarity index 98% rename from libs/service-portal/licenses/src/screens/v1/PassportDetail/PassportDetail.tsx rename to libs/portals/my-pages/licenses/src/screens/v1/PassportDetail/PassportDetail.tsx index 8d4cc2c27eda..612893233b73 100644 --- a/libs/service-portal/licenses/src/screens/v1/PassportDetail/PassportDetail.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v1/PassportDetail/PassportDetail.tsx @@ -12,7 +12,7 @@ import { AlertBanner, AlertMessage, } from '@island.is/island-ui/core' -import { LinkResolver, UserInfoLine } from '@island.is/service-portal/core' +import { LinkResolver, UserInfoLine } from '@island.is/portals/my-pages/core' import { defineMessage } from 'react-intl' import { formatDate } from '../../../utils/dateUtils' import { m } from '../../../lib/messages' @@ -20,7 +20,7 @@ import { IdentityDocumentModelChild, useChildrenPassport, usePassport, -} from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/graphql' import * as styles from './PassportDetail.css' import { Gender, GenderType } from '../../../types/passport.type' import { capitalizeEveryWord } from '../../../utils/capitalize' diff --git a/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.graphql b/libs/portals/my-pages/licenses/src/screens/v2/LicenseDetail/LicenseDetail.graphql similarity index 100% rename from libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.graphql rename to libs/portals/my-pages/licenses/src/screens/v2/LicenseDetail/LicenseDetail.graphql diff --git a/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx b/libs/portals/my-pages/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx similarity index 97% rename from libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx rename to libs/portals/my-pages/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx index 9ae0e16e3a35..7157bcff1fa5 100644 --- a/libs/service-portal/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v2/LicenseDetail/LicenseDetail.tsx @@ -11,8 +11,8 @@ import { IntroHeader, LinkButton, m as coreMessages, -} from '@island.is/service-portal/core' -import { useUserProfile } from '@island.is/service-portal/graphql' +} from '@island.is/portals/my-pages/core' +import { useUserProfile } from '@island.is/portals/my-pages/graphql' import { isDefined } from '@island.is/shared/utils' import { useEffect, useMemo } from 'react' import { useParams } from 'react-router-dom' diff --git a/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql b/libs/portals/my-pages/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql similarity index 100% rename from libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql rename to libs/portals/my-pages/licenses/src/screens/v2/LicensesOverview/LicensesOverview.graphql diff --git a/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.tsx b/libs/portals/my-pages/licenses/src/screens/v2/LicensesOverview/LicensesOverview.tsx similarity index 97% rename from libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.tsx rename to libs/portals/my-pages/licenses/src/screens/v2/LicensesOverview/LicensesOverview.tsx index 02ec2674466a..f12f165314c3 100644 --- a/libs/service-portal/licenses/src/screens/v2/LicensesOverview/LicensesOverview.tsx +++ b/libs/portals/my-pages/licenses/src/screens/v2/LicensesOverview/LicensesOverview.tsx @@ -4,7 +4,7 @@ import { GenericLicenseError, } from '@island.is/api/schema' import { useLocale, useNamespaces } from '@island.is/localization' -import { useUserProfile } from '@island.is/service-portal/graphql' +import { useUserProfile } from '@island.is/portals/my-pages/graphql' import { Locale } from '@island.is/shared/types' import { useGenericLicenseCollectionQuery } from './LicensesOverview.generated' import { Box, Stack, Tabs, TagVariant } from '@island.is/island-ui/core' @@ -13,7 +13,7 @@ import { CardLoader, IntroHeader, m as coreMessages, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../../lib/messages' import { Problem } from '@island.is/react-spa/shared' import { getPathFromType } from '../../../utils/mapPaths' diff --git a/libs/service-portal/licenses/src/types/passport.type.ts b/libs/portals/my-pages/licenses/src/types/passport.type.ts similarity index 100% rename from libs/service-portal/licenses/src/types/passport.type.ts rename to libs/portals/my-pages/licenses/src/types/passport.type.ts diff --git a/libs/service-portal/licenses/src/utils/capitalize.ts b/libs/portals/my-pages/licenses/src/utils/capitalize.ts similarity index 100% rename from libs/service-portal/licenses/src/utils/capitalize.ts rename to libs/portals/my-pages/licenses/src/utils/capitalize.ts diff --git a/libs/service-portal/licenses/src/utils/dataMapper.tsx b/libs/portals/my-pages/licenses/src/utils/dataMapper.tsx similarity index 99% rename from libs/service-portal/licenses/src/utils/dataMapper.tsx rename to libs/portals/my-pages/licenses/src/utils/dataMapper.tsx index 7b924648e8e5..68fa8733b56b 100644 --- a/libs/service-portal/licenses/src/utils/dataMapper.tsx +++ b/libs/portals/my-pages/licenses/src/utils/dataMapper.tsx @@ -1,6 +1,6 @@ import { m } from '../lib/messages' import { FormatMessage } from '@island.is/localization' -import { LinkButton } from '@island.is/service-portal/core' +import { LinkButton } from '@island.is/portals/my-pages/core' import { LicensePaths } from '../lib/paths' interface Category { diff --git a/libs/service-portal/licenses/src/utils/dateUtils.ts b/libs/portals/my-pages/licenses/src/utils/dateUtils.ts similarity index 100% rename from libs/service-portal/licenses/src/utils/dateUtils.ts rename to libs/portals/my-pages/licenses/src/utils/dateUtils.ts diff --git a/libs/service-portal/licenses/src/utils/mapPaths.ts b/libs/portals/my-pages/licenses/src/utils/mapPaths.ts similarity index 100% rename from libs/service-portal/licenses/src/utils/mapPaths.ts rename to libs/portals/my-pages/licenses/src/utils/mapPaths.ts diff --git a/libs/service-portal/licenses/tsconfig.json b/libs/portals/my-pages/licenses/tsconfig.json similarity index 100% rename from libs/service-portal/licenses/tsconfig.json rename to libs/portals/my-pages/licenses/tsconfig.json diff --git a/libs/portals/my-pages/licenses/tsconfig.lib.json b/libs/portals/my-pages/licenses/tsconfig.lib.json new file mode 100644 index 000000000000..bc322cb27aa7 --- /dev/null +++ b/libs/portals/my-pages/licenses/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ], + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/portals/my-pages/licenses/tsconfig.spec.json b/libs/portals/my-pages/licenses/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/licenses/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/occupational-licenses/.babelrc b/libs/portals/my-pages/occupational-licenses/.babelrc similarity index 100% rename from libs/service-portal/occupational-licenses/.babelrc rename to libs/portals/my-pages/occupational-licenses/.babelrc diff --git a/libs/portals/my-pages/occupational-licenses/.eslintrc.json b/libs/portals/my-pages/occupational-licenses/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/occupational-licenses/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/occupational-licenses/README.md b/libs/portals/my-pages/occupational-licenses/README.md similarity index 51% rename from libs/service-portal/occupational-licenses/README.md rename to libs/portals/my-pages/occupational-licenses/README.md index 6dc15bc7d1e3..fc4c5b31ce2b 100644 --- a/libs/service-portal/occupational-licenses/README.md +++ b/libs/portals/my-pages/occupational-licenses/README.md @@ -4,4 +4,4 @@ This library was generated with [Nx](https://nx.dev). ## Running unit tests -Run `nx test service-portal-occupational-licenses` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-occupational-licenses` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/occupational-licenses/babel-jest.config.json b/libs/portals/my-pages/occupational-licenses/babel-jest.config.json similarity index 100% rename from libs/service-portal/occupational-licenses/babel-jest.config.json rename to libs/portals/my-pages/occupational-licenses/babel-jest.config.json diff --git a/libs/service-portal/social-insurance-maintenance/codegen.yml b/libs/portals/my-pages/occupational-licenses/codegen.yml similarity index 73% rename from libs/service-portal/social-insurance-maintenance/codegen.yml rename to libs/portals/my-pages/occupational-licenses/codegen.yml index 8de3c0bb4cbc..b4c3c957f762 100644 --- a/libs/service-portal/social-insurance-maintenance/codegen.yml +++ b/libs/portals/my-pages/occupational-licenses/codegen.yml @@ -1,18 +1,19 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/social-insurance-maintenance/src/**/**/*.graphql + - libs/portals/my-pages/occupational-licenses/src/screens/**/*.graphql generates: - libs/service-portal/social-insurance-maintenance/src/: + libs/portals/my-pages/occupational-licenses/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' - plugins: - - typescript-operations - - typescript-react-apollo config: scalars: DateTime: string + plugins: + - typescript-operations + - typescript-react-apollo + hooks: afterAllFileWrite: - prettier --write diff --git a/libs/service-portal/occupational-licenses/jest.config.ts b/libs/portals/my-pages/occupational-licenses/jest.config.ts similarity index 67% rename from libs/service-portal/occupational-licenses/jest.config.ts rename to libs/portals/my-pages/occupational-licenses/jest.config.ts index e1d0f229f87c..09e28322b02f 100644 --- a/libs/service-portal/occupational-licenses/jest.config.ts +++ b/libs/portals/my-pages/occupational-licenses/jest.config.ts @@ -1,7 +1,7 @@ /* eslint-disable */ export default { preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,7 +11,7 @@ export default { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], coverageDirectory: - '/coverage/libs/service-portal/occupational-licenses', + '/coverage/libs/portals/my-pages/occupational-licenses', globals: {}, - displayName: 'service-portal-occupational-licenses', + displayName: 'portals-my-pages-occupational-licenses', } diff --git a/libs/portals/my-pages/occupational-licenses/project.json b/libs/portals/my-pages/occupational-licenses/project.json new file mode 100644 index 000000000000..02400918973d --- /dev/null +++ b/libs/portals/my-pages/occupational-licenses/project.json @@ -0,0 +1,34 @@ +{ + "name": "portals-my-pages-occupational-licenses", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/portals/my-pages/occupational-licenses/src", + "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], + "targets": { + "lint": { + "executor": "@nx/eslint:lint" + }, + "test": { + "executor": "@nx/jest:jest", + "outputs": [ + "{workspaceRoot}/libs/portals/my-pages/occupational-licenses" + ], + "options": { + "jestConfig": "libs/portals/my-pages/occupational-licenses/jest.config.ts" + } + }, + "extract-strings": { + "executor": "nx:run-commands", + "options": { + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/occupational-licenses/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + } + }, + "codegen/frontend-client": { + "executor": "nx:run-commands", + "options": { + "output": "libs/portals/my-pages/occupational-licenses/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/occupational-licenses/codegen.yml" + } + } + } +} diff --git a/libs/service-portal/occupational-licenses/src/components/LicenceActionCard.tsx b/libs/portals/my-pages/occupational-licenses/src/components/LicenceActionCard.tsx similarity index 95% rename from libs/service-portal/occupational-licenses/src/components/LicenceActionCard.tsx rename to libs/portals/my-pages/occupational-licenses/src/components/LicenceActionCard.tsx index 83a5498bc6eb..221fb5388971 100644 --- a/libs/service-portal/occupational-licenses/src/components/LicenceActionCard.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/components/LicenceActionCard.tsx @@ -1,7 +1,7 @@ import { FormatMessage, useLocale } from '@island.is/localization' -import { ActionCard } from '@island.is/service-portal/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import { olMessage as ol } from '../lib/messages' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { OccupationalLicenseV2Status } from '@island.is/api/schema' import { TagVariant } from '@island.is/island-ui/core' diff --git a/libs/service-portal/occupational-licenses/src/components/LicenseActionCardV1.tsx b/libs/portals/my-pages/occupational-licenses/src/components/LicenseActionCardV1.tsx similarity index 94% rename from libs/service-portal/occupational-licenses/src/components/LicenseActionCardV1.tsx rename to libs/portals/my-pages/occupational-licenses/src/components/LicenseActionCardV1.tsx index 68eaef5ca944..df0bf8d544f6 100644 --- a/libs/service-portal/occupational-licenses/src/components/LicenseActionCardV1.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/components/LicenseActionCardV1.tsx @@ -1,7 +1,7 @@ import { FormatMessage, useLocale } from '@island.is/localization' -import { ActionCard } from '@island.is/service-portal/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import { olMessage as ol } from '../lib/messages' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { OccupationalLicenseStatus } from '@island.is/api/schema' import { TagVariant } from '@island.is/island-ui/core' diff --git a/libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx b/libs/portals/my-pages/occupational-licenses/src/components/LicenseDetail.tsx similarity index 99% rename from libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx rename to libs/portals/my-pages/occupational-licenses/src/components/LicenseDetail.tsx index 036d5d4d598c..527f90c676e1 100644 --- a/libs/service-portal/occupational-licenses/src/components/LicenseDetail.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/components/LicenseDetail.tsx @@ -5,7 +5,7 @@ import { InfoLine, InfoLineStack, FootNote, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { olMessage as om } from '../lib/messages' import { OccupationalLicenseStatus } from '@island.is/api/schema' import { OrganizationSlugType } from '@island.is/shared/constants' diff --git a/libs/service-portal/occupational-licenses/src/index.ts b/libs/portals/my-pages/occupational-licenses/src/index.ts similarity index 100% rename from libs/service-portal/occupational-licenses/src/index.ts rename to libs/portals/my-pages/occupational-licenses/src/index.ts diff --git a/libs/service-portal/occupational-licenses/src/lib/messages.ts b/libs/portals/my-pages/occupational-licenses/src/lib/messages.ts similarity index 100% rename from libs/service-portal/occupational-licenses/src/lib/messages.ts rename to libs/portals/my-pages/occupational-licenses/src/lib/messages.ts diff --git a/libs/service-portal/occupational-licenses/src/lib/navigation.ts b/libs/portals/my-pages/occupational-licenses/src/lib/navigation.ts similarity index 94% rename from libs/service-portal/occupational-licenses/src/lib/navigation.ts rename to libs/portals/my-pages/occupational-licenses/src/lib/navigation.ts index 6f20f14946c9..0fcd084068a8 100644 --- a/libs/service-portal/occupational-licenses/src/lib/navigation.ts +++ b/libs/portals/my-pages/occupational-licenses/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { OccupationalLicensesPaths } from './paths' import { olMessage as om } from './messages' diff --git a/libs/service-portal/occupational-licenses/src/lib/paths.ts b/libs/portals/my-pages/occupational-licenses/src/lib/paths.ts similarity index 100% rename from libs/service-portal/occupational-licenses/src/lib/paths.ts rename to libs/portals/my-pages/occupational-licenses/src/lib/paths.ts diff --git a/libs/service-portal/occupational-licenses/src/module.tsx b/libs/portals/my-pages/occupational-licenses/src/module.tsx similarity index 100% rename from libs/service-portal/occupational-licenses/src/module.tsx rename to libs/portals/my-pages/occupational-licenses/src/module.tsx diff --git a/libs/service-portal/occupational-licenses/src/screens/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx b/libs/portals/my-pages/occupational-licenses/src/screens/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx similarity index 95% rename from libs/service-portal/occupational-licenses/src/screens/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx rename to libs/portals/my-pages/occupational-licenses/src/screens/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx index 9f7b4023b63d..4d0d9cc57ca6 100644 --- a/libs/service-portal/occupational-licenses/src/screens/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/screens/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx @@ -5,7 +5,7 @@ import { useFeatureFlagClient } from '@island.is/react/feature-flags' import { useEffect, useState } from 'react' import OverviewV1 from '../v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1' import OverviewV2 from '../v2/OccupationalLicensesOverview/OccupationalLicensesOverview' -import { CardLoader } from '@island.is/service-portal/core' +import { CardLoader } from '@island.is/portals/my-pages/core' export type VersionType = 'v1' | 'v2' | 'initial' diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.graphql b/libs/portals/my-pages/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.graphql similarity index 100% rename from libs/service-portal/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.graphql rename to libs/portals/my-pages/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.graphql diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.tsx b/libs/portals/my-pages/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.tsx similarity index 97% rename from libs/service-portal/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.tsx rename to libs/portals/my-pages/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.tsx index 51fb99fd8dac..9dd0d21a442f 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/screens/v1/EducationalDetail/EducationalDetail.tsx @@ -7,12 +7,12 @@ import { ErrorScreen, MENNTAMALASTOFNUN_SLUG, formSubmit, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { useUserInfo } from '@island.is/auth/react' import { LicenseDetail } from '../../../components/LicenseDetail' import { useEffect, useState } from 'react' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { olMessage as om } from '../../../lib/messages' type UseParams = { diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.graphql b/libs/portals/my-pages/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.graphql similarity index 100% rename from libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.graphql rename to libs/portals/my-pages/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.graphql diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx b/libs/portals/my-pages/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx similarity index 91% rename from libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx rename to libs/portals/my-pages/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx index 1a7598dee033..2e3dadbc0309 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/screens/v1/HealthDirectorateDetail/HealthDirectorateDetail.tsx @@ -6,13 +6,13 @@ import { EmptyState, ErrorScreen, HEALTH_DIRECTORATE_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { useLocale, useNamespaces } from '@island.is/localization' import { useUserInfo } from '@island.is/auth/react' import { LicenseDetail } from '../../../components/LicenseDetail' import { olMessage as om } from '../../../lib/messages' -import { m } from '@island.is/service-portal/core' -import { OccupationalLicenseV2LicenseType } from '@island.is/service-portal/graphql' +import { m } from '@island.is/portals/my-pages/core' +import { OccupationalLicenseV2LicenseType } from '@island.is/portals/my-pages/graphql' type UseParams = { id: string diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql b/libs/portals/my-pages/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql similarity index 100% rename from libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql rename to libs/portals/my-pages/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql diff --git a/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx b/libs/portals/my-pages/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx similarity index 99% rename from libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx rename to libs/portals/my-pages/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx index f363140e81a6..2c96fefc5d64 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/screens/v1/OccupationalLicensesOverview/OccupationalLicensesOverviewV1.tsx @@ -8,7 +8,7 @@ import { m, ErrorScreen, ISLAND_SYSLUMENN_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Organization } from '@island.is/shared/types' import { getOrganizationLogoUrl } from '@island.is/shared/utils' diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql b/libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql similarity index 100% rename from libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql rename to libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx b/libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx similarity index 97% rename from libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx rename to libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx index b351c48ec843..9bdc975b543a 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx @@ -13,14 +13,14 @@ import { formSubmit, LinkButton, IntroWrapper, -} from '@island.is/service-portal/core' -import { DocumentsPaths } from '@island.is/service-portal/documents' +} from '@island.is/portals/my-pages/core' +import { DocumentsPaths } from '@island.is/portals/my-pages/documents' import { useLocale, useNamespaces } from '@island.is/localization' import { olMessage as om } from '../../../lib/messages' import { useGetOccupationalLicenseByIdQuery } from './OccupationalLicensesDetail.generated' import { Problem } from '@island.is/react-spa/shared' import { OrganizationSlugType } from '@island.is/shared/constants' -import { useOrganization } from '@island.is/service-portal/graphql' +import { useOrganization } from '@island.is/portals/my-pages/graphql' import { OccupationalLicenseV2LicenseType, OccupationalLicensesV2LinkType, diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql b/libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql similarity index 100% rename from libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql rename to libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.graphql diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx b/libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx similarity index 96% rename from libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx rename to libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx index 576d9a39744e..623fb4303dba 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx +++ b/libs/portals/my-pages/occupational-licenses/src/screens/v2/OccupationalLicensesOverview/OccupationalLicensesOverview.tsx @@ -1,8 +1,8 @@ import { AlertMessage, Box, Stack } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { Problem } from '@island.is/react-spa/shared' -import { CardLoader, IntroWrapper, m } from '@island.is/service-portal/core' -import { useOrganizations } from '@island.is/service-portal/graphql' +import { CardLoader, IntroWrapper, m } from '@island.is/portals/my-pages/core' +import { useOrganizations } from '@island.is/portals/my-pages/graphql' import { isDefined } from '@island.is/shared/utils' import { useMemo } from 'react' import { LicenceActionCard } from '../../../components/LicenceActionCard' diff --git a/libs/service-portal/occupational-licenses/tsconfig.json b/libs/portals/my-pages/occupational-licenses/tsconfig.json similarity index 100% rename from libs/service-portal/occupational-licenses/tsconfig.json rename to libs/portals/my-pages/occupational-licenses/tsconfig.json diff --git a/libs/portals/my-pages/occupational-licenses/tsconfig.lib.json b/libs/portals/my-pages/occupational-licenses/tsconfig.lib.json new file mode 100644 index 000000000000..bc322cb27aa7 --- /dev/null +++ b/libs/portals/my-pages/occupational-licenses/tsconfig.lib.json @@ -0,0 +1,19 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../../node_modules/@nx/react/typings/cssmodule.d.ts", + "../../../node_modules/@nx/react/typings/image.d.ts" + ], + "exclude": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "jest.config.ts" + ], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/portals/my-pages/occupational-licenses/tsconfig.spec.json b/libs/portals/my-pages/occupational-licenses/tsconfig.spec.json new file mode 100644 index 000000000000..515fdb6e5dd4 --- /dev/null +++ b/libs/portals/my-pages/occupational-licenses/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.test.ts", + "**/*.spec.tsx", + "**/*.test.tsx", + "**/*.spec.js", + "**/*.test.js", + "**/*.spec.jsx", + "**/*.test.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/petitions/.babelrc b/libs/portals/my-pages/petitions/.babelrc similarity index 100% rename from libs/service-portal/petitions/.babelrc rename to libs/portals/my-pages/petitions/.babelrc diff --git a/libs/portals/my-pages/petitions/.eslintrc.json b/libs/portals/my-pages/petitions/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/petitions/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/service-portal/petitions/README.md b/libs/portals/my-pages/petitions/README.md similarity index 64% rename from libs/service-portal/petitions/README.md rename to libs/portals/my-pages/petitions/README.md index 03f30468ec84..81a27930438f 100644 --- a/libs/service-portal/petitions/README.md +++ b/libs/portals/my-pages/petitions/README.md @@ -4,4 +4,4 @@ This module displays what petitions are assigned to you, and allows you to un-re ## Running unit tests -Run `nx test service-portal-petitions` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-petitions` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/petitions/babel-jest.config.json b/libs/portals/my-pages/petitions/babel-jest.config.json similarity index 100% rename from libs/service-portal/petitions/babel-jest.config.json rename to libs/portals/my-pages/petitions/babel-jest.config.json diff --git a/libs/service-portal/petitions/codegen.yml b/libs/portals/my-pages/petitions/codegen.yml similarity index 74% rename from libs/service-portal/petitions/codegen.yml rename to libs/portals/my-pages/petitions/codegen.yml index 4775fc2f59d8..1ffffdf3eb0f 100644 --- a/libs/service-portal/petitions/codegen.yml +++ b/libs/portals/my-pages/petitions/codegen.yml @@ -1,7 +1,7 @@ schema: - apps/api/src/api.graphql generates: - libs/service-portal/petitions/src/types/schema.ts: + libs/portals/my-pages/petitions/src/types/schema.ts: plugins: - typescript - typescript-operations diff --git a/libs/service-portal/petitions/jest.config.js b/libs/portals/my-pages/petitions/jest.config.js similarity index 65% rename from libs/service-portal/petitions/jest.config.js rename to libs/portals/my-pages/petitions/jest.config.js index fb5a45b8dce9..64731eb6cd46 100644 --- a/libs/service-portal/petitions/jest.config.js +++ b/libs/portals/my-pages/petitions/jest.config.js @@ -1,7 +1,7 @@ module.exports = { - displayName: 'service-portal-petitions', + displayName: 'portals-my-pages-petitions', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -10,5 +10,5 @@ module.exports = { ], }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '/coverage/libs/service-portal/petitions', + coverageDirectory: '/coverage/libs/portals/my-pages/petitions', } diff --git a/libs/service-portal/petitions/project.json b/libs/portals/my-pages/petitions/project.json similarity index 56% rename from libs/service-portal/petitions/project.json rename to libs/portals/my-pages/petitions/project.json index 9e46e3cccea6..26e1ef789ded 100644 --- a/libs/service-portal/petitions/project.json +++ b/libs/portals/my-pages/petitions/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-petitions", + "name": "portals-my-pages-petitions", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/petitions/src", + "sourceRoot": "libs/portals/my-pages/petitions/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,20 +12,20 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/petitions/jest.config.js" + "jestConfig": "libs/portals/my-pages/petitions/jest.config.js" }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/petitions"] + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/petitions"] }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "command": "graphql-codegen --config libs/service-portal/petitions/codegen.yml" + "command": "graphql-codegen --config libs/portals/my-pages/petitions/codegen.yml" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/petitions/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/petitions/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } } } diff --git a/libs/service-portal/petitions/src/index.ts b/libs/portals/my-pages/petitions/src/index.ts similarity index 100% rename from libs/service-portal/petitions/src/index.ts rename to libs/portals/my-pages/petitions/src/index.ts diff --git a/libs/service-portal/petitions/src/lib/messages.ts b/libs/portals/my-pages/petitions/src/lib/messages.ts similarity index 100% rename from libs/service-portal/petitions/src/lib/messages.ts rename to libs/portals/my-pages/petitions/src/lib/messages.ts diff --git a/libs/service-portal/petitions/src/lib/paths.ts b/libs/portals/my-pages/petitions/src/lib/paths.ts similarity index 100% rename from libs/service-portal/petitions/src/lib/paths.ts rename to libs/portals/my-pages/petitions/src/lib/paths.ts diff --git a/libs/service-portal/petitions/src/lib/utils.ts b/libs/portals/my-pages/petitions/src/lib/utils.ts similarity index 100% rename from libs/service-portal/petitions/src/lib/utils.ts rename to libs/portals/my-pages/petitions/src/lib/utils.ts diff --git a/libs/service-portal/petitions/src/module.tsx b/libs/portals/my-pages/petitions/src/module.tsx similarity index 96% rename from libs/service-portal/petitions/src/module.tsx rename to libs/portals/my-pages/petitions/src/module.tsx index f94ff7d55887..81c0779731b1 100644 --- a/libs/service-portal/petitions/src/module.tsx +++ b/libs/portals/my-pages/petitions/src/module.tsx @@ -1,6 +1,6 @@ import { lazy } from 'react' import { Features } from '@island.is/feature-flags' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule, PortalRoute } from '@island.is/portals/core' import { EndorsementsScope } from '@island.is/auth/scopes' import { PetitionPaths } from './lib/paths' diff --git a/libs/service-portal/petitions/src/screens/Petitions/index.tsx b/libs/portals/my-pages/petitions/src/screens/Petitions/index.tsx similarity index 99% rename from libs/service-portal/petitions/src/screens/Petitions/index.tsx rename to libs/portals/my-pages/petitions/src/screens/Petitions/index.tsx index 4373fbf948a3..151fb8b05470 100644 --- a/libs/service-portal/petitions/src/screens/Petitions/index.tsx +++ b/libs/portals/my-pages/petitions/src/screens/Petitions/index.tsx @@ -16,7 +16,7 @@ import { PaginatedEndorsementResponse as SignedLists, } from '../../types/schema' import { useGetListsUserSigned, useListsUserOwns } from '../hooks' -import { ActionCard } from '@island.is/service-portal/core' +import { ActionCard } from '@island.is/portals/my-pages/core' import { formatDate } from '../../lib/utils' import { PetitionPaths } from '../../lib/paths' diff --git a/libs/service-portal/petitions/src/screens/PetitionsTable/ExportPetition/DownloadPdf/index.tsx b/libs/portals/my-pages/petitions/src/screens/PetitionsTable/ExportPetition/DownloadPdf/index.tsx similarity index 100% rename from libs/service-portal/petitions/src/screens/PetitionsTable/ExportPetition/DownloadPdf/index.tsx rename to libs/portals/my-pages/petitions/src/screens/PetitionsTable/ExportPetition/DownloadPdf/index.tsx diff --git a/libs/service-portal/petitions/src/screens/PetitionsTable/ExportPetition/downloadCSV.ts b/libs/portals/my-pages/petitions/src/screens/PetitionsTable/ExportPetition/downloadCSV.ts similarity index 100% rename from libs/service-portal/petitions/src/screens/PetitionsTable/ExportPetition/downloadCSV.ts rename to libs/portals/my-pages/petitions/src/screens/PetitionsTable/ExportPetition/downloadCSV.ts diff --git a/libs/service-portal/petitions/src/screens/PetitionsTable/ExportPetition/index.tsx b/libs/portals/my-pages/petitions/src/screens/PetitionsTable/ExportPetition/index.tsx similarity index 100% rename from libs/service-portal/petitions/src/screens/PetitionsTable/ExportPetition/index.tsx rename to libs/portals/my-pages/petitions/src/screens/PetitionsTable/ExportPetition/index.tsx diff --git a/libs/service-portal/petitions/src/screens/PetitionsTable/index.tsx b/libs/portals/my-pages/petitions/src/screens/PetitionsTable/index.tsx similarity index 100% rename from libs/service-portal/petitions/src/screens/PetitionsTable/index.tsx rename to libs/portals/my-pages/petitions/src/screens/PetitionsTable/index.tsx diff --git a/libs/service-portal/petitions/src/screens/PetitionsTable/styles.css.ts b/libs/portals/my-pages/petitions/src/screens/PetitionsTable/styles.css.ts similarity index 100% rename from libs/service-portal/petitions/src/screens/PetitionsTable/styles.css.ts rename to libs/portals/my-pages/petitions/src/screens/PetitionsTable/styles.css.ts diff --git a/libs/service-portal/petitions/src/screens/Skeletons/Skeleton.tsx b/libs/portals/my-pages/petitions/src/screens/Skeletons/Skeleton.tsx similarity index 100% rename from libs/service-portal/petitions/src/screens/Skeletons/Skeleton.tsx rename to libs/portals/my-pages/petitions/src/screens/Skeletons/Skeleton.tsx diff --git a/libs/service-portal/petitions/src/screens/Skeletons/SkeletonAdmin.tsx b/libs/portals/my-pages/petitions/src/screens/Skeletons/SkeletonAdmin.tsx similarity index 100% rename from libs/service-portal/petitions/src/screens/Skeletons/SkeletonAdmin.tsx rename to libs/portals/my-pages/petitions/src/screens/Skeletons/SkeletonAdmin.tsx diff --git a/libs/service-portal/petitions/src/screens/ViewOwnedList/index.tsx b/libs/portals/my-pages/petitions/src/screens/ViewOwnedList/index.tsx similarity index 99% rename from libs/service-portal/petitions/src/screens/ViewOwnedList/index.tsx rename to libs/portals/my-pages/petitions/src/screens/ViewOwnedList/index.tsx index b5a0c9848fbb..f24b2e7bdddb 100644 --- a/libs/service-portal/petitions/src/screens/ViewOwnedList/index.tsx +++ b/libs/portals/my-pages/petitions/src/screens/ViewOwnedList/index.tsx @@ -18,7 +18,7 @@ import PetitionsTable from '../PetitionsTable' import { CloseList, OpenList } from '../queries' import Skeleton from '../Skeletons/Skeleton' -import { Modal } from '@island.is/service-portal/core' +import { Modal } from '@island.is/portals/my-pages/core' import { useGetPetitionEndorsementsPaginated, useGetSinglePetition, diff --git a/libs/service-portal/petitions/src/screens/ViewSignedList/index.tsx b/libs/portals/my-pages/petitions/src/screens/ViewSignedList/index.tsx similarity index 99% rename from libs/service-portal/petitions/src/screens/ViewSignedList/index.tsx rename to libs/portals/my-pages/petitions/src/screens/ViewSignedList/index.tsx index fac42680959a..ed0a13c52afb 100644 --- a/libs/service-portal/petitions/src/screens/ViewSignedList/index.tsx +++ b/libs/portals/my-pages/petitions/src/screens/ViewSignedList/index.tsx @@ -30,7 +30,7 @@ import { EndorsementList, PaginatedEndorsementResponse, } from '@island.is/api/schema' -import { Modal } from '@island.is/service-portal/core' +import { Modal } from '@island.is/portals/my-pages/core' const ViewSignedList = () => { useNamespaces('sp.petitions') diff --git a/libs/service-portal/petitions/src/screens/hooks.ts b/libs/portals/my-pages/petitions/src/screens/hooks.ts similarity index 100% rename from libs/service-portal/petitions/src/screens/hooks.ts rename to libs/portals/my-pages/petitions/src/screens/hooks.ts diff --git a/libs/service-portal/petitions/src/screens/queries.ts b/libs/portals/my-pages/petitions/src/screens/queries.ts similarity index 100% rename from libs/service-portal/petitions/src/screens/queries.ts rename to libs/portals/my-pages/petitions/src/screens/queries.ts diff --git a/libs/service-portal/petitions/tsconfig.json b/libs/portals/my-pages/petitions/tsconfig.json similarity index 100% rename from libs/service-portal/petitions/tsconfig.json rename to libs/portals/my-pages/petitions/tsconfig.json diff --git a/libs/service-portal/petitions/tsconfig.lib.json b/libs/portals/my-pages/petitions/tsconfig.lib.json similarity index 89% rename from libs/service-portal/petitions/tsconfig.lib.json rename to libs/portals/my-pages/petitions/tsconfig.lib.json index f8c7bfd01e50..6394d9f9cd81 100644 --- a/libs/service-portal/petitions/tsconfig.lib.json +++ b/libs/portals/my-pages/petitions/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/service-portal/petitions/tsconfig.spec.json b/libs/portals/my-pages/petitions/tsconfig.spec.json similarity index 88% rename from libs/service-portal/petitions/tsconfig.spec.json rename to libs/portals/my-pages/petitions/tsconfig.spec.json index cab0321d3031..1f4ea6984a42 100644 --- a/libs/service-portal/petitions/tsconfig.spec.json +++ b/libs/portals/my-pages/petitions/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/restrictions/.babelrc b/libs/portals/my-pages/restrictions/.babelrc similarity index 100% rename from libs/service-portal/restrictions/.babelrc rename to libs/portals/my-pages/restrictions/.babelrc diff --git a/libs/service-portal/consent/.eslintrc.json b/libs/portals/my-pages/restrictions/.eslintrc.json similarity index 80% rename from libs/service-portal/consent/.eslintrc.json rename to libs/portals/my-pages/restrictions/.eslintrc.json index 75b85077debb..772a43d27834 100644 --- a/libs/service-portal/consent/.eslintrc.json +++ b/libs/portals/my-pages/restrictions/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/libs/service-portal/restrictions/README.md b/libs/portals/my-pages/restrictions/README.md similarity index 65% rename from libs/service-portal/restrictions/README.md rename to libs/portals/my-pages/restrictions/README.md index 61fef91fc940..c96dea2ddaa7 100644 --- a/libs/service-portal/restrictions/README.md +++ b/libs/portals/my-pages/restrictions/README.md @@ -4,4 +4,4 @@ This module enables user to activate and deactivate restrictions on logins with ## Running unit tests -Run `nx test service-portal-restrictions` to execute the unit tests via [Jest](https://jestjs.io). +Run `nx test portals-my-pages-restrictions` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/portals/my-pages/restrictions/codegen.yml b/libs/portals/my-pages/restrictions/codegen.yml new file mode 100644 index 000000000000..5d4af0bc67ec --- /dev/null +++ b/libs/portals/my-pages/restrictions/codegen.yml @@ -0,0 +1,18 @@ +schema: + - apps/api/src/api.graphql +documents: + - libs/portals/my-pages/restrictions/src/**/*.graphql +generates: + libs/portals/my-pages/restrictions/src/: + preset: 'near-operation-file' + presetConfig: + baseTypesPath: '~@island.is/api/schema' + plugins: + - typescript-operations + - typescript-react-apollo + config: + scalars: + DateTime: string +hooks: + afterAllFileWrite: + - prettier --write diff --git a/libs/service-portal/restrictions/project.json b/libs/portals/my-pages/restrictions/project.json similarity index 56% rename from libs/service-portal/restrictions/project.json rename to libs/portals/my-pages/restrictions/project.json index 29ea65ecebf7..f47f42e6b602 100644 --- a/libs/service-portal/restrictions/project.json +++ b/libs/portals/my-pages/restrictions/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-restrictions", + "name": "portals-my-pages-restrictions", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/restrictions/src", + "sourceRoot": "libs/portals/my-pages/restrictions/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { @@ -11,14 +11,14 @@ "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/restrictions/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/restrictions/codegen.yml" + "output": "libs/portals/my-pages/restrictions/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/restrictions/codegen.yml" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/restrictions/src/{lib,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/restrictions/src/{lib,screens}/**/*.{js,ts,tsx}'" } } } diff --git a/libs/service-portal/restrictions/src/index.ts b/libs/portals/my-pages/restrictions/src/index.ts similarity index 100% rename from libs/service-portal/restrictions/src/index.ts rename to libs/portals/my-pages/restrictions/src/index.ts diff --git a/libs/service-portal/restrictions/src/lib/messages.ts b/libs/portals/my-pages/restrictions/src/lib/messages.ts similarity index 100% rename from libs/service-portal/restrictions/src/lib/messages.ts rename to libs/portals/my-pages/restrictions/src/lib/messages.ts diff --git a/libs/service-portal/restrictions/src/lib/navigation.ts b/libs/portals/my-pages/restrictions/src/lib/navigation.ts similarity index 100% rename from libs/service-portal/restrictions/src/lib/navigation.ts rename to libs/portals/my-pages/restrictions/src/lib/navigation.ts diff --git a/libs/service-portal/restrictions/src/lib/paths.ts b/libs/portals/my-pages/restrictions/src/lib/paths.ts similarity index 100% rename from libs/service-portal/restrictions/src/lib/paths.ts rename to libs/portals/my-pages/restrictions/src/lib/paths.ts diff --git a/libs/service-portal/restrictions/src/module.tsx b/libs/portals/my-pages/restrictions/src/module.tsx similarity index 100% rename from libs/service-portal/restrictions/src/module.tsx rename to libs/portals/my-pages/restrictions/src/module.tsx diff --git a/libs/service-portal/restrictions/src/screens/restrictions/Restrictions.action.ts b/libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.action.ts similarity index 100% rename from libs/service-portal/restrictions/src/screens/restrictions/Restrictions.action.ts rename to libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.action.ts diff --git a/libs/service-portal/restrictions/src/screens/restrictions/Restrictions.css.ts b/libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.css.ts similarity index 100% rename from libs/service-portal/restrictions/src/screens/restrictions/Restrictions.css.ts rename to libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.css.ts diff --git a/libs/service-portal/restrictions/src/screens/restrictions/Restrictions.graphql b/libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.graphql similarity index 100% rename from libs/service-portal/restrictions/src/screens/restrictions/Restrictions.graphql rename to libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.graphql diff --git a/libs/service-portal/restrictions/src/screens/restrictions/Restrictions.loader.ts b/libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.loader.ts similarity index 100% rename from libs/service-portal/restrictions/src/screens/restrictions/Restrictions.loader.ts rename to libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.loader.ts diff --git a/libs/service-portal/restrictions/src/screens/restrictions/Restrictions.tsx b/libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.tsx similarity index 99% rename from libs/service-portal/restrictions/src/screens/restrictions/Restrictions.tsx rename to libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.tsx index da12d7f9e2e1..9bdee98efe8b 100644 --- a/libs/service-portal/restrictions/src/screens/restrictions/Restrictions.tsx +++ b/libs/portals/my-pages/restrictions/src/screens/restrictions/Restrictions.tsx @@ -16,7 +16,7 @@ import { useLocale, useNamespaces } from '@island.is/localization' import { APPLICATION_SERVICE_PROVIDER_SLUG, IntroHeader, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { Modal } from '@island.is/react/components' import { useSubmitting } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/restrictions/tsconfig.json b/libs/portals/my-pages/restrictions/tsconfig.json similarity index 100% rename from libs/service-portal/restrictions/tsconfig.json rename to libs/portals/my-pages/restrictions/tsconfig.json diff --git a/libs/service-portal/restrictions/tsconfig.lib.json b/libs/portals/my-pages/restrictions/tsconfig.lib.json similarity index 92% rename from libs/service-portal/restrictions/tsconfig.lib.json rename to libs/portals/my-pages/restrictions/tsconfig.lib.json index 21799b3e6ba3..7d4982e6f258 100644 --- a/libs/service-portal/restrictions/tsconfig.lib.json +++ b/libs/portals/my-pages/restrictions/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": [ "node", diff --git a/libs/service-portal/sessions/.babelrc b/libs/portals/my-pages/sessions/.babelrc similarity index 100% rename from libs/service-portal/sessions/.babelrc rename to libs/portals/my-pages/sessions/.babelrc diff --git a/libs/portals/my-pages/sessions/.eslintrc.json b/libs/portals/my-pages/sessions/.eslintrc.json new file mode 100644 index 000000000000..772a43d27834 --- /dev/null +++ b/libs/portals/my-pages/sessions/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } + ] +} diff --git a/libs/service-portal/sessions/README.md b/libs/portals/my-pages/sessions/README.md similarity index 100% rename from libs/service-portal/sessions/README.md rename to libs/portals/my-pages/sessions/README.md diff --git a/libs/service-portal/health/codegen.yml b/libs/portals/my-pages/sessions/codegen.yml similarity index 78% rename from libs/service-portal/health/codegen.yml rename to libs/portals/my-pages/sessions/codegen.yml index 88f809e0877c..1bf0f743a02d 100644 --- a/libs/service-portal/health/codegen.yml +++ b/libs/portals/my-pages/sessions/codegen.yml @@ -1,18 +1,18 @@ schema: - apps/api/src/api.graphql documents: - - libs/service-portal/health/src/**/*.graphql + - libs/portals/my-pages/sessions/src/**/*.graphql generates: - libs/service-portal/health/src/: + libs/portals/my-pages/sessions/src/: preset: 'near-operation-file' presetConfig: baseTypesPath: '~@island.is/api/schema' - config: - scalars: - DateTime: string plugins: - typescript-operations - typescript-react-apollo + config: + scalars: + DateTime: string hooks: afterAllFileWrite: - prettier --write diff --git a/libs/portals/my-pages/sessions/jest.config.ts b/libs/portals/my-pages/sessions/jest.config.ts new file mode 100644 index 000000000000..bbcf538af828 --- /dev/null +++ b/libs/portals/my-pages/sessions/jest.config.ts @@ -0,0 +1,12 @@ +/* eslint-disable */ +export default { + displayName: 'portals-my-pages-sessions', + preset: './jest.preset.js', + rootDir: '../../../..', + roots: [__dirname], + transform: { + '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], + coverageDirectory: '/coverage/libs/portals/my-pages/sessions', +} diff --git a/libs/service-portal/sessions/project.json b/libs/portals/my-pages/sessions/project.json similarity index 53% rename from libs/service-portal/sessions/project.json rename to libs/portals/my-pages/sessions/project.json index e69006772dae..5055336e0bbd 100644 --- a/libs/service-portal/sessions/project.json +++ b/libs/portals/my-pages/sessions/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-sessions", + "name": "portals-my-pages-sessions", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/sessions/src", + "sourceRoot": "libs/portals/my-pages/sessions/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { @@ -11,21 +11,21 @@ "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "output": "libs/service-portal/sessions/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/sessions/codegen.yml" + "output": "libs/portals/my-pages/sessions/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/sessions/codegen.yml" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/sessions/src/**/*.{ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/sessions/src/**/*.{ts,tsx}'" } }, "test": { "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/sessions"], + "outputs": ["{workspaceRoot}/coverage/libs/portals/my-pages/sessions"], "options": { - "jestConfig": "libs/service-portal/sessions/jest.config.ts" + "jestConfig": "libs/portals/my-pages/sessions/jest.config.ts" } } } diff --git a/libs/service-portal/sessions/src/components/Client/Client.tsx b/libs/portals/my-pages/sessions/src/components/Client/Client.tsx similarity index 100% rename from libs/service-portal/sessions/src/components/Client/Client.tsx rename to libs/portals/my-pages/sessions/src/components/Client/Client.tsx diff --git a/libs/service-portal/sessions/src/components/LogTable/LogTable.css.ts b/libs/portals/my-pages/sessions/src/components/LogTable/LogTable.css.ts similarity index 100% rename from libs/service-portal/sessions/src/components/LogTable/LogTable.css.ts rename to libs/portals/my-pages/sessions/src/components/LogTable/LogTable.css.ts diff --git a/libs/service-portal/sessions/src/components/LogTable/LogTable.tsx b/libs/portals/my-pages/sessions/src/components/LogTable/LogTable.tsx similarity index 100% rename from libs/service-portal/sessions/src/components/LogTable/LogTable.tsx rename to libs/portals/my-pages/sessions/src/components/LogTable/LogTable.tsx diff --git a/libs/service-portal/sessions/src/components/LogTable/LogTableMobile.tsx b/libs/portals/my-pages/sessions/src/components/LogTable/LogTableMobile.tsx similarity index 98% rename from libs/service-portal/sessions/src/components/LogTable/LogTableMobile.tsx rename to libs/portals/my-pages/sessions/src/components/LogTable/LogTableMobile.tsx index 2cbdad307a84..1d1199b99e19 100644 --- a/libs/service-portal/sessions/src/components/LogTable/LogTableMobile.tsx +++ b/libs/portals/my-pages/sessions/src/components/LogTable/LogTableMobile.tsx @@ -5,7 +5,7 @@ import { SessionsSession } from '@island.is/api/schema' import { useAuth } from '@island.is/auth/react' import { Box, Icon, Table as T, Text } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { ExpandHeader, ExpandRow } from '@island.is/service-portal/core' +import { ExpandHeader, ExpandRow } from '@island.is/portals/my-pages/core' import { Country, getCountryByCode } from '@island.is/shared/utils' import { SessionType } from '../../lib/types/sessionTypes' diff --git a/libs/service-portal/sessions/src/components/PersonIcon/PersonIcon.tsx b/libs/portals/my-pages/sessions/src/components/PersonIcon/PersonIcon.tsx similarity index 100% rename from libs/service-portal/sessions/src/components/PersonIcon/PersonIcon.tsx rename to libs/portals/my-pages/sessions/src/components/PersonIcon/PersonIcon.tsx diff --git a/libs/service-portal/sessions/src/components/SessionFilter/SessionFilter.css.ts b/libs/portals/my-pages/sessions/src/components/SessionFilter/SessionFilter.css.ts similarity index 100% rename from libs/service-portal/sessions/src/components/SessionFilter/SessionFilter.css.ts rename to libs/portals/my-pages/sessions/src/components/SessionFilter/SessionFilter.css.ts diff --git a/libs/service-portal/sessions/src/components/SessionFilter/SessionFilter.tsx b/libs/portals/my-pages/sessions/src/components/SessionFilter/SessionFilter.tsx similarity index 98% rename from libs/service-portal/sessions/src/components/SessionFilter/SessionFilter.tsx rename to libs/portals/my-pages/sessions/src/components/SessionFilter/SessionFilter.tsx index 6259e87ea050..3da9701a28f2 100644 --- a/libs/service-portal/sessions/src/components/SessionFilter/SessionFilter.tsx +++ b/libs/portals/my-pages/sessions/src/components/SessionFilter/SessionFilter.tsx @@ -8,7 +8,7 @@ import { Stack, useBreakpoint, } from '@island.is/island-ui/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import * as styles from './SessionFilter.css' import React from 'react' import { useLocale } from '@island.is/localization' diff --git a/libs/service-portal/sessions/src/index.ts b/libs/portals/my-pages/sessions/src/index.ts similarity index 100% rename from libs/service-portal/sessions/src/index.ts rename to libs/portals/my-pages/sessions/src/index.ts diff --git a/libs/service-portal/sessions/src/lib/messages.ts b/libs/portals/my-pages/sessions/src/lib/messages.ts similarity index 100% rename from libs/service-portal/sessions/src/lib/messages.ts rename to libs/portals/my-pages/sessions/src/lib/messages.ts diff --git a/libs/service-portal/sessions/src/lib/navigation.ts b/libs/portals/my-pages/sessions/src/lib/navigation.ts similarity index 80% rename from libs/service-portal/sessions/src/lib/navigation.ts rename to libs/portals/my-pages/sessions/src/lib/navigation.ts index 2a8023f18b97..f41ea73aff56 100644 --- a/libs/service-portal/sessions/src/lib/navigation.ts +++ b/libs/portals/my-pages/sessions/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { SessionsPaths } from './paths' diff --git a/libs/service-portal/sessions/src/lib/paths.ts b/libs/portals/my-pages/sessions/src/lib/paths.ts similarity index 100% rename from libs/service-portal/sessions/src/lib/paths.ts rename to libs/portals/my-pages/sessions/src/lib/paths.ts diff --git a/libs/service-portal/sessions/src/lib/types/sessionTypes.ts b/libs/portals/my-pages/sessions/src/lib/types/sessionTypes.ts similarity index 100% rename from libs/service-portal/sessions/src/lib/types/sessionTypes.ts rename to libs/portals/my-pages/sessions/src/lib/types/sessionTypes.ts diff --git a/libs/service-portal/sessions/src/module.tsx b/libs/portals/my-pages/sessions/src/module.tsx similarity index 93% rename from libs/service-portal/sessions/src/module.tsx rename to libs/portals/my-pages/sessions/src/module.tsx index 8e1c464aaf17..8983877ddadf 100644 --- a/libs/service-portal/sessions/src/module.tsx +++ b/libs/portals/my-pages/sessions/src/module.tsx @@ -2,7 +2,7 @@ import { lazy } from 'react' import { ApiScope } from '@island.is/auth/scopes' import { PortalModule } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { SessionsPaths } from './lib/paths' diff --git a/libs/service-portal/sessions/src/screens/Sessions/Sessions.graphql b/libs/portals/my-pages/sessions/src/screens/Sessions/Sessions.graphql similarity index 100% rename from libs/service-portal/sessions/src/screens/Sessions/Sessions.graphql rename to libs/portals/my-pages/sessions/src/screens/Sessions/Sessions.graphql diff --git a/libs/service-portal/sessions/src/screens/Sessions/Sessions.tsx b/libs/portals/my-pages/sessions/src/screens/Sessions/Sessions.tsx similarity index 100% rename from libs/service-portal/sessions/src/screens/Sessions/Sessions.tsx rename to libs/portals/my-pages/sessions/src/screens/Sessions/Sessions.tsx diff --git a/libs/service-portal/sessions/src/utils/utils.ts b/libs/portals/my-pages/sessions/src/utils/utils.ts similarity index 100% rename from libs/service-portal/sessions/src/utils/utils.ts rename to libs/portals/my-pages/sessions/src/utils/utils.ts diff --git a/libs/service-portal/sessions/tsconfig.json b/libs/portals/my-pages/sessions/tsconfig.json similarity index 100% rename from libs/service-portal/sessions/tsconfig.json rename to libs/portals/my-pages/sessions/tsconfig.json diff --git a/libs/service-portal/consent/tsconfig.lib.json b/libs/portals/my-pages/sessions/tsconfig.lib.json similarity index 92% rename from libs/service-portal/consent/tsconfig.lib.json rename to libs/portals/my-pages/sessions/tsconfig.lib.json index 5a443a6513c5..b1fdab0f8413 100644 --- a/libs/service-portal/consent/tsconfig.lib.json +++ b/libs/portals/my-pages/sessions/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/portals/my-pages/sessions/tsconfig.spec.json b/libs/portals/my-pages/sessions/tsconfig.spec.json new file mode 100644 index 000000000000..ef88b556acb9 --- /dev/null +++ b/libs/portals/my-pages/sessions/tsconfig.spec.json @@ -0,0 +1,20 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.test.ts", + "**/*.spec.ts", + "**/*.test.tsx", + "**/*.spec.tsx", + "**/*.test.js", + "**/*.spec.js", + "**/*.test.jsx", + "**/*.spec.jsx", + "**/*.d.ts", + "jest.config.ts" + ] +} diff --git a/libs/service-portal/signature-collection/.babelrc b/libs/portals/my-pages/signature-collection/.babelrc similarity index 100% rename from libs/service-portal/signature-collection/.babelrc rename to libs/portals/my-pages/signature-collection/.babelrc diff --git a/libs/portals/my-pages/signature-collection/.eslintrc.json b/libs/portals/my-pages/signature-collection/.eslintrc.json new file mode 100644 index 000000000000..97a68cca0c27 --- /dev/null +++ b/libs/portals/my-pages/signature-collection/.eslintrc.json @@ -0,0 +1,10 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "rules": {}, + "overrides": [ + { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, + { "files": ["*.ts", "*.tsx"], "rules": {} }, + { "files": ["*.js", "*.jsx"], "rules": {} } + ] +} diff --git a/libs/portals/my-pages/signature-collection/README.md b/libs/portals/my-pages/signature-collection/README.md new file mode 100644 index 000000000000..09d52e05bd2e --- /dev/null +++ b/libs/portals/my-pages/signature-collection/README.md @@ -0,0 +1,5 @@ +# Service Portal Signature Collection + +## Running unit tests + +Run `nx test portals-my-pages-signature-collection` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/signature-collection/babel-jest.config.json b/libs/portals/my-pages/signature-collection/babel-jest.config.json similarity index 100% rename from libs/service-portal/signature-collection/babel-jest.config.json rename to libs/portals/my-pages/signature-collection/babel-jest.config.json diff --git a/libs/service-portal/signature-collection/codegen.yml b/libs/portals/my-pages/signature-collection/codegen.yml similarity index 70% rename from libs/service-portal/signature-collection/codegen.yml rename to libs/portals/my-pages/signature-collection/codegen.yml index 98bca87a0c51..dd22cd15ec3b 100644 --- a/libs/service-portal/signature-collection/codegen.yml +++ b/libs/portals/my-pages/signature-collection/codegen.yml @@ -1,7 +1,7 @@ schema: - apps/api/src/api.graphql generates: - libs/service-portal/signature-collection/src/types/schema.ts: + libs/portals/my-pages/signature-collection/src/types/schema.ts: plugins: - typescript - typescript-operations diff --git a/libs/service-portal/signature-collection/jest.config.js b/libs/portals/my-pages/signature-collection/jest.config.js similarity index 66% rename from libs/service-portal/signature-collection/jest.config.js rename to libs/portals/my-pages/signature-collection/jest.config.js index 5776770db22e..08c1191204c6 100644 --- a/libs/service-portal/signature-collection/jest.config.js +++ b/libs/portals/my-pages/signature-collection/jest.config.js @@ -1,7 +1,7 @@ module.exports = { - displayName: 'service-portal-signature-collection', + displayName: 'portals-my-pages-signature-collection', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,5 +11,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: - '/coverage/libs/service-portal/signature-collection', + '/coverage/libs/portals/my-pages/signature-collection', } diff --git a/libs/service-portal/signature-collection/project.json b/libs/portals/my-pages/signature-collection/project.json similarity index 55% rename from libs/service-portal/signature-collection/project.json rename to libs/portals/my-pages/signature-collection/project.json index d48ac6683b97..5e96fcdf8852 100644 --- a/libs/service-portal/signature-collection/project.json +++ b/libs/portals/my-pages/signature-collection/project.json @@ -1,7 +1,7 @@ { - "name": "service-portal-signature-collection", + "name": "portals-my-pages-signature-collection", "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/signature-collection/src", + "sourceRoot": "libs/portals/my-pages/signature-collection/src", "projectType": "library", "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, @@ -12,22 +12,22 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/signature-collection/jest.config.js" + "jestConfig": "libs/portals/my-pages/signature-collection/jest.config.js" }, "outputs": [ - "{workspaceRoot}/coverage/libs/service-portal/signature-collection" + "{workspaceRoot}/coverage/libs/portals/my-pages/signature-collection" ] }, "codegen/frontend-client": { "executor": "nx:run-commands", "options": { - "command": "graphql-codegen --config libs/service-portal/signature-collection/codegen.yml" + "command": "graphql-codegen --config libs/portals/my-pages/signature-collection/codegen.yml" } }, "extract-strings": { "executor": "nx:run-commands", "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/signature-collection/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/signature-collection/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } } } diff --git a/libs/service-portal/signature-collection/src/hooks/graphql/mutations.ts b/libs/portals/my-pages/signature-collection/src/hooks/graphql/mutations.ts similarity index 100% rename from libs/service-portal/signature-collection/src/hooks/graphql/mutations.ts rename to libs/portals/my-pages/signature-collection/src/hooks/graphql/mutations.ts diff --git a/libs/service-portal/signature-collection/src/hooks/graphql/queries.ts b/libs/portals/my-pages/signature-collection/src/hooks/graphql/queries.ts similarity index 100% rename from libs/service-portal/signature-collection/src/hooks/graphql/queries.ts rename to libs/portals/my-pages/signature-collection/src/hooks/graphql/queries.ts diff --git a/libs/service-portal/signature-collection/src/hooks/index.ts b/libs/portals/my-pages/signature-collection/src/hooks/index.ts similarity index 100% rename from libs/service-portal/signature-collection/src/hooks/index.ts rename to libs/portals/my-pages/signature-collection/src/hooks/index.ts diff --git a/libs/service-portal/signature-collection/src/index.ts b/libs/portals/my-pages/signature-collection/src/index.ts similarity index 100% rename from libs/service-portal/signature-collection/src/index.ts rename to libs/portals/my-pages/signature-collection/src/index.ts diff --git a/libs/service-portal/signature-collection/src/lib/constants.ts b/libs/portals/my-pages/signature-collection/src/lib/constants.ts similarity index 100% rename from libs/service-portal/signature-collection/src/lib/constants.ts rename to libs/portals/my-pages/signature-collection/src/lib/constants.ts diff --git a/libs/service-portal/signature-collection/src/lib/messages.ts b/libs/portals/my-pages/signature-collection/src/lib/messages.ts similarity index 100% rename from libs/service-portal/signature-collection/src/lib/messages.ts rename to libs/portals/my-pages/signature-collection/src/lib/messages.ts diff --git a/libs/service-portal/signature-collection/src/lib/navigation.ts b/libs/portals/my-pages/signature-collection/src/lib/navigation.ts similarity index 88% rename from libs/service-portal/signature-collection/src/lib/navigation.ts rename to libs/portals/my-pages/signature-collection/src/lib/navigation.ts index ce3b10f848e0..d8dff65fcb19 100644 --- a/libs/service-portal/signature-collection/src/lib/navigation.ts +++ b/libs/portals/my-pages/signature-collection/src/lib/navigation.ts @@ -1,4 +1,4 @@ -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { SignatureCollectionPaths } from './paths' import { PortalNavigationItem } from '@island.is/portals/core' diff --git a/libs/service-portal/signature-collection/src/lib/paths.ts b/libs/portals/my-pages/signature-collection/src/lib/paths.ts similarity index 100% rename from libs/service-portal/signature-collection/src/lib/paths.ts rename to libs/portals/my-pages/signature-collection/src/lib/paths.ts diff --git a/libs/service-portal/signature-collection/src/module.tsx b/libs/portals/my-pages/signature-collection/src/module.tsx similarity index 98% rename from libs/service-portal/signature-collection/src/module.tsx rename to libs/portals/my-pages/signature-collection/src/module.tsx index 97a84a8d385d..6341632072bc 100644 --- a/libs/service-portal/signature-collection/src/module.tsx +++ b/libs/portals/my-pages/signature-collection/src/module.tsx @@ -1,5 +1,5 @@ import { lazy } from 'react' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { PortalModule, PortalRoute } from '@island.is/portals/core' import { SignatureCollectionPaths } from './lib/paths' import { ApiScope } from '@island.is/auth/scopes' diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/AddConstituency/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/AddConstituency/index.tsx similarity index 98% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/AddConstituency/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/AddConstituency/index.tsx index c6119aa3ed74..fddf81207ca5 100644 --- a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/AddConstituency/index.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/AddConstituency/index.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' import { Box, Button, Text, Checkbox, toast } from '@island.is/island-ui/core' -import { Modal } from '@island.is/service-portal/core' +import { Modal } from '@island.is/portals/my-pages/core' import { useLocale } from '@island.is/localization' import { m } from '../../../../lib/messages' import { diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/logo.png b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/logo.png similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/logo.png rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/Document/logo.png diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/PdfReport/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/EditPage/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/EditPage/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/EditPage/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/EditPage/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx similarity index 98% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx index 61f9bb8d6c56..cbaae79ac79a 100644 --- a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/PaperSignees.tsx @@ -10,7 +10,7 @@ import { Tooltip, } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' -import { useIdentityQuery } from '@island.is/service-portal/graphql' +import { useIdentityQuery } from '@island.is/portals/my-pages/graphql' import * as nationalId from 'kennitala' import { useEffect, useState } from 'react' import { InputController } from '@island.is/shared/form-fields' diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/Signees/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/ViewList/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Parliamentary/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/index.tsx similarity index 97% rename from libs/service-portal/signature-collection/src/screens/Parliamentary/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Parliamentary/index.tsx index ac82acb3ea19..2a565c751471 100644 --- a/libs/service-portal/signature-collection/src/screens/Parliamentary/index.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/Parliamentary/index.tsx @@ -4,7 +4,7 @@ import { EmptyState, IntroHeader, THJODSKRA_SLUG, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../lib/messages' import OwnerView from './OwnerView' import SigneeView from '../shared/SigneeView' diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx similarity index 97% rename from libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx index 8e11940926fd..3f9f7dd662cb 100644 --- a/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/CancelCollection/index.tsx @@ -1,7 +1,7 @@ import { Box, Button, Text, toast } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { m } from '../../../../lib/messages' -import { Modal } from '@island.is/service-portal/core' +import { Modal } from '@island.is/portals/my-pages/core' import { useState } from 'react' import { useGetCurrentCollection } from '../../../../hooks' import { useMutation } from '@apollo/client' diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx b/libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/ViewList/SigneesOverview.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/ViewList/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/index.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Presidential/OwnerView/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Presidential/OwnerView/index.tsx diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/Presidential/index.tsx similarity index 94% rename from libs/service-portal/signature-collection/src/screens/Presidential/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/Presidential/index.tsx index c6cd4e314d7a..bc3135a14118 100644 --- a/libs/service-portal/signature-collection/src/screens/Presidential/index.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/Presidential/index.tsx @@ -2,7 +2,7 @@ import { Box } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import OwnerView from './OwnerView' import { useGetCurrentCollection, useIsOwner } from '../../hooks' -import { EmptyState, IntroHeader } from '@island.is/service-portal/core' +import { EmptyState, IntroHeader } from '@island.is/portals/my-pages/core' import { m } from '../../lib/messages' import { CollectionType } from '../../lib/constants' import SigneeView from '../shared/SigneeView' diff --git a/libs/service-portal/signature-collection/src/screens/Presidential/styles.css.ts b/libs/portals/my-pages/signature-collection/src/screens/Presidential/styles.css.ts similarity index 100% rename from libs/service-portal/signature-collection/src/screens/Presidential/styles.css.ts rename to libs/portals/my-pages/signature-collection/src/screens/Presidential/styles.css.ts diff --git a/libs/service-portal/signature-collection/src/screens/shared/SignedList/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/shared/SignedList/index.tsx similarity index 98% rename from libs/service-portal/signature-collection/src/screens/shared/SignedList/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/shared/SignedList/index.tsx index 7b010b1ecba0..7d7c03d45181 100644 --- a/libs/service-portal/signature-collection/src/screens/shared/SignedList/index.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/shared/SignedList/index.tsx @@ -1,7 +1,7 @@ import { ActionCard, Box, Button, Text, toast } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { m } from '../../../lib/messages' -import { Modal } from '@island.is/service-portal/core' +import { Modal } from '@island.is/portals/my-pages/core' import { useState } from 'react' import { useGetSignedList } from '../../../hooks' import format from 'date-fns/format' diff --git a/libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx b/libs/portals/my-pages/signature-collection/src/screens/shared/SigneeView/index.tsx similarity index 98% rename from libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx rename to libs/portals/my-pages/signature-collection/src/screens/shared/SigneeView/index.tsx index 55678b091a2f..536fe190d765 100644 --- a/libs/service-portal/signature-collection/src/screens/shared/SigneeView/index.tsx +++ b/libs/portals/my-pages/signature-collection/src/screens/shared/SigneeView/index.tsx @@ -6,7 +6,7 @@ import { Text, } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' -import { EmptyState } from '@island.is/service-portal/core' +import { EmptyState } from '@island.is/portals/my-pages/core' import { useGetListsForUser, useGetSignedList } from '../../../hooks' import { Skeleton } from '../../../skeletons' import { useAuth } from '@island.is/auth/react' diff --git a/libs/service-portal/signature-collection/src/skeletons.tsx b/libs/portals/my-pages/signature-collection/src/skeletons.tsx similarity index 100% rename from libs/service-portal/signature-collection/src/skeletons.tsx rename to libs/portals/my-pages/signature-collection/src/skeletons.tsx diff --git a/libs/service-portal/signature-collection/tsconfig.json b/libs/portals/my-pages/signature-collection/tsconfig.json similarity index 82% rename from libs/service-portal/signature-collection/tsconfig.json rename to libs/portals/my-pages/signature-collection/tsconfig.json index 45d3d172fde4..4aee5eb425be 100644 --- a/libs/service-portal/signature-collection/tsconfig.json +++ b/libs/portals/my-pages/signature-collection/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../../tsconfig.base.json", "compilerOptions": { "jsx": "react-jsx", "allowJs": true diff --git a/libs/service-portal/signature-collection/tsconfig.lib.json b/libs/portals/my-pages/signature-collection/tsconfig.lib.json similarity index 89% rename from libs/service-portal/signature-collection/tsconfig.lib.json rename to libs/portals/my-pages/signature-collection/tsconfig.lib.json index f8c7bfd01e50..6394d9f9cd81 100644 --- a/libs/service-portal/signature-collection/tsconfig.lib.json +++ b/libs/portals/my-pages/signature-collection/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/service-portal/signature-collection/tsconfig.spec.json b/libs/portals/my-pages/signature-collection/tsconfig.spec.json similarity index 88% rename from libs/service-portal/signature-collection/tsconfig.spec.json rename to libs/portals/my-pages/signature-collection/tsconfig.spec.json index cab0321d3031..1f4ea6984a42 100644 --- a/libs/service-portal/signature-collection/tsconfig.spec.json +++ b/libs/portals/my-pages/signature-collection/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/social-insurance-maintenance/.babelrc b/libs/portals/my-pages/social-insurance-maintenance/.babelrc similarity index 100% rename from libs/service-portal/social-insurance-maintenance/.babelrc rename to libs/portals/my-pages/social-insurance-maintenance/.babelrc diff --git a/libs/portals/my-pages/social-insurance-maintenance/.eslintrc.json b/libs/portals/my-pages/social-insurance-maintenance/.eslintrc.json new file mode 100644 index 000000000000..772a43d27834 --- /dev/null +++ b/libs/portals/my-pages/social-insurance-maintenance/.eslintrc.json @@ -0,0 +1,18 @@ +{ + "extends": ["plugin:@nx/react", "../../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } + ] +} diff --git a/libs/portals/my-pages/social-insurance-maintenance/README.md b/libs/portals/my-pages/social-insurance-maintenance/README.md new file mode 100644 index 000000000000..aed2bbbb0845 --- /dev/null +++ b/libs/portals/my-pages/social-insurance-maintenance/README.md @@ -0,0 +1,7 @@ +# portals-my-pages-social-insurance-maintenance + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test portals-my-pages-social-insurance-maintenance` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/social-insurance-maintenance/babel-jest.config.json b/libs/portals/my-pages/social-insurance-maintenance/babel-jest.config.json similarity index 100% rename from libs/service-portal/social-insurance-maintenance/babel-jest.config.json rename to libs/portals/my-pages/social-insurance-maintenance/babel-jest.config.json diff --git a/libs/portals/my-pages/social-insurance-maintenance/codegen.yml b/libs/portals/my-pages/social-insurance-maintenance/codegen.yml new file mode 100644 index 000000000000..8e009f7c97c1 --- /dev/null +++ b/libs/portals/my-pages/social-insurance-maintenance/codegen.yml @@ -0,0 +1,18 @@ +schema: + - apps/api/src/api.graphql +documents: + - libs/portals/my-pages/social-insurance-maintenance/src/**/**/*.graphql +generates: + libs/portals/my-pages/social-insurance-maintenance/src/: + preset: 'near-operation-file' + presetConfig: + baseTypesPath: '~@island.is/api/schema' + plugins: + - typescript-operations + - typescript-react-apollo + config: + scalars: + DateTime: string +hooks: + afterAllFileWrite: + - prettier --write diff --git a/libs/service-portal/social-insurance-maintenance/jest.config.js b/libs/portals/my-pages/social-insurance-maintenance/jest.config.js similarity index 63% rename from libs/service-portal/social-insurance-maintenance/jest.config.js rename to libs/portals/my-pages/social-insurance-maintenance/jest.config.js index c0e1d29c8c7a..1d7e8212774a 100644 --- a/libs/service-portal/social-insurance-maintenance/jest.config.js +++ b/libs/portals/my-pages/social-insurance-maintenance/jest.config.js @@ -1,7 +1,7 @@ module.exports = { - displayName: 'service-portal-social-insurance-maintenance', + displayName: 'portals-my-pages-social-insurance-maintenance', preset: './jest.preset.js', - rootDir: '../../..', + rootDir: '../../../..', roots: [__dirname], transform: { '^.+\\.[tj]sx?$': [ @@ -11,5 +11,5 @@ module.exports = { }, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], coverageDirectory: - '/coverage/libs/service-portal/social-insurance-maintenance', + '/coverage/libs/portals/my-pages/social-insurance-maintenance', } diff --git a/libs/portals/my-pages/social-insurance-maintenance/project.json b/libs/portals/my-pages/social-insurance-maintenance/project.json new file mode 100644 index 000000000000..8b1196378b56 --- /dev/null +++ b/libs/portals/my-pages/social-insurance-maintenance/project.json @@ -0,0 +1,34 @@ +{ + "name": "portals-my-pages-social-insurance-maintenance", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "sourceRoot": "libs/portals/my-pages/social-insurance-maintenance/src", + "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], + "targets": { + "lint": { + "executor": "@nx/eslint:lint" + }, + "test": { + "executor": "@nx/jest:jest", + "options": { + "jestConfig": "libs/portals/my-pages/social-insurance-maintenance/jest.config.js" + }, + "outputs": [ + "{workspaceRoot}/coverage/libs/portals/my-pages/social-insurance-maintenance" + ] + }, + "extract-strings": { + "executor": "nx:run-commands", + "options": { + "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/my-pages/social-insurance-maintenance/src/{lib,components,screens}/**/*.{js,ts,tsx}'" + } + }, + "codegen/frontend-client": { + "executor": "nx:run-commands", + "options": { + "output": "libs/portals/my-pages/social-insurance-maintenance/src/**/*.generated.ts", + "command": "graphql-codegen --config libs/portals/my-pages/social-insurance-maintenance/codegen.yml" + } + } + } +} diff --git a/libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.graphql b/libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.graphql similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.graphql rename to libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.graphql diff --git a/libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.tsx similarity index 98% rename from libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.tsx rename to libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.tsx index ebce1c009d2a..d62c321e6c66 100644 --- a/libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.tsx +++ b/libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTable.tsx @@ -6,7 +6,7 @@ import { EmptyTable, ExpandHeader, amountFormat, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../lib/messages' import { useGetPaymentPlanQuery } from './PaymentGroupTable.generated' import { PaymentGroupTableRow } from './PaymentGroupTableRow' diff --git a/libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTableRow.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTableRow.tsx similarity index 94% rename from libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTableRow.tsx rename to libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTableRow.tsx index 308f3f5ccf4c..bc302192d166 100644 --- a/libs/service-portal/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTableRow.tsx +++ b/libs/portals/my-pages/social-insurance-maintenance/src/components/PaymentGroupTable/PaymentGroupTableRow.tsx @@ -3,10 +3,10 @@ import { MONTHS, ScrollableMiddleTable, amountFormat, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { SocialInsurancePaymentGroup } from '@island.is/api/schema' import { FormatMessage } from '@island.is/localization' -import { m as coreMessages } from '@island.is/service-portal/core' +import { m as coreMessages } from '@island.is/portals/my-pages/core' type Props = { data: SocialInsurancePaymentGroup diff --git a/libs/service-portal/social-insurance-maintenance/src/components/index.ts b/libs/portals/my-pages/social-insurance-maintenance/src/components/index.ts similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/components/index.ts rename to libs/portals/my-pages/social-insurance-maintenance/src/components/index.ts diff --git a/libs/service-portal/social-insurance-maintenance/src/index.ts b/libs/portals/my-pages/social-insurance-maintenance/src/index.ts similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/index.ts rename to libs/portals/my-pages/social-insurance-maintenance/src/index.ts diff --git a/libs/service-portal/social-insurance-maintenance/src/lib/messages.ts b/libs/portals/my-pages/social-insurance-maintenance/src/lib/messages.ts similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/lib/messages.ts rename to libs/portals/my-pages/social-insurance-maintenance/src/lib/messages.ts diff --git a/libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts b/libs/portals/my-pages/social-insurance-maintenance/src/lib/navigation.ts similarity index 95% rename from libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts rename to libs/portals/my-pages/social-insurance-maintenance/src/lib/navigation.ts index acb14d6604f3..ea5784e7fdef 100644 --- a/libs/service-portal/social-insurance-maintenance/src/lib/navigation.ts +++ b/libs/portals/my-pages/social-insurance-maintenance/src/lib/navigation.ts @@ -1,5 +1,5 @@ import { PortalNavigationItem } from '@island.is/portals/core' -import { m } from '@island.is/service-portal/core' +import { m } from '@island.is/portals/my-pages/core' import { SocialInsuranceMaintenancePaths } from './paths' export const socialInsuranceMaintenanceNavigation: PortalNavigationItem = { diff --git a/libs/service-portal/social-insurance-maintenance/src/lib/paths.ts b/libs/portals/my-pages/social-insurance-maintenance/src/lib/paths.ts similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/lib/paths.ts rename to libs/portals/my-pages/social-insurance-maintenance/src/lib/paths.ts diff --git a/libs/service-portal/social-insurance-maintenance/src/module.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/module.tsx similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/module.tsx rename to libs/portals/my-pages/social-insurance-maintenance/src/module.tsx diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql rename to libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.graphql diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx similarity index 99% rename from libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx rename to libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx index 805af9dd9587..ce10804ddf32 100644 --- a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx +++ b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlan/IncomePlan.tsx @@ -12,7 +12,7 @@ import { LinkButton, m as coreMessages, formatDate, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../lib/messages' import { Problem } from '@island.is/react-spa/shared' import { SocialInsuranceMaintenancePaths } from '../../lib/paths' diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql rename to libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.graphql diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx similarity index 98% rename from libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx rename to libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx index 1b74aa01978f..3f5b207c349d 100644 --- a/libs/service-portal/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx +++ b/libs/portals/my-pages/social-insurance-maintenance/src/screens/IncomePlanDetail/IncomePlanDetail.tsx @@ -15,7 +15,7 @@ import { LinkButton, amountFormat, m as coreMessages, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../lib/messages' import { useGetIncomePlanDetailQuery } from './IncomePlanDetail.generated' import { Problem } from '@island.is/react-spa/shared' diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.graphql b/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.graphql similarity index 100% rename from libs/service-portal/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.graphql rename to libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.graphql diff --git a/libs/service-portal/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx b/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx similarity index 98% rename from libs/service-portal/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx rename to libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx index 59847a7549e0..35e746a9b6c0 100644 --- a/libs/service-portal/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx +++ b/libs/portals/my-pages/social-insurance-maintenance/src/screens/PaymentPlan/PaymentPlan.tsx @@ -8,7 +8,7 @@ import { UserInfoLine, amountFormat, m as coreMessages, -} from '@island.is/service-portal/core' +} from '@island.is/portals/my-pages/core' import { m } from '../../lib/messages' import { useGetPreviousPaymentsQuery } from './PaymentPlan.generated' import { PaymentGroupTable } from '../../components' diff --git a/libs/service-portal/social-insurance-maintenance/tsconfig.json b/libs/portals/my-pages/social-insurance-maintenance/tsconfig.json similarity index 100% rename from libs/service-portal/social-insurance-maintenance/tsconfig.json rename to libs/portals/my-pages/social-insurance-maintenance/tsconfig.json diff --git a/libs/service-portal/social-insurance-maintenance/tsconfig.lib.json b/libs/portals/my-pages/social-insurance-maintenance/tsconfig.lib.json similarity index 89% rename from libs/service-portal/social-insurance-maintenance/tsconfig.lib.json rename to libs/portals/my-pages/social-insurance-maintenance/tsconfig.lib.json index f8c7bfd01e50..6394d9f9cd81 100644 --- a/libs/service-portal/social-insurance-maintenance/tsconfig.lib.json +++ b/libs/portals/my-pages/social-insurance-maintenance/tsconfig.lib.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "types": ["node"] }, "files": [ diff --git a/libs/service-portal/social-insurance-maintenance/tsconfig.spec.json b/libs/portals/my-pages/social-insurance-maintenance/tsconfig.spec.json similarity index 88% rename from libs/service-portal/social-insurance-maintenance/tsconfig.spec.json rename to libs/portals/my-pages/social-insurance-maintenance/tsconfig.spec.json index cab0321d3031..1f4ea6984a42 100644 --- a/libs/service-portal/social-insurance-maintenance/tsconfig.spec.json +++ b/libs/portals/my-pages/social-insurance-maintenance/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../../dist/out-tsc", + "outDir": "../../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/libs/service-portal/air-discount/README.md b/libs/service-portal/air-discount/README.md deleted file mode 100644 index 1df67ff6ef3d..000000000000 --- a/libs/service-portal/air-discount/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Service Portal Air Discount - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test service-portal-air-discount` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/consent/jest.config.ts b/libs/service-portal/consent/jest.config.ts deleted file mode 100644 index 15d12e619fb9..000000000000 --- a/libs/service-portal/consent/jest.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -/* eslint-disable */ -export default { - displayName: 'service-portal-consent', - preset: '../../../jest.preset.js', - transform: { - '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }], - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], - coverageDirectory: '../../../coverage/libs/service-portal/consent', -} diff --git a/libs/service-portal/core/project.json b/libs/service-portal/core/project.json deleted file mode 100644 index 2131f9cba8b8..000000000000 --- a/libs/service-portal/core/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "service-portal-core", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/core/src", - "projectType": "library", - "tags": ["lib:portals-mypages", "scope:portals-mypages"], - "generators": {}, - "targets": { - "lint": { - "executor": "@nx/eslint:lint" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "libs/service-portal/core/jest.config.ts" - }, - "outputs": ["{workspaceRoot}/coverage/libs/service-portal/core"] - }, - "extract-strings": { - "executor": "nx:run-commands", - "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/core/src/{lib,components,helpers,screens}/**/*.{js,ts,tsx}'" - } - } - } -} diff --git a/libs/service-portal/documents/README.md b/libs/service-portal/documents/README.md deleted file mode 100644 index 1e397999ea50..000000000000 --- a/libs/service-portal/documents/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# service-portal-documents - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test service-portal-documents` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/documents/tsconfig.lib.json b/libs/service-portal/documents/tsconfig.lib.json deleted file mode 100644 index 2ebbff79e562..000000000000 --- a/libs/service-portal/documents/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/documents/tsconfig.spec.json b/libs/service-portal/documents/tsconfig.spec.json deleted file mode 100644 index 639a8e987c80..000000000000 --- a/libs/service-portal/documents/tsconfig.spec.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/education-career/.eslintrc.json b/libs/service-portal/education-career/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/education-career/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/education-degree/.eslintrc.json b/libs/service-portal/education-degree/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/education-degree/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/education-license/.eslintrc.json b/libs/service-portal/education-license/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/education-license/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/education-license/tsconfig.spec.json b/libs/service-portal/education-license/tsconfig.spec.json deleted file mode 100644 index e1535ba9d07c..000000000000 --- a/libs/service-portal/education-license/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/education-student-assessment/.eslintrc.json b/libs/service-portal/education-student-assessment/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/education-student-assessment/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/education-student-assessment/tsconfig.spec.json b/libs/service-portal/education-student-assessment/tsconfig.spec.json deleted file mode 100644 index e1535ba9d07c..000000000000 --- a/libs/service-portal/education-student-assessment/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/education/jest.config.ts b/libs/service-portal/education/jest.config.ts deleted file mode 100644 index 0935a1213627..000000000000 --- a/libs/service-portal/education/jest.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable */ -export default { - preset: './jest.preset.js', - rootDir: '../../..', - roots: [__dirname], - transform: { - '^.+\\.[tj]sx?$': [ - 'ts-jest', - { tsconfig: `${__dirname}/tsconfig.spec.json` }, - ], - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/education', - globals: {}, - displayName: 'service-portal-education', -} diff --git a/libs/service-portal/education/tsconfig.lib.json b/libs/service-portal/education/tsconfig.lib.json deleted file mode 100644 index 2ebbff79e562..000000000000 --- a/libs/service-portal/education/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/education/tsconfig.spec.json b/libs/service-portal/education/tsconfig.spec.json deleted file mode 100644 index 639a8e987c80..000000000000 --- a/libs/service-portal/education/tsconfig.spec.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/finance/.eslintrc.json b/libs/service-portal/finance/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/finance/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/finance/README.md b/libs/service-portal/finance/README.md deleted file mode 100644 index 78847142b801..000000000000 --- a/libs/service-portal/finance/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# service-portal-finance - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test service-portal-finance` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/finance/jest.config.ts b/libs/service-portal/finance/jest.config.ts deleted file mode 100644 index 3b6fa510aa9e..000000000000 --- a/libs/service-portal/finance/jest.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable */ -export default { - preset: './jest.preset.js', - rootDir: '../../..', - roots: [__dirname], - transform: { - '^.+\\.[tj]sx?$': [ - 'ts-jest', - { tsconfig: `${__dirname}/tsconfig.spec.json` }, - ], - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/finance', - globals: {}, - displayName: 'service-portal-finance', -} diff --git a/libs/service-portal/finance/tsconfig.lib.json b/libs/service-portal/finance/tsconfig.lib.json deleted file mode 100644 index 2ebbff79e562..000000000000 --- a/libs/service-portal/finance/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/finance/tsconfig.spec.json b/libs/service-portal/finance/tsconfig.spec.json deleted file mode 100644 index 639a8e987c80..000000000000 --- a/libs/service-portal/finance/tsconfig.spec.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/graphql/README.md b/libs/service-portal/graphql/README.md deleted file mode 100644 index 594e6964c013..000000000000 --- a/libs/service-portal/graphql/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# service-portal-graphql - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `ng test service-portal-graphql` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/graphql/jest.config.ts b/libs/service-portal/graphql/jest.config.ts deleted file mode 100644 index 8e20a46b8130..000000000000 --- a/libs/service-portal/graphql/jest.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable */ -export default { - preset: './jest.preset.js', - rootDir: '../../..', - roots: [__dirname], - transform: { - '^.+\\.[tj]sx?$': [ - 'ts-jest', - { tsconfig: `${__dirname}/tsconfig.spec.json` }, - ], - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/graphql', - globals: {}, - displayName: 'service-portal-graphql', -} diff --git a/libs/service-portal/graphql/tsconfig.spec.json b/libs/service-portal/graphql/tsconfig.spec.json deleted file mode 100644 index e1535ba9d07c..000000000000 --- a/libs/service-portal/graphql/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/health/.eslintrc.json b/libs/service-portal/health/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/health/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/health/README.md b/libs/service-portal/health/README.md deleted file mode 100644 index 746d87724b11..000000000000 --- a/libs/service-portal/health/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# service-portal-health - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test service-portal-health` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/health/jest.config.ts b/libs/service-portal/health/jest.config.ts deleted file mode 100644 index 9cb6d2675fdb..000000000000 --- a/libs/service-portal/health/jest.config.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* eslint-disable */ -export default { - preset: './jest.preset.js', - rootDir: '../../..', - roots: [__dirname], - transform: { - '^.+\\.[tj]sx?$': [ - 'ts-jest', - { tsconfig: `${__dirname}/tsconfig.spec.json` }, - ], - }, - moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], - coverageDirectory: '/coverage/libs/service-portal/health', - globals: {}, - displayName: 'service-portal-health', -} diff --git a/libs/service-portal/health/tsconfig.lib.json b/libs/service-portal/health/tsconfig.lib.json deleted file mode 100644 index 2ebbff79e562..000000000000 --- a/libs/service-portal/health/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/health/tsconfig.spec.json b/libs/service-portal/health/tsconfig.spec.json deleted file mode 100644 index 639a8e987c80..000000000000 --- a/libs/service-portal/health/tsconfig.spec.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ], - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ] -} diff --git a/libs/service-portal/information/.eslintrc.json b/libs/service-portal/information/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/information/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/information/codegen.yml b/libs/service-portal/information/codegen.yml deleted file mode 100644 index 5e9f844f89bd..000000000000 --- a/libs/service-portal/information/codegen.yml +++ /dev/null @@ -1,18 +0,0 @@ -schema: - - apps/api/src/api.graphql -documents: - - libs/service-portal/information/src/**/**/*.graphql -generates: - libs/service-portal/information/src/: - preset: 'near-operation-file' - presetConfig: - baseTypesPath: '~@island.is/api/schema' - plugins: - - typescript-operations - - typescript-react-apollo - config: - scalars: - DateTime: string -hooks: - afterAllFileWrite: - - prettier --write diff --git a/libs/service-portal/information/tsconfig.lib.json b/libs/service-portal/information/tsconfig.lib.json deleted file mode 100644 index 7da3e9d24116..000000000000 --- a/libs/service-portal/information/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ], - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] -} diff --git a/libs/service-portal/information/tsconfig.spec.json b/libs/service-portal/information/tsconfig.spec.json deleted file mode 100644 index e1535ba9d07c..000000000000 --- a/libs/service-portal/information/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/law-and-order/codegen.yml b/libs/service-portal/law-and-order/codegen.yml deleted file mode 100644 index 802e5dd8ddad..000000000000 --- a/libs/service-portal/law-and-order/codegen.yml +++ /dev/null @@ -1,18 +0,0 @@ -schema: - - apps/api/src/api.graphql -documents: - - libs/service-portal/law-and-order/src/**/**/*.graphql -generates: - libs/service-portal/law-and-order/src/: - preset: 'near-operation-file' - presetConfig: - baseTypesPath: '~@island.is/api/schema' - plugins: - - typescript-operations - - typescript-react-apollo - config: - scalars: - DateTime: string -hooks: - afterAllFileWrite: - - prettier --write diff --git a/libs/service-portal/licenses/.eslintrc.json b/libs/service-portal/licenses/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/licenses/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/licenses/tsconfig.lib.json b/libs/service-portal/licenses/tsconfig.lib.json deleted file mode 100644 index 7da3e9d24116..000000000000 --- a/libs/service-portal/licenses/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ], - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] -} diff --git a/libs/service-portal/licenses/tsconfig.spec.json b/libs/service-portal/licenses/tsconfig.spec.json deleted file mode 100644 index e1535ba9d07c..000000000000 --- a/libs/service-portal/licenses/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/occupational-licenses/.eslintrc.json b/libs/service-portal/occupational-licenses/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/occupational-licenses/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/occupational-licenses/codegen.yml b/libs/service-portal/occupational-licenses/codegen.yml deleted file mode 100644 index 9290e44ea16a..000000000000 --- a/libs/service-portal/occupational-licenses/codegen.yml +++ /dev/null @@ -1,19 +0,0 @@ -schema: - - apps/api/src/api.graphql -documents: - - libs/service-portal/occupational-licenses/src/screens/**/*.graphql -generates: - libs/service-portal/occupational-licenses/src/: - preset: 'near-operation-file' - presetConfig: - baseTypesPath: '~@island.is/api/schema' - config: - scalars: - DateTime: string - plugins: - - typescript-operations - - typescript-react-apollo - -hooks: - afterAllFileWrite: - - prettier --write diff --git a/libs/service-portal/occupational-licenses/project.json b/libs/service-portal/occupational-licenses/project.json deleted file mode 100644 index 09a85e529ee0..000000000000 --- a/libs/service-portal/occupational-licenses/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "service-portal-occupational-licenses", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/occupational-licenses/src", - "projectType": "library", - "tags": ["lib:portals-mypages", "scope:portals-mypages"], - "targets": { - "lint": { - "executor": "@nx/eslint:lint" - }, - "test": { - "executor": "@nx/jest:jest", - "outputs": ["{workspaceRoot}/libs/service-portal/occupational-licenses"], - "options": { - "jestConfig": "libs/service-portal/occupational-licenses/jest.config.ts" - } - }, - "extract-strings": { - "executor": "nx:run-commands", - "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/occupational-licenses/src/{lib,components,screens}/**/*.{js,ts,tsx}'" - } - }, - "codegen/frontend-client": { - "executor": "nx:run-commands", - "options": { - "output": "libs/service-portal/occupational-licenses/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/occupational-licenses/codegen.yml" - } - } - } -} diff --git a/libs/service-portal/occupational-licenses/tsconfig.lib.json b/libs/service-portal/occupational-licenses/tsconfig.lib.json deleted file mode 100644 index 7da3e9d24116..000000000000 --- a/libs/service-portal/occupational-licenses/tsconfig.lib.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "types": ["node"] - }, - "files": [ - "../../../node_modules/@nx/react/typings/cssmodule.d.ts", - "../../../node_modules/@nx/react/typings/image.d.ts" - ], - "exclude": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "jest.config.ts" - ], - "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] -} diff --git a/libs/service-portal/occupational-licenses/tsconfig.spec.json b/libs/service-portal/occupational-licenses/tsconfig.spec.json deleted file mode 100644 index e1535ba9d07c..000000000000 --- a/libs/service-portal/occupational-licenses/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.spec.ts", - "**/*.test.ts", - "**/*.spec.tsx", - "**/*.test.tsx", - "**/*.spec.js", - "**/*.test.js", - "**/*.spec.jsx", - "**/*.test.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/petitions/.eslintrc.json b/libs/service-portal/petitions/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/petitions/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/restrictions/codegen.yml b/libs/service-portal/restrictions/codegen.yml deleted file mode 100644 index 0db305e659e4..000000000000 --- a/libs/service-portal/restrictions/codegen.yml +++ /dev/null @@ -1,18 +0,0 @@ -schema: - - apps/api/src/api.graphql -documents: - - libs/service-portal/restrictions/src/**/*.graphql -generates: - libs/service-portal/restrictions/src/: - preset: 'near-operation-file' - presetConfig: - baseTypesPath: '~@island.is/api/schema' - plugins: - - typescript-operations - - typescript-react-apollo - config: - scalars: - DateTime: string -hooks: - afterAllFileWrite: - - prettier --write diff --git a/libs/service-portal/sessions/.eslintrc.json b/libs/service-portal/sessions/.eslintrc.json deleted file mode 100644 index 75b85077debb..000000000000 --- a/libs/service-portal/sessions/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/service-portal/sessions/codegen.yml b/libs/service-portal/sessions/codegen.yml deleted file mode 100644 index 307cd44b057b..000000000000 --- a/libs/service-portal/sessions/codegen.yml +++ /dev/null @@ -1,18 +0,0 @@ -schema: - - apps/api/src/api.graphql -documents: - - libs/service-portal/sessions/src/**/*.graphql -generates: - libs/service-portal/sessions/src/: - preset: 'near-operation-file' - presetConfig: - baseTypesPath: '~@island.is/api/schema' - plugins: - - typescript-operations - - typescript-react-apollo - config: - scalars: - DateTime: string -hooks: - afterAllFileWrite: - - prettier --write diff --git a/libs/service-portal/sessions/tsconfig.spec.json b/libs/service-portal/sessions/tsconfig.spec.json deleted file mode 100644 index 83cd0e830ed2..000000000000 --- a/libs/service-portal/sessions/tsconfig.spec.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "outDir": "../../../dist/out-tsc", - "module": "commonjs", - "types": ["jest", "node"] - }, - "include": [ - "**/*.test.ts", - "**/*.spec.ts", - "**/*.test.tsx", - "**/*.spec.tsx", - "**/*.test.js", - "**/*.spec.js", - "**/*.test.jsx", - "**/*.spec.jsx", - "**/*.d.ts", - "jest.config.ts" - ] -} diff --git a/libs/service-portal/signature-collection/.eslintrc.json b/libs/service-portal/signature-collection/.eslintrc.json deleted file mode 100644 index 4f027ee445be..000000000000 --- a/libs/service-portal/signature-collection/.eslintrc.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "rules": {}, - "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } - ] -} diff --git a/libs/service-portal/signature-collection/README.md b/libs/service-portal/signature-collection/README.md deleted file mode 100644 index 484ea03a6c26..000000000000 --- a/libs/service-portal/signature-collection/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Service Portal Signature Collection - -## Running unit tests - -Run `nx test service-portal-signature-collection` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/social-insurance-maintenance/.eslintrc.json b/libs/service-portal/social-insurance-maintenance/.eslintrc.json deleted file mode 100644 index 75b85077debb..000000000000 --- a/libs/service-portal/social-insurance-maintenance/.eslintrc.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "extends": ["plugin:@nx/react", "../../../.eslintrc.json"], - "ignorePatterns": ["!**/*"], - "overrides": [ - { - "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], - "rules": {} - }, - { - "files": ["*.ts", "*.tsx"], - "rules": {} - }, - { - "files": ["*.js", "*.jsx"], - "rules": {} - } - ] -} diff --git a/libs/service-portal/social-insurance-maintenance/README.md b/libs/service-portal/social-insurance-maintenance/README.md deleted file mode 100644 index 89c9d1ca5bff..000000000000 --- a/libs/service-portal/social-insurance-maintenance/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# service-portal-social-insurance-maintenance - -This library was generated with [Nx](https://nx.dev). - -## Running unit tests - -Run `nx test service-portal-social-insurance-maintenance` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/service-portal/social-insurance-maintenance/project.json b/libs/service-portal/social-insurance-maintenance/project.json deleted file mode 100644 index 505f43235e36..000000000000 --- a/libs/service-portal/social-insurance-maintenance/project.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "service-portal-social-insurance-maintenance", - "$schema": "../../../node_modules/nx/schemas/project-schema.json", - "sourceRoot": "libs/service-portal/social-insurance-maintenance/src", - "projectType": "library", - "tags": ["lib:portals-mypages", "scope:portals-mypages"], - "targets": { - "lint": { - "executor": "@nx/eslint:lint" - }, - "test": { - "executor": "@nx/jest:jest", - "options": { - "jestConfig": "libs/service-portal/social-insurance-maintenance/jest.config.js" - }, - "outputs": [ - "{workspaceRoot}/coverage/libs/service-portal/social-insurance-maintenance" - ] - }, - "extract-strings": { - "executor": "nx:run-commands", - "options": { - "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/social-insurance-maintenance/src/{lib,components,screens}/**/*.{js,ts,tsx}'" - } - }, - "codegen/frontend-client": { - "executor": "nx:run-commands", - "options": { - "output": "libs/service-portal/social-insurance-maintenance/src/**/*.generated.ts", - "command": "graphql-codegen --config libs/service-portal/social-insurance-maintenance/codegen.yml" - } - } - } -} diff --git a/scripts/ci/30_test.sh b/scripts/ci/30_test.sh index 1e41c58fd19d..19263f44c0d8 100755 --- a/scripts/ci/30_test.sh +++ b/scripts/ci/30_test.sh @@ -30,7 +30,7 @@ projects_uncollectible_coverage=( "api-domains-email-signup" "skilavottord-web" "shared-babel" - "service-portal-core" + "portals-my-pages-core" ) # shellcheck disable=SC2076 if [[ ! " ${projects_uncollectible_coverage[*]} " =~ " ${APP} " ]]; then diff --git a/tsconfig.base.json b/tsconfig.base.json index 2e16da92f52a..3cab159e69be 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -984,123 +984,123 @@ "libs/portals/admin/signature-collection/src/index.ts" ], "@island.is/portals/core": ["libs/portals/core/src/index.ts"], - "@island.is/portals/shared-modules/delegations": [ - "libs/portals/shared-modules/delegations/src/index.ts" + "@island.is/portals/my-pages/air-discount": [ + "libs/portals/my-pages/air-discount/src/index.ts" ], - "@island.is/portals/shared-modules/delegations/messages": [ - "libs/portals/shared-modules/delegations/src/lib/messages.ts" + "@island.is/portals/my-pages/applications": [ + "libs/portals/my-pages/applications/src/index.ts" ], - "@island.is/react-spa/bff": ["libs/react-spa/bff/src/index.ts"], - "@island.is/react-spa/shared": ["libs/react-spa/shared/src/index.ts"], - "@island.is/react/components": ["libs/react/components/src/index.ts"], - "@island.is/react/feature-flags": [ - "libs/react/feature-flags/src/index.ts" + "@island.is/portals/my-pages/assets": [ + "libs/portals/my-pages/assets/src/index.ts" ], - "@island.is/regulations": ["libs/regulations/src/index.ts"], - "@island.is/regulations/*": ["libs/regulations/src/sub/*"], - "@island.is/residence-history": ["libs/residence-history/src/index.ts"], - "@island.is/service-portal/air-discount": [ - "libs/service-portal/air-discount/src/index.ts" + "@island.is/portals/my-pages/assets/messages": [ + "libs/portals/my-pages/assets/src/lib/messages.ts" ], - "@island.is/service-portal/applications": [ - "libs/service-portal/applications/src/index.ts" + "@island.is/portals/my-pages/consent": [ + "libs/portals/my-pages/consent/src/index.ts" ], - "@island.is/service-portal/assets": [ - "libs/service-portal/assets/src/index.ts" + "@island.is/portals/my-pages/constants": [ + "libs/portals/my-pages/constants/src/index.ts" ], - "@island.is/service-portal/assets/messages": [ - "libs/service-portal/assets/src/lib/messages.ts" + "@island.is/portals/my-pages/core": [ + "libs/portals/my-pages/core/src/index.ts" ], - "@island.is/service-portal/consent": [ - "libs/service-portal/consent/src/index.ts" + "@island.is/portals/my-pages/core/messages": [ + "libs/portals/my-pages/core/src/lib/messages.ts" ], - "@island.is/service-portal/constants": [ - "libs/service-portal/constants/src/index.ts" + "@island.is/portals/my-pages/documents": [ + "libs/portals/my-pages/documents/src/index.ts" ], - "@island.is/service-portal/core": [ - "libs/service-portal/core/src/index.ts" + "@island.is/portals/my-pages/documents/messages": [ + "libs/portals/my-pages/documents/src/utils/messages.ts" ], - "@island.is/service-portal/core/messages": [ - "libs/service-portal/core/src/lib/messages.ts" + "@island.is/portals/my-pages/education": [ + "libs/portals/my-pages/education/src/index.ts" ], - "@island.is/service-portal/documents": [ - "libs/service-portal/documents/src/index.ts" + "@island.is/portals/my-pages/education-career": [ + "libs/portals/my-pages/education-career/src/index.ts" ], - "@island.is/service-portal/documents/messages": [ - "libs/service-portal/documents/src/utils/messages.ts" + "@island.is/portals/my-pages/education-degree": [ + "libs/portals/my-pages/education-degree/src/index.ts" ], - "@island.is/service-portal/education": [ - "libs/service-portal/education/src/index.ts" + "@island.is/portals/my-pages/education-license": [ + "libs/portals/my-pages/education-license/src/index.ts" ], - "@island.is/service-portal/education-career": [ - "libs/service-portal/education-career/src/index.ts" + "@island.is/portals/my-pages/education-student-assessment": [ + "libs/portals/my-pages/education-student-assessment/src/index.ts" ], - "@island.is/service-portal/education-degree": [ - "libs/service-portal/education-degree/src/index.ts" + "@island.is/portals/my-pages/eligibility": [ + "libs/portals/my-pages/eligibility/src/index.ts" ], - "@island.is/service-portal/education-license": [ - "libs/service-portal/education-license/src/index.ts" + "@island.is/portals/my-pages/finance": [ + "libs/portals/my-pages/finance/src/index.ts" ], - "@island.is/service-portal/education-student-assessment": [ - "libs/service-portal/education-student-assessment/src/index.ts" + "@island.is/portals/my-pages/finance/messages": [ + "libs/portals/my-pages/finance/src/lib/messages.ts" ], - "@island.is/service-portal/eligibility": [ - "libs/service-portal/eligibility/src/index.ts" + "@island.is/portals/my-pages/graphql": [ + "libs/portals/my-pages/graphql/src/index.ts" ], - "@island.is/service-portal/finance": [ - "libs/service-portal/finance/src/index.ts" + "@island.is/portals/my-pages/health": [ + "libs/portals/my-pages/health/src/index.ts" ], - "@island.is/service-portal/finance/messages": [ - "libs/service-portal/finance/src/lib/messages.ts" + "@island.is/portals/my-pages/health/messages": [ + "libs/portals/my-pages/health/src/lib/messages.ts" ], - "@island.is/service-portal/graphql": [ - "libs/service-portal/graphql/src/index.ts" + "@island.is/portals/my-pages/information": [ + "libs/portals/my-pages/information/src/index.ts" ], - "@island.is/service-portal/health": [ - "libs/service-portal/health/src/index.ts" + "@island.is/portals/my-pages/information/messages": [ + "libs/portals/my-pages/information/src/lib/messages.ts" ], - "@island.is/service-portal/health/messages": [ - "libs/service-portal/health/src/lib/messages.ts" + "@island.is/portals/my-pages/law-and-order": [ + "libs/portals/my-pages/law-and-order/src/index.ts" ], - "@island.is/service-portal/information": [ - "libs/service-portal/information/src/index.ts" + "@island.is/portals/my-pages/licenses": [ + "libs/portals/my-pages/licenses/src/index.ts" ], - "@island.is/service-portal/information/messages": [ - "libs/service-portal/information/src/lib/messages.ts" + "@island.is/portals/my-pages/licenses/messages": [ + "libs/portals/my-pages/licenses/src/lib/messages.ts" ], - "@island.is/service-portal/law-and-order": [ - "libs/service-portal/law-and-order/src/index.ts" + "@island.is/portals/my-pages/modules": [ + "libs/portals/my-pages/modules/src/index.ts" ], - "@island.is/service-portal/licenses": [ - "libs/service-portal/licenses/src/index.ts" + "@island.is/portals/my-pages/occupational-licenses": [ + "libs/portals/my-pages/occupational-licenses/src/index.ts" ], - "@island.is/service-portal/licenses/messages": [ - "libs/service-portal/licenses/src/lib/messages.ts" + "@island.is/portals/my-pages/petitions": [ + "libs/portals/my-pages/petitions/src/index.ts" ], - "@island.is/service-portal/modules": [ - "libs/service-portal/modules/src/index.ts" + "@island.is/portals/my-pages/restrictions": [ + "libs/portals/my-pages/restrictions/src/index.ts" ], - "@island.is/service-portal/occupational-licenses": [ - "libs/service-portal/occupational-licenses/src/index.ts" + "@island.is/portals/my-pages/sessions": [ + "libs/portals/my-pages/sessions/src/index.ts" ], - "@island.is/service-portal/petitions": [ - "libs/service-portal/petitions/src/index.ts" + "@island.is/portals/my-pages/settings/islykill": [ + "libs/portals/my-pages/settings/islykill/src/index.ts" ], - "@island.is/service-portal/restrictions": [ - "libs/service-portal/restrictions/src/index.ts" + "@island.is/portals/my-pages/signature-collection": [ + "libs/portals/my-pages/signature-collection/src/index.ts" ], - "@island.is/service-portal/sessions": [ - "libs/service-portal/sessions/src/index.ts" + "@island.is/portals/my-pages/social-insurance-maintenance": [ + "libs/portals/my-pages/social-insurance-maintenance/src/index.ts" ], - "@island.is/service-portal/settings/islykill": [ - "libs/service-portal/settings/islykill/src/index.ts" + "@island.is/portals/shared-modules/delegations": [ + "libs/portals/shared-modules/delegations/src/index.ts" ], - "@island.is/service-portal/signature-collection": [ - "libs/service-portal/signature-collection/src/index.ts" + "@island.is/portals/shared-modules/delegations/messages": [ + "libs/portals/shared-modules/delegations/src/lib/messages.ts" ], - "@island.is/service-portal/social-insurance-maintenance": [ - "libs/service-portal/social-insurance-maintenance/src/index.ts" + "@island.is/react-spa/bff": ["libs/react-spa/bff/src/index.ts"], + "@island.is/react-spa/shared": ["libs/react-spa/shared/src/index.ts"], + "@island.is/react/components": ["libs/react/components/src/index.ts"], + "@island.is/react/feature-flags": [ + "libs/react/feature-flags/src/index.ts" ], + "@island.is/regulations": ["libs/regulations/src/index.ts"], + "@island.is/regulations/*": ["libs/regulations/src/sub/*"], + "@island.is/residence-history": ["libs/residence-history/src/index.ts"], "@island.is/services/auth/testing": [ "libs/services/auth/testing/src/index.ts" ],