mirror of
https://github.com/linsa-io/linsa.git
synced 2026-01-12 12:20:23 +01:00
Merge branch 'main' into tasks
This commit is contained in:
@@ -1,19 +1,27 @@
|
||||
"use client"
|
||||
|
||||
import type { Viewport } from "next"
|
||||
import { Sidebar } from "@/components/custom/sidebar/sidebar"
|
||||
import { CommandPalette } from "@/components/custom/command-palette/command-palette"
|
||||
import { useAccountOrGuest } from "@/lib/providers/jazz-provider"
|
||||
import { LearnAnythingOnboarding } from "@/components/custom/learn-anything-onboarding"
|
||||
import { Shortcut } from "@/components/custom/Shortcut/shortcut"
|
||||
import { GlobalKeydownHandler } from "@/components/custom/global-keydown-handler"
|
||||
|
||||
export const viewport: Viewport = {
|
||||
width: "device-width, shrink-to-fit=no",
|
||||
maximumScale: 1,
|
||||
userScalable: false
|
||||
}
|
||||
|
||||
export default function PageLayout({ children }: { children: React.ReactNode }) {
|
||||
const { me } = useAccountOrGuest()
|
||||
|
||||
return (
|
||||
<div className="flex h-full min-h-full w-full flex-row items-stretch overflow-hidden">
|
||||
<Sidebar />
|
||||
<LearnAnythingOnboarding />
|
||||
<GlobalKeydownHandler />
|
||||
|
||||
{me._type !== "Anonymous" && <CommandPalette />}
|
||||
<CommandPalette />
|
||||
<Shortcut />
|
||||
|
||||
<div className="flex min-w-0 flex-1 flex-col">
|
||||
<div className="relative flex min-w-0 flex-1 flex-col">
|
||||
<main className="relative flex flex-auto flex-col place-items-stretch overflow-auto lg:my-2 lg:mr-2 lg:rounded-md lg:border">
|
||||
{children}
|
||||
</main>
|
||||
|
||||
5
web/app/(pages)/topics/page.tsx
Normal file
5
web/app/(pages)/topics/page.tsx
Normal file
@@ -0,0 +1,5 @@
|
||||
import { TopicRoute } from "@/components/routes/topics/TopicRoute"
|
||||
|
||||
export default function Page() {
|
||||
return <TopicRoute />
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { Metadata } from "next"
|
||||
import type { Metadata, Viewport } from "next"
|
||||
import { cn } from "@/lib/utils"
|
||||
import { ThemeProvider } from "@/lib/providers/theme-provider"
|
||||
import "./globals.css"
|
||||
@@ -10,7 +10,13 @@ import { DeepLinkProvider } from "@/lib/providers/deep-link-provider"
|
||||
import { GeistMono, GeistSans } from "./fonts"
|
||||
import { JazzAndAuth } from "@/lib/providers/jazz-provider"
|
||||
import { TooltipProvider } from "@/components/ui/tooltip"
|
||||
import { LearnAnythingOnboarding } from "@/components/custom/learn-anything-onboarding"
|
||||
|
||||
export const viewport: Viewport = {
|
||||
width: "device-width",
|
||||
height: "device-height",
|
||||
initialScale: 1,
|
||||
viewportFit: "cover"
|
||||
}
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Learn Anything",
|
||||
@@ -43,7 +49,7 @@ export default function RootLayout({
|
||||
<body className={cn("h-full w-full font-sans antialiased", GeistSans.variable, GeistMono.variable)}>
|
||||
<Providers>
|
||||
{children}
|
||||
<LearnAnythingOnboarding />
|
||||
|
||||
<Toaster expand={false} />
|
||||
</Providers>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user