diff --git a/.gitignore b/.gitignore index 7e8f66bb..d35db9fb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ coverage build .terraform* terraform.tfstate* +!.terraform.lock.hcl # Ignore all .env files except .env.example .env* diff --git a/src/backend/auth/options.ts b/src/backend/auth/options.ts index 3508770c..a08fa6b5 100644 --- a/src/backend/auth/options.ts +++ b/src/backend/auth/options.ts @@ -1,8 +1,11 @@ import GoogleProvider from "next-auth/providers/google"; import { createPersistedAuthAdapter } from "@/backend/auth/adapter"; import { KyselyDatabaseInstance } from "../lib"; +import type { NextAuthOptions } from "next-auth"; -export const getNextAuthOptions = (db: KyselyDatabaseInstance) => ({ +export const getNextAuthOptions = ( + db: KyselyDatabaseInstance +): NextAuthOptions => ({ providers: [ GoogleProvider({ clientId: process.env.GOOGLE_CLIENT_ID as string, @@ -10,4 +13,7 @@ export const getNextAuthOptions = (db: KyselyDatabaseInstance) => ({ }), ], adapter: createPersistedAuthAdapter(db), + pages: { + signIn: "/signInPage", + }, }); diff --git a/src/components/layout/Layout.module.css b/src/components/layout/Layout.module.css index 8b87fe17..c3fc45d5 100644 --- a/src/components/layout/Layout.module.css +++ b/src/components/layout/Layout.module.css @@ -11,7 +11,7 @@ color: var(--on-background); height: 100%; width: 100%; - padding: 1em; + padding: 5em 3em 3em 3em; } .mainPurple { @@ -24,18 +24,27 @@ background-color: var(--grey-80); } +/* @media only screen and (max-width: 480px) { + .main { + padding: 5em 3em 3em 3em; + } +} */ + @media only screen and (min-width: 480px) { + .main { + padding: 5em 3em 3em 3em; + } } /* Small Devices, Tablets */ @media only screen and (min-width: 768px) { + .main { + padding: 5em 3em 3em 3em; + } } /* Medium Devices, Desktops */ @media only screen and (min-width: 992px) { - .main { - padding: 5em; - } } /* Large Devices, Wide Screens */ diff --git a/src/components/navbar/NavBar.tsx b/src/components/navbar/NavBar.tsx index 20faa1c2..18b8f653 100644 --- a/src/components/navbar/NavBar.tsx +++ b/src/components/navbar/NavBar.tsx @@ -1,4 +1,22 @@ -import React from "react"; +import CloseIcon from "@mui/icons-material/Close"; +import CoPresent from "@mui/icons-material/CoPresent"; +import Logout from "@mui/icons-material/Logout"; +import MenuIcon from "@mui/icons-material/Menu"; +import PeopleOutline from "@mui/icons-material/PeopleOutline"; +import Settings from "@mui/icons-material/Settings"; +import AppBar from "@mui/material/AppBar"; +import Box from "@mui/material/Box"; +import Drawer from "@mui/material/Drawer"; +import IconButton from "@mui/material/IconButton"; +import List from "@mui/material/List"; +import ListItem from "@mui/material/ListItem"; +import Toolbar from "@mui/material/Toolbar"; +import useMediaQuery from "@mui/material/useMediaQuery"; +import { signOut, useSession } from "next-auth/react"; +import Image from "next/image"; +import Link from "next/link"; +import * as React from "react"; +import { MouseEventHandler } from "react"; import $navbar from "./Navbar.module.css"; import Link from "next/link"; import Image from "next/image"; @@ -7,7 +25,6 @@ import { CoPresent, Settings, Logout, - Info, } from "@mui/icons-material"; import { signOut } from "next-auth/react"; import { useSession } from "next-auth/react"; @@ -19,7 +36,7 @@ const NavBar = () => { <> {status === "authenticated" && (