refactor: rename internal/session package to internal/ctx

onsonr · Oct 8, 2024 · 25cddba · 25cddba
1 parent 35348fe
commit 25cddba
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -322,7 +322,7 @@ build-hway: gen-templ gen-pkl
 
 build-motr: gen-templ gen-pkl
 	@echo "(dwn) Building motr.wasm -> Service Worker IPFS Vault"
-	GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./pkg/dwn/wasm/main.go
+	GOOS=js GOARCH=wasm go build -o ./pkg/dwn/app.wasm ./cmd/motr/main.go
 
 build-nebula:
 	@echo "(nebula) Building nebula"

diff --git a/pkg/dwn/wasm/main.go → cmd/motr/main.go b/pkg/dwn/wasm/main.go → cmd/motr/main.go
@@ -15,14 +15,14 @@ import (
 	"github.com/labstack/echo/v4"
 	promise "github.com/nlepage/go-js-promise"
 
-	"github.com/onsonr/sonr/internal/session"
+	"github.com/onsonr/sonr/internal/ctx"
 	"github.com/onsonr/sonr/pkg/nebula/routes"
 	"github.com/onsonr/sonr/pkg/nebula/worker"
 )
 
 func main() {
 	e := echo.New()
-	e.Use(session.UseSession)
+	e.Use(ctx.UseSession)
 	registerViews(e)
 	registerState(e)
 	Serve(e)

diff --git a/internal/channel/broadcast.go → internal/bch/broadcast.go b/internal/channel/broadcast.go → internal/bch/broadcast.go
diff --git a/internal/channel/middleware.go → internal/bch/middleware.go b/internal/channel/middleware.go → internal/bch/middleware.go
diff --git a/internal/session/cookies.go → internal/ctx/cookies.go b/internal/session/cookies.go → internal/ctx/cookies.go
@@ -1,4 +1,4 @@
-package session
+package ctx
 
 import (
 	"net/http"

diff --git a/internal/session/middleware.go → internal/ctx/middleware.go b/internal/session/middleware.go → internal/ctx/middleware.go
@@ -1,10 +1,8 @@
-package session
+package ctx
 
 import (
 	"github.com/labstack/echo/v4"
 	"github.com/segmentio/ksuid"
-
-	"github.com/onsonr/sonr/internal/headers"
 )
 
 // GetSession returns the current Session
@@ -16,7 +14,7 @@ func GetSession(c echo.Context) *Session {
 func UseSession(next echo.HandlerFunc) echo.HandlerFunc {
 	return func(c echo.Context) error {
 		sc := initSession(c)
-		headers := new(headers.RequestHeaders)
+		headers := new(RequestHeaders)
 		err := sc.Bind(headers)
 		if err != nil {
 			return err

diff --git a/internal/headers/request.go → internal/ctx/request.go b/internal/headers/request.go → internal/ctx/request.go
@@ -1,4 +1,4 @@
-package headers
+package ctx
 
 type RequestHeaders struct {
 	CacheControl  *string `header:"Cache-Control"`

diff --git a/internal/headers/response.go → internal/ctx/response.go b/internal/headers/response.go → internal/ctx/response.go
@@ -1,4 +1,4 @@
-package headers
+package ctx
 
 type ResponseHeaders struct {
 	// HTMX Specific

diff --git a/internal/swtkn/macaroon.go → internal/swt/macaroon.go b/internal/swtkn/macaroon.go → internal/swt/macaroon.go
diff --git a/internal/swtkn/middleware.go → internal/swt/middleware.go b/internal/swtkn/middleware.go → internal/swt/middleware.go
diff --git a/web/server.go b/web/server.go
@@ -4,14 +4,14 @@ package main
 
 import (
 	"github.com/labstack/echo/v4"
-	"github.com/onsonr/sonr/internal/session"
+	"github.com/onsonr/sonr/internal/ctx"
 	"github.com/onsonr/sonr/pkg/nebula/routes"
 	"github.com/syumai/workers"
 )
 
 func main() {
 	s := echo.New()
-	s.Use(session.UseSession)
+	s.Use(ctx.UseSession)
 
 	s.GET("/", routes.Home)
 	s.GET("/login", routes.LoginStart)