From 6e6f3f432492e71e2971bb143cbd11619d1bf2ed Mon Sep 17 00:00:00 2001 From: Thomas Hintz Date: Sun, 23 Apr 2023 14:57:53 +0200 Subject: [PATCH] big changes --- src/app/(extra)/layout.jsx | 12 +- src/app/(extra)/reactors/account/layout.jsx | 14 +- src/app/(extra)/reactors/page.jsx | 30 ++- src/app/(main)/layout.jsx | 15 +- src/components/NavBar.jsx | 173 ++++++++++-- src/components/ReactorsLink.jsx | 45 ++++ src/components/UserMenu.jsx | 70 +++++ src/components/UserMenuClient.jsx | 72 +++++ src/db.js | 5 + src/images/reactors3.jpeg | Bin 0 -> 2135354 bytes src/images/reactors4.jpeg | Bin 0 -> 595887 bytes src/images/trs-logo.svg | 274 ++++++++++++++++++++ src/pages/api/create-account.js | 15 +- src/pages/api/sign-in.js | 8 +- src/pages/api/sign-out.js | 2 +- 15 files changed, 666 insertions(+), 69 deletions(-) create mode 100644 src/components/ReactorsLink.jsx create mode 100644 src/components/UserMenu.jsx create mode 100644 src/components/UserMenuClient.jsx create mode 100644 src/images/reactors3.jpeg create mode 100644 src/images/reactors4.jpeg create mode 100644 src/images/trs-logo.svg diff --git a/src/app/(extra)/layout.jsx b/src/app/(extra)/layout.jsx index 9a53b19..22df13d 100644 --- a/src/app/(extra)/layout.jsx +++ b/src/app/(extra)/layout.jsx @@ -1,10 +1,14 @@ +import UserMenu from '@/components/UserMenu'; +import ReactorsLink from '@/components/ReactorsLink'; import NavBar from '@/components/NavBar' export default function ExtraLayout({children}) { return ( -
- - {children} -
+ <> + )} reactorsLink={()} /> +
+ {children} +
+ ); } diff --git a/src/app/(extra)/reactors/account/layout.jsx b/src/app/(extra)/reactors/account/layout.jsx index 9d02a0b..e314410 100644 --- a/src/app/(extra)/reactors/account/layout.jsx +++ b/src/app/(extra)/reactors/account/layout.jsx @@ -23,17 +23,5 @@ export default async function Layout({ children }) { if (!userId) { redirect('/reactors'); } - return ( - <> - signed in as: {userId} - - {children} - - ); + return children; }; diff --git a/src/app/(extra)/reactors/page.jsx b/src/app/(extra)/reactors/page.jsx index e35a45d..8d56aff 100644 --- a/src/app/(extra)/reactors/page.jsx +++ b/src/app/(extra)/reactors/page.jsx @@ -5,7 +5,8 @@ import { Container } from '@/components/Container'; import { CheckIcon } from '@heroicons/react/20/solid' -import reactorsBackground from '@/images/reactors2.jpg'; +import reactorsBackground from '@/images/reactors3.jpeg'; +import reactorsBackground2 from '@/images/reactors4.jpeg'; const features = [ { @@ -67,8 +68,8 @@ export default async function Page() {
TODO reactors background
-

+

Join The Reactors!

-

+

The BEST way to support the show and gain access to subscriber-only bonus content!

+
+ + Already have an account? Sign In + +
Product screenshot -
+ )} reactorsLink={()} /> +
Hosted by @@ -194,7 +198,7 @@ function Layout({ children }) {
-

The React Show @@ -254,8 +257,8 @@ function Layout({ children }) {

- -
{children}
+ +
{children}