add a proper login page

This commit is contained in:
Thomas Ruoff
2020-11-04 00:14:29 +01:00
parent b283ffe476
commit 1dfd1f1f8b
6 changed files with 163 additions and 38 deletions

View File

@@ -1,5 +1,5 @@
import { GetServerSideProps } from 'next'
import React, { useEffect, useState } from 'react'
import { GetServerSideProps } from 'next'
import Footer from '../../../../components/footer'
import Header from '../../../../components/header'
import Input from '../../../../components/input'
@@ -11,31 +11,26 @@ import { getMilageMax } from '../../../../db/index'
import { dateFormatFrontend } from '../../../../helpers/date'
import { getBillTotal } from '../../../../helpers/bill'
import { getBookingStatus } from '../../../../helpers/booking'
import authenticate from '../../../../lib/authenticate'
import withSession from '../../../../lib/session'
import withSession, { isAdminSession } from '../../../../lib/session'
import { getServerSideBooking } from '../../../../lib/getServerSideProps'
export const getServerSideProps: GetServerSideProps = withSession(
async (context) => {
const { req, res } = context
const authenticatedUser = authenticate(req, res)
if (!authenticatedUser) {
// TODO: not sure if needed
req?.session.destroy()
const adminUser = isAdminSession(req, res)
if (!adminUser) {
return { props: {} }
}
req.session.set('user', authenticatedUser)
await req.session.save()
const milageMax = await getMilageMax()
const result = await getServerSideBooking(context)
return {
...result,
// TODO: have a closer look at this type issue. Seems like a bug
// @ts-ignore
props: { ...result.props, milageMax },
props: { ...result.props, milageMax, user: adminUser },
}
}
)
@@ -107,7 +102,7 @@ async function saveBill(
return response.json()
}
export default function BillPage({
export default function BookingBillPage({
booking: bookingProp,
milageMax,
}: {

View File

@@ -1,14 +1,35 @@
import React, { useEffect, useState } from 'react'
import { GetServerSideProps } from 'next'
import Footer from '../../../../components/footer'
import Header from '../../../../components/header'
import Calendar from '../../../../components/calendar'
import withSession, { isAdminSession } from '../../../../lib/session'
import { getServerSideBooking } from '../../../../lib/getServerSideProps'
import { BookingDocument } from '../../../../db/booking'
import { getBookingStatus } from '../../../../helpers/booking'
import { dateFormatFrontend } from '../../../../helpers/date'
import { BOOKING_STATUS } from '../../../../db/enums'
export const getServerSideProps = getServerSideBooking
export const getServerSideProps: GetServerSideProps = withSession(
async (context) => {
const { req, res } = context
console.error('here')
const adminUser = isAdminSession(req, res)
if (!adminUser) {
return { props: {} }
}
const result = await getServerSideBooking(context)
return {
...result,
// TODO: have a closer look at this type issue. Seems like a bug
// @ts-ignore
props: { ...result.props, user: adminUser },
}
}
)
async function patchBooking(uuid: string, bookingData: any) {
const response = await fetch(`/api/admin/booking/${uuid}`, {