From 7758f43ce4ffd49d8b46ffd796e3dfc4e5110b2c Mon Sep 17 00:00:00 2001
From: Prad N <prad@sonr.io>
Date: Fri, 4 Apr 2025 00:47:55 -0400
Subject: [PATCH] refactor: restructure project layout for clarity and
 maintainability

---
 .goreleaser.yaml                         |  1 -
 .taskfiles/Default.yml                   |  2 +-
 .taskfiles/{Docker.yml => Release.yml}   |  0
 cmd/vault/main.go => main.go             |  0
 {pkg/manifest => manifest}/manifest.go   |  0
 pkg/config/{runtime.go => middleware.go} |  0
 pkg/htmx/middleware.go                   |  1 +
 pkg/htmx/render.go                       | 29 ++++++++++++++++++++++++
 pkg/ipfs/client.go                       |  1 +
 pkg/ipfs/middleware.go                   |  2 +-
 pkg/sonr/client.go                       |  1 +
 pkg/sonr/middleware.go                   |  2 +-
 pkg/ucan/middleware.go                   |  2 +-
 pkg/ucan/protected.go                    |  1 +
 pkg/ucan/token.go                        |  1 +
 pkg/ucan/validator.go                    |  1 +
 16 files changed, 39 insertions(+), 5 deletions(-)
 rename .taskfiles/{Docker.yml => Release.yml} (100%)
 rename cmd/vault/main.go => main.go (100%)
 rename {pkg/manifest => manifest}/manifest.go (100%)
 rename pkg/config/{runtime.go => middleware.go} (100%)
 create mode 100644 pkg/htmx/middleware.go
 create mode 100644 pkg/htmx/render.go
 create mode 100644 pkg/ipfs/client.go
 create mode 100644 pkg/sonr/client.go
 create mode 100644 pkg/ucan/protected.go
 create mode 100644 pkg/ucan/token.go
 create mode 100644 pkg/ucan/validator.go

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 1865b0a..0bd8375 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -3,7 +3,6 @@ version: 2
 project_name: motr
 builds:
   - id: motr
-    main: ./cmd/vault
     binary: app
     goos:
       - js
diff --git a/.taskfiles/Default.yml b/.taskfiles/Default.yml
index c809a58..3f41e1b 100644
--- a/.taskfiles/Default.yml
+++ b/.taskfiles/Default.yml
@@ -53,7 +53,7 @@ tasks:
     generates:
       - bin/motr.wasm
     cmds:
-      - go build -o bin/motr.wasm ./cmd/vault
+      - go build -o bin/motr.wasm .
 
   build:docker:
     desc: Builds Docker image
diff --git a/.taskfiles/Docker.yml b/.taskfiles/Release.yml
similarity index 100%
rename from .taskfiles/Docker.yml
rename to .taskfiles/Release.yml
diff --git a/cmd/vault/main.go b/main.go
similarity index 100%
rename from cmd/vault/main.go
rename to main.go
diff --git a/pkg/manifest/manifest.go b/manifest/manifest.go
similarity index 100%
rename from pkg/manifest/manifest.go
rename to manifest/manifest.go
diff --git a/pkg/config/runtime.go b/pkg/config/middleware.go
similarity index 100%
rename from pkg/config/runtime.go
rename to pkg/config/middleware.go
diff --git a/pkg/htmx/middleware.go b/pkg/htmx/middleware.go
new file mode 100644
index 0000000..1ef1df4
--- /dev/null
+++ b/pkg/htmx/middleware.go
@@ -0,0 +1 @@
+package htmx
diff --git a/pkg/htmx/render.go b/pkg/htmx/render.go
new file mode 100644
index 0000000..8e763b3
--- /dev/null
+++ b/pkg/htmx/render.go
@@ -0,0 +1,29 @@
+package htmx
+
+import (
+	"bytes"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+)
+
+func Render(c echo.Context, cmp templ.Component) error {
+	// Create a buffer to store the rendered HTML
+	buf := &bytes.Buffer{}
+	// Render the component to the buffer
+	err := cmp.Render(c.Request().Context(), buf)
+	if err != nil {
+		return err
+	}
+
+	// Set the content type
+	c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTML)
+
+	// Write the buffered content to the response
+	_, err = c.Response().Write(buf.Bytes())
+	if err != nil {
+		return err
+	}
+	c.Response().WriteHeader(200)
+	return nil
+}
diff --git a/pkg/ipfs/client.go b/pkg/ipfs/client.go
new file mode 100644
index 0000000..a0c59fc
--- /dev/null
+++ b/pkg/ipfs/client.go
@@ -0,0 +1 @@
+package ipfs
diff --git a/pkg/ipfs/middleware.go b/pkg/ipfs/middleware.go
index c870d7c..a0c59fc 100644
--- a/pkg/ipfs/middleware.go
+++ b/pkg/ipfs/middleware.go
@@ -1 +1 @@
-package middleware
+package ipfs
diff --git a/pkg/sonr/client.go b/pkg/sonr/client.go
new file mode 100644
index 0000000..ef52fe9
--- /dev/null
+++ b/pkg/sonr/client.go
@@ -0,0 +1 @@
+package sonr
diff --git a/pkg/sonr/middleware.go b/pkg/sonr/middleware.go
index c870d7c..ef52fe9 100644
--- a/pkg/sonr/middleware.go
+++ b/pkg/sonr/middleware.go
@@ -1 +1 @@
-package middleware
+package sonr
diff --git a/pkg/ucan/middleware.go b/pkg/ucan/middleware.go
index c870d7c..a847881 100644
--- a/pkg/ucan/middleware.go
+++ b/pkg/ucan/middleware.go
@@ -1 +1 @@
-package middleware
+package ucan
diff --git a/pkg/ucan/protected.go b/pkg/ucan/protected.go
new file mode 100644
index 0000000..a847881
--- /dev/null
+++ b/pkg/ucan/protected.go
@@ -0,0 +1 @@
+package ucan
diff --git a/pkg/ucan/token.go b/pkg/ucan/token.go
new file mode 100644
index 0000000..a847881
--- /dev/null
+++ b/pkg/ucan/token.go
@@ -0,0 +1 @@
+package ucan
diff --git a/pkg/ucan/validator.go b/pkg/ucan/validator.go
new file mode 100644
index 0000000..a847881
--- /dev/null
+++ b/pkg/ucan/validator.go
@@ -0,0 +1 @@
+package ucan