mirror of
https://github.com/streetwriters/notesnook.git
synced 2026-02-23 19:49:56 +01:00
web: show titlebar on auth pages
Signed-off-by: 01zulfi <85733202+01zulfi@users.noreply.github.com>
This commit is contained in:
@@ -68,13 +68,23 @@ export function getWindowControls(
|
||||
];
|
||||
}
|
||||
export const TITLE_BAR_HEIGHT = 37;
|
||||
export function TitleBar({ isUnderlay = isMac() }: { isUnderlay?: boolean }) {
|
||||
export function TitleBar({
|
||||
isUnderlay = isMac(),
|
||||
force = false
|
||||
}: {
|
||||
isUnderlay?: boolean;
|
||||
force?: boolean;
|
||||
}) {
|
||||
const { isFullscreen, hasNativeWindowControls, isMaximized } =
|
||||
useWindowControls();
|
||||
const isTablet = useTablet();
|
||||
const isMobile = useMobile();
|
||||
if ((!isMac() && !isMobile && !isTablet) || (isFullscreen && isMac()))
|
||||
if (
|
||||
!force &&
|
||||
((!isMac() && !isMobile && !isTablet) || (isFullscreen && isMac()))
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const tools = getWindowControls(
|
||||
hasNativeWindowControls,
|
||||
|
||||
@@ -29,7 +29,7 @@ import { desktop } from "./common/desktop-bridge";
|
||||
import { useKeyStore } from "./interfaces/key-store";
|
||||
import Config from "./utils/config";
|
||||
import { usePromise } from "@notesnook/common";
|
||||
import { AuthProps } from "./views/auth";
|
||||
import { AuthProps, isAuthRouteActive } from "./views/auth";
|
||||
import { loadDatabase } from "./hooks/use-database";
|
||||
import AppLock from "./views/app-lock";
|
||||
import { Text } from "@theme-ui/components";
|
||||
@@ -58,7 +58,7 @@ export async function startApp(children?: React.ReactNode) {
|
||||
|
||||
root.render(
|
||||
<>
|
||||
<TitleBar />
|
||||
<TitleBar force={isAuthRouteActive()} />
|
||||
<ErrorBoundary>
|
||||
<GlobalErrorHandler>
|
||||
<BaseThemeProvider
|
||||
|
||||
@@ -30,7 +30,12 @@ import {
|
||||
Warn
|
||||
} from "../components/icons";
|
||||
import Field, { FieldProps } from "../components/field";
|
||||
import { getQueryParams, hardNavigate, makeURL } from "../navigation";
|
||||
import {
|
||||
getCurrentPath,
|
||||
getQueryParams,
|
||||
hardNavigate,
|
||||
makeURL
|
||||
} from "../navigation";
|
||||
import { store as userstore } from "../stores/user-store";
|
||||
import { db } from "../common/db";
|
||||
import Config from "../utils/config";
|
||||
@@ -163,6 +168,11 @@ const routePaths: Record<AuthRoutes, string> = {
|
||||
signup: "/signup"
|
||||
};
|
||||
|
||||
export function isAuthRouteActive() {
|
||||
const path = getCurrentPath();
|
||||
return Object.values(routePaths).includes(path);
|
||||
}
|
||||
|
||||
const authorizedRoutes: AuthRoutes[] = [
|
||||
"login:email",
|
||||
"login:password",
|
||||
|
||||
Reference in New Issue
Block a user