diff --git a/app/srv/api/auth/login.ts b/app/srv/api/auth/login.ts index f674ee10..64b246ff 100644 --- a/app/srv/api/auth/login.ts +++ b/app/srv/api/auth/login.ts @@ -10,7 +10,7 @@ export const _ = { const current = session.get(req); if (!current) { - const user = await db.user.findFirst({ + const user = await _db.user.findFirst({ where: { OR: [{ username }, { phone: username }] }, include: { org_user: { diff --git a/app/srv/api/code.ts b/app/srv/api/code.ts index 9ecc2aca..0fc8906e 100644 --- a/app/srv/api/code.ts +++ b/app/srv/api/code.ts @@ -11,7 +11,7 @@ export const _ = { const { req, res } = apiContext(this); if (action === "reload-api") { - const site = await db.site.findFirst({ + const site = await _db.site.findFirst({ select: { config: true }, where: { id: site_id }, }); diff --git a/app/srv/api/comp-create.ts b/app/srv/api/comp-create.ts index b29c097f..9f67d016 100644 --- a/app/srv/api/comp-create.ts +++ b/app/srv/api/comp-create.ts @@ -59,7 +59,7 @@ export const _ = { let gid = group_id; if (!gid) { - let group = await db.component_group.findFirst({ + let group = await _db.component_group.findFirst({ where: { component_site: { some: { @@ -79,7 +79,7 @@ export const _ = { }); if (!group) { - group = await db.component_group.create({ + group = await _db.component_group.create({ data: { name: "All", component_site: { @@ -97,7 +97,7 @@ export const _ = { gid = group.id; } if (element) { - const newcomp = await db.component.create({ + const newcomp = await _db.component.create({ data: { name: element.get("name") || "", content_tree: element.toJSON(), @@ -122,7 +122,7 @@ export const _ = { }, }, }; - await db.component.update({ + await _db.component.update({ data: { content_tree: content_tree, }, @@ -147,7 +147,7 @@ export const _ = { ); if (comp_id) { - await db.component.update({ + await _db.component.update({ where: { id: comp_id, }, @@ -159,7 +159,7 @@ export const _ = { }, }); } else if (page && page.id) { - await db.page.update({ + await _db.page.update({ where: { id: page.id, }, diff --git a/app/srv/api/comp.ts b/app/srv/api/comp.ts index 89a7e0e3..db156542 100644 --- a/app/srv/api/comp.ts +++ b/app/srv/api/comp.ts @@ -4,6 +4,6 @@ export const _ = { url: "/_web/comp/:id", async api(id: string) { const { req, res } = apiContext(this); - return await db.component.findFirst({ where: { id } }); + return await _db.component.findFirst({ where: { id } }); }, }; diff --git a/app/srv/api/page.ts b/app/srv/api/page.ts index 2e790c2c..dfa033c2 100644 --- a/app/srv/api/page.ts +++ b/app/srv/api/page.ts @@ -4,6 +4,6 @@ export const _ = { url: "/_web/page/:id", async api(id: string) { const { req, res } = apiContext(this); - return await db.page.findFirst({ where: { id } }); + return await _db.page.findFirst({ where: { id } }); }, }; diff --git a/app/srv/api/site-dts.ts b/app/srv/api/site-dts.ts index 29e832fc..35f52776 100644 --- a/app/srv/api/site-dts.ts +++ b/app/srv/api/site-dts.ts @@ -24,7 +24,7 @@ export const _ = { } } - // const site = await db.site.findFirst({ + // const site = await _db.site.findFirst({ // where: { id: site_id }, // select: { js: true }, // }); diff --git a/app/srv/ws/edit/tools/load-page-cached.ts b/app/srv/ws/edit/tools/load-page-cached.ts index af09e96e..03022fe7 100644 --- a/app/srv/ws/edit/tools/load-page-cached.ts +++ b/app/srv/ws/edit/tools/load-page-cached.ts @@ -23,7 +23,7 @@ export const loadCachedPage = async (site_id: string, page_id: string) => { edit.lastRefresh = Date.now(); site_cache[page_id] = edit as any; } else { - const page = await db.page.findFirst({ + const page = await _db.page.findFirst({ where: { id: page_id }, select: { js: true, diff --git a/app/web/src/nova/zip/root.tsx b/app/web/src/nova/zip/root.tsx new file mode 100644 index 00000000..a84f9e43 --- /dev/null +++ b/app/web/src/nova/zip/root.tsx @@ -0,0 +1,7 @@ +import { useState } from "react"; + +export const Root = () => { + const [_, render] = useState({}); + + return <>; +}; diff --git a/app/web/src/nova/zip/w.ts b/app/web/src/nova/zip/w.ts new file mode 100644 index 00000000..366a1af2 --- /dev/null +++ b/app/web/src/nova/zip/w.ts @@ -0,0 +1,6 @@ +export const w = window as unknown as { + _prasi: { + context: {}; + render: () => {}; + }; +}; diff --git a/app/web/src/nova/zip/zip.tsx b/app/web/src/nova/zip/zip.tsx new file mode 100644 index 00000000..4f4a18af --- /dev/null +++ b/app/web/src/nova/zip/zip.tsx @@ -0,0 +1,16 @@ +import { createRoot } from "react-dom/client"; +import { defineReact, defineWindow } from "web-utils"; +import { Root } from "./root"; + +(async () => { + const div = document.getElementById("root"); + if (div) { + const root = createRoot(div); + await defineWindow(false); + defineReact(); + root.render(); + if (document.body.classList.contains("opacity-0")) { + document.body.classList.remove("opacity-0"); + } + } +})(); diff --git a/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx b/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx index f2caaab7..05caa10f 100644 --- a/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx +++ b/app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx @@ -261,7 +261,7 @@ export const CompManager: FC = () => { local.loading = true; local.render(); - await db.component_site.create({ + await _db.component_site.create({ data: { id_component_group: group_id, id_site: p.site?.id || "", @@ -522,7 +522,7 @@ export const CompManager: FC = () => { if (confirm("Are you sure ?")) { delete local.group[g.info.id]; local.render(); - await db.component_site.delete({ + await _db.component_site.delete({ where: { id_component_group_id_site: { id_component_group: g.info.id,