Add base URL to invent builder

invent-framework · Apr 29, 2024 · 89c4c92 · 89c4c92
1 parent 3d1e0fe
commit 89c4c92
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 37 deletions.
diff --git a/src/tools/builder/index.html b/src/tools/builder/index.html
@@ -10,7 +10,7 @@
   </head>
   <body class="overflow-hidden">
     <div id="app"></div>
-    <script type="py" src="/src/python/main.py" config="/src/python/pyscript.toml"></script>
+    <script type="py" src="/python/main.py" config="/invent/python/pyscript.toml"></script>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/src/tools/builder/src/python/__init__.py → src/tools/builder/public/python/__init__.py b/src/tools/builder/src/python/__init__.py → src/tools/builder/public/python/__init__.py
diff --git a/src/tools/builder/src/python/builder.py → src/tools/builder/public/python/builder.py b/src/tools/builder/src/python/builder.py → src/tools/builder/public/python/builder.py
diff --git a/src/tools/builder/src/python/invent.zip → src/tools/builder/public/python/invent.zip b/src/tools/builder/src/python/invent.zip → src/tools/builder/public/python/invent.zip
diff --git a/src/tools/builder/src/python/main.py → src/tools/builder/public/python/main.py b/src/tools/builder/src/python/main.py → src/tools/builder/public/python/main.py
diff --git a/src/tools/builder/public/python/pyscript.toml b/src/tools/builder/public/python/pyscript.toml
@@ -0,0 +1,6 @@
+["files"]
+"/invent/python/builder.py"="builder.py"
+#
+# Invent.
+#
+"/invent/python/invent.zip"="./*"
diff --git a/src/tools/builder/src/App.vue b/src/tools/builder/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <router-view />
+  <builder />
 
   <!-- Modal Dynamic Component -->
   <transition
@@ -18,6 +18,6 @@
 </template>
 
 <script setup lang="ts">
-import { RouterView } from 'vue-router'
+import Builder from './views/builder/builder.vue';
 import { ModalUtilities } from './utilities/modal-utilities';
 </script>
diff --git a/src/tools/builder/src/main.ts b/src/tools/builder/src/main.ts
@@ -1,6 +1,5 @@
 import { createApp } from 'vue'
 import App from './App.vue'
-import router from './router'
 import "@/assets/tailwind.css"
 import { LocalizationUtilities } from './utilities/localization-utilities'
 
@@ -15,7 +14,6 @@ import { whenDefined } from "https://pyscript.net/releases/2024.4.1/core.js";
 whenDefined("py").then(() => {
     LocalizationUtilities.loadPreferredLanguageAsync().then(() => {
         createApp(App)
-            .use(router)
             .use(Components)
             .use(Modals)
             .use(InventWidgets)

diff --git a/src/tools/builder/src/python/pyscript.toml b/src/tools/builder/src/python/pyscript.toml
diff --git a/src/tools/builder/src/router/index.ts b/src/tools/builder/src/router/index.ts
diff --git a/src/tools/builder/src/utilities/localization-utilities.ts b/src/tools/builder/src/utilities/localization-utilities.ts
@@ -67,7 +67,7 @@ export class LocalizationUtilities {
 	private static async loadLanguage(code: string): Promise<LocalizationTableModel> {
 		let result: LocalizationTableModel = {};
 
-		const response: Response = await fetch(`/languages/${code}.json`);
+		const response: Response = await fetch(`${import.meta.env.BASE_URL}/languages/${code}.json`);
 
 		if (response.ok) {
 			result = await response.json() as LocalizationTableModel;

diff --git a/src/tools/builder/src/views/builder/components/page-editor/page-editor-model.ts b/src/tools/builder/src/views/builder/components/page-editor/page-editor-model.ts
@@ -17,8 +17,8 @@ class PageEditorModel extends ComponentModelBase {
 		return `
 			<html>
 				<head>
-				    <link rel="stylesheet" href="/css/paper.min.css">
-				    <link rel="stylesheet" href="/css/page-editor.css">
+				    <link rel="stylesheet" href="/invent/css/paper.min.css">
+				    <link rel="stylesheet" href="/invent/css/page-editor.css">
 				</head>
 				<body></body>
 			</html>

diff --git a/src/tools/builder/src/views/builder/routes.ts b/src/tools/builder/src/views/builder/routes.ts
diff --git a/src/tools/builder/vite.config.ts b/src/tools/builder/vite.config.ts
@@ -5,6 +5,7 @@ import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  base: "/invent",
   plugins: [
     vue(),
   ],