refactor: remove cdn package and move assets to global styles

onsonr · Oct 9, 2024 · a824c23 · a824c23
1 parent 58a02be
commit a824c23
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -316,8 +316,6 @@ gen-pkl:
 nebula-build:
 	@echo "(nebula) Building nebula"
 	cd pkg/nebula && bun install && bun run build
-	@echo "(nebula) Copying assets to hway"
-	cp -r pkg/nebula/assets/js pkg/nebula/assets/css cmd/hway/build
 
 motr-build: gen-templ gen-pkl
 	@echo "(dwn) Building motr.wasm -> Service Worker IPFS Vault"

diff --git a/pkg/nebula/global/styles/layout.templ b/pkg/nebula/global/styles/layout.templ
@@ -1,9 +1,6 @@
 package styles
 
-import (
-	cdn "github.com/onsonr/sonr/pkg/nebula/assets"
-	"strings"
-)
+import "strings"
 
 type Icon interface {
 	Render() templ.Component
@@ -33,9 +30,9 @@ templ Layout(title string, remote bool) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
-			@cdn.Styles()
-			@cdn.Htmx()
-			@cdn.Alpine()
+			@Styles()
+			@Htmx()
+			@Alpine()
 			<meta charset="UTF-8"/>
 			<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
@@ -57,9 +54,9 @@ templ LayoutNoBody(title string, remote bool) {
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
-			@cdn.Styles()
-			@cdn.Htmx()
-			@cdn.Alpine()
+			@Styles()
+			@Htmx()
+			@Alpine()
 			<meta charset="UTF-8"/>
 			<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>

diff --git a/pkg/nebula/global/styles/layout_templ.go b/pkg/nebula/global/styles/layout_templ.go
diff --git a/pkg/nebula/assets/scripts.templ → pkg/nebula/global/styles/scripts.templ b/pkg/nebula/assets/scripts.templ → pkg/nebula/global/styles/scripts.templ
@@ -1,4 +1,4 @@
-package cdn
+package styles
 
 const (
 	PublicOrigin = "https://cdn.sonr.id"

diff --git a/pkg/nebula/assets/scripts_templ.go → pkg/nebula/global/styles/scripts_templ.go b/pkg/nebula/assets/scripts_templ.go → pkg/nebula/global/styles/scripts_templ.go