Skip to content

Commit 7376c9f

Browse files
authored
Merge pull request #40 from Jim-Hodapp-Coaching/misc_coaching_page_ui_enhancements
Several coaching session page UI cleanup changes
2 parents 308add3 + ef0fdd3 commit 7376c9f

File tree

5 files changed

+33
-246
lines changed

5 files changed

+33
-246
lines changed

src/app/coaching-sessions/[id]/page.tsx

+7-4
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,10 @@ export default function CoachingSessionsPage() {
129129
></CoachingSessionTitle>
130130
<div className="ml-auto flex w-full space-x-2 sm:justify-end">
131131
<PresetSelector current={current} future={future} past={past} />
132-
<PresetActions />
132+
{/* Hidden for MVP */}
133+
<div className="hidden">
134+
<PresetActions />
135+
</div>
133136
</div>
134137
</div>
135138
</div>
@@ -195,9 +198,9 @@ export default function CoachingSessionsPage() {
195198
className="w-[260px] text-sm"
196199
side="left"
197200
>
198-
Notes refreshing is currently a manual process. To view
199-
changes made by someone else in this session, before making
200-
any new Notes changes yourself, click this button.
201+
To view changes to the Notes made by someone else during this
202+
session, before making any new changes yourself, click this
203+
button.
201204
</HoverCardContent>
202205
</HoverCard>
203206
</div>

src/components/ui/main-nav-menu.tsx

+12-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import { current, future, past } from "../../data/presets";
2828

2929
import { ChevronDownIcon } from "@radix-ui/react-icons";
3030

31-
import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
3231
import {
3332
Card,
3433
CardContent,
@@ -50,6 +49,7 @@ import {
5049
PopoverTrigger,
5150
} from "@/components/ui/popover";
5251
import { useAppStateStore } from "@/lib/providers/app-state-store-provider";
52+
import { siteConfig } from "@/site.config";
5353

5454
export function MainNavMenu() {
5555
const [open, setIsOpen] = React.useState(false);
@@ -62,8 +62,9 @@ export function MainNavMenu() {
6262
<NavigationMenuItem>
6363
<NavigationMenuTrigger>
6464
<span className="hidden font-bold sm:inline-block">
65-
{/* FIXME: Replace "Refactor" with something from siteConfig or something else */}
66-
{organization.name.length > 0 ? organization.name : "Refactor"}
65+
{organization.name.length > 0
66+
? organization.name
67+
: siteConfig.name}
6768
</span>
6869
</NavigationMenuTrigger>
6970
<NavigationMenuContent>
@@ -72,20 +73,23 @@ export function MainNavMenu() {
7273
<NavigationMenuLink asChild>
7374
<a
7475
className="flex h-full w-full select-none flex-col justify-end rounded-md bg-gradient-to-b from-muted/50 to-muted p-6 no-underline outline-none focus:shadow-md"
75-
href="/"
76+
href="/dashboard"
7677
>
77-
<Icons.logo className="h-6 w-6" />
78+
<Icons.refactor_logo className="h-4 w-4" />
7879
<div className="mb-2 mt-4 text-lg font-medium">
79-
Refactor Coaching
80+
{organization.name.length > 0
81+
? organization.name
82+
: siteConfig.name}
8083
</div>
8184
<p className="text-sm leading-tight text-muted-foreground">
82-
Professional software engineer coaching.
85+
{siteConfig.description}
8386
</p>
8487
</a>
8588
</NavigationMenuLink>
8689
</li>
8790

88-
<Card>
91+
{/* Hidden for MVP */}
92+
<Card className="hidden">
8993
<CardHeader>
9094
<CardTitle>Organization & Relationship</CardTitle>
9195
<CardDescription>

src/components/ui/model-selector.tsx

-163
This file was deleted.

src/components/ui/site-header.tsx

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
"use client";
22

3-
import { CommandMenu } from "@/components/ui/command-menu"
4-
import { MainNav } from "@/components/ui/main-nav"
5-
import { MobileNav } from "@/components/ui/mobile-nav"
6-
import { ModeToggle } from "@/components/ui/mode-toggle"
7-
import { UserNav } from "@/components/ui/user-nav"
3+
import { CommandMenu } from "@/components/ui/command-menu";
4+
import { MainNav } from "@/components/ui/main-nav";
5+
import { MobileNav } from "@/components/ui/mobile-nav";
6+
import { ModeToggle } from "@/components/ui/mode-toggle";
7+
import { UserNav } from "@/components/ui/user-nav";
88

99
// import { useRouter } from 'next/navigation'
1010
// import { useAuthStore } from "@/lib/providers/auth-store-provider";
@@ -19,7 +19,7 @@ export function SiteHeader() {
1919

2020
return (
2121
<header className="sticky top-0 z-50 w-full border-b border-border/40 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
22-
<div className="container flex h-14 max-w-screen-2xl items-center">
22+
<div className="flex h-14 pl-4 max-w-screen-2xl items-start">
2323
<MainNav />
2424
<MobileNav />
2525
<div className="flex flex-1 items-center justify-between space-x-2 md:justify-end">
@@ -29,20 +29,20 @@ export function SiteHeader() {
2929
<nav className="flex items-center">
3030
<ModeToggle />
3131
{/* {isLoggedIn ? ( */}
32-
<UserNav />
32+
<UserNav />
3333
{/* ) : ( */}
34-
{/* <> */}
35-
{/* {console.warn("User is not logged in, redirecting to login route.")} */}
36-
{/* TODO: For some reason, this is causing a redirect boundary error / trying to update
34+
{/* <> */}
35+
{/* {console.warn("User is not logged in, redirecting to login route.")} */}
36+
{/* TODO: For some reason, this is causing a redirect boundary error / trying to update
3737
2 components (Router) + (SiteHeader) at the same time. I think it has to do with the
3838
AuthStoreProvider and the two different layouts.
3939
Help: https://reactjs.org/link/setstate-in-render */}
40-
{/* router.push("/login") */}
41-
{/* </> */}
40+
{/* router.push("/login") */}
41+
{/* </> */}
4242
{/* )} */}
4343
</nav>
4444
</div>
4545
</div>
4646
</header>
47-
)
48-
}
47+
);
48+
}

src/components/ui/temperature-selector.tsx

-57
This file was deleted.

0 commit comments

Comments
 (0)