updatedAt value with teams page

Starchasers · Oct 7, 2021 · 61898d9 · 61898d9
1 parent f7f80b8
commit 61898d9
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/src/components/elements/Layout/Footer.tsx b/src/components/elements/Layout/Footer.tsx
@@ -3,12 +3,15 @@ import React from 'react'
 import format from 'date-fns/format'
 
 import Page from '../../blocks/Page'
-import { LayoutProps } from './index'
 import Container from '../Container'
 import theme from '../../../assets/theme'
 import Columns from '../Columns'
 
-const Footer = (props: Omit<Omit<LayoutProps, 'title'>, 'children'>) => (
+export interface IFooter {
+  updatedAt?: Date
+}
+
+const Footer = (props: IFooter) => (
   <Page.Footer {...props}>
     <Page.Footer.Nav>
       <Container>
@@ -30,15 +33,14 @@ const Footer = (props: Omit<Omit<LayoutProps, 'title'>, 'children'>) => (
             </a>
           </div>
           <div />
-          {props.contentPage.sys.updatedAt && (
+          {props.updatedAt && (
             <div>
               <span
                 className={css`
                   opacity: 0.5;
                 `}
               >
-                Last modified:{' '}
-                {format(new Date(props.contentPage.sys.updatedAt), 'dd.MM.yyyy kk:mm')}
+                Last modified: {format(new Date(props.updatedAt), 'dd.MM.yyyy kk:mm')}
               </span>
             </div>
           )}

diff --git a/src/components/elements/Layout/index.tsx b/src/components/elements/Layout/index.tsx
@@ -4,13 +4,13 @@ import Head from 'next/head'
 import Providers from './Providers'
 import Page from '../../blocks/Page'
 import Header from './Header'
-import Footer from './Footer'
+import Footer, { IFooter } from './Footer'
 
 import { ILayoutData } from '../../../utils/contentful/models/getLayoutData'
 import { IMetaTag } from '../../../../@types/generated/contentful'
 import { IContentPageData } from '../../../utils/contentful/models/getContentPageData'
 
-export interface LayoutProps extends ILayoutData, IContentPageData {
+export interface LayoutProps extends ILayoutData, IContentPageData, IFooter {
   children: ReactChild
   title?: string
   metaTags?: IMetaTag[]
@@ -27,7 +27,7 @@ const Layout = ({ title, children, metaTags, ...props }: LayoutProps) => (
     <Page>
       <Header {...props} />
       <Page.Content {...props} children={children} />
-      <Footer {...props} />
+      <Footer {...props} updatedAt={props.updatedAt ?? new Date(props.contentPage.sys.updatedAt)} />
     </Page>
   </Providers>
 )

diff --git a/src/pages/[id].tsx b/src/pages/[id].tsx
@@ -1,5 +1,5 @@
-import React from 'react'
 import { GetStaticPaths, GetStaticProps } from 'next'
+import React from 'react'
 
 import Layout from '../components/elements/Layout'
 import getLayoutData, { ILayoutData } from '../utils/contentful/models/getLayoutData'

diff --git a/src/pages/coordinates-calculation.tsx b/src/pages/coordinates-calculation.tsx
@@ -1,3 +1,4 @@
+import { GetStaticProps } from 'next'
 import React from 'react'
 
 import Layout from '../components/elements/Layout'
@@ -21,7 +22,7 @@ const CoordinatesCalculation = (props: ICoordinatesCalculationPageProps) => (
   </Layout>
 )
 
-export const getStaticProps = async (): Promise<{ props: ICoordinatesCalculationPageProps }> => {
+export const getStaticProps: GetStaticProps<ICoordinatesCalculationPageProps> = async () => {
   const layout = await getLayoutData()
   const contentPage = await getContentPageData('coordinates-calculation')
   const coordinatesData = await getCoordinatesData()

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -1,3 +1,4 @@
+import { GetStaticProps } from 'next'
 import React from 'react'
 
 import Layout from '../components/elements/Layout'
@@ -17,7 +18,7 @@ const Home = (props: IHomePageProps) => (
   </Layout>
 )
 
-export const getStaticProps = async (): Promise<{ props: IHomePageProps }> => {
+export const getStaticProps: GetStaticProps<IHomePageProps> = async () => {
   const layout = await getLayoutData()
   const contentPage = await getContentPageData('')
 

diff --git a/src/pages/teams.tsx b/src/pages/teams.tsx
@@ -1,3 +1,4 @@
+import { GetStaticProps } from 'next'
 import React from 'react'
 
 import Layout from '../components/elements/Layout'
@@ -20,12 +21,22 @@ const CoordinatesCalculation = (props: IWarTeamsPageProps) => (
     {...props}
     title={`${props.contentPage?.fields.title} | ${props.layout.fields.projectNameShort}`}
     metaTags={props.contentPage.fields.metaTags}
+    updatedAt={
+      new Date(
+        [...props.warTeamsPage.fields.groupA, ...props.warTeamsPage.fields.groupB].sort(
+          (groupA, groupB) =>
+            new Date(groupA.sys.updatedAt).getTime() < new Date(groupB.sys.updatedAt).getTime()
+              ? 1
+              : -1
+        )?.[0].sys.updatedAt ?? props.contentPage.sys.updatedAt
+      )
+    }
   >
     <WarTeamsPage {...props} />
   </Layout>
 )
 
-export const getStaticProps = async (): Promise<{ props: IWarTeamsPageProps }> => {
+export const getStaticProps: GetStaticProps<IWarTeamsPageProps> = async () => {
   const layout = await getLayoutData()
   const contentPage = await getContentPageData('teams')
   const coordinatesData = await getCoordinatesData()