improved the build config.

frontend/pages/_app.tsx

@@ -1,5 +1,6 @@
 import App from 'next/app'
 import { ApolloProvider } from '@apollo/client'
+import { createContext } from 'react'
 
 import Page from '../src/app/components/Page'
 import client from '../src/lib/apollo'
@@ -9,26 +10,12 @@ import circuit2 from '../circuit2'
 import circuit1 from '../circuit1'
 import homework from '../homework'
 import corona1 from '../corona1'
-import { createContext } from 'react'
 
 const trainings = [corona1, homework, circuit1, circuit2]
 
 export const TrainingContext = createContext(trainings)
 
 class MyApp extends App {
-  static async getInitialProps({ Component, ctx }: any) {
-    let pageProps: any = {}
-
-    if (Component.getInitialProps) {
-      pageProps = await Component.getInitialProps(ctx)
-    }
-
-    // Add the query object to the pageProps
-    // https://github.com/wesbos/Advanced-React/blob/master/finished-application/frontend/pages/_app.js
-    pageProps.query = ctx.query
-    return { pageProps }
-  }
-
   render() {
     const { Component, pageProps } = this.props
 

frontend/pages/admin/users.js

@@ -1,15 +0,0 @@
-import { withRouter } from 'next/router'
-
-import { useCurrentUserQuery } from '../../src/gql'
-import { UserAdmin } from '../../src/user'
-
-const UserAdminPage = () => {
-  const { data, loading, error } = useCurrentUserQuery()
-  console.log('UserPage', data, loading, error && error.message)
-
-  return (
-    <UserAdmin />
-  )
-}
-
-export default withRouter(UserAdminPage)

frontend/pages/timer.tsx

@@ -1,24 +0,0 @@
-import { Timer } from '../src/timer'
-import { useContext, useState, useEffect } from 'react'
-import { TrainingContext } from './_app'
-import { useRouter } from 'next/router'
-
-const TimerPage = () => {
-  const trainingList = useContext(TrainingContext)
-  const [trainingIndex, setTrainingIndex] = useState(trainingList.length - 1)
-  const router = useRouter()
-  const queryId = router.query && router.query.id
-
-  useEffect(() => {
-    if (typeof queryId !== 'string') return
-    const intId = parseInt(queryId)
-    if (intId < 0 || intId + 1 > trainingList.length) return
-    setTrainingIndex(intId)
-  }, [router.query])
-
-  const { trainings } = trainingList[trainingIndex]
-
-  return <Timer training={trainings[0]} />
-}
-
-export default TimerPage

frontend/pages/timer/[id].tsx

@@ -1,3 +1,3 @@
-import TimerPage from '../timer'
+import TimerPage from './index'
 
 export default TimerPage

frontend/pages/timer/index.tsx

@@ -1,3 +1,24 @@
-import TimerPage from '../timer'
+import { Timer } from '../../src/timer'
+import { useContext, useState, useEffect } from 'react'
+import { TrainingContext } from '../_app'
+import { useRouter } from 'next/router'
+
+const TimerPage = () => {
+  const trainingList = useContext(TrainingContext)
+  const [trainingIndex, setTrainingIndex] = useState(trainingList.length - 1)
+  const router = useRouter()
+  const queryId = router.query && router.query.id
+
+  useEffect(() => {
+    if (typeof queryId !== 'string') return
+    const intId = parseInt(queryId)
+    if (intId < 0 || intId + 1 > trainingList.length) return
+    setTrainingIndex(intId)
+  }, [router.query])
+
+  const { trainings } = trainingList[trainingIndex]
+
+  return <Timer training={trainings[0]} />
+}
 
 export default TimerPage

frontend/pages/user.tsx

@@ -1,37 +0,0 @@
-import { withRouter } from 'next/router'
-
-import { useCurrentUserQuery } from '../src/gql'
-
-import {
-  SignupForm,
-  LoginForm,
-  LogoutButton,
-  RequestPassword,
-  ResetPassword,
-  UserDetails,
-  DeleteUserButton
-} from '../src/user'
-
-const UserPage = () => {
-  const { data, loading, error } = useCurrentUserQuery()
-  console.log('UserPage', data, loading, error && error.message)
-  //const user = data && data.me
-
-  if (loading) return <p>Loading user data...</p>
-  if (error) return <p>Error loading user data.</p>
-
-  return (
-    <>
-      {/*loading && <p>'Loading'</p>}
-      {user ? <LogoutButton /> : <LoginForm />}
-      <SignupForm />
-      <RequestPassword />
-      <ResetPassword />
-      {user && <UserDetails user={user} />}
-  {user && <DeleteUserButton user={user} />*/}
-      <p>nothing here.</p>
-    </>
-  )
-}
-
-export default withRouter(UserPage)

frontend/src/app/components/Logo.tsx

@@ -37,7 +37,7 @@ const Logo = () => (
           height: 0.2em;
           border-radius: 50%;
           background-color: white;
-          right: 40%;
+          right: 50%;
           bottom: 55%;
         }
 

frontend/src/training/components/Training.tsx

@@ -6,7 +6,6 @@ import { ITraining } from '../types'
 import TrainingMeta from './TrainingMeta'
 
 const Training = ({ training, index }: { training: ITraining; index: number }) => {
-  console.log('Training', training, index)
   return (
     <article>
       <h2>{training.title}</h2>

frontend/src/training/components/TrainingBlock.tsx

@@ -3,7 +3,6 @@ import { calculateDuration, formatTime } from '../utils'
 import { IBlock } from '../types'
 
 const TrainingBlock = ({ block }: { block: IBlock }) => {
-  console.log('Training Block', block)
   const duration = calculateDuration(block)
   return (
     <div>