From 0f5660cbecf24326a455f174ea4113c16ce1b04f Mon Sep 17 00:00:00 2001 From: rizky Date: Wed, 21 Aug 2024 02:22:09 -0700 Subject: [PATCH] fix overridenav --- server/server-route.ts | 13 +++++++++++++ session/server.ts => server/server-session.ts | 11 ++--------- session/client.ts => utils/client-session.ts | 0 utils/init.ts | 3 +++ utils/override-nav.ts | 2 +- 5 files changed, 19 insertions(+), 10 deletions(-) create mode 100755 server/server-route.ts rename session/server.ts => server/server-session.ts (85%) rename session/client.ts => utils/client-session.ts (100%) diff --git a/server/server-route.ts b/server/server-route.ts new file mode 100755 index 0000000..546dedd --- /dev/null +++ b/server/server-route.ts @@ -0,0 +1,13 @@ +export type ServerArg = { + req: Request; + handle: (req: Request) => Promise; + mode: "dev" | "prod"; + url: { + raw: URL; + pathname: string; + }; +}; +export const newRoute = (arg: { + url: string; + handler: (arg: ServerArg) => Promise | Response | void; +}) => {}; diff --git a/session/server.ts b/server/server-session.ts similarity index 85% rename from session/server.ts rename to server/server-session.ts index eb4a6d7..abc3f29 100755 --- a/session/server.ts +++ b/server/server-session.ts @@ -1,14 +1,7 @@ /// -type ServerArg = { - req: Request; - handle: (req: Request) => Promise; - mode: "dev" | "prod"; - url: { - raw: URL; - pathname: string; - }; -}; +import { ServerArg } from "./server-route"; + type ServerSession = { handle: (arg: ServerArg) => Promise; }; diff --git a/session/client.ts b/utils/client-session.ts similarity index 100% rename from session/client.ts rename to utils/client-session.ts diff --git a/utils/init.ts b/utils/init.ts index c62d4a6..01cec00 100755 --- a/utils/init.ts +++ b/utils/init.ts @@ -1,3 +1,4 @@ +import { overrideNav } from "./override-nav"; const w = window as any; if (typeof isEditor === "undefined") { @@ -12,3 +13,5 @@ if (typeof isEditor === "undefined") { } w.isMobile = false; w.isDesktop = false; + +overrideNav(); diff --git a/utils/override-nav.ts b/utils/override-nav.ts index b384b2a..b61c6e8 100755 --- a/utils/override-nav.ts +++ b/utils/override-nav.ts @@ -5,7 +5,7 @@ import { getPathname } from "lib/utils/pathname"; const w = window as any; export const overrideNav = (arg?: { local?: any }) => { - if (!w.prasi_menu && !isEditor) { + if ((!w.prasi_menu && !isEditor) || arg?.local) { w.prasi_menu = { nav_override: true, nav: w.navigate, pm: null }; w.navigate = (async (_href, params) => { if (!_href) {