Fix #1

.github/workflows/uix-deploy-prod.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup Deno
         uses: "denoland/setup-deno@v1"
       - name: Run Tests
-        run: "deno run -Aq --import-map https://dev.cdn.unyt.org/importmap.json https://dev.cdn.unyt.org/unyt_tests/run.ts -s --reportfile testreport.xml"
+        run: "deno run -Aq --import-map ./importmap.json https://cdn.unyt.org/unyt-tests/run.ts -s --reportfile testreport.xml"
       - name: Publish Test Report
         uses: "mikepenz/action-junit-report@v3"
         if: "success() || failure()"
@@ -24,8 +24,10 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: "actions/checkout@v3"
+        with:
+          submodules: recursive
       - name: Setup Deno
         uses: "denoland/setup-deno@v1"
       - name: Deploy UIX App
-        run: "deno run --importmap https://dev.cdn.unyt.org/uix1/importmap.json -Aqr https://dev.cdn.unyt.org/uix1/run.ts --stage prod --detach "
+        run: "deno run --importmap ./importmap.json -Aqr https://cdn.unyt.org/[email protected]/run.ts --stage prod --detach"
     needs: test

README.md

@@ -26,7 +26,7 @@ The repository includes persistent data storage and implements both
    ```
 3. Run the project local
    ```bash
-   $ uix -lb --port 8000
+   $ uix --port 8000
    ```
 4. Navigate to your favourite web browser and open http://localhost:8000 to see
    everything in action.
@@ -105,4 +105,4 @@ is ready for user interactions as soon as it loads.
 
 ---
 
-<sub>&copy; unyt 2023 • [unyt.org](https://unyt.org)</sub>
+<sub>&copy; unyt 2024 • [unyt.org](https://unyt.org)</sub>

backend/entrypoint.tsx

@@ -1,16 +1,9 @@
 import { Overview } from "../common/Overview.tsx";
 import { listStorage } from "backend/lists.eternal.ts";
-import { renderBackend, renderHybrid, renderStatic } from "uix/base/render-methods.ts";
 import { Entrypoint } from "uix/html/entrypoints.ts";
-import { List } from "common/List.tsx";
-import { lazy } from "uix/html/entrypoint-providers.tsx";
-import { Lists } from "backend/lists.ts";
 
 // The frontend routes definition
 export default {
-	'/': renderHybrid(<Overview lists={listStorage}/>), // On '/'-route display the overview component
-	// '/:id': lazy(async (_, {id}) => {
-	// 	return renderBackend(<List list={await Lists.get(id)}/>) // render the list component
-	// }),
-	'*': null // Letting the frontend handle all other routes
+	'/': <Overview lists={listStorage}/>,
+	'*': null
 } satisfies Entrypoint;

backend/lists.ts

@@ -1,3 +1,4 @@
+// deno-lint-ignore-file require-await
 import { listStorage } from "./lists.eternal.ts";
 
 export type ListItem = {
@@ -12,9 +13,7 @@ export type SharedList = {
 	items: Set<ListItem>
 }
 
-
 export class Lists {
-
 	static async get(id: string) {
 		// create new list if none exists
 		if (!listStorage.has(id)) {
@@ -25,5 +24,4 @@ export class Lists {
 		}
 		return listStorage.get(id)!;
 	}
-
 }

common/List.scss

@@ -86,7 +86,7 @@
 		width: 500px;
 		height: fit-content;
 		padding: 40px;
-		background-color: var(--bg_content);
+		background-color: var(--bg);
 		border: 1px solid gray;
 		border-radius: 10px;
 		justify-content: center;

common/List.tsx

@@ -2,20 +2,6 @@ import { ListItem, type SharedList } from "backend/lists.ts";
 import { map, always } from "datex-core-legacy/functions.ts";
 import { template } from "uix/html/template.ts";
 import { Component } from "uix/components/Component.ts";
-import { ObjectRef } from "unyt_core/runtime/pointers.ts";
-import { ColorModeToggle } from "common/ColorModeToggle.tsx";
-import { local_text } from "unyt_core/datex_short.ts";
-
-const strings = {
-	add: local_text({
-		de: 'Eintrag hinzufügen',
-		en: 'Add Item'
-	}),
-	cleanup: local_text({
-		de: 'Löschen',
-		en: 'Cleanup'
-	})
-}
 
 @template(function(this: List) {
 	return <div>
@@ -24,20 +10,21 @@ const strings = {
 		</div>
 		<ol>
 			{
-				map(this.options.list.items as Set<ObjectRef<ListItem>>, (item, index) => 
-					<li>
-						<input type="checkbox" checked={item.$.checked} id={`checkbox-${index}`}/>
-						<label for={`checkbox-${index}`}>{item.$.name}</label>
-						<span>{item.$.amount} {item.$.type}{always(()=>item.amount! > 1 ? 's': '')}</span>
+				map(this.options.list.items, (item, index) => {
+					const reactiveItem = item.$ as unknown as ListItem;
+					return <li>
+						<input type="checkbox" checked={reactiveItem.checked} id={`checkbox-${index}`}/>
+						<label for={`checkbox-${index}`}>{reactiveItem.name}</label>
+						<span>{reactiveItem.amount} {reactiveItem.type}{always(()=>item.amount! > 1 ? 's': '')}</span>
 					</li>
-				)
+				})
 			}
 		</ol>
 		<button class="add-button" onclick:frontend={() => this.dialog.showModal()}>
-			{strings.add}
+			Add item
 		</button>
 		<button class="remove-button" onclick:frontend={() => this.removeChecked()}>
-			{strings.cleanup}
+			Cleanup
 		</button>
 		<dialog id="dialog" onclick:frontend={function (e) { if (e.target == this) this.close()}}>
 			<input placeholder="Enter item name" type="text" id="name"/>
@@ -49,17 +36,15 @@ const strings = {
 			</select>
 			<div id="add" onclick:frontend={() => this.addItem()}>Add</div>
 		</dialog>
-
-		<ColorModeToggle/>
 	</div>
 })
 export class List extends Component<{list: SharedList}> {
 
 	/** references to the DOM elements */
-	@id declare name: HTMLInputElement;
-	@id declare amount: HTMLInputElement;
-	@id declare type: HTMLOptionElement;
-	@id declare dialog: HTMLDialogElement;
+	@id name!: HTMLInputElement;
+	@id amount!: HTMLInputElement;
+	@id type!: HTMLOptionElement;
+	@id dialog!: HTMLDialogElement;
 
 	/**
 	 * Remove all checked items
@@ -83,7 +68,6 @@ export class List extends Component<{list: SharedList}> {
 			amount: Number(this.amount.value),
 			type: this.type.value,
 		});
-
 		this.dialog.close()
 	}
 }

common/Overview.tsx

@@ -2,16 +2,7 @@ import { SharedList } from "backend/lists.ts";
 import { map } from "datex-core-legacy/functions.ts";
 import { template } from "uix/html/template.ts";
 import { Component } from "uix/components/Component.ts";
-import { logger } from "unyt_core/datex_all.ts";
 
-let x = $$({a: "xa12"})
-
-function tsversion(x:any) {
-	logger.error("called", datex.meta)
-	return $$(Deno.version.typescript)
-}
-
-// FIX: without ...map
 @template(function(this: Overview) {
 	return <div>
 		<h1>Overview</h1>

deno.json

@@ -1,10 +1,12 @@
 {
-    "importMap": "./importmap.json",
+    "_publicImportMap": "./importmap.json",
+    "importMap": "./.datex-cache/importmap.lock.json",
     "compilerOptions": {
         "jsx": "react-jsx",
         "jsxImportSource": "uix",
         "lib": [
-            "deno.window"
+            "deno.window",
+            "dom"
         ]
     }
-}
+}