midsuit
/
prasi-bun
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename db,api -> _db, _api

This commit is contained in:
Rizky 2024-02-06 08:59:49 +07:00
parent d9c4bdfc7c
commit 9442ff9e41
71 changed files with 221 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/srv/api/site-export.ts
View File

@ -12,10 +12,10 @@ export const _ = {
url: "/site-export/:site_id",
async api(site_id: string) {
const { req, res } = apiContext(this);
const site = (await db.site.findFirst({
const site = (await _db.site.findFirst({
where: { id: site_id },
})) as any;
const pages = await db.page.findMany({
const pages = await _db.page.findMany({
where: {
id_site: site_id,
is_deleted: false,
@ -24,7 +24,7 @@ export const _ = {
});
if (site) {
const layout = await db.page.findFirst({
const layout = await _db.page.findFirst({
where: {
id_site: site.id,
name: { startsWith: "layout:" },
@ -34,7 +34,7 @@ export const _ = {
select: { content_tree: true, id: true },
});
const cgroups = await db.site_use_comp.findMany({
const cgroups = await _db.site_use_comp.findMany({
where: { id_site: site.id },
});
@ -54,7 +54,7 @@ export const _ = {
}
}
const comps = await db.component.findMany({
const comps = await _db.component.findMany({
where: {
component_group: {
component_site: {
@ -69,11 +69,11 @@ export const _ = {
site: {} as Record<string, string>,
pages: {} as Record<string, Record<string, string>>,
};
const page_ids = await db.page.findMany({
const page_ids = await _db.page.findMany({
where: { id_site: site_id, is_deleted: false },
select: { id: true },
});
const npm_page = await db.npm_page.findMany({
const npm_page = await _db.npm_page.findMany({
where: { id_page: { in: page_ids.map((e) => e.id) } },
});

10
app/srv/util/build-npm.ts
View File

@ -31,9 +31,9 @@ export const buildNpm = async ({
let items = _items;
if (!items) {
if (mode === "site") {
items = await db.npm_site.findMany({ where: { id_site: id } });
items = await _db.npm_site.findMany({ where: { id_site: id } });
} else {
items = await db.npm_page.findMany({ where: { id_page: id } });
items = await _db.npm_page.findMany({ where: { id_page: id } });
}
}
const packages: Record<string, string> = {};
@ -157,7 +157,7 @@ packages:
if (mode === "page") {
delete glb.npm.page[id];
await db.npm_page.updateMany({
await _db.npm_page.updateMany({
where: {
id_page: id,
},
@ -165,7 +165,7 @@ packages:
});
const p = eg.edit.page[id];
if (p) {
await db.page.update({
await _db.page.update({
where: {
id,
},
@ -178,7 +178,7 @@ packages:
} else if (mode === "site") {
delete glb.npm.site[id];
await db.npm_site.updateMany({
await _db.npm_site.updateMany({
where: {
id_site: id,
},

6
app/srv/ws/edit/action/diff-local.ts
View File

@ -31,7 +31,7 @@ export const diffLocal = (ws: any, msg: any) => {
if (msg.id) {
const page = eg.edit.page[msg.id].doc.getMap("map").toJSON();
try {
await db.page.update({
await _db.page.update({
where: { id: page.id },
data: {
content_tree: page.content_tree,
@ -52,7 +52,7 @@ export const diffLocal = (ws: any, msg: any) => {
clearTimeout(eg.edit.comp[msg.id].saveTimeout);
eg.edit.comp[msg.id].saveTimeout = setTimeout(async () => {
const comp = eg.edit.comp[msg.id].doc.getMap("map").toJSON();
await db.component.update({
await _db.component.update({
where: {
id: msg.id,
},
@ -68,7 +68,7 @@ export const diffLocal = (ws: any, msg: any) => {
eg.edit.site[msg.id].saveTimeout = setTimeout(async () => {
const site = eg.edit.site[msg.id].doc.getMap("site").toJSON();
delete site.page;
await db.site.update({
await _db.site.update({
where: {
id: msg.id,
},

2
app/srv/ws/edit/action/get-comp.ts
View File

@ -17,7 +17,7 @@ export const getComp = async (
if (!validate(comp_id)) return;
if (!eg.edit.comp[comp_id]) {
const rawComp = await db.component.findFirst({
const rawComp = await _db.component.findFirst({
where: {
id: comp_id,
},

2
app/srv/ws/edit/edit-handler.ts
View File

@ -36,7 +36,7 @@ export const editHandler: WebSocketHandler<WSData> = {
clearTimeout(site.saveTimeout);
site.saveTimeout = setTimeout(async () => {
const js = JSON.parse(msg.src);
await db.site.update({
await _db.site.update({
where: {
id: msg.id_site,
},

2
app/srv/ws/edit/tools/load-page.ts
View File

@ -3,7 +3,7 @@ import { Page } from "../../../../web/src/utils/types/general";
export const loadPage = async (page_id: string) => {
if (page_id && validate(page_id)) {
let page = (await db.page.findFirst({
let page = (await _db.page.findFirst({
where: { id: page_id },
select: {
id: true,

6
app/srv/ws/edit/tools/load-site.ts
View File

@ -16,7 +16,7 @@ export const loadSite = async (idOrDomain: string) => {
rname = "prasi.app";
}
const res = await db.site.findFirst({
const res = await _db.site.findFirst({
where: isValidUUID(rname)
? {
id: rname,
@ -73,11 +73,11 @@ export const loadSite = async (idOrDomain: string) => {
const createPage = async (
site: site & { page: page[] },
page: WithOptional<
Parameters<typeof db.page.create>[0]["data"],
Parameters<typeof _db.page.create>[0]["data"],
"content_tree"
>
) => {
const raw = await db.page.create({
const raw = await _db.page.create({
data: {
...(page as any),
content_tree: page.content_tree ? page.content_tree : blank,

10
app/srv/ws/sync/actions/code_edit.ts
View File

@ -91,14 +91,14 @@ export const code_edit: SAction["code"]["edit"] = async function (
});
if (save_to === "comp" && comp_id) {
db.component.update({
_db.component.update({
where: { id: comp_id },
data: {
content_tree: root.toJSON(),
},
});
} else if (page_id && validate(page_id)) {
db.page.update({
_db.page.update({
where: { id: page_id },
data: {
content_tree: root.toJSON(),
@ -128,14 +128,14 @@ export const code_edit: SAction["code"]["edit"] = async function (
});
if (save_to === "comp" && comp_id) {
db.component.update({
_db.component.update({
where: { id: comp_id },
data: {
content_tree: root.toJSON(),
},
});
} else if (page_id && validate(page_id)) {
db.page.update({
_db.page.update({
where: { id: page_id },
data: {
content_tree: root.toJSON(),
@ -189,7 +189,7 @@ export const code_edit: SAction["code"]["edit"] = async function (
}
}
});
await db.component.update({
await _db.component.update({
where: { id: comp_id },
data: {
content_tree: root.toJSON(),

8
app/srv/ws/sync/actions/comp_group.ts
View File

@ -6,7 +6,7 @@ export const comp_group: SAction["comp"]["group"] = async function (
id_site
) {
const result: Awaited<ReturnType<SAction["comp"]["group"]>> = {};
let groups = await db.component_group.findMany({
let groups = await _db.component_group.findMany({
where: {
component_site: {
some: {
@ -21,7 +21,7 @@ export const comp_group: SAction["comp"]["group"] = async function (
});
if (groups.length === 0) {
await db.component_group.create({
await _db.component_group.create({
data: {
name: "All",
component_site: {
@ -33,7 +33,7 @@ export const comp_group: SAction["comp"]["group"] = async function (
},
});
await db.component_group.create({
await _db.component_group.create({
data: {
name: "__TRASH__",
component_site: {
@ -45,7 +45,7 @@ export const comp_group: SAction["comp"]["group"] = async function (
},
});
groups = await db.component_group.findMany({
groups = await _db.component_group.findMany({
where: {
component_site: {
some: {

4
app/srv/ws/sync/actions/comp_new.ts
View File

@ -115,7 +115,7 @@ export const comp_new: SAction["comp"]["new"] = async function (
};
const createComp = async (item: any, group_id: string) => {
const comp = await db.component.create({
const comp = await _db.component.create({
data: {
name: item.name,
content_tree: {},
@ -133,7 +133,7 @@ const createComp = async (item: any, group_id: string) => {
props: {},
ref_ids: {},
};
await db.component.update({
await _db.component.update({
where: { id: comp.id },
data: { content_tree: item },
});

4
app/srv/ws/sync/actions/page_cache.ts
View File

@ -21,7 +21,7 @@ export const page_cache: SAction["page"]["cache"] = async function (
!cache[site_id] ||
(cache[site_id] && Date.now() - cache[site_id].ts > 5000)
) {
const pages = await db.page.findMany({
const pages = await _db.page.findMany({
where: {
id_site: site_id,
is_deleted: false,
@ -45,7 +45,7 @@ export const page_cache: SAction["page"]["cache"] = async function (
for (const url of urls) {
const found = router.lookup(url);
if (found && !exclude_page_id.includes(found.id)) {
const row = await db.page.findFirst({
const row = await _db.page.findFirst({
where: { id: found.id },
select: { content_tree: true, url: true },
});

4
app/srv/ws/sync/actions/page_load.ts
View File

@ -65,13 +65,13 @@ export const page_load: SAction["page"]["load"] = async function (
user.active.delAll({ client_id: this.client_id });
if (!snap && !ydoc) {
const page = await db.page.findFirst({ where: { id } });
const page = await _db.page.findFirst({ where: { id } });
if (page) {
const doc = new Y.Doc();
let root = doc.getMap("map");
const proot = await prepContentTree(page.id, page.content_tree, this);
if (validate(id) && id) {
await db.page.update({ where: { id }, data: { content_tree: proot } });
await _db.page.update({ where: { id }, data: { content_tree: proot } });
}
syncronize(root, { id, root: proot });

2
app/srv/ws/sync/actions/site_group.ts
View File

@ -1,7 +1,7 @@
import { SyncConnection } from "../type";
export const site_group = async function (this: SyncConnection) {
const res = db.org.findMany({
const res = _db.org.findMany({
where: {
org_user: { some: { id_user: this.user_id } },
},

4
app/srv/ws/sync/actions/site_load.ts
View File

@ -10,7 +10,7 @@ export const site_load: SAction["site"]["load"] = async function (
site_id: string
) {
if (validate(site_id)) {
const site = await db.site.findFirst({ where: { id: site_id } });
const site = await _db.site.findFirst({ where: { id: site_id } });
if (site) {
if (this.conf) this.conf.site_id = site.id;
@ -19,7 +19,7 @@ export const site_load: SAction["site"]["load"] = async function (
? { api_url: (site.config as any).api_url || "" }
: { api_url: "" };
const layouts = await db.page.findMany({
const layouts = await _db.page.findMany({
where: {
id_site: site_id,
name: {

2
app/srv/ws/sync/actions/site_update.ts
View File

@ -22,7 +22,7 @@ export const site_update: SAction["site"]["update"] = async function (
}
}
await db.site.update({
await _db.site.update({
where: { id },
data: updated,
});

4
app/srv/ws/sync/actions/yjs_diff_local.ts
View File

@ -25,7 +25,7 @@ export const yjs_diff_local: SAction["yjs"]["diff_local"] = async function (
if (root) {
if (mode === "page") {
if (validate(id) && id) {
await db.page.update({
await _db.page.update({
where: { id },
data: {
content_tree: root.toJSON(),
@ -33,7 +33,7 @@ export const yjs_diff_local: SAction["yjs"]["diff_local"] = async function (
});
}
} else if (mode === "comp") {
await db.component.update({
await _db.component.update({
where: { id },
data: {
content_tree: root.toJSON(),

2
app/srv/ws/sync/editor/load-component.ts
View File

@ -53,7 +53,7 @@ export const loadComponent = async (comp_id: string, sync?: SyncConnection) => {
};
if (!snap && !ydoc) {
const comp = await db.component.findFirst({ where: { id: comp_id } });
const comp = await _db.component.findFirst({ where: { id: comp_id } });
if (comp) {
const item = comp.content_tree as IItem;
if (item && item.component?.id !== comp.id) {

4
app/srv/ws/sync/editor/load-default.ts
View File

@ -4,7 +4,7 @@ export const loadDefaultSite = async (user_id: string) => {
const conf = user.conf.get(user_id);
if (conf) {
if (!conf.site_id) {
const site = await db.site.findFirst({
const site = await _db.site.findFirst({
where: {
id_user: user_id,
is_deleted: false,
@ -18,7 +18,7 @@ export const loadDefaultSite = async (user_id: string) => {
}
if (conf.site_id && !conf.page_id) {
const page = await db.page.findFirst({
const page = await _db.page.findFirst({
select: { id: true },
where: {
id_site: conf.site_id,

6
app/srv/ws/sync/editor/load-sitepage.ts
View File

@ -7,7 +7,7 @@ export const loadSitePage = async (
page_id?: string
) => {
if (validate(site_id)) {
const site = await db.site.findFirst({
const site = await _db.site.findFirst({
where: { id: site_id },
select: { id: true },
});
@ -18,13 +18,13 @@ export const loadSitePage = async (
let page = null;
if (validate(page_id || "")) {
page = await db.page.findFirst({
page = await _db.page.findFirst({
where: { id: page_id, id_site: site_id, is_deleted: false },
select: { id: true },
});
}
if (!page) {
page = await db.page.findFirst({
page = await _db.page.findFirst({
where: { id_site: site_id, is_deleted: false },
select: { id: true },
});

2
app/srv/ws/sync/editor/prep-page.ts
View File

@ -106,7 +106,7 @@ export const loadCompForPage = async (ctree: IRoot, sync: SyncConnection) => {
if (Object.keys(should_save).length > 0) {
for (const [comp_id, v] of Object.entries(should_save)) {
await db.component.update({
await _db.component.update({
where: { id: comp_id },
data: {
content_tree: v,

2
app/srv/ws/sync/sync-handler.ts
View File

@ -47,7 +47,7 @@ export const syncHandler: WebSocketHandler<WSData> = {
const { user_id, page_id, site_id } = msg;
conn.user_id = user_id;
conn.user = await db.user.findFirst({ where: { id: user_id } });
conn.user = await _db.user.findFirst({ where: { id: user_id } });
let conf = await user.conf.getOrCreate(user_id);
if (site_id) {
const newconf = await loadSitePage(user_id, site_id, page_id);

4
app/web/src/base/page/auth/login.tsx
View File

@ -15,7 +15,7 @@ export default page({
init: false,
},
async () => {
const s = await api.session();
const s = await _api.session();
if (s && s.id) {
const rto = (window as any).redirectTo;
if (rto) {
@ -40,7 +40,7 @@ export default page({
e.preventDefault();
form.submitting = true;
form.render();
const s = await api.login(form.username, form.password);
const s = await _api.login(form.username, form.password);
if (s.status === "failed") {
form.submitting = false;

2
app/web/src/base/page/auth/logout.tsx
View File

@ -4,7 +4,7 @@ import { Loading } from "../../../utils/ui/loading";
export default page({
url: "/logout",
component: ({}) => {
api.logout().then(() => {
_api.logout().then(() => {
location.href = "/login";
});

4
app/web/src/base/page/auth/register.tsx
View File

@ -16,7 +16,7 @@ export default page({
init: false,
},
async () => {
const s = await api.session();
const s = await _api.session();
if (s && s.id) {
navigate("/ed");
@ -36,7 +36,7 @@ export default page({
e.preventDefault();
form.submitting = true;
form.render();
const s = await api.register({
const s = await _api.register({
username: form.username,
password: form.password,
email: form.email,

10
app/web/src/base/page/editor.tsx
View File

@ -35,7 +35,7 @@ export default page({
if (!!ses) {
done();
}
let e = await api.session();
let e = await _api.session();
if (!e) {
(window as any).redirectTo = location.pathname;
navigate("/login");
@ -56,7 +56,7 @@ export default page({
local.session = ses;
if (!site_id) {
const res = await db.site.findFirst({
const res = await _db.site.findFirst({
where: {
is_deleted: false,
org: {
@ -70,7 +70,7 @@ export default page({
},
});
if (res) {
const page = await db.page.findFirst({
const page = await _db.page.findFirst({
where: {
id_site: res.id,
is_deleted: false,
@ -91,7 +91,7 @@ export default page({
return;
}
} else if (!page_id) {
let res = await db.page.findFirst({
let res = await _db.page.findFirst({
where: {
id_site: site_id,
is_deleted: false,
@ -102,7 +102,7 @@ export default page({
});
if (!res) {
res = await db.page.create({
res = await _db.page.create({
data: {
content_tree: {
childs: [],

5
app/web/src/index.tsx
View File

@ -17,12 +17,11 @@ const start = async () => {
const cur = new URL(w.basehost || location.href);
const base_url = `${cur.protocol}//${cur.host}`;
w.db = dbProxy(base_url);
w._db = dbProxy(base_url);
try {
await loadApiProxyDef(base_url, false);
w.api = apiProxy(base_url);
w._api = apiProxy(base_url);
} catch (e) {
console.warn("Failed to load API:", base_url);
}

10
app/web/src/nova/ed/logic/ed-sync.tsx
View File

@ -37,7 +37,7 @@ export const edInitSync = (p: PG) => {
if (location.pathname.startsWith("/vi/")) {
if (page.list.length === 0) {
db.page
_db.page
.findMany({
where: {
id_site: params.site_id,
@ -84,7 +84,7 @@ export const edInitSync = (p: PG) => {
if (!params.page_id) {
if (location.pathname.startsWith("/ed")) {
if (!params.site_id) {
db.page
_db.page
.findFirst({
where: {
is_deleted: false,
@ -99,7 +99,7 @@ export const edInitSync = (p: PG) => {
if (e) location.href = `/ed/${e.id_site}/${e.id}`;
});
} else {
db.page
_db.page
.findFirst({
where: {
is_deleted: false,
@ -111,7 +111,7 @@ export const edInitSync = (p: PG) => {
.then(async (e) => {
if (e) location.href = `/ed/${params.site_id}/${e.id}`;
else {
const res = await db.page.create({
const res = await _db.page.create({
data: {
content_tree: {
childs: [],
@ -156,7 +156,7 @@ export const edInitSync = (p: PG) => {
params.site_id &&
location.pathname.startsWith("/ed/")
) {
db.page
_db.page
.findFirst({
where: {
is_deleted: false,

8
app/web/src/nova/ed/panel/popup/code/code.tsx
View File

@ -33,7 +33,7 @@ export const EdPopCode = () => {
useEffect(() => {
if (code.mode === "" && p.site.id) {
db.code.findFirst({ where: { id_site: p.site.id } }).then((e) => {
_db.code.findFirst({ where: { id_site: p.site.id } }).then((e) => {
code.mode = e ? "new" : "old";
if (localStorage.vsc_opened === "yes") {
@ -90,7 +90,7 @@ export const EdPopCode = () => {
)
) {
code.mode = "new";
db.code.create({
_db.code.create({
data: { id_site: p.site.id, name: "site" },
});
p.ui.popup.code.open = false;
@ -355,7 +355,7 @@ const CodeBody = () => {
)
) {
localStorage.vsc_opened = "yes";
await db.site.update({
await _db.site.update({
where: { id: p.site.id },
data: { code_mode: "old" },
});
@ -416,7 +416,7 @@ const CodeBody = () => {
)
) {
localStorage.vsc_opened = "yes";
await db.site.update({
await _db.site.update({
where: { id: p.site.id },
data: { code_mode: "vsc" },
});

4
app/web/src/nova/ed/panel/popup/code/name-list.tsx
View File

@ -44,7 +44,7 @@ export const CodeNameList: FC<{
},
async () => {
codeName.loading = true;
codeName.list = await api.code(p.site.id, "list");
codeName.list = await _api.code(p.site.id, "list");
codeName.loading = false;
local.render();
}
@ -94,7 +94,7 @@ export const CodeNameList: FC<{
local.newopen = false;
local.render();
const nc = await db.code.create({
const nc = await _db.code.create({
data: {
id_site: p.site.id,
name: local.newname,

2
app/web/src/nova/ed/panel/popup/comp/comp-popup.tsx
View File

@ -169,7 +169,7 @@ export const EdPopComp = () => {
typeof opt.dragSourceId === "string" &&
typeof opt.dropTargetId === "string"
) {
db.component.update({
_db.component.update({
where: {
id: opt.dragSourceId,
},

8
app/web/src/nova/ed/panel/popup/comp/comp-preview.tsx
View File

@ -35,7 +35,7 @@ export const EdCompPreview = () => {
if (root) {
if (root.text !== found.text) {
found.text = root.text;
db.component.update({
_db.component.update({
where: { id: comp_id },
data: { name: found.text },
});
@ -71,7 +71,7 @@ export const EdCompPreview = () => {
p.ui.popup.comp_group = {
mouse_event: e,
async on_pick(group_id) {
await db.component.update({
await _db.component.update({
where: { id: comp_id },
data: { id_component_group: group_id },
});
@ -100,7 +100,7 @@ export const EdCompPreview = () => {
e.stopPropagation();
if (isTrashed) {
if (confirm("Permanently delete this component?")) {
await db.component.delete({
await _db.component.delete({
where: { id: p.ui.popup.comp.preview_id },
});
const idx =
@ -117,7 +117,7 @@ export const EdCompPreview = () => {
}
} else {
if (confirm("Move component to trash?")) {
await db.component.update({
await _db.component.update({
where: { id: comp_id },
data: { id_component_group: compPicker.trash_id },
});

4
app/web/src/nova/ed/panel/popup/comp/comp-reload.ts
View File

@ -45,7 +45,7 @@ export const reloadCompPicker = async (p: PG) => {
comp_ids.push(k);
}
const comps = await db.component.findMany({
const comps = await _db.component.findMany({
where: { id_component_group: { in: comp_ids } },
select: { id: true, id_component_group: true, name: true },
});
@ -66,7 +66,7 @@ export const reloadCompPicker = async (p: PG) => {
if (root) {
if (root.data?.item.name && comp.name !== root.data?.item.name) {
comp.name = root.data.item.name;
db.component.update({
_db.component.update({
where: { id: comp.id },
data: { name: comp.name },
});

6
app/web/src/nova/ed/panel/popup/comp/comp-tree.tsx
View File

@ -81,13 +81,13 @@ export const edPageTreeRender: NodeRender<CompItem> = (
item.name = local.rename_to;
if (item.id === "") {
if (item.name) {
db.page_folder.create({
_db.page_folder.create({
data: { name: local.rename_to, id_site: p.site.id },
});
}
await reloadCompPicker(p);
} else {
db.page_folder.update({
_db.page_folder.update({
where: { id: item.id },
data: { name: local.rename_to },
});
@ -136,7 +136,7 @@ export const edPageTreeRender: NodeRender<CompItem> = (
p.ui.popup.comp_group = {
mouse_event: e,
async on_pick(group_id) {
await db.component.update({
await _db.component.update({
where: { id: item.id },
data: { id_component_group: group_id },
});

16
app/web/src/nova/ed/panel/popup/npm/npm-import.tsx
View File

@ -27,16 +27,16 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => {
const reload = async () => {
if (mode === "page") {
local.list = await db.npm_page.findMany({
local.list = await _db.npm_page.findMany({
where: { id_page: p.page.cur.id },
});
} else if (mode === "site") {
local.list = await db.npm_site.findMany({
local.list = await _db.npm_site.findMany({
where: { id_site: p.site.id },
});
}
const size = await api.npm_size(
const size = await _api.npm_size(
mode,
mode === "site" ? p.site.id || "" : p.page.cur.id
);
@ -100,7 +100,7 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => {
local.render();
if (mode === "page") {
await db.npm_page.create({
await _db.npm_page.create({
data: {
id_page: p.page.cur.id,
module: name,
@ -108,7 +108,7 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => {
},
});
} else {
await db.npm_site.create({
await _db.npm_site.create({
data: {
id_site: p.site.id,
module: name,
@ -129,11 +129,11 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => {
const [name, version] = e.value.split("-><-");
if (mode === "page") {
await db.npm_page.create({
await _db.npm_page.create({
data: { id_page: p.page.cur.id, module: name, version },
});
} else {
await db.npm_site.create({
await _db.npm_site.create({
data: { id_site: p.site.id, module: name, version },
});
}
@ -194,7 +194,7 @@ export const EdNpmImport = ({ mode }: { mode: "page" | "site" }) => {
local.bundling = true;
local.render();
const res = (await api.npm_bundle(
const res = (await _api.npm_bundle(
mode,
mode === "site"
? p.site.id || ""

16
app/web/src/nova/ed/panel/popup/npm/npm-items.tsx
View File

@ -34,11 +34,11 @@ export const EdNpmItems = ({
bundled={bundled}
remove={async (e) => {
if (mode === "site") {
await db.npm_site.delete({
await _db.npm_site.delete({
where: { id: BigInt(e.id) },
});
} else {
await db.npm_page.delete({
await _db.npm_page.delete({
where: { id: BigInt(e.id) },
});
}
@ -230,14 +230,14 @@ const MainImport: FC<{
useEffect(() => {
if (!local.open) {
if (mode === "site") {
db.npm_site.update({
_db.npm_site.update({
where: { id: item.id },
data: {
import_as,
},
});
} else {
db.npm_page.update({
_db.npm_page.update({
where: { id: item.id },
data: {
import_as,
@ -315,14 +315,14 @@ const CustomImport: FC<{
useEffect(() => {
if (!local.open) {
if (mode === "site") {
db.npm_site.update({
_db.npm_site.update({
where: { id: item.id },
data: {
import_as,
},
});
} else {
db.npm_page.update({
_db.npm_page.update({
where: { id: item.id },
data: {
import_as,
@ -396,14 +396,14 @@ const NamedImport: FC<{
useEffect(() => {
if (!local.open) {
if (mode === "site") {
db.npm_site.update({
_db.npm_site.update({
where: { id: item.id },
data: {
import_as,
},
});
} else {
db.npm_page.update({
_db.npm_page.update({
where: { id: item.id },
data: {
import_as,

6
app/web/src/nova/ed/panel/popup/page/page-form.tsx
View File

@ -62,7 +62,7 @@ export const EdFormPage: FC<{
let id_folder = form.id_folder;
if (!id_folder || id_folder === "ROOT") id_folder = null;
if (!form.id) {
const res = await db.page.create({
const res = await _db.page.create({
data: {
content_tree: {
childs: [],
@ -77,7 +77,7 @@ export const EdFormPage: FC<{
});
onSave(res, true);
} else {
const res = await db.page.update({
const res = await _db.page.update({
data: {
name: form.name,
url: form.url || "",
@ -191,7 +191,7 @@ export const EdFormPage: FC<{
className="bg-red-600 w-[40px] flex justify-center items-center"
onClick={async () => {
if (confirm("Are you sure ?")) {
const res = await db.page.update({
const res = await _db.page.update({
where: {
id: page.id,
},

4
app/web/src/nova/ed/panel/popup/page/page-popup.tsx
View File

@ -157,7 +157,7 @@ export const EdPopPage = () => {
p.render();
if (!opt.dragSource?.droppable) {
await db.page.update({
await _db.page.update({
where: {
id: opt.dragSourceId as string,
},
@ -170,7 +170,7 @@ export const EdPopPage = () => {
select: { id: true },
});
} else {
await db.page_folder.update({
await _db.page_folder.update({
where: {
id: opt.dragSourceId as string,
},

4
app/web/src/nova/ed/panel/popup/page/page-reload.ts
View File

@ -24,7 +24,7 @@ export const pagePicker = {
export const reloadPagePicker = async (p: PG) => {
pagePicker.status = "loading";
const pages = await db.page.findMany({
const pages = await _db.page.findMany({
where: {
id_site: p.site.id,
is_deleted: false,
@ -39,7 +39,7 @@ export const reloadPagePicker = async (p: PG) => {
},
});
const folders = await db.page_folder.findMany({
const folders = await _db.page_folder.findMany({
where: { id_site: p.site.id, is_deleted: false },
select: { id: true, name: true, parent_id: true },
});

14
app/web/src/nova/ed/panel/popup/page/page-tree.tsx
View File

@ -72,7 +72,7 @@ export const edPageTreeRender: NodeRender<PageItem> = (
if (item.id === "NEW") {
if (item.name) {
await db.page_folder.create({
await _db.page_folder.create({
data: {
name: local.rename_to,
id_site: p.site.id,
@ -84,7 +84,7 @@ export const edPageTreeRender: NodeRender<PageItem> = (
pagePicker.new_parent_id = "";
}
} else {
await db.page_folder.update({
await _db.page_folder.update({
where: { id: item.id },
data: { name: local.rename_to },
});
@ -160,7 +160,7 @@ export const edPageTreeRender: NodeRender<PageItem> = (
e.stopPropagation();
if (confirm("Clone page ?")) {
local.render();
const page = (await db.page.findFirst({
const page = (await _db.page.findFirst({
where: {
id: node.id as string,
is_deleted: false,
@ -171,7 +171,7 @@ export const edPageTreeRender: NodeRender<PageItem> = (
delete page.id;
page.name = `${page.name} [Cloned]`;
page.url = `${page.url}-cloned`;
await db.page.create({
await _db.page.create({
data: page,
});
@ -204,7 +204,7 @@ export const edPageTreeRender: NodeRender<PageItem> = (
e.stopPropagation();
if (confirm("Deletting cannot be undone. Are you sure ?")) {
if (item.type === "folder") {
await db.page.updateMany({
await _db.page.updateMany({
where: { id_folder: node.id as string },
data: {
id_folder:
@ -213,14 +213,14 @@ export const edPageTreeRender: NodeRender<PageItem> = (
: (node.parent as string),
},
});
await db.page_folder.update({
await _db.page_folder.update({
where: { id: node.id as string },
data: {
is_deleted: true,
},
});
} else {
await db.page.update({
await _db.page.update({
where: { id: node.id as string },
data: {
is_deleted: true,

6
app/web/src/nova/ed/panel/popup/site/site-form.tsx
View File

@ -59,7 +59,7 @@ export const EdFormSite: FC<{
try {
if (!form.id) {
try {
await db.site.create({
await _db.site.create({
data: {
name: form.name,
favicon: "",
@ -73,7 +73,7 @@ export const EdFormSite: FC<{
alert(e);
}
} else {
await db.site.update({
await _db.site.update({
data: {
name: form.name,
domain: form.domain,
@ -160,7 +160,7 @@ export const EdFormSite: FC<{
"Please type 'yes' (without quote) to confirm deletion: "
)?.toLowerCase() === "yes"
) {
await db.site.update({
await _db.site.update({
where: {
id: site.id,
},

2
app/web/src/nova/ed/panel/popup/site/site-head.tsx
View File

@ -34,7 +34,7 @@ export const EdSiteHead = ({
onClick={async () => {
const neworg = prompt("New Organization Name");
if (neworg) {
const res = await db.org.create({
const res = await _db.org.create({
data: {
name: neworg,
org_user: {

12
app/web/src/nova/ed/panel/popup/site/site-tree.tsx
View File

@ -98,7 +98,7 @@ export const EdSiteTree = ({
node.text = gitem.name;
gitem.renaming = false;
local.render();
await db.org.update({
await _db.org.update({
where: { id: gitem.id },
data: { name: gitem.name },
});
@ -139,14 +139,14 @@ export const EdSiteTree = ({
<EdPopUser
users={gitem.users}
onDel={async (u) => {
await db.org_user.deleteMany({
await _db.org_user.deleteMany({
where: { id_org: gitem.id, id_user: u.id },
});
gitem.users = gitem.users.filter((e) => e.id !== u.id);
local.render();
}}
onAdd={async (u) => {
await db.org_user.create({
await _db.org_user.create({
data: { id_org: gitem.id, id_user: u.id },
});
gitem.users = [...gitem.users, u];
@ -168,10 +168,10 @@ export const EdSiteTree = ({
className="text-[12px] bg-white border rounded px-2 hover:bg-red-100 text-red-600 cursor-pointer min-h-[20px] flex items-center"
onClick={async () => {
if (confirm("Remove this organization ?")) {
await db.org_user.deleteMany({
await _db.org_user.deleteMany({
where: { id_org: gitem.id },
});
await db.org.delete({
await _db.org.delete({
where: {
id: gitem.id,
},
@ -336,7 +336,7 @@ export const EdSiteTree = ({
const from = dragSource?.data;
if (target && from) {
if (target.type === "group") {
await db.site.update({
await _db.site.update({
where: {
id: from.id,
},

2
app/web/src/nova/ed/panel/popup/site/site-user.tsx
View File

@ -29,7 +29,7 @@ export const EdPopUser = ({
async () => {
if (!user.loading) {
user.loading = new Promise(async (done) => {
const res = await db.user.findMany({
const res = await _db.user.findMany({
select: {
id: true,
username: true,

2
app/web/src/nova/ed/panel/tree/node/item/name.tsx
View File

@ -68,7 +68,7 @@ export const EdTreeName = ({
}
if (active.comp_id === item.component?.id) {
db.component.update({
_db.component.update({
where: {
id: active.comp_id,
},

2
app/web/src/nova/vi/load/load-legacy.tsx
View File

@ -27,7 +27,7 @@ export const viLoadLegacy = async (vi: {
w.exports = {};
}
const site = await db.site.findFirst({
const site = await _db.site.findFirst({
where: { id: vi.site.id },
include: { component_site: true },
});

2
app/web/src/render/editor/logic/init.ts
View File

@ -127,7 +127,7 @@ export const initEditor = async (p: PG, site_id: string) => {
}
w.apiurl = p.site.api_url;
api.site_dts(p.site.id).then((e: any) => {
_api.site_dts(p.site.id).then((e: any) => {
p.site_dts = e || "";
p.render();
});

2
app/web/src/render/editor/logic/route.ts
View File

@ -23,7 +23,7 @@ export const routeEditor = (p: PG, page_id: string) => {
p.status = "ready";
p.render();
};
await api.page_reload(page_id);
await _api.page_reload(page_id);
} else {
p.status = "ready";
p.render();

2
app/web/src/render/editor/logic/ws.ts
View File

@ -41,7 +41,7 @@ export const editorWS = async (p: PG) => {
p.wsRetry.localIP &&
["localhost", "127.0.0.1"].includes(wsurl.hostname)
) {
const ips = await api.local_ip();
const ips = await _api.local_ip();
wsurl.hostname = ips[0];
}

30
app/web/src/render/editor/panel/manager/comp/comp-mgr.tsx
View File

@ -92,7 +92,7 @@ export const CompManager: FC = () => {
if (p.site.id) {
local.loading = true;
local.site_use = (
await db.site_use_comp.findMany({
await _db.site_use_comp.findMany({
where: {
id_site: p.site.id,
},
@ -101,7 +101,7 @@ export const CompManager: FC = () => {
},
})
).map((e) => e.use_id_site);
const group = await db.component_group.findMany({
const group = await _db.component_group.findMany({
where: {
component_site: {
some: {
@ -151,7 +151,7 @@ export const CompManager: FC = () => {
const group_ids = Object.keys(local.group);
if (group_ids.length > 0) {
const comps = await db.component.findMany({
const comps = await _db.component.findMany({
where: {
id_component_group: {
in: group_ids,
@ -308,7 +308,7 @@ export const CompManager: FC = () => {
});
if (totrash.length > 0) {
if (!local.trash_id) {
const res = await db.component_group.create({
const res = await _db.component_group.create({
data: {
name: "__TRASH__",
component_site: {
@ -322,7 +322,7 @@ export const CompManager: FC = () => {
}
if (local.trash_id) {
await db.component.updateMany({
await _db.component.updateMany({
where: {
id: { in: totrash },
},
@ -378,7 +378,7 @@ export const CompManager: FC = () => {
onClick={async () => {
local.site_use_loading = true;
local.render();
await db.site_use_comp.create({
await _db.site_use_comp.create({
data: {
id_site: p.site.id,
use_id_site: "9e34f31f-4ebd-4630-b61d-597045171ebb",
@ -409,7 +409,7 @@ export const CompManager: FC = () => {
if (p.site.id) {
local.site_use_loading = true;
local.render();
await db.site_use_comp.delete({
await _db.site_use_comp.delete({
where: {
id_site_use_id_site: {
id_site: p.site.id,
@ -482,7 +482,7 @@ export const CompManager: FC = () => {
local.renaming.id = "";
local.render();
db.component_group.update({
_db.component_group.update({
where: {
id: g.info.id,
},
@ -543,7 +543,7 @@ export const CompManager: FC = () => {
onClick={async () => {
g.shared = false;
db.component_group.update({
_db.component_group.update({
where: {
id: g.info.id,
},
@ -563,7 +563,7 @@ export const CompManager: FC = () => {
onClick={async () => {
g.shared = true;
db.component_group.update({
_db.component_group.update({
where: {
id: g.info.id,
},
@ -596,7 +596,7 @@ export const CompManager: FC = () => {
const name = prompt(`New Group Name:`);
if (name) {
const res = await db.component_group.create({
const res = await _db.component_group.create({
data: {
component_site: {
create: {
@ -629,7 +629,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,
@ -779,7 +779,7 @@ export const CompManager: FC = () => {
g.comps.splice(idx, 1);
local.render();
db.component.update({
_db.component.update({
where: {
id: e.id,
},
@ -823,7 +823,7 @@ export const CompManager: FC = () => {
onClick={async (ev) => {
if (confirm("Are you sure ?")) {
if (!local.trash_id) {
const res = await db.component_group.create({
const res = await _db.component_group.create({
data: {
name: "__TRASH__",
component_site: {
@ -837,7 +837,7 @@ export const CompManager: FC = () => {
}
if (local.trash_id) {
await db.component.update({
await _db.component.update({
where: {
id: local.selected_id,
},

6
app/web/src/render/editor/panel/manager/page/page-mgr-form.tsx
View File

@ -62,7 +62,7 @@ export const PageForm: FC<{
let id_folder = form.id_folder;
if (!id_folder || id_folder === "ROOT") id_folder = null;
if (!form.id) {
const res = await db.page.create({
const res = await _db.page.create({
data: {
content_tree: {
childs: [],
@ -77,7 +77,7 @@ export const PageForm: FC<{
});
onSave(res, true);
} else {
const res = await db.page.update({
const res = await _db.page.update({
data: {
name: form.name,
url: form.url || "",
@ -187,7 +187,7 @@ export const PageForm: FC<{
className="bg-red-600 w-[40px] flex justify-center items-center"
onClick={async () => {
if (confirm("Are you sure ?")) {
const res = await db.page.update({
const res = await _db.page.update({
where: {
id: page.id,
},

20
app/web/src/render/editor/panel/manager/page/page-mgr.tsx
View File

@ -77,7 +77,7 @@ export const PageManager = () => {
local.loading = true;
local.render();
const folders = await db.page_folder.findMany({
const folders = await _db.page_folder.findMany({
where: {
id_site: p.site.id,
is_deleted: false,
@ -90,7 +90,7 @@ export const PageManager = () => {
data.folder[f.id] = { ...f };
}
data.all = await db.page.findMany({
data.all = await _db.page.findMany({
where: {
id_site: p.site.id,
is_deleted: false,
@ -256,7 +256,7 @@ export const PageManager = () => {
opt.dropTargetId === "ROOT" || opt.dropTargetId === "root";
if (!opt.dragSource?.droppable) {
await db.page.update({
await _db.page.update({
where: {
id: opt.dragSourceId as string,
},
@ -268,7 +268,7 @@ export const PageManager = () => {
select: { id: true },
});
} else {
await db.page_folder.update({
await _db.page_folder.update({
where: {
id: opt.dragSourceId as string,
},
@ -364,7 +364,7 @@ export const PageManager = () => {
local.loading = true;
local.render();
await db.page_folder.create({
await _db.page_folder.create({
data: {
id_site: firstPage.id_site,
name: local.newFolder.name,
@ -386,7 +386,7 @@ export const PageManager = () => {
node.text = local.newFolder.name;
local.loading = true;
local.render();
await db.page_folder.update({
await _db.page_folder.update({
data: {
name: local.newFolder.name,
},
@ -502,14 +502,14 @@ export const PageManager = () => {
if (confirm("Clone page ?")) {
local.loading = true;
local.render();
const page = (await db.page.findFirst({
const page = (await _db.page.findFirst({
where: { id: node.id as string },
})) as any;
delete page.id;
page.name = `${page.name} [Cloned]`;
page.url = `${page.url}-cloned`;
await db.page.create({
await _db.page.create({
data: page,
});
@ -542,7 +542,7 @@ export const PageManager = () => {
local.init = false;
delete data.folder[node.id];
local.render();
db.page_folder.update({
_db.page_folder.update({
where: { id: node.id as string },
data: {
is_deleted: true,
@ -551,7 +551,7 @@ export const PageManager = () => {
} else {
local.loading = true;
local.render();
await db.page.update({
await _db.page.update({
where: { id: node.id as string },
data: {
is_deleted: true,

6
app/web/src/render/editor/panel/manager/site/site-form.tsx
View File

@ -58,7 +58,7 @@ export const SiteForm: FC<{
local.render();
if (!form.id) {
try {
await db.site.create({
await _db.site.create({
data: {
name: form.name,
favicon: "",
@ -72,7 +72,7 @@ export const SiteForm: FC<{
alert(e);
}
} else {
await db.site.update({
await _db.site.update({
data: {
name: form.name,
domain: form.domain,
@ -156,7 +156,7 @@ export const SiteForm: FC<{
"Please type 'yes' (without quote) to confirm deletion: "
)?.toLowerCase() === "yes"
) {
await db.site.update({
await _db.site.update({
where: {
id: site.id,
},

4
app/web/src/render/editor/panel/manager/site/site-mgr.tsx
View File

@ -22,7 +22,7 @@ export const SiteManager = () => {
});
const reloadSites = async () => {
const orgs = await db.org_user.findMany({
const orgs = await _db.org_user.findMany({
where: {
id_user: p.session.data.user.id,
},
@ -44,7 +44,7 @@ export const SiteManager = () => {
for (const org of orgs) {
local.orgs[org.org.id] = org.org;
}
const sites = await db.site.findMany({
const sites = await _db.site.findMany({
where: {
id_org: {
in: Object.keys(local.orgs),

32
app/web/src/render/editor/panel/toolbar/center/NPMImport.tsx
View File

@ -47,7 +47,7 @@ export const NPMImport = () => {
if (!w.npmImport.init) {
w.npmImport.init = true;
w.npmImport.loading = Promise.all([
db.npm_site
_db.npm_site
.findMany({
where: {
id_site: p.site.id,
@ -56,7 +56,7 @@ export const NPMImport = () => {
.then((e) => {
w.npmImport.site = e;
}),
db.npm_page
_db.npm_page
.findMany({
where: {
id_page: p.page.id,
@ -92,7 +92,7 @@ export const NPMImport = () => {
);
const j = await f.json();
const version = j.versions[0].version;
const res = await db.npm_site.create({
const res = await _db.npm_site.create({
data: {
id_site: p.site?.id || "",
module: e.name,
@ -113,7 +113,7 @@ export const NPMImport = () => {
mode="page"
onChange={async (e) => {
if (p.page) {
const res = await db.npm_page.create({
const res = await _db.npm_page.create({
data: {
id_page: p.page.id || "",
module: e.name,
@ -148,7 +148,7 @@ const NPMModule: FC<{
if (!p.page) return <></>;
useEffect(() => {
if (p.page)
api
_api
.npm_size(mode, mode === "site" ? p.site.id || "" : p.page.id)
.then((e: string) => {
local.size = parseInt(e) || 0;
@ -168,7 +168,7 @@ const NPMModule: FC<{
list = w.npmImport.page[p.page.id];
} else {
local.loading = true;
db.npm_page
_db.npm_page
.findMany({
where: {
id_page: p.page.id,
@ -243,7 +243,7 @@ const NPMModule: FC<{
local.bundling = true;
local.bundleError = "";
local.render();
const res = (await api.npm_bundle(
const res = (await _api.npm_bundle(
mode,
mode === "site" ? p.site.id || "" : p.page ? p.page.id : ""
)) as any;
@ -377,7 +377,7 @@ const NPMModule: FC<{
);
const j = await f.json();
const version = j.versions[0].version;
const res = await db.npm_site.create({
const res = await _db.npm_site.create({
data: {
id_site: p.site?.id || "",
module: val,
@ -406,7 +406,7 @@ const NPMModule: FC<{
mode={mode}
remove={async (e) => {
if (mode === "site") {
await db.npm_site.delete({
await _db.npm_site.delete({
where: { id: BigInt(e.id) },
});
w.npmImport.site = w.npmImport.site.filter(
@ -414,7 +414,7 @@ const NPMModule: FC<{
);
} else {
if (p.page) {
await db.npm_page.delete({
await _db.npm_page.delete({
where: { id: BigInt(e.id) },
});
@ -610,14 +610,14 @@ const MainImport: FC<{
useEffect(() => {
if (!local.open) {
if (mode === "site") {
db.npm_site.update({
_db.npm_site.update({
where: { id: item.id },
data: {
import_as,
},
});
} else {
db.npm_page.update({
_db.npm_page.update({
where: { id: item.id },
data: {
import_as,
@ -695,14 +695,14 @@ const CustomImport: FC<{
useEffect(() => {
if (!local.open) {
if (mode === "site") {
db.npm_site.update({
_db.npm_site.update({
where: { id: item.id },
data: {
import_as,
},
});
} else {
db.npm_page.update({
_db.npm_page.update({
where: { id: item.id },
data: {
import_as,
@ -776,14 +776,14 @@ const NamedImport: FC<{
useEffect(() => {
if (!local.open) {
if (mode === "site") {
db.npm_site.update({
_db.npm_site.update({
where: { id: item.id },
data: {
import_as,
},
});
} else {
db.npm_page.update({
_db.npm_page.update({
where: { id: item.id },
data: {
import_as,

2
app/web/src/render/editor/panel/toolbar/center/ToolbarCenter.tsx
View File

@ -157,7 +157,7 @@ export const ToolbarCenter = () => {
(!p.site.api_prasi ||
(p.site.api_prasi && !p.site.api_prasi.port))
) {
await db.site.update({
await _db.site.update({
data: {
config: {
api_url: p.site.api_url,

2
app/web/src/render/editor/panel/toolbar/center/api/External.tsx
View File

@ -48,7 +48,7 @@ export const ExternalAPI = ({
}
}}
onBlur={async () => {
await db.site.update({
await _db.site.update({
where: { id: p.site.id },
data: {
config: {

12
app/web/src/render/editor/panel/toolbar/center/api/Internal.tsx
View File

@ -21,7 +21,7 @@ export const InternalAPI: FC<{
const reloadStatus = () => {
if (p.site) {
const s = api.srvapi_check.bind({ apiUrl: "https://api.prasi.app" });
const s = _api.srvapi_check.bind({ apiUrl: "https://api.prasi.app" });
s(p.site.id).then((e: any) => {
local.status = e;
checkApi(e === "started");
@ -83,7 +83,7 @@ export const InternalAPI: FC<{
className="border border-slate-500 hover:bg-red-100 hover:border-red-500 px-2 rounded cursor-pointer"
onClick={async () => {
if (p.site) {
const s = api.srvapi_op.bind({
const s = _api.srvapi_op.bind({
apiUrl: "https://api.prasi.app",
});
@ -99,7 +99,7 @@ export const InternalAPI: FC<{
className="border border-slate-500 hover:bg-purple-100 hover:border-purple-500 px-2 rounded cursor-pointer"
onClick={async () => {
if (p.site) {
const s = api.srvapi_op.bind({
const s = _api.srvapi_op.bind({
apiUrl: "https://api.prasi.app",
});
@ -124,7 +124,7 @@ export const InternalAPI: FC<{
className="border border-slate-500 hover:bg-green-100 hover:border-green-500 px-2 rounded cursor-pointer"
onClick={async () => {
if (p.site) {
const s = api.srvapi_op.bind({
const s = _api.srvapi_op.bind({
apiUrl: "https://api.prasi.app",
});
@ -164,7 +164,7 @@ export const InternalAPI: FC<{
w.prasiApiDbPull = true;
local.render();
await api.srvapi_dbpull(
await _api.srvapi_dbpull(
p.site.id,
p.site.api_prasi.db || ""
);
@ -205,7 +205,7 @@ export const InternalAPI: FC<{
if (confirm("Are you sure ?")) {
local.loading = true;
local.render();
await api.srvapi_destroy(p.site.id);
await _api.srvapi_destroy(p.site.id);
p.site.api_url = "";
p.site.api_prasi.db = "";
p.site.api_prasi.port = "";

20
app/web/src/render/editor/panel/toolbar/center/mobile/config.tsx
View File

@ -27,7 +27,7 @@ export const ExportMobileSetting: FC<{
}> = () => {
const p = useGlobal(EditorGlobal, "EDITOR");
const local = useLocal({}, async () => {
setting.config = await api.export_mobile(p.site.id, "config");
setting.config = await _api.export_mobile(p.site.id, "config");
local.render();
});
@ -48,7 +48,7 @@ export const ExportMobileSetting: FC<{
if (setting.config?.android && confirm("Remove Android?")) {
setting.status = "building-android";
local.render();
setting.config = await api.export_mobile(
setting.config = await _api.export_mobile(
p.site.id,
"remove-android"
);
@ -66,7 +66,7 @@ export const ExportMobileSetting: FC<{
onClick={async () => {
setting.status = "building-android";
local.render();
setting.config = await api.export_mobile(
setting.config = await _api.export_mobile(
p.site.id,
"build-android"
);
@ -90,7 +90,7 @@ export const ExportMobileSetting: FC<{
if (setting.config?.ios && confirm("Remove IOS?")) {
setting.status = "building-ios";
local.render();
setting.config = await api.export_mobile(
setting.config = await _api.export_mobile(
p.site.id,
"remove-ios"
);
@ -108,7 +108,7 @@ export const ExportMobileSetting: FC<{
onClick={async () => {
setting.status = "building-ios";
local.render();
setting.config = await api.export_mobile(
setting.config = await _api.export_mobile(
p.site.id,
"build-ios"
);
@ -169,7 +169,7 @@ export const ExportMobileSetting: FC<{
onClick={async () => {
setting.status = "saving";
local.render();
await api.export_mobile(
await _api.export_mobile(
p.site.id,
"set-config",
setting.config
@ -178,13 +178,13 @@ export const ExportMobileSetting: FC<{
if (setting.config?.android) {
setting.status = "building-android";
local.render();
await api.export_mobile(p.site.id, "build-android");
await _api.export_mobile(p.site.id, "build-android");
}
if (setting.config?.ios) {
setting.status = "building-ios";
local.render();
await api.export_mobile(p.site.id, "build-ios");
await _api.export_mobile(p.site.id, "build-ios");
}
setting.status = "ready";
@ -280,11 +280,11 @@ const Img = (opt: {
type="file"
onChange={async (e) => {
if (e.currentTarget.files) {
const res = await api._upload(e.currentTarget.files[0]);
const res = await _api._upload(e.currentTarget.files[0]);
(setting.config as any)[opt.name] = res;
setting.status = "saving";
opt.render();
await api.export_mobile(
await _api.export_mobile(
opt.site_id,
"set-config",
setting.config

2
app/web/src/render/editor/panel/toolbar/left/ToolbarLeft.tsx
View File

@ -21,7 +21,7 @@ export const ToolbarLeft = () => {
{
label: "Logout",
onClick: () => {
api.logout().then(() => {
_api.logout().then(() => {
location.href = "/login";
});
},

6
app/web/src/render/editor/panel/tree/item/right-click.tsx
View File

@ -39,13 +39,13 @@ export const ETreeRightClick: FC<{
const isActiveComponent = rootComp && rootComp.id === item?.id && rootComp.id;
if (local.compGroups.list && local.compGroups.list.length === 0) {
db.component_group
_db.component_group
.findMany({
where: { component_site: { some: { id_site: p.site.id } } },
})
.then(async (comps) => {
if (comps && comps.length === 0) {
const res = await db.component_group.create({
const res = await _db.component_group.create({
data: {
component_site: {
create: {
@ -336,7 +336,7 @@ export const ETreeRightClick: FC<{
local.compGroups.choose = (group_id) => {
p.compLoading[item.id] = true;
p.render();
api
_api
.comp_create({
item_id: item.originalId || item.id,
site_id: p.site.id || "",

8
app/web/src/render/live/dev-loader.tsx
View File

@ -6,7 +6,7 @@ const config = { serverurl: "" };
export const devLoader: Loader = {
async site(p, where) {
config.serverurl = serverurl;
const site = (await db.site.findFirst({
const site = (await _db.site.findFirst({
where:
where.type === "siteid" ? { id: where.id } : { domain: where.domain },
select: {
@ -24,7 +24,7 @@ export const devLoader: Loader = {
return null;
}
const cgroups = await db.site_use_comp.findMany({
const cgroups = await _db.site_use_comp.findMany({
where: { id_site: site.id },
select: { use_id_site: true },
});
@ -36,7 +36,7 @@ export const devLoader: Loader = {
}
}
const layout = await db.page.findFirst({
const layout = await _db.page.findFirst({
where: {
id_site: site.id,
name: { startsWith: "layout:" },
@ -83,7 +83,7 @@ export const devLoader: Loader = {
}
const loadPages = async () => {
return await db.page.findMany({
return await _db.page.findMany({
where: {
id_site: cache.site.id,
is_deleted: false,

4
app/web/src/utils/types/general.ts
View File

@ -36,8 +36,8 @@ export const w = window as unknown as {
ts: number;
serverurl: string;
apiurl: string;
api: any;
db: any;
_api: any;
_db: any;
offline: boolean;
debug: {
on: any;

5
pkgs/core/api/_dbs.ts
View File

@ -1,5 +1,6 @@
import { g } from "utils/global";
import { apiContext } from "../server/api/api-ctx";
import { DBArg, execQuery } from "../utils/query";
import { execQuery } from "../utils/query";
export const _ = {
url: "/_dbs/:action",
@ -7,7 +8,7 @@ export const _ = {
const { req, res } = apiContext(this);
try {
const result = await execQuery(req.params, db);
const result = await execQuery(req.params, g._db);
res.send(result);
} catch (e: any) {
res.sendStatus(500);

2
pkgs/core/api/_prasi.ts
View File

@ -84,7 +84,7 @@ export const _ = {
export const getApiEntry = () => {
const res: any = {};
for (const [k, v] of Object.entries(g.api)) {
for (const [k, v] of Object.entries(g._api)) {
const name = k.substring(0, k.length - 3).replace(/\W/gi, "_");
res[name] = { ...v, name, path: `app/srv/api/${v.path}` };
}

6
pkgs/core/index.ts
View File

@ -27,7 +27,7 @@ if (!g.Y) {
g.syncronize = (await import("y-pojo")).syncronize;
await createLogger();
g.api = {};
g._api = {};
g.mode = process.argv.includes("dev") ? "dev" : "prod";
g.datadir = g.mode == "prod" ? "../data" : "data";
g.port = parseInt(process.env.PORT || "4550");
@ -42,11 +42,11 @@ if (!g.Y) {
snapshot.init();
}
const db = g.db;
const db = g._db;
if (!db) {
await preparePrisma();
await ensureNotRunning();
const db = g.db;
const db = g._db;
if (db) {
db.$connect()
.catch((e: any) => {

2
pkgs/core/server/api/api-scan.ts
View File

@ -21,7 +21,7 @@ export const prepareApiRoutes = async () => {
fn: api._.api,
path: importPath.substring((root || path).length + 1),
};
g.api[filename] = route;
g._api[filename] = route;
} catch (e) {
g.log.warn(
`Failed to import app/srv/api${importPath.substring(

2
pkgs/core/server/api/prep-api-ts.ts
View File

@ -5,7 +5,7 @@ import { g } from "../../utils/global";
export const prepareAPITypes = async () => {
const out: string[] = [];
for (const [k, v] of Object.entries(g.api)) {
for (const [k, v] of Object.entries(g._api)) {
const name = k.substring(0, k.length - 3).replace(/\W/gi, "_");
let p = {

2
pkgs/core/server/serve-api.ts
View File

@ -10,7 +10,7 @@ export const CORS_HEADERS = {
export const serveAPI = {
init: async () => {
g.router = createRouter({ strictTrailingSlash: false });
for (const route of Object.values(g.api)) {
for (const route of Object.values(g._api)) {
g.router.insert(route.url.replace(/\*/gi, "**"), route);
}
},

4
pkgs/core/utils/global.ts
View File

@ -15,12 +15,12 @@ type SingleRoute = {
export const g = global as unknown as {
status: "init" | "ready";
datadir: string;
db: PrismaClient;
_db: PrismaClient;
dburl: string;
mode: "dev" | "prod";
server: Server;
log: Logger;
api: Record<string, SingleRoute>;
_api: Record<string, SingleRoute>;
domains: null | Record<string, string>;
router: RadixRouter<SingleRoute>;
port: number;

2
pkgs/core/utils/prisma.ts
View File

@ -15,7 +15,7 @@ export const preparePrisma = async () => {
}
const { PrismaClient } = await import("../../../app/db/db");
g.db = new PrismaClient();
g._db = new PrismaClient();
}
g.dburl = process.env.DATABASE_URL || "";

4
pkgs/web-utils/src/global.ts
View File

@ -6,8 +6,8 @@ declare global {
const params: any;
const css: typeof goober.css;
const cx: (...arg: any[]) => string;
const api: any;
const db: PrismaClient;
const _api: any;
const _db: PrismaClient;
const prasiContext: any;
const serverurl: string;
}