From 2fd3a47e72971be97af899214da90099335d8ec5 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Fri, 9 Sep 2022 00:17:47 +0200 Subject: [PATCH] move Layout into _app.tsx --- pages/_app.tsx | 18 ++-- pages/admin/bookings/[uuid]/bill.tsx | 14 ++- pages/admin/bookings/[uuid]/index.tsx | 5 +- pages/admin/index.tsx | 13 +-- pages/book.tsx | 5 +- pages/bookings/[uuid]/index.tsx | 25 +++-- pages/bookings/[uuid]/stored.tsx | 5 +- pages/impressum.tsx | 6 +- pages/index.tsx | 127 +++++++++++++------------- pages/prices.tsx | 6 +- pages/privacy.tsx | 10 +- pages/terms.tsx | 10 +- 12 files changed, 112 insertions(+), 132 deletions(-) diff --git a/pages/_app.tsx b/pages/_app.tsx index 488150d..ce5bb92 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,7 +1,11 @@ export { reportWebVitals } from 'next-axiom' import { useEffect } from 'react' +import type { AppProps } from 'next/app' + import { useSession, signIn, SessionProvider } from 'next-auth/react' +import Layout from '../components/layout'; + import '../styles/index.css' function Auth({ children }) { @@ -29,13 +33,15 @@ export default function MyApp({ return (
- {Component.authenticationRequired ? ( - + + {Component.authenticationRequired ? ( + + + + ) : ( - - ) : ( - - )} + )} +
) diff --git a/pages/admin/bookings/[uuid]/bill.tsx b/pages/admin/bookings/[uuid]/bill.tsx index 7b57029..fc2e7f0 100644 --- a/pages/admin/bookings/[uuid]/bill.tsx +++ b/pages/admin/bookings/[uuid]/bill.tsx @@ -1,5 +1,4 @@ import React, { useEffect, useState } from 'react' -import Layout from '../../../../components/layout' import Input from '../../../../components/input' import Select from '../../../../components/select' import { Booking } from '../../../../db/booking' @@ -115,14 +114,14 @@ function BookingBillPage({ setStoringInProgress(false) } - const onAddAdditionalCost = function ( + const onAddAdditionalCost = function( event: React.MouseEvent ) { event.preventDefault() setAdditionalCosts([...additionalCosts, { name: '', value: 0 }]) } - const onRemoveAdditionalCost = function ( + const onRemoveAdditionalCost = function( event: React.MouseEvent, index: number ) { @@ -134,7 +133,7 @@ function BookingBillPage({ } return ( - + <> {booking && (
@@ -198,9 +197,8 @@ function BookingBillPage({ > - - +
)} - + ) } diff --git a/pages/admin/bookings/[uuid]/index.tsx b/pages/admin/bookings/[uuid]/index.tsx index 89a287e..ba0794b 100644 --- a/pages/admin/bookings/[uuid]/index.tsx +++ b/pages/admin/bookings/[uuid]/index.tsx @@ -1,7 +1,6 @@ import React, { useEffect, useState } from 'react' import { useRouter } from 'next/router' import Link from 'next/link' -import Layout from '../../../../components/layout' import Calendar from '../../../../components/calendar' import { getServerSideBooking } from '../../../../lib/getServerSideProps' import { Booking } from '../../../../db/booking' @@ -37,7 +36,7 @@ function ShowBookingAdmin({ booking: bookingProp }: { booking: Booking }) { } return ( - + <>

Buchung {booking.uuid}

@@ -71,7 +70,7 @@ function ShowBookingAdmin({ booking: bookingProp }: { booking: Booking }) { Rechnung
- + ) } diff --git a/pages/admin/index.tsx b/pages/admin/index.tsx index b8c7332..a39a521 100644 --- a/pages/admin/index.tsx +++ b/pages/admin/index.tsx @@ -1,6 +1,5 @@ import React from 'react' import BookingTable from '../../components/bookingTable' -import Layout from '../../components/layout' import { getServerSideRecentBookings } from '../../lib/getServerSideProps' @@ -9,20 +8,18 @@ export const getServerSideProps = getServerSideRecentBookings function AdminRecentBookings({ bookings }) { if (!bookings || !bookings.length) { return ( - -

- No recent bookings 😿 -

- +

+ No recent bookings 😿 +

) } return ( - + <> {bookings.map((booking: any) => ( ))} - + ) } diff --git a/pages/book.tsx b/pages/book.tsx index 03ec93b..8b326b5 100644 --- a/pages/book.tsx +++ b/pages/book.tsx @@ -1,11 +1,10 @@ -import Layout from '../components/layout' import Book from '../components/book' export default function Home() { return ( - + <>

Buchungsanfrage

- + ) } diff --git a/pages/bookings/[uuid]/index.tsx b/pages/bookings/[uuid]/index.tsx index 3d40be7..9c700ec 100644 --- a/pages/bookings/[uuid]/index.tsx +++ b/pages/bookings/[uuid]/index.tsx @@ -1,5 +1,4 @@ import React, { useEffect, useState } from 'react' -import Layout from '../../../components/layout' import { getServerSideBooking } from '../../../lib/getServerSideProps' import { Booking } from '../../../db/booking' import { BOOKING_STATUS } from '../../../db/enums' @@ -41,7 +40,7 @@ export default function ShowBooking({ } return ( - + <>
Buchungsstatus: {getBookingStatus(booking.status)}
@@ -54,16 +53,16 @@ export default function ShowBooking({ {[BOOKING_STATUS.CONFIRMED, BOOKING_STATUS.REQUESTED].includes( booking.status ) && ( -
- -
- )} - +
+ +
+ )} + ) } diff --git a/pages/bookings/[uuid]/stored.tsx b/pages/bookings/[uuid]/stored.tsx index 71441c4..440d52d 100644 --- a/pages/bookings/[uuid]/stored.tsx +++ b/pages/bookings/[uuid]/stored.tsx @@ -1,6 +1,5 @@ import React, { useEffect, useState } from 'react' import Link from 'next/link' -import Layout from '../../../components/layout' import { Booking } from '../../../db/booking' import { loadBookingData, storeBookingData } from '../../../helpers/storage' import { getServerSideBooking } from '../../../lib/getServerSideProps' @@ -19,7 +18,7 @@ export default function ShowBookingStored({ booking }: { booking: Booking }) { } return ( - + <>

Vielen Dank für die Buchungsanfrage

@@ -52,6 +51,6 @@ export default function ShowBookingStored({ booking }: { booking: Booking }) {

)} - + ) } diff --git a/pages/impressum.tsx b/pages/impressum.tsx index ad0df64..2f59e9d 100644 --- a/pages/impressum.tsx +++ b/pages/impressum.tsx @@ -5,13 +5,9 @@ import { MDXRemote } from 'next-mdx-remote' import mdComponents from '../components/mdComponents' -import Layout from '../components/layout' - export default function TermsPage({ source }) { return ( - - - + ) } diff --git a/pages/index.tsx b/pages/index.tsx index 864c2e8..5b1ea19 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,74 +1,71 @@ import Link from 'next/link' -import Layout from '../components/layout' export default function Home() { return ( - -
-

- Pfadi-Bussle{' '} - - des Freundeskreis des VCP Rosenfeld e.V. - -

-

- Für Lager, Vereinsausflüge, Urlaubsreisen, Umzüge, etc. kann man unser - Pfadi-Bussle mieten. -

-

- Das Bussle ist ein VW T4 Kleinbus mit 9 Sitzplätzen (inkl. Fahrer), - mit Klimaanlage, Radio/CD/Aux und Anhängerkupplung. Die zweite und - dritte Sitzreihe können ausgebaut werden. -

-

- - Preise - {' '} - und{' '} - - Mietbedingungen - -

- -

- Du hast weiter Fragen melde Dich gerne per -
- - E-Mail - - , Telefon{' '} - - 0151 / 21225302 - {' '} - oder{' '} - - - - Whatsapp - - +

) } diff --git a/pages/prices.tsx b/pages/prices.tsx index 798fab0..174c0fe 100644 --- a/pages/prices.tsx +++ b/pages/prices.tsx @@ -1,8 +1,6 @@ -import Layout from '../components/layout' - export default function Prices() { return ( - + <>

Preise

@@ -43,6 +41,6 @@ export default function Prices() {
- + ) } diff --git a/pages/privacy.tsx b/pages/privacy.tsx index 05b10b0..559eca2 100644 --- a/pages/privacy.tsx +++ b/pages/privacy.tsx @@ -3,15 +3,11 @@ import { serialize } from 'next-mdx-remote/serialize' import { MDXRemote } from 'next-mdx-remote' import mdComponents from '../components/mdComponents' -import Layout from '../components/layout' - export default function TermsPage({ source }) { return ( - -
- -
- +
+ +
) } diff --git a/pages/terms.tsx b/pages/terms.tsx index 68d02e8..1abaf24 100644 --- a/pages/terms.tsx +++ b/pages/terms.tsx @@ -5,15 +5,11 @@ import { MDXRemote } from 'next-mdx-remote' import mdComponents from '../components/mdComponents' -import Layout from '../components/layout' - export default function TermsPage({ source }) { return ( - -
- -
- +
+ +
) }