Skip to content
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
25 changes: 11 additions & 14 deletions app/(dashboard)/[tenant]/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { OrganizationChangeHandler } from "@/components/core/organization-change-handler";
import { redirect } from "next/navigation";
import { NuqsAdapter } from "nuqs/adapters/next/app";
import { ReportTimezone } from "@/components/core/report-timezone";
import { Navbar } from "@/components/layout/navbar";
import { isDatabaseReady } from "@/lib/utils/useDatabase";
import { getOwner } from "@/lib/utils/useOwner";
import { TRPCReactProvider } from "@/trpc/client";
import { caller } from "@/trpc/server";
import { redirect } from "next/navigation";
import { NuqsAdapter } from "nuqs/adapters/next/app";

export default async function ConsoleLayout(props: {
children: React.ReactNode;
Expand All @@ -29,18 +28,16 @@ export default async function ConsoleLayout(props: {

return (
<TRPCReactProvider>
<OrganizationChangeHandler>
<NuqsAdapter>
<main className="relative mx-auto w-full flex-grow flex-col">
<Navbar notificationsWire={notificationsWire} />
<div className="min-h-[calc(100vh-97px)] lg:min-w-0 lg:flex-1 pb-8">
{props.children}
</div>
<NuqsAdapter>
<main className="relative mx-auto w-full flex-grow flex-col">
<Navbar notificationsWire={notificationsWire} />
<div className="min-h-[calc(100vh-97px)] lg:min-w-0 lg:flex-1 pb-8">
{props.children}
</div>

<ReportTimezone />
</main>
</NuqsAdapter>
</OrganizationChangeHandler>
<ReportTimezone />
</main>
</NuqsAdapter>
</TRPCReactProvider>
);
}
12 changes: 0 additions & 12 deletions components/core/organization-change-handler.tsx

This file was deleted.

12 changes: 10 additions & 2 deletions components/layout/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import { OrganizationSwitcher, UserButton } from "@clerk/nextjs";
import { dark } from "@clerk/themes";
import { useQueries } from "@tanstack/react-query";
import { useQueries, useQueryClient } from "@tanstack/react-query";
import { ChevronDown, HelpCircle } from "lucide-react";
import Image from "next/image";
import Link from "next/link";
import { useParams, usePathname, useRouter } from "next/navigation";
import { useTheme } from "next-themes";
import { useMemo, useState } from "react";
import { useEffect, useMemo, useState } from "react";
import { Button } from "@/components/ui/button";
import {
DropdownMenu,
Expand Down Expand Up @@ -46,6 +46,14 @@ export function Navbar({ notificationsWire }: { notificationsWire: string }) {

const trpc = useTRPC();

const queryClient = useQueryClient();

useEffect(() => {
queryClient.invalidateQueries({
refetchType: "all",
});
}, [queryClient]);

const [{ data: projects = [] }, { data: tasklists = [] }] = useQueries({
queries: [
trpc.user.getProjects.queryOptions({
Expand Down
57 changes: 0 additions & 57 deletions hooks/use-organization-change.tsx

This file was deleted.