Merge branch 'malj/2307' into staging

web/common/helpers/dateUtilities.ts

@@ -1,6 +1,6 @@
 import { getYear, getMonth, getDate, getHours, getMinutes, getSeconds } from 'date-fns'
 import { zonedTimeToUtc } from 'date-fns-tz'
-import { EventDateType } from '../../../web/types/types'
+import { EventDateType } from '../../../web/types/index'
 
 export const toDateParts = (datetime: Date): number[] => {
   return [

web/common/helpers/getOpenGraphImages.ts

@@ -1,6 +1,6 @@
 import imageUrlBuilder from '@sanity/image-url'
 import { sanityClientWithEquinorCDN } from '../../lib/sanity.server'
-import type { ImageWithAlt } from '../../types/types'
+import type { ImageWithAlt } from '../../types/index'
 
 const builder = imageUrlBuilder(sanityClientWithEquinorCDN)
 

web/common/helpers/getUrlFromAction.ts

@@ -1,4 +1,4 @@
-import type { LinkData } from '../../types/types'
+import type { LinkData } from '../../types/index'
 
 export const getUrlFromAction = ({
   link,

web/components/src/Backgrounds/BackgroundContainer.tsx

@@ -1,7 +1,7 @@
 import { forwardRef, HTMLAttributes } from 'react'
 import styled from 'styled-components'
 import { normal, inverted } from '../../../styles/themes'
-import type { BackgroundColours, BackgroundTypes, ImageBackground } from '../../../types/types'
+import type { BackgroundColours, BackgroundTypes, ImageBackground } from '../../../types/index'
 import { ColouredContainer } from './ColouredContainer'
 import { ImageBackgroundContainer } from './ImageBackgroundContainer'
 import { ColorKeyTokens } from '../../../styles/colorKeyToUtilityMap'

web/components/src/Backgrounds/ColouredContainer.tsx

@@ -2,7 +2,7 @@ import styled from 'styled-components'
 import { normal, inverted } from '../../../styles/themes'
 import { getContainerColor, isInvertedStyle } from '../../utils/backgroundColours'
 import { forwardRef, HTMLAttributes, CSSProperties } from 'react'
-import { BackgroundColours } from '../../../types/types'
+import { BackgroundColours } from '../../../types/index'
 import { ColorKeyTokens, colorKeyToUtilityMap } from '../../../styles/colorKeyToUtilityMap'
 import { twMerge } from 'tailwind-merge'
 

web/components/src/Backgrounds/ImageBackgroundContainer.tsx

@@ -1,6 +1,6 @@
 import { forwardRef, HTMLAttributes, CSSProperties } from 'react'
 import { useSanityLoader } from '../../../lib/hooks/useSanityLoader'
-import { ImageBackground } from '../../../types/types'
+import { ImageBackground } from '../../../types/index'
 import { twMerge } from 'tailwind-merge'
 import { useMediaQuery } from '../../../lib/hooks/useMediaQuery'
 

web/components/src/Fact/FactBox.tsx

@@ -1,6 +1,6 @@
 import { forwardRef, HTMLAttributes } from 'react'
 import type { FactImagePosition } from './'
-import { BackgroundColours } from '../../../types/types'
+import { BackgroundColours } from '../../../types/index'
 import { ColorKeyTokens } from '../../../styles/colorKeyToUtilityMap'
 import { BackgroundContainer, BackgroundContainerProps } from '@components'
 import { twMerge } from 'tailwind-merge'

web/components/src/Table/Table.tsx

@@ -1,7 +1,7 @@
 import { forwardRef, CSSProperties } from 'react'
 import { Table as EdsTable, TableProps as EdsTableProps } from '@equinor/eds-core-react'
 import styled, { ThemeProvider } from 'styled-components'
-import { TableThemes } from '../../../types/types'
+import { TableThemes } from '../../../types/index'
 
 type ThemeType = {
   headerBackground: string

web/components/utils/backgroundColours.tsx

@@ -1,4 +1,4 @@
-import type { BackgroundColours } from '../../types/types'
+import type { BackgroundColours } from '../../types/index'
 
 export type StyleVariants =
   | '--bg-default'

web/core/Carousel/Carousel.tsx

@@ -4,7 +4,7 @@ import {
   EventCardData,
   KeyNumberItemData,
   IFrameCarouselItemData,
-} from '../../types/types'
+} from '../../types/index'
 import {
   ElementType,
   forwardRef,

web/core/Carousel/CarouselEventItem.tsx

@@ -2,7 +2,7 @@ import envisTwMerge from '../../twMerge'
 import { DisplayModes } from './Carousel'
 import { forwardRef, HTMLAttributes } from 'react'
 import { EventCard } from '@sections/cards/EventCard'
-import { EventCardData } from '../../types/types'
+import { EventCardData } from '../../types/index'
 
 type CarouselEventItemProps = {
   event: EventCardData

web/core/Carousel/CarouselIframeItem.tsx

@@ -1,5 +1,5 @@
 import envisTwMerge from '../../twMerge'
-import { IFrameCarouselItemData } from '../../types/types'
+import { IFrameCarouselItemData } from '../../types/index'
 import { DisplayModes } from './Carousel'
 import { forwardRef, HTMLAttributes } from 'react'
 import { Heading, Paragraph } from '@core/Typography'

web/core/Carousel/CarouselImageItem.tsx

@@ -1,6 +1,6 @@
 import envisTwMerge from '../../twMerge'
 import Image from '../../pageComponents/shared/SanityImage'
-import { ImageWithAlt, ImageWithCaptionData } from '../../types/types'
+import { ImageWithAlt, ImageWithCaptionData } from '../../types/index'
 import { DisplayModes } from './Carousel'
 import { forwardRef, HTMLAttributes } from 'react'
 

web/core/Carousel/CarouselKeyNumberItem.tsx

@@ -1,7 +1,7 @@
 import envisTwMerge from '../../twMerge'
 import { DisplayModes } from './Carousel'
 import { forwardRef, HTMLAttributes } from 'react'
-import { KeyNumberItemData } from '../../types/types'
+import { KeyNumberItemData } from '../../types/index'
 import KeyNumberItem from '@sections/KeyNumber/KeyNumberItem'
 
 type CarouselEventItemProps = {

web/core/Carousel/CarouselVideoItem.tsx

@@ -1,5 +1,5 @@
 import envisTwMerge from '../../twMerge'
-import { VideoPlayerCarouselItem, VideoPlayerRatios } from '../../types/types'
+import { VideoPlayerCarouselItem, VideoPlayerRatios } from '../../types/index'
 import { DisplayModes } from './Carousel'
 import { VideoComponentWithCaption } from '../../pageComponents/shared/VideoPlayer'
 import { forwardRef, HTMLAttributes } from 'react'

web/core/Link/BaseLink.tsx

@@ -1,7 +1,7 @@
 import { AnchorHTMLAttributes, forwardRef } from 'react'
 import { default as NextLink, LinkProps } from 'next/link'
 import { twMerge } from 'tailwind-merge'
-import { LinkType } from '../../types/types'
+import { LinkType } from '../../types/index'
 
 export type BaseLinkProps = {
   /** What kind of content is it  */

web/core/Link/ButtonLink.tsx

@@ -1,7 +1,7 @@
 import { forwardRef } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { BaseLink, BaseLinkProps } from './BaseLink'
-import { LinkType } from '../../types/types'
+import { LinkType } from '../../types/index'
 import { ButtonProps, commonButtonStyling, getVariant } from '../Button'
 
 export type ButtonLinkProps = {

web/core/Link/ReadMoreLink.tsx

@@ -2,7 +2,7 @@ import { forwardRef } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { BaseLink, BaseLinkProps } from './BaseLink'
 import { ArrowRight } from '../../icons'
-import { LinkType } from '../../types/types'
+import { LinkType } from '../../types/index'
 
 export type ReadMoreLinkProps = {
   /** Overriding styles for the icon  */

web/core/Link/ResourceLink.tsx

@@ -1,7 +1,7 @@
 import { forwardRef } from 'react'
 import { twMerge } from 'tailwind-merge'
 import { BaseLink, BaseLinkProps } from './BaseLink'
-import { LinkType } from '../../types/types'
+import { LinkType } from '../../types/index'
 import { ArrowRight } from '../../icons'
 
 export type ResourceLinkProps = {

web/pageComponents/cards/MagazineCard.tsx

@@ -2,7 +2,7 @@ import { Card } from '@components'
 import { CSSProperties } from 'react'
 import styled from 'styled-components'
 import Image, { Ratios } from '../shared/SanityImage'
-import { MagazineCardData } from '../../types/types'
+import { MagazineCardData } from '../../types/index'
 
 const { Title, Header, Action, Arrow, Media, CardLink } = Card
 

web/pageComponents/cards/SimpleCard.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components'
 import Image, { Ratios } from '../shared/SanityImage'
 
 import { Card, Heading } from '@components'
-import type { MenuLinkData, SubMenuGroupLinkData } from '../../types/types'
+import type { MenuLinkData, SubMenuGroupLinkData } from '../../types/index'
 
 const { Header, Action, Arrow, CardLink, Media } = Card
 

web/pageComponents/landingPages/ContentGroup.tsx

@@ -2,7 +2,7 @@ import styled from 'styled-components'
 import { Heading } from '@components'
 import SimpleCard from '../cards/SimpleCard'
 
-import type { SubMenuGroupData } from '../../types/types'
+import type { SubMenuGroupData } from '../../types/index'
 
 const GroupWrapper = styled.div`
   margin: var(--space-3xLarge) 0;

web/pageComponents/news/LatestNews.tsx

@@ -1,4 +1,4 @@
-import type { CardData } from '../../types/types'
+import type { CardData } from '../../types/index'
 import { FormattedMessage } from 'react-intl'
 import { FormattedDate } from '@components/FormattedDateTime'
 import { useMediaQuery } from '../../lib/hooks/useMediaQuery'

web/pageComponents/pageTemplates/ErrorPage.tsx

@@ -5,7 +5,7 @@ import { Heading, Text } from '@components'
 import RichText from '../shared/portableText/RichText'
 import isEmpty from '../shared/portableText/helpers/isEmpty'
 import BackgroundImage from '../errorPages/BackgroundImage'
-import type { ErrorPageData } from '../../types/types'
+import type { ErrorPageData } from '../../types/index'
 import { metaTitleSuffix } from '../../languages'
 
 const TextWrapper = styled.div`

web/pageComponents/pageTemplates/Event.tsx

@@ -9,7 +9,7 @@ import AddToCalendar from '../topicPages/AddToCalendar'
 import Promotion from '../topicPages/Promotion'
 import type { PortableTextBlock } from '@portabletext/types'
 import Seo from '../../pageComponents/shared/Seo'
-import type { EventSchema } from '../../types/types'
+import type { EventSchema } from '../../types/index'
 import { EventJsonLd } from 'next-seo'
 import Blocks from '../../pageComponents/shared/portableText/Blocks'
 import { twMerge } from 'tailwind-merge'

web/pageComponents/pageTemplates/LandingPage.tsx

@@ -1,5 +1,5 @@
 import styled from 'styled-components'
-import type { LandingPageSchema } from '../../types/types'
+import type { LandingPageSchema } from '../../types/index'
 import IngressText from '../shared/portableText/IngressText'
 import TitleText from '../shared/portableText/TitleText'
 import ContentGroup from '../landingPages/ContentGroup'

web/pageComponents/pageTemplates/MagazineIndexPage.tsx

@@ -11,7 +11,7 @@ import { UnpaddedText } from './newsroom/StyledComponents'
 import { useRef } from 'react'
 import usePaginationPadding from '../../lib/hooks/usePaginationPadding'
 import Seo from '../../pageComponents/shared/Seo'
-import { HeroTypes } from '../../types/types'
+import { HeroTypes } from '../../types/index'
 import MagazineIndexText from '../shared/portableText/MagazineIndexText'
 import { PaginationContextProvider } from '../shared/search/pagination/PaginationContext'
 import Teaser from '../shared/Teaser'

web/pageComponents/pageTemplates/MagazinePage.tsx

@@ -3,7 +3,7 @@ import { useRouter } from 'next/router'
 import MagazineTagBar from '../shared/MagazineTagBar'
 import { PageContent } from './shared/SharedPageContent'
 import SharedTitle from './shared/SharedTitle'
-import { HeroTypes, MagazinePageSchema } from '../../types/types'
+import { HeroTypes, MagazinePageSchema } from '../../types/index'
 import { SharedBanner } from './shared/SharedBanner'
 import Teaser from '../shared/Teaser'
 import Seo from '../../pageComponents/shared/Seo'

web/pageComponents/pageTemplates/News.tsx

@@ -11,7 +11,7 @@ import getOpenGraphImages from '../../common/helpers/getOpenGraphImages'
 import BasicIFrame from '../shared/iframe/BasicIFrame'
 import { getFullUrl } from '../../common/helpers/getFullUrl'
 import { metaTitleSuffix } from '../../languages'
-import type { NewsSchema } from '../../types/types'
+import type { NewsSchema } from '../../types/index'
 import { toPlainText } from '@portabletext/react'
 import Blocks from '../shared/portableText/Blocks'
 import { twMerge } from 'tailwind-merge'

web/pageComponents/pageTemplates/TopicPage.tsx

@@ -1,6 +1,6 @@
 import { toPlainText } from '@portabletext/react'
 import useSharedTitleStyles from '../../lib/hooks/useSharedTitleStyles'
-import { HeroTypes, TopicPageSchema } from '../../types/types'
+import { HeroTypes, TopicPageSchema } from '../../types/index'
 import Seo from '../shared/Seo'
 import { SharedBanner } from './shared/SharedBanner'
 import { PageContent } from './shared/SharedPageContent'

web/pageComponents/pageTemplates/shared/SharedBanner.tsx

@@ -1,5 +1,5 @@
 import { PortableTextBlock } from '@portabletext/types'
-import { BackgroundColours, HeroType, HeroTypes, LoopingVideoData } from '../../../types/types'
+import { BackgroundColours, HeroType, HeroTypes, LoopingVideoData } from '../../../types/index'
 import { DefaultHero } from '../../shared/Hero/DefaultHero'
 import { FiftyFiftyHero } from '../../shared/Hero/FiftyFiftyHero'
 import { FullImageHero } from '../../shared/Hero/FullImageHero'

web/pageComponents/pageTemplates/shared/SharedPageContent.tsx

@@ -54,7 +54,7 @@ import {
   DesignOptions,
   ImageForTextData,
   AnchorLinkListData,
-} from '../../../types/types'
+} from '../../../types/index'
 import { getColorForTheme } from '../../shared/textTeaser/theme'
 import Grid from '@sections/Grid/Grid'
 import { CampaignBanner } from '@sections/CampaignBanner'

web/pageComponents/searchIndexPages/magazineIndex/Hits.tsx

@@ -2,7 +2,7 @@ import { useHits, UseHitsProps } from 'react-instantsearch'
 import { FormattedMessage } from 'react-intl'
 import styled from 'styled-components'
 import MagazineCard from '../../cards/MagazineCard'
-import type { MagazineCardData } from '../../../types/types'
+import type { MagazineCardData } from '../../../types/index'
 import { forwardRef } from 'react'
 
 const HitList = styled.div`

web/pageComponents/shared/ContactList.tsx

@@ -1,4 +1,4 @@
-import type { ContactListData } from '../../types/types'
+import type { ContactListData } from '../../types/index'
 import { Text, Heading } from '@components'
 import { removeWhiteSpace } from '../../common/helpers/removeWhiteSpace'
 import { twMerge } from 'tailwind-merge'

web/pageComponents/shared/Footer.tsx

@@ -1,6 +1,6 @@
 import { forwardRef } from 'react'
 import { Facebook, Instagram, Linkedin, Twitter, Youtube } from '../../icons'
-import type { FooterLinkData, SomeType, FooterColumns } from '../../types/types'
+import type { FooterLinkData, SomeType, FooterColumns } from '../../types/index'
 import { default as NextLink } from 'next/link'
 
 

web/pageComponents/shared/Header.tsx

@@ -5,7 +5,7 @@ import { useRouter } from 'next/router'
 import { default as NextLink } from 'next/link'
 import { Topbar, BackgroundContainer } from '@components'
 import { AllSlugsType, LocalizationSwitch } from './LocalizationSwitch'
-import type { MenuData, SimpleMenuData } from '../../types/types'
+import type { MenuData, SimpleMenuData } from '../../types/index'
 import SiteMenu from './siteMenu/SiteMenu'
 import SimpleSiteMenu from './siteMenu/simple/SimpleSiteMenu'
 import { Flags } from '../../common/helpers/datasetHelpers'

web/pageComponents/shared/Hero/DefaultHero.tsx

@@ -1,4 +1,4 @@
-import type { ImageWithCaptionData } from '../../../types/types'
+import type { ImageWithCaptionData } from '../../../types/index'
 import styled from 'styled-components'
 import DefaulHeroImage from './DefaultHeroImage'
 import { PortableTextBlock } from '@portabletext/types'

web/pageComponents/shared/Hero/DefaultHeroImage.tsx

@@ -1,4 +1,4 @@
-import type { ImageWithCaptionData } from '../../../types/types'
+import type { ImageWithCaptionData } from '../../../types/index'
 import Image, { Ratios } from '../SanityImage'
 import { Caption } from '../image/Caption'
 

web/pageComponents/shared/Hero/FiftyFiftyHero.tsx

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 import Image from '../SanityImage'
 import TitleText from '../portableText/TitleText'
-import type { HeroType } from '../../../types/types'
+import type { HeroType } from '../../../types/index'
 import { BackgroundContainer } from '@components'
 import { ReadMoreLink } from '@core/Link'
 import Blocks from '../portableText/Blocks'

web/pageComponents/shared/ImageCarousel/ImageCarousel.tsx

@@ -6,7 +6,7 @@ import { BackgroundContainer } from '@components'
 import styled from 'styled-components'
 import TitleText from '../portableText/TitleText'
 import { CarouselItem } from './ImageCarouselItem'
-import type { ImageCarouselData } from '../../../types/types'
+import type { ImageCarouselData } from '../../../types/index'
 
 import 'swiper/css'
 import 'swiper/css/pagination'

web/pageComponents/shared/ImageCarousel/ImageCarouselItem.tsx

@@ -3,7 +3,7 @@ import Image, { Ratios } from '../SanityImage'
 import { Caption } from '../image/Caption'
 import { EdsProvider } from '@equinor/eds-core-react'
 import { NavButton } from './Navigation'
-import type { ImageWithAlt } from '../../../types/types'
+import type { ImageWithAlt } from '../../../types/index'
 
 const StyledFigure = styled.figure`
   margin: 0;

web/pageComponents/shared/Layout.tsx

@@ -1,6 +1,6 @@
 import { HTMLAttributes } from 'react'
 import Footer from './Footer'
-import type { FooterColumns } from '../../types/types'
+import type { FooterColumns } from '../../types/index'
 import { IntlProvider } from 'react-intl'
 import { defaultLanguage } from '../../languages'
 import { getIsoFromLocale } from '../../lib/localization'

web/pageComponents/shared/Quote.tsx

@@ -1,5 +1,5 @@
 import { PullQuote } from '@components'
-import type { QuoteData } from '../../types/types'
+import type { QuoteData } from '../../types/index'
 import Image, { Ratios } from './SanityImage'
 
 const Quote = ({ data: { quote, authorTitle, author, image, designOptions } }: { data: QuoteData }) => (

web/pageComponents/shared/RelatedContent.tsx

@@ -1,6 +1,6 @@
 import { Fragment, HTMLAttributes } from 'react'
 import { Heading, List } from '@components'
-import type { RelatedLinksData, LinkData } from '../../types/types'
+import type { RelatedLinksData, LinkData } from '../../types/index'
 import { ResourceLink } from '@core/Link'
 import { getUrlFromAction } from '../../common/helpers'
 import { getLocaleFromName } from '../../lib/localization'

web/pageComponents/shared/Seo.tsx

@@ -1,5 +1,5 @@
 import { NextSeo, WebPageJsonLd } from 'next-seo'
-import { ImageWithAlt } from '../../types/types'
+import { ImageWithAlt } from '../../types/index'
 import { metaTitleSuffix } from '../../languages'
 import getOpenGraphImages from '../../common/helpers/getOpenGraphImages'
 import { toPlainText } from '@portabletext/react'

web/pageComponents/shared/Teaser.tsx

@@ -4,7 +4,7 @@ import IngressText from './portableText/IngressText'
 import { getUrlFromAction, urlFor } from '../../common/helpers'
 import Img from 'next/image'
 import Image from './SanityImage'
-import type { TeaserData, ImageWithAlt } from '../../types/types'
+import type { TeaserData, ImageWithAlt } from '../../types/index'
 import { ReadMoreLink, ResourceLink } from '../../core/Link'
 import { Heading } from '../../core/Typography'
 import { getLocaleFromName } from '../../lib/localization'

web/pageComponents/shared/VideoPlayer.tsx

@@ -6,7 +6,7 @@ import {
   VideoPlayerRatios,
   VideoType,
   VideoDesignOptionsType,
-} from '../../types/types'
+} from '../../types/index'
 import { BackgroundContainer } from '@components'
 import { urlFor } from '../../common/helpers'
 import IngressText from './portableText/IngressText'

web/pageComponents/shared/iframe/BasicIFrame.tsx

@@ -1,5 +1,5 @@
 import styled from 'styled-components'
-import type { IFrameData } from '../../../types/types'
+import type { IFrameData } from '../../../types/index'
 import { BackgroundContainer } from '@components'
 import TitleText from '../portableText/TitleText'
 import IFrame from './IFrame'

web/pageComponents/shared/image/Caption.tsx

@@ -1,4 +1,4 @@
-import type { CaptionData } from 'types/types'
+import type { CaptionData } from 'types/index'
 import { FigureCaption } from '@components'
 import { HTMLAttributes } from 'react'