refactor: move nebula assets to hway build directory

onsonr · Oct 9, 2024 · 5df9d4a · 5df9d4a
1 parent a3edb65
commit 5df9d4a
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 213 deletions.
diff --git a/Makefile b/Makefile
@@ -311,9 +311,9 @@ gen-pkl:
 ###                            motr, hway & nebula                          ###
 ###############################################################################
 
-.PHONY: build-motr build-hway build-nebula
+.PHONY: motr-build hway-build nebula-build nebula-copy
 
-hway-build: gen-templ
+hway-build: nebula-build nebula-copy gen-templ
 	@echo "(motr) Building Highway gateway"
 	GOOS=js GOARCH=wasm go build -o ./cmd/hway/build/app.wasm ./cmd/hway/server.go
 
@@ -329,6 +329,10 @@ nebula-build:
 	@echo "(nebula) Building nebula"
 	cd pkg/nebula && bun install && bun run build
 
+nebula-copy:
+	@echo "(nebula) Copying assets to hway"
+	cp -r pkg/nebula/assets/js pkg/nebula/assets/css cmd/hway/build
+
 
 ###############################################################################
 ###                                     help                                ###

diff --git a/cmd/hway/server.go b/cmd/hway/server.go
@@ -12,7 +12,6 @@ import (
 func main() {
 	s := echo.New()
 	s.Use(ctx.UseSession)
-
 	s.GET("/", routes.Home)
 	s.GET("/login", routes.LoginStart)
 	s.GET("/register", routes.RegisterStart)

diff --git a/devbox.json b/devbox.json
@@ -31,47 +31,18 @@
   },
   "shell": {
     "scripts": {
-      "build:docker": [
-        "make local-image"
-      ],
-      "build:hway": [
-        "make build-nebula",
-        "make build-hway"
-      ],
-      "build:nebula": [
-        "make build-nebula"
-      ],
-      "build:motr": [
-        "make build-motr"
-      ],
-      "build:sonrd": [
-        "make build-motr",
-        "make build"
-      ],
-      "build": [
-        "make build-motr",
-        "make build",
-        "make build-hway"
-      ],
-      "gen:proto": [
-        "rm -rf ./pkg/nebula/node_modules",
-        "make proto-gen"
-      ],
-      "gen:pkl": [
-        "make gen-pkl"
-      ],
-      "gen:templ": [
-        "make gen-templ"
-      ],
-      "start": [
-        "process-compose up -f ./deploy/process-compose.yaml"
-      ],
-      "stop": [
-        "process-compose down -f ./deploy/process-compose.yaml"
-      ],
-      "start:testnet": [
-        "make sh-testnet"
-      ]
+      "build:docker": ["make local-image"],
+      "build:hway": ["make build-nebula", "make build-hway"],
+      "build:nebula": ["make build-nebula"],
+      "build:motr": ["make build-motr"],
+      "build:sonrd": ["make build-motr", "make build"],
+      "build": ["make build-motr", "make build", "make build-hway"],
+      "gen:proto": ["rm -rf ./pkg/nebula/node_modules", "make proto-gen"],
+      "gen:pkl": ["make gen-pkl"],
+      "gen:templ": ["make gen-templ"],
+      "start": ["process-compose up -f ./deploy/process-compose.yaml"],
+      "stop": ["process-compose down -f ./deploy/process-compose.yaml"],
+      "start:testnet": ["make sh-testnet"]
     }
   }
 }
diff --git a/pkg/nebula/assets/scripts.templ b/pkg/nebula/assets/scripts.templ
@@ -12,25 +12,17 @@ var (
 )
 
 templ Styles() {
-	@stylesHandle.Once() {
-		<link href={ "https://cdn.sonr.id/css/styles.css" } rel="stylesheet"/>
-	}
+	<link href={ "/css/styles.css" } rel="stylesheet"/>
 }
 
 templ Alpine() {
-	@alpineHandle.Once() {
-		<script src={ "https://cdn.sonr.id/js/alpine.min.js" } defer></script>
-	}
+	<script src={ "/js/alpine.min.js" } defer></script>
 }
 
 templ Dexie() {
-	@dexieHandle.Once() {
-		<script src={ "https://cdn.sonr.id/js/dexie.min.js" }></script>
-	}
+	<script src={ "/js/dexie.min.js" }></script>
 }
 
 templ Htmx() {
-	@htmxHandle.Once() {
-		<script src={ "https://cdn.sonr.id/js/htmx.min.js" }></script>
-	}
+	<script src={ "/js/htmx.min.js" }></script>
 }
diff --git a/pkg/nebula/assets/scripts_templ.go b/pkg/nebula/assets/scripts_templ.go
diff --git a/pkg/nebula/global/styles/layout.templ b/pkg/nebula/global/styles/layout.templ
@@ -33,8 +33,6 @@ templ Layout(title string, remote bool) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
-			@cdn.Alpine()
-			@cdn.Htmx()
 			@cdn.Styles()
 			<meta charset="UTF-8"/>
 			<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
@@ -49,6 +47,8 @@ templ Layout(title string, remote bool) {
 			<main class="flex-row items-center justify-center mx-auto w-fit max-w-screen-sm gap-y-3">
 				{ children... }
 			</main>
+			@cdn.Alpine()
+			@cdn.Htmx()
 		</body>
 	</html>
 }
@@ -57,8 +57,6 @@ templ LayoutNoBody(title string, remote bool) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
-			@cdn.Alpine()
-			@cdn.Htmx()
 			@cdn.Styles()
 			<meta charset="UTF-8"/>
 			<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
@@ -74,6 +72,8 @@ templ LayoutNoBody(title string, remote bool) {
 				<div class="flex flex-col min-h-screen overflow-hidden supports-[overflow:clip]:overflow-clip">
 					{ children... }
 				</div>
+				@cdn.Alpine()
+				@cdn.Htmx()
 			</body>
 		</main>
 	</html>