Skip to content

Commit

Permalink
🐛 fix(auth): fix auth error when there is a portal call
Browse files Browse the repository at this point in the history
  • Loading branch information
thrownullexception committed Oct 9, 2023
1 parent b9c164c commit 5b44744
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dashpress",
"version": "0.1.7",
"version": "1.0.1",
"license": "GPL-3.0-or-later",
"scripts": {
"dev": "next dev",
Expand Down
29 changes: 16 additions & 13 deletions src/frontend/_layouts/guest/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { GuestLayout } from "frontend/design-system/layouts/GuestLayout";
import { useSiteConfig } from "frontend/hooks/app/site.config";
import { useAppTheme } from "../useAppTheme";
import { GoogleTagManager } from "../scripts/GoogleTagManager";
import { PortalProvider } from "../app/portal";

interface IProps {
children: ReactNode;
Expand All @@ -16,18 +17,20 @@ export function AuthLayout({ children, title, subTitle }: IProps) {
useAppTheme();

return (
<GuestLayout
title={title}
subTitle={subTitle}
appDetails={{ ...siteConfig, logo: siteConfig.fullLogo }}
>
<Head>
<title>
{title} - {siteConfig.name}
</title>
</Head>
{children}
<GoogleTagManager />
</GuestLayout>
<PortalProvider>
<GuestLayout
title={title}
subTitle={subTitle}
appDetails={{ ...siteConfig, logo: siteConfig.fullLogo }}
>
<Head>
<title>
{title} - {siteConfig.name}
</title>
</Head>
{children}
<GoogleTagManager />
</GuestLayout>
</PortalProvider>
);
}
3 changes: 1 addition & 2 deletions src/frontend/views/settings/_Base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ export function BaseSettingsLayout({ children }: IProps) {
const menuItems = useMutateBaseSettingsMenu(baseMenuItems);
return (
<AppLayout>
{/* TODO */}
{false && (
{false && ( // TODO log the user who click on the button to not disturb again
<>
<InfoAlert
renderJsx
Expand Down

0 comments on commit 5b44744

Please sign in to comment.