From bce86b58816cfd89d64e45fb877008ff3525c590 Mon Sep 17 00:00:00 2001 From: Rizky Date: Mon, 22 Jan 2024 22:47:50 +0700 Subject: [PATCH] wip fix --- app/db/package.json | 4 ++-- app/db/prisma/schema.prisma | 1 + app/srv/ws/sync/actions/site_load.ts | 10 ++++------ app/web/src/nova/ed/logic/ed-global.ts | 1 + bun.lockb | Bin 267704 -> 267704 bytes 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/db/package.json b/app/db/package.json index abad046c..5bdf12fb 100644 --- a/app/db/package.json +++ b/app/db/package.json @@ -1,7 +1,7 @@ { "name": "db", "dependencies": { - "@prisma/client": "^5.7.1", - "prisma": "^5.7.1" + "@prisma/client": "^5.8.1", + "prisma": "^5.8.1" } } diff --git a/app/db/prisma/schema.prisma b/app/db/prisma/schema.prisma index d3d246a3..16ac0c75 100644 --- a/app/db/prisma/schema.prisma +++ b/app/db/prisma/schema.prisma @@ -225,6 +225,7 @@ model site { is_deleted Boolean @default(false) responsive String @default("all") npm_cache String @default(" ") @db.VarChar + code_mode String @default("old") @db.VarChar(5) code code[] component_site component_site[] npm_site npm_site[] diff --git a/app/srv/ws/sync/actions/site_load.ts b/app/srv/ws/sync/actions/site_load.ts index c6e2adc6..0406b70e 100644 --- a/app/srv/ws/sync/actions/site_load.ts +++ b/app/srv/ws/sync/actions/site_load.ts @@ -1,11 +1,9 @@ import { validate } from "uuid"; import { ESite } from "../../../../web/src/nova/ed/logic/ed-global"; import { SAction } from "../actions"; +import { prepCode } from "../editor/code/prep-code"; import { activity } from "../entity/activity"; import { SyncConnection } from "../type"; -import { prepCode } from "../editor/code/prep-code"; -import { docs } from "../entity/docs"; -import { snapshot } from "../entity/snapshot"; export const site_load: SAction["site"]["load"] = async function ( this: SyncConnection, @@ -40,10 +38,10 @@ export const site_load: SAction["site"]["load"] = async function ( config: config as ESite["config"], domain: site.domain, js: site.js || "", - responsive: site.responsive, + responsive: site.responsive as ESite["responsive"], js_compiled: site.js_compiled || "", - layout: { id: layout?.id || "", snapshot: null }, - code: { snapshot: null }, + layout: { id: layout?.id || "", snapshot: null, meta: undefined }, + code: { snapshot: null, mode: site.code_mode as "old" | "vsc" }, }; } } diff --git a/app/web/src/nova/ed/logic/ed-global.ts b/app/web/src/nova/ed/logic/ed-global.ts index f26017d3..33637b93 100644 --- a/app/web/src/nova/ed/logic/ed-global.ts +++ b/app/web/src/nova/ed/logic/ed-global.ts @@ -25,6 +25,7 @@ export const EmptySite = { }, code: { snapshot: null as null | Uint8Array, + mode: "old" as "old" | "vsc", }, }; diff --git a/bun.lockb b/bun.lockb index 6f5fb16f2a7e1ca59a728ead54580baa8e2128f9..7ad4a3c3b13e60c6f420000656cb30754ed0180a 100755 GIT binary patch delta 1271 zcmdn7T42X&feCsF-*WTcPx4mL(@ykYi#s`A>b$0sjkM?0piTC+PyB6X9o^_RPl!{5 zfuTX*00RT>=C4A(MI`v@w@b8WRp!*EEmc0;`;FNo+ObhhS3Q0+hlbA7$tJoclQZ`6 zfaw(wnzIt9*#l?@>tsV+bIyZ6o)wHYIb$D>3ZFOXjIXB0rx#ScYh1`SFUdJ_js7*2V!J1Y_wQ17l{H)Pkt4-sL0FM* z#{XvK2SD=~8UFGA1G>+f3CMv07M~dsx>7gS&s*2FT->^Gnf=(x^s?dmm6sK}GmSmJq~*;1KRxC+qh$Th9m;(zt=X$* z2yWn?<{7^*WYU(0@f0t&Kq@BmS|qn&fyIS2DVJUUMrKXtJ;5kZzs-8X+Xp5=XD>g_`1pmh zp`GJ?2k1cfQJ?NOzf}=*4g& z&I6Kbj@qm`l)F)}SUkt|x29lAhUoOYK<7Ce<@T}tcH+R!=-IBJiXjrWwI+nT@job{ zxTmW+y>i=kUxll?_n#F!)!OFin8>{<NY5xrb>>KBL9-Ivr+7DGNPA28N9N3=I6hBw4mju{3I%!8s;IQ$3668+DkK zT|rp`mJh(fAoUF3%mS2w;VP_kRDhbf*U38iCfbjp#3CRw7pT6S>P?qqJgn- zYEr7v^nyRk;?s40Gjs5yrkd{$^I5&i02{4rs~51fT#=F~{_l z-)I77elrUgLhUEPX0YiMf0$KtNpkXZ#V}^2X@8j6gp+eJQ}asnb@d?(U7+8$v;1Y= GA^`xXX1^u? delta 1276 zcmdn7T42X&feCsF{jFc71y63j(sFA*>K+`sO$zyC(Rc|x4L z3=9pN2N)PcHh&fREh15$wp96W?>Ae<_@)uky%vZ_$1+k#mn8 z!?8!jKi>%YoK{);?0nItb?ofCX9J#h_7wiSdQS3`w&^43uYo+)vtMi5@Fx9mzP&f3 zJL9=I&=N+5fBgS|wt6#x?F17n?vG#PZQHYL()pXGKXrN){#4>>3R{1#D8R}MS)kH*v=l~j8eFj$U{I0J)?fr}=w>+EByFB%La`0@2rm$ya@~lYC z^G9}GNlT?7)BbcpjYt7!i^7_Bdp%FT+}0&~a*>|?nJNB1f)_v6aXP5GQqp@$qkGA< zg^@?JV?J)#WPj)0!Je8n@pJOc)As_M=iuuy>rtr;cjx`T@2=mo>AN;j_GLN8U!#j0 zyj*<_7B2-(EEkn>I}jo8s>7f4VsyGm&cPzh0~6ym{;1zkvHBL@wC$oN8JB}O!$2PVm~b&91?+YHVzF`DX`Pv5A+tQ-%@ z8nAo-76z$j0B07U3@m3LWMmHjvk_1RmWL2Be}I-?mO46%C+iQnH9h;5l+s@OwB9N S*VTtGbb*1eo#ij{76|}E|JRrR