Skip to content

Commit

Permalink
fix: build errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@potts99
potts99 committed Jun 7, 2024
1 parent c7b04d8 commit c3d39b9
Show file tree
Hide file tree
Showing 7 changed files with 131 additions and 338 deletions.
Binary file modified .yarn/install-state.gz
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions apps/client/components/CreateTicketModal/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ export default function CreateTicketModal({ keypress, setKeyPressDown }) {

return (
<>
<li className="w-[calc(100%+15px)]">
<li className="w-[calc(100%+15px)]" >
<button
onClick={() => setOpen(open)}
onClick={() => setOpen(true)}
className={classNames(
open
? "bg-[#F0F3F9] dark:bg-gray-800 dark:text-green-600"
Expand Down
6 changes: 3 additions & 3 deletions apps/client/layouts/newLayout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,9 +452,9 @@ export default function NewLayout({ children }: any) {
case "f":
location.push("/tickets/closed");
break;
case "Escape":
location.push("/tickets");
break;
// case "Escape":
// location.push("/tickets");
// break;
default:
break;
}
Expand Down
10 changes: 5 additions & 5 deletions apps/client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"@blocknote/react": "^0.13.5",
"@headlessui/react": "^1.4.2",
"@heroicons/react": "^2.0.18",
"@mantine/core": "^6.0.13",
"@mantine/hooks": "^6.0.13",
"@mantine/notifications": "^6.0.13",
"@mantine/spotlight": "^6.0.13",
"@mantine/tiptap": "^6.0.13",
"@mantine/core": "^7.10.1",
"@mantine/hooks": "^7.10.1",
"@mantine/notifications": "^7.10.1",
"@mantine/spotlight": "^7.10.1",
"@mantine/tiptap": "^7.10.1",
"@monaco-editor/react": "^4.6.0",
"@radix-ui/themes": "^2.0.1",
"@tabler/icons-react": "^3.5.0",
Expand Down
126 changes: 70 additions & 56 deletions apps/client/pages/_app.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//@ts-nocheck
import "@radix-ui/themes/styles.css";

import { ThemeProvider } from "next-themes";
import "../styles/globals.css";

Expand All @@ -10,6 +11,7 @@ import {
TicketIcon,
} from "@heroicons/react/24/outline";
import { Notifications } from "@mantine/notifications";
import { MantineProvider } from "@mantine/core";
import { Theme } from "@radix-ui/themes";
import { useRouter } from "next/router";
import { QueryClient, QueryClientProvider } from "react-query";
Expand Down Expand Up @@ -90,58 +92,63 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: any) {

if (router.asPath.slice(0, 5) === "/auth") {
return (
<>
<MantineProvider>
<Notifications position="top-right" />
<Component {...pageProps} />
</>
</MantineProvider>
);
}

if (router.pathname.includes("/admin")) {
return (
<SessionProvider>
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<NewLayout>
<AdminLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</AdminLayout>
</NewLayout>
</Auth>
</QueryClientProvider>
</Theme>
</ThemeProvider>
<MantineProvider>
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<NewLayout>
<AdminLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</AdminLayout>
</NewLayout>
</Auth>
</QueryClientProvider>
</Theme>
</ThemeProvider>
</MantineProvider>
</SessionProvider>
);
}

if (router.pathname.includes("/notebook")) {
return (
<SessionProvider>
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<NewLayout>
<NoteBookLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</NoteBookLayout>
</NewLayout>
</Auth>
</QueryClientProvider>
</Theme>
</ThemeProvider>
<MantineProvider>
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<NewLayout>
<NoteBookLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</NoteBookLayout>
</NewLayout>
</Auth>
</QueryClientProvider>
</Theme>
</ThemeProvider>
</MantineProvider>
</SessionProvider>
);
}

if (router.pathname.includes("/settings")) {
return (
<SessionProvider>
<MantineProvider>
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
Expand All @@ -156,59 +163,66 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }: any) {
</QueryClientProvider>
</Theme>
</ThemeProvider>
</MantineProvider>
</SessionProvider>
);
}

if (router.pathname.startsWith("/portal")) {
return (
<SessionProvider>
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<PortalLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</PortalLayout>
</Auth>
</QueryClientProvider>
</Theme>
<MantineProvider defaultColorScheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<PortalLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</PortalLayout>
</Auth>
</QueryClientProvider>
</Theme>
</MantineProvider>
</SessionProvider>
);
}

if (router.pathname === "/onboarding") {
return (
<SessionProvider>
<Notifications position="top-right" />
<Component {...pageProps} />
<MantineProvider defaultColorScheme="light">
<Notifications position="top-right" />
<Component {...pageProps} />
</MantineProvider>
</SessionProvider>
);
}

if (router.pathname === "/submit") {
return (
<>
<MantineProvider defaultColorScheme="light">
<Notifications position="top-right" />
<Component {...pageProps} />
</>
</MantineProvider>
);
}

return (
<SessionProvider>
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<NewLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</NewLayout>
</Auth>
</QueryClientProvider>
</Theme>
</ThemeProvider>
<MantineProvider defaultColorScheme="light">
<ThemeProvider attribute="class" defaultTheme="light">
<Theme>
<QueryClientProvider client={queryClient}>
<Auth>
<NewLayout>
<Notifications position="top-right" />
<Component {...pageProps} />
</NewLayout>
</Auth>
</QueryClientProvider>
</Theme>
</ThemeProvider>
</MantineProvider>
</SessionProvider>
);
}
Expand Down
1 change: 0 additions & 1 deletion apps/client/pages/auth/forgot-password.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default function Login({}) {
const router = useRouter();

const [email, setEmail] = useState("");
const [view, setView] = useState("request");

async function postData() {
await fetch(`/api/v1/auth/password-reset`, {
Expand Down
Loading

0 comments on commit c3d39b9

Please sign in to comment.