diff --git a/app/srv/util/prod-index.ts b/app/srv/util/prod-index.ts index bbb6c334..10a5af70 100644 --- a/app/srv/util/prod-index.ts +++ b/app/srv/util/prod-index.ts @@ -14,7 +14,6 @@ export const prodIndex = ( - ${this.head.join("\n")} diff --git a/app/web/public-br/index.html b/app/web/public-br/index.html deleted file mode 100644 index fbf08e6f..00000000 Binary files a/app/web/public-br/index.html and /dev/null differ diff --git a/app/web/public_files.ts b/app/web/public_files.ts index 2840cdcc..e1fafe72 100644 --- a/app/web/public_files.ts +++ b/app/web/public_files.ts @@ -1,6 +1,5 @@ export const files = [ "favicon.ico", - "index.html", "img/empty.png", "img/logo-white.png", "img/logo.png" diff --git a/app/web/src/base/root.tsx b/app/web/src/base/root.tsx index 7d5a2314..be884936 100644 --- a/app/web/src/base/root.tsx +++ b/app/web/src/base/root.tsx @@ -4,6 +4,8 @@ import { GlobalContext, useLocal } from "web-utils"; import { w } from "../utils/types/general"; import { Loading } from "../utils/ui/loading"; import * as pages from "./pages"; + + export const Root: FC<{}> = ({}) => { const local = useLocal( { diff --git a/app/web/src/index.css b/app/web/src/index.css index 620242cf..f30bc1ff 100644 --- a/app/web/src/index.css +++ b/app/web/src/index.css @@ -17,7 +17,19 @@ body, } body { - font-family: "Source Sans 3", system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: + "Source Sans 3", + system-ui, + -apple-system, + BlinkMacSystemFont, + "Segoe UI", + Roboto, + Oxygen, + Ubuntu, + Cantarell, + "Open Sans", + "Helvetica Neue", + sans-serif; } .JsxText { @@ -43,4 +55,4 @@ body { .name-of-PropertyAccessExpression { color: #f08c36; -} \ No newline at end of file +} diff --git a/app/web/public/index.html b/app/web/src/index.html similarity index 83% rename from app/web/public/index.html rename to app/web/src/index.html index ae193fba..61bc989d 100644 --- a/app/web/public/index.html +++ b/app/web/src/index.html @@ -7,7 +7,7 @@ content="width=device-width, initial-scale=1.0, user-scalable=1.0, minimum-scale=1.0, maximum-scale=1.0" /> Prasi: App Builder - + + diff --git a/app/web/src/index.tsx b/app/web/src/index.tsx index f6b2eb4a..78b3e047 100644 --- a/app/web/src/index.tsx +++ b/app/web/src/index.tsx @@ -4,9 +4,9 @@ import { apiProxy } from "./base/load/api/api-proxy"; import { loadApiProxyDef } from "./base/load/api/api-proxy-def"; import { dbProxy } from "./base/load/db/db-proxy"; import { Root } from "./base/root"; -import "./index.css"; import { sworkerAddCache, sworkerRegister } from "./sworker-boot"; import { w } from "./utils/types/general"; + import "@fontsource/jetbrains-mono"; import "@fontsource/source-sans-3"; diff --git a/pkgs/core/build.ts b/pkgs/core/build.ts index 435b37b3..d1f6ebaa 100644 --- a/pkgs/core/build.ts +++ b/pkgs/core/build.ts @@ -63,7 +63,7 @@ if (build_all) { : "node_modules/.bin/parcel" ), "build", - "./src/index.tsx", + "./src/index.html", // "--no-optimize", "--no-scope-hoist", "--dist-dir", diff --git a/pkgs/core/utils/parcel.ts b/pkgs/core/utils/parcel.ts index 910404c6..f46d55d6 100644 --- a/pkgs/core/utils/parcel.ts +++ b/pkgs/core/utils/parcel.ts @@ -16,7 +16,7 @@ export const parcelBuild = async () => { : "node_modules/.bin/parcel" ), g.mode === "dev" ? "watch" : "build", - "./src/index.tsx", + "./src/index.html", g.mode === "dev" ? "--no-hmr" : "--no-optimize", "--dist-dir", dir.path(`app/static`),