Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

17 fix auth store refresh page bug #18

Merged
merged 13 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
// Set the default
"editor.formatOnSave": false,
// Enable per-language
"[javascript]": {
"editor.formatOnSave": true
},
"[typescript]": {
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.formatOnSave": true
},
"[html]": {
"editor.formatOnSave": true
},
}
150 changes: 102 additions & 48 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@radix-ui/react-navigation-menu": "^1.1.4",
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-scroll-area": "^1.0.5",
"@radix-ui/react-select": "^2.0.0",
"@radix-ui/react-separator": "^1.0.3",
"@radix-ui/react-slider": "^1.1.2",
"@radix-ui/react-slot": "^1.0.2",
Expand All @@ -34,7 +35,7 @@
"cmdk": "^0.2.1",
"date-fns": "^3.3.1",
"lucide-react": "^0.314.0",
"next": "14.1.0",
"next": "^14.2.3",
"next-themes": "^0.2.1",
"react": "^18",
"react-day-picker": "^8.10.0",
Expand Down
17 changes: 13 additions & 4 deletions src/app/coaching-sessions/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import {
CollapsibleTrigger,
} from "@/components/ui/collapsible";

import { LockClosedIcon } from "@radix-ui/react-icons";

import {
Tooltip,
TooltipContent,
Expand Down Expand Up @@ -211,12 +213,15 @@ export default function CoachingSessionsPage() {
<div className="grid h-full items-stretch gap-6 md:grid-cols-[1fr_200px]">
<div className="flex-col space-y-4 sm:flex md:order-1">
<Tabs defaultValue="notes" className="flex-1">
<TabsList className="grid w-full grid-cols-4">
<TabsList className="grid flex w-96 grid-cols-4 justify-start">
<TabsTrigger value="notes">Notes</TabsTrigger>
<TabsTrigger value="program">Program</TabsTrigger>
<TabsTrigger value="console">Console</TabsTrigger>
<TabsTrigger value="coachs_notes">
Coach&#39;s Notes
<div className="flex gap-2 items-start">
<LockClosedIcon className="mt-1" />
Coach&#39;s Notes
</div>
</TabsTrigger>
</TabsList>
<TabsContent value="notes">
Expand All @@ -228,10 +233,14 @@ export default function CoachingSessionsPage() {
</div>
</TabsContent>
<TabsContent value="program">
<div className="p-4 min-h-[400px] md:min-h-[630px] lg:min-h-[630px] bg-red-500 text-white">Program</div>
<div className="p-4 min-h-[400px] md:min-h-[630px] lg:min-h-[630px] bg-red-500 text-white">
Program
</div>
</TabsContent>
<TabsContent value="console">
<div className="p-4 min-h-[400px] md:min-h-[630px] lg:min-h-[630px] bg-blue-500 text-white">Console</div>
<div className="p-4 min-h-[400px] md:min-h-[630px] lg:min-h-[630px] bg-blue-500 text-white">
Console
</div>
</TabsContent>
<TabsContent value="coachs_notes">
<div className="flex h-full flex-col space-y-4">
Expand Down
25 changes: 25 additions & 0 deletions src/app/dashboard/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { Metadata } from "next";
import "@/styles/globals.css";
import { siteConfig } from "@/site.config.ts"

import { SiteHeader } from "@/components/ui/site-header"

export const metadata: Metadata = {
title: siteConfig.name,
description: "Generated by create next app",
};

export default function CoachingSessionLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return (
<>
<SiteHeader />
<main>
{children}
</main>
</>
);
}
Loading
Loading