From d92a722bb936a813da6080a293d58b15e310b5e4 Mon Sep 17 00:00:00 2001 From: Rizky Date: Sat, 25 Nov 2023 10:46:42 +0700 Subject: [PATCH] wip fix popup --- app/web/src/nova/ed/ed-base.tsx | 10 ++++---- app/web/src/nova/ed/ed-left.tsx | 2 +- app/web/src/nova/ed/ed-mid.tsx | 18 +++++++++++++++ app/web/src/nova/ed/logic/ed-global.ts | 4 ++++ .../header/left/{site.tsx => site-picker.tsx} | 0 .../nova/ed/panel/header/mid/page-picker.tsx | 23 +++++++++++++++++++ .../nova/ed/panel/popup/page/page-popup.tsx | 3 +++ .../popup/site/{site.tsx => site-popup.tsx} | 2 +- 8 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 app/web/src/nova/ed/ed-mid.tsx rename app/web/src/nova/ed/panel/header/left/{site.tsx => site-picker.tsx} (100%) create mode 100644 app/web/src/nova/ed/panel/header/mid/page-picker.tsx create mode 100644 app/web/src/nova/ed/panel/popup/page/page-popup.tsx rename app/web/src/nova/ed/panel/popup/site/{site.tsx => site-popup.tsx} (99%) diff --git a/app/web/src/nova/ed/ed-base.tsx b/app/web/src/nova/ed/ed-base.tsx index 8de89007..bd3792d8 100644 --- a/app/web/src/nova/ed/ed-base.tsx +++ b/app/web/src/nova/ed/ed-base.tsx @@ -1,18 +1,19 @@ import { useGlobal } from "web-utils"; import { Loading } from "../../utils/ui/loading"; import { EdLeft } from "./ed-left"; +import { EdMid } from "./ed-mid"; import { EdRight } from "./ed-right"; import { EDGlobal } from "./logic/ed-global"; import { edInit } from "./logic/ed-init"; import { edRoute } from "./logic/ed-route"; import { edUndoManager } from "./logic/ed-undo"; -import { EdMain } from "./panel/main/main"; import { EdPane } from "./panel/main/pane-resize"; import { EdPopCode } from "./panel/popup/code/code"; import { EdPopCompGroup } from "./panel/popup/comp/comp-group"; -import { EdPopSite } from "./panel/popup/site/site"; -import { EdScriptInit } from "./panel/script/monaco/init"; import { EdPopScript } from "./panel/popup/script/script"; +import { EdPopSite } from "./panel/popup/site/site-popup"; +import { EdScriptInit } from "./panel/script/monaco/init"; +import { EdPagePop } from "./panel/popup/page/page-popup"; export const EdBase = () => { const p = useGlobal(EDGlobal, "EDITOR"); @@ -42,7 +43,7 @@ export const EdBase = () => {
- +
@@ -50,6 +51,7 @@ export const EdBase = () => { + diff --git a/app/web/src/nova/ed/ed-left.tsx b/app/web/src/nova/ed/ed-left.tsx index 9969b6b8..41e1e4ae 100644 --- a/app/web/src/nova/ed/ed-left.tsx +++ b/app/web/src/nova/ed/ed-left.tsx @@ -4,7 +4,7 @@ import { useGlobal } from "web-utils"; import { EDGlobal } from "./logic/ed-global"; import { EdApi } from "./panel/header/left/api"; import { EdSiteJS } from "./panel/header/left/js"; -import { EdSitePicker } from "./panel/header/left/site"; +import { EdSitePicker } from "./panel/header/left/site-picker"; import { EdTreeBody } from "./panel/tree/body"; import { EdTreeSearch } from "./panel/tree/search"; diff --git a/app/web/src/nova/ed/ed-mid.tsx b/app/web/src/nova/ed/ed-mid.tsx new file mode 100644 index 00000000..07b732a6 --- /dev/null +++ b/app/web/src/nova/ed/ed-mid.tsx @@ -0,0 +1,18 @@ +import { FC } from "react"; +import { EdMain } from "./panel/main/main"; +import { EdPagePicker } from "./panel/header/mid/page-picker"; + +export const EdMid: FC<{}> = () => { + return ( +
+
+ +
+ +
+ ); +}; diff --git a/app/web/src/nova/ed/logic/ed-global.ts b/app/web/src/nova/ed/logic/ed-global.ts index b9514983..092c793e 100644 --- a/app/web/src/nova/ed/logic/ed-global.ts +++ b/app/web/src/nova/ed/logic/ed-global.ts @@ -221,6 +221,10 @@ export const EDGlobal = { show_log: false, list: {} as Record, }, + page: { + go: () => {}, + form: null as null | {}, + }, script: { open: false, mode: "js" as "js" | "css" | "html", diff --git a/app/web/src/nova/ed/panel/header/left/site.tsx b/app/web/src/nova/ed/panel/header/left/site-picker.tsx similarity index 100% rename from app/web/src/nova/ed/panel/header/left/site.tsx rename to app/web/src/nova/ed/panel/header/left/site-picker.tsx diff --git a/app/web/src/nova/ed/panel/header/mid/page-picker.tsx b/app/web/src/nova/ed/panel/header/mid/page-picker.tsx new file mode 100644 index 00000000..fad88f86 --- /dev/null +++ b/app/web/src/nova/ed/panel/header/mid/page-picker.tsx @@ -0,0 +1,23 @@ +import { useGlobal } from "web-utils"; +import { EDGlobal } from "../../../logic/ed-global"; +import { TopBtn } from "../top-btn"; + +export const EdPagePicker = () => { + const p = useGlobal(EDGlobal, "EDITOR"); + + return ( + {}} + innerClassName="flex items-center justify-center space-x-2" + > +
`, + }} + >
+
+ {p.page.cur.name} +
+
+ ); +}; diff --git a/app/web/src/nova/ed/panel/popup/page/page-popup.tsx b/app/web/src/nova/ed/panel/popup/page/page-popup.tsx new file mode 100644 index 00000000..d9dc8f09 --- /dev/null +++ b/app/web/src/nova/ed/panel/popup/page/page-popup.tsx @@ -0,0 +1,3 @@ +export const EdPagePop = () => { + return
Hello world
; +}; diff --git a/app/web/src/nova/ed/panel/popup/site/site.tsx b/app/web/src/nova/ed/panel/popup/site/site-popup.tsx similarity index 99% rename from app/web/src/nova/ed/panel/popup/site/site.tsx rename to app/web/src/nova/ed/panel/popup/site/site-popup.tsx index 72aae5e8..5b29eb7b 100644 --- a/app/web/src/nova/ed/panel/popup/site/site.tsx +++ b/app/web/src/nova/ed/panel/popup/site/site-popup.tsx @@ -8,7 +8,7 @@ import { EdFormSite } from "./site-form"; import { EdSiteHead } from "./site-head"; import { EdSiteTree, SiteGroupItem } from "./site-tree"; -import uFuzzy, { Info } from "@leeoniya/ufuzzy"; +import uFuzzy from "@leeoniya/ufuzzy"; import { fuzzy } from "../../../../../utils/ui/fuzzy"; const uf = new uFuzzy({});