From 2b157c7c8a3c7564fec14a54e34200244931a819 Mon Sep 17 00:00:00 2001 From: Sergey Mankovsky Date: Sun, 1 Sep 2024 01:26:15 +0200 Subject: [PATCH] Show fullscreen room --- www/app/(app)/layout.tsx | 119 ++++++++++++++++++++++++++++++++++++ www/app/[roomName]/page.tsx | 2 +- www/app/layout.tsx | 110 +-------------------------------- 3 files changed, 121 insertions(+), 110 deletions(-) create mode 100644 www/app/(app)/layout.tsx diff --git a/www/app/(app)/layout.tsx b/www/app/(app)/layout.tsx new file mode 100644 index 00000000..827b11af --- /dev/null +++ b/www/app/(app)/layout.tsx @@ -0,0 +1,119 @@ +import { Container, Flex, Link } from "@chakra-ui/layout"; +import { getConfig } from "../lib/edgeConfig"; +import NextLink from "next/link"; +import Image from "next/image"; +import About from "../(aboutAndPrivacy)/about"; +import Privacy from "../(aboutAndPrivacy)/privacy"; +import UserInfo from "../(auth)/userInfo"; + +export default async function AppLayout({ + children, +}: { + children: React.ReactNode; +}) { + const hostname = new URL(process.env.NEXT_PUBLIC_SITE_URL!).hostname; + const config = await getConfig(hostname); + const { requireLogin, privacy, browse, rooms } = config.features; + return ( + + + {/* Logo on the left */} + + Reflector +
+

+ Reflector +

+

+ Capture the signal, not the noise +

+
+ +
+ {/* Text link on the right */} + + Create + + {browse ? ( + <> +  ·  + + Browse + + + ) : ( + <> + )} + {rooms ? ( + <> +  ·  + + Rooms + + + ) : ( + <> + )} +  ·  + + {privacy ? ( + <> +  ·  + + + ) : ( + <> + )} + {requireLogin ? ( + <> +  ·  + + + ) : ( + <> + )} +
+
+ + {children} +
+ ); +} diff --git a/www/app/[roomName]/page.tsx b/www/app/[roomName]/page.tsx index 35ba3422..e103b2f3 100644 --- a/www/app/[roomName]/page.tsx +++ b/www/app/[roomName]/page.tsx @@ -25,7 +25,7 @@ export default function Room(details: RoomDetails) { )} diff --git a/www/app/layout.tsx b/www/app/layout.tsx index 087d9c0d..b167a3b2 100644 --- a/www/app/layout.tsx +++ b/www/app/layout.tsx @@ -2,20 +2,14 @@ import "./styles/globals.scss"; import { Poppins } from "next/font/google"; import { Metadata, Viewport } from "next"; import FiefWrapper from "./(auth)/fiefWrapper"; -import UserInfo from "./(auth)/userInfo"; import { ErrorProvider } from "./(errors)/errorContext"; import ErrorMessage from "./(errors)/errorMessage"; -import Image from "next/image"; -import About from "./(aboutAndPrivacy)/about"; -import Privacy from "./(aboutAndPrivacy)/privacy"; import { DomainContextProvider } from "./domainContext"; import { getConfig } from "./lib/edgeConfig"; import { ErrorBoundary } from "@sentry/nextjs"; import { cookies } from "next/dist/client/components/headers"; import { SESSION_COOKIE_NAME } from "./lib/fief"; import { Providers } from "./providers"; -import NextLink from "next/link"; -import { Container, Flex, Link } from "@chakra-ui/react"; const poppins = Poppins({ subsets: ["latin"], weight: ["200", "400", "600"] }); @@ -74,7 +68,6 @@ export default async function RootLayout({ }) { const hostname = new URL(process.env.NEXT_PUBLIC_SITE_URL!).hostname; const config = await getConfig(hostname); - const { requireLogin, privacy, browse, rooms } = config.features; const hasAuthCookie = !!cookies().get(SESSION_COOKIE_NAME); return ( @@ -89,108 +82,7 @@ export default async function RootLayout({ "something went really wrong"

}> - - - - {/* Logo on the left */} - - Reflector -
-

- Reflector -

-

- Capture the signal, not the noise -

-
- -
- {/* Text link on the right */} - - Create - - {browse ? ( - <> -  ·  - - Browse - - - ) : ( - <> - )} - {rooms ? ( - <> -  ·  - - Rooms - - - ) : ( - <> - )} -  ·  - - {privacy ? ( - <> -  ·  - - - ) : ( - <> - )} - {requireLogin ? ( - <> -  ·  - - - ) : ( - <> - )} -
-
- - {children} -
-
+ {children}