diff --git a/cmd/hway/main.go b/cmd/hway/main.go index 6c40a7915..06aac4852 100644 --- a/cmd/hway/main.go +++ b/cmd/hway/main.go @@ -9,9 +9,9 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "github.com/onsonr/sonr/app/gateway" - "github.com/onsonr/sonr/app/gateway/config" "github.com/onsonr/sonr/crypto/ucan" + "github.com/onsonr/sonr/internal/gateway" + "github.com/onsonr/sonr/internal/gateway/config" "github.com/onsonr/sonr/pkg/common/ipfs" "github.com/onsonr/sonr/pkg/didauth/producer" ) diff --git a/cmd/motr/main.go b/cmd/motr/main.go index 9526a6d8a..96c9ad6c7 100644 --- a/cmd/motr/main.go +++ b/cmd/motr/main.go @@ -8,8 +8,8 @@ import ( "syscall/js" "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/vault" - "github.com/onsonr/sonr/app/vault/types" + "github.com/onsonr/sonr/internal/vault" + "github.com/onsonr/sonr/internal/vault/types" "github.com/onsonr/sonr/pkg/didauth/controller" ) diff --git a/devbox.lock b/devbox.lock index bfbf21127..6d16b761e 100644 --- a/devbox.lock +++ b/devbox.lock @@ -49,51 +49,51 @@ } } }, - "gum@latest": { - "last_modified": "2024-11-16T04:25:12Z", - "resolved": "github:NixOS/nixpkgs/34a626458d686f1b58139620a8b2793e9e123bba#gum", + "go@latest": { + "last_modified": "2024-11-28T07:51:56Z", + "resolved": "github:NixOS/nixpkgs/226216574ada4c3ecefcbbec41f39ce4655f78ef#go", "source": "devbox-search", - "version": "0.14.5", + "version": "1.23.3", "systems": { "aarch64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/rzqm62ixipbzbhfagqlic5xxag9a2v82-gum-0.14.5", + "path": "/nix/store/qrj2wp6vzfpjfrrlcmr22818zg83fb73-go-1.23.3", "default": true } ], - "store_path": "/nix/store/rzqm62ixipbzbhfagqlic5xxag9a2v82-gum-0.14.5" + "store_path": "/nix/store/qrj2wp6vzfpjfrrlcmr22818zg83fb73-go-1.23.3" }, "aarch64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/3ick2j8z9jgkk3cyc1ik4zkbs3m4583n-gum-0.14.5", + "path": "/nix/store/dm66qyl19skrwcmk4rb9xcs64xc1d071-go-1.23.3", "default": true } ], - "store_path": "/nix/store/3ick2j8z9jgkk3cyc1ik4zkbs3m4583n-gum-0.14.5" + "store_path": "/nix/store/dm66qyl19skrwcmk4rb9xcs64xc1d071-go-1.23.3" }, "x86_64-darwin": { "outputs": [ { "name": "out", - "path": "/nix/store/9rh8qxbxgb07v3a62mx9404ynk2yhxrj-gum-0.14.5", + "path": "/nix/store/vkjn6njpz4gy5ma763vh8hh93bgjwycr-go-1.23.3", "default": true } ], - "store_path": "/nix/store/9rh8qxbxgb07v3a62mx9404ynk2yhxrj-gum-0.14.5" + "store_path": "/nix/store/vkjn6njpz4gy5ma763vh8hh93bgjwycr-go-1.23.3" }, "x86_64-linux": { "outputs": [ { "name": "out", - "path": "/nix/store/1bnivwijzrnzx5h0hd5rywwy8rlhxmw5-gum-0.14.5", + "path": "/nix/store/bavnchxi7v6xs077jxv7fl5rrqc3y87w-go-1.23.3", "default": true } ], - "store_path": "/nix/store/1bnivwijzrnzx5h0hd5rywwy8rlhxmw5-gum-0.14.5" + "store_path": "/nix/store/bavnchxi7v6xs077jxv7fl5rrqc3y87w-go-1.23.3" } } }, diff --git a/app/gateway/config/Env.pkl.go b/internal/gateway/config/Env.pkl.go similarity index 100% rename from app/gateway/config/Env.pkl.go rename to internal/gateway/config/Env.pkl.go diff --git a/app/gateway/config/internal/index.html b/internal/gateway/config/embed/index.html similarity index 100% rename from app/gateway/config/internal/index.html rename to internal/gateway/config/embed/index.html diff --git a/app/gateway/config/internal/main.js b/internal/gateway/config/embed/main.js similarity index 100% rename from app/gateway/config/internal/main.js rename to internal/gateway/config/embed/main.js diff --git a/app/gateway/config/internal/static.go b/internal/gateway/config/embed/static.go similarity index 89% rename from app/gateway/config/internal/static.go rename to internal/gateway/config/embed/static.go index 230b4bf2a..fc1e54d95 100644 --- a/app/gateway/config/internal/static.go +++ b/internal/gateway/config/embed/static.go @@ -1,4 +1,4 @@ -package internal +package embed import ( _ "embed" diff --git a/app/gateway/config/internal/sw.js b/internal/gateway/config/embed/sw.js similarity index 100% rename from app/gateway/config/internal/sw.js rename to internal/gateway/config/embed/sw.js diff --git a/app/gateway/config/env.go b/internal/gateway/config/env.go similarity index 100% rename from app/gateway/config/env.go rename to internal/gateway/config/env.go diff --git a/app/gateway/config/init.pkl.go b/internal/gateway/config/init.pkl.go similarity index 100% rename from app/gateway/config/init.pkl.go rename to internal/gateway/config/init.pkl.go diff --git a/app/gateway/config/manifest.go b/internal/gateway/config/manifest.go similarity index 100% rename from app/gateway/config/manifest.go rename to internal/gateway/config/manifest.go diff --git a/app/gateway/config/schema.go b/internal/gateway/config/schema.go similarity index 96% rename from app/gateway/config/schema.go rename to internal/gateway/config/schema.go index 9d6de2ae3..97e6ac9e1 100644 --- a/app/gateway/config/schema.go +++ b/internal/gateway/config/schema.go @@ -4,7 +4,7 @@ import ( "reflect" "strings" - "github.com/onsonr/sonr/app/vault/types" + "github.com/onsonr/sonr/internal/vault/types" "github.com/onsonr/sonr/pkg/common/models" ) diff --git a/app/gateway/config/vault.go b/internal/gateway/config/vault.go similarity index 79% rename from app/gateway/config/vault.go rename to internal/gateway/config/vault.go index 1bbda65af..6fd5dfb4d 100644 --- a/app/gateway/config/vault.go +++ b/internal/gateway/config/vault.go @@ -4,8 +4,8 @@ import ( "encoding/json" "github.com/ipfs/boxo/files" - "github.com/onsonr/sonr/app/gateway/config/internal" - "github.com/onsonr/sonr/app/vault/types" + "github.com/onsonr/sonr/internal/gateway/config/embed" + "github.com/onsonr/sonr/internal/vault/types" ) const SchemaVersion = 1 @@ -30,9 +30,9 @@ func NewFS(cfg *types.Config) (files.Directory, error) { return files.NewMapDirectory(map[string]files.Node{ AppManifestFileName: files.NewBytesFile(manifestBz), DWNConfigFileName: files.NewBytesFile(cnfBz), - IndexHTMLFileName: files.NewBytesFile(internal.IndexHTML), - MainJSFileName: files.NewBytesFile(internal.MainJS), - ServiceWorkerFileName: files.NewBytesFile(internal.WorkerJS), + IndexHTMLFileName: files.NewBytesFile(embed.IndexHTML), + MainJSFileName: files.NewBytesFile(embed.MainJS), + ServiceWorkerFileName: files.NewBytesFile(embed.WorkerJS), }), nil } diff --git a/app/gateway/internal/database/models.go b/internal/gateway/database/models.go similarity index 100% rename from app/gateway/internal/database/models.go rename to internal/gateway/database/models.go diff --git a/app/gateway/internal/database/sqlite.go b/internal/gateway/database/sqlite.go similarity index 94% rename from app/gateway/internal/database/sqlite.go rename to internal/gateway/database/sqlite.go index f1dabdb6e..945ad001d 100644 --- a/app/gateway/internal/database/sqlite.go +++ b/internal/gateway/database/sqlite.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - "github.com/onsonr/sonr/app/gateway/config" + "github.com/onsonr/sonr/internal/gateway/config" "gorm.io/driver/sqlite" "gorm.io/gorm" ) diff --git a/app/gateway/handlers/index_handler.go b/internal/gateway/handlers/index_handler.go similarity index 92% rename from app/gateway/handlers/index_handler.go rename to internal/gateway/handlers/index_handler.go index 44aaf500d..6b62a0c9b 100644 --- a/app/gateway/handlers/index_handler.go +++ b/internal/gateway/handlers/index_handler.go @@ -2,8 +2,8 @@ package handlers import ( "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/internal/pages/index" - "github.com/onsonr/sonr/app/gateway/internal/session" + "github.com/onsonr/sonr/internal/gateway/pages/index" + "github.com/onsonr/sonr/internal/gateway/session" "github.com/onsonr/sonr/pkg/common/response" ) diff --git a/app/gateway/handlers/login_handler.go b/internal/gateway/handlers/login_handler.go similarity index 100% rename from app/gateway/handlers/login_handler.go rename to internal/gateway/handlers/login_handler.go diff --git a/app/gateway/handlers/register_handler.go b/internal/gateway/handlers/register_handler.go similarity index 92% rename from app/gateway/handlers/register_handler.go rename to internal/gateway/handlers/register_handler.go index f1706a8cb..c398121c8 100644 --- a/app/gateway/handlers/register_handler.go +++ b/internal/gateway/handlers/register_handler.go @@ -8,15 +8,14 @@ import ( "github.com/go-webauthn/webauthn/protocol" "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/internal/database" - "github.com/onsonr/sonr/app/gateway/internal/pages/register" "github.com/onsonr/sonr/crypto/mpc" + "github.com/onsonr/sonr/internal/gateway/database" + "github.com/onsonr/sonr/internal/gateway/pages/register" "github.com/onsonr/sonr/pkg/common/response" - "github.com/onsonr/sonr/pkg/common/styles/forms" ) func HandleRegisterView(c echo.Context) error { - dat := forms.CreateProfileData{ + dat := register.CreateProfileData{ FirstNumber: 1, LastNumber: 2, } @@ -33,7 +32,7 @@ func HandleRegisterStart(c echo.Context) error { if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, err.Error()) } - dat := forms.RegisterPasskeyData{ + dat := register.RegisterPasskeyData{ Address: ks.Address(), Handle: handle, Name: fmt.Sprintf("%s %s", firstName, lastName), diff --git a/app/gateway/handlers/spawn_handler.go b/internal/gateway/handlers/spawn_handler.go similarity index 100% rename from app/gateway/handlers/spawn_handler.go rename to internal/gateway/handlers/spawn_handler.go diff --git a/app/gateway/internal/pages/index/error.templ b/internal/gateway/pages/index/error.templ similarity index 100% rename from app/gateway/internal/pages/index/error.templ rename to internal/gateway/pages/index/error.templ diff --git a/app/gateway/internal/pages/index/error_templ.go b/internal/gateway/pages/index/error_templ.go similarity index 100% rename from app/gateway/internal/pages/index/error_templ.go rename to internal/gateway/pages/index/error_templ.go diff --git a/app/gateway/internal/pages/index/page.templ b/internal/gateway/pages/index/page.templ similarity index 100% rename from app/gateway/internal/pages/index/page.templ rename to internal/gateway/pages/index/page.templ diff --git a/app/gateway/internal/pages/index/page_templ.go b/internal/gateway/pages/index/page_templ.go similarity index 100% rename from app/gateway/internal/pages/index/page_templ.go rename to internal/gateway/pages/index/page_templ.go diff --git a/app/gateway/internal/pages/login/model.go b/internal/gateway/pages/login/model.go similarity index 100% rename from app/gateway/internal/pages/login/model.go rename to internal/gateway/pages/login/model.go diff --git a/app/gateway/internal/pages/register/creds.templ b/internal/gateway/pages/register/creds.templ similarity index 100% rename from app/gateway/internal/pages/register/creds.templ rename to internal/gateway/pages/register/creds.templ diff --git a/app/gateway/internal/pages/register/creds_templ.go b/internal/gateway/pages/register/creds_templ.go similarity index 93% rename from app/gateway/internal/pages/register/creds_templ.go rename to internal/gateway/pages/register/creds_templ.go index b5ae7418b..9e21af634 100644 --- a/app/gateway/internal/pages/register/creds_templ.go +++ b/internal/gateway/pages/register/creds_templ.go @@ -53,7 +53,7 @@ func formRegisterPasskey(action, method string, data RegisterPasskeyData) templ. var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(method) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 12, Col: 55} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 12, Col: 55} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -304,7 +304,7 @@ func sonrProfile(addr string, name string, handle string, creationBlock string) var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(handle) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 173, Col: 43} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 173, Col: 43} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { @@ -317,7 +317,7 @@ func sonrProfile(addr string, name string, handle string, creationBlock string) var templ_7745c5c3_Var8 string templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(shortenAddress(addr)) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 180, Col: 58} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 180, Col: 58} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { @@ -330,7 +330,7 @@ func sonrProfile(addr string, name string, handle string, creationBlock string) var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(creationBlock) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 185, Col: 55} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 185, Col: 55} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { @@ -343,7 +343,7 @@ func sonrProfile(addr string, name string, handle string, creationBlock string) var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 189, Col: 32} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 189, Col: 32} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { @@ -386,7 +386,7 @@ func cryptoWalletOption(ticker string, name string, isDefault bool) templ.Compon var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(ticker) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 198, Col: 27} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 198, Col: 27} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { @@ -399,7 +399,7 @@ func cryptoWalletOption(ticker string, name string, isDefault bool) templ.Compon var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(ticker) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 199, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 199, Col: 39} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { @@ -412,7 +412,7 @@ func cryptoWalletOption(ticker string, name string, isDefault bool) templ.Compon var templ_7745c5c3_Var14 string templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 200, Col: 9} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 200, Col: 9} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14)) if templ_7745c5c3_Err != nil { @@ -430,7 +430,7 @@ func cryptoWalletOption(ticker string, name string, isDefault bool) templ.Compon var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(ticker) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 204, Col: 27} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 204, Col: 27} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { @@ -443,7 +443,7 @@ func cryptoWalletOption(ticker string, name string, isDefault bool) templ.Compon var templ_7745c5c3_Var16 string templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(ticker) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 205, Col: 39} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 205, Col: 39} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16)) if templ_7745c5c3_Err != nil { @@ -456,7 +456,7 @@ func cryptoWalletOption(ticker string, name string, isDefault bool) templ.Compon var templ_7745c5c3_Var17 string templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/creds.templ`, Line: 206, Col: 9} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/creds.templ`, Line: 206, Col: 9} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { diff --git a/app/gateway/internal/pages/register/model.go b/internal/gateway/pages/register/model.go similarity index 100% rename from app/gateway/internal/pages/register/model.go rename to internal/gateway/pages/register/model.go diff --git a/app/gateway/internal/pages/register/page.templ b/internal/gateway/pages/register/page.templ similarity index 100% rename from app/gateway/internal/pages/register/page.templ rename to internal/gateway/pages/register/page.templ diff --git a/app/gateway/internal/pages/register/page_templ.go b/internal/gateway/pages/register/page_templ.go similarity index 100% rename from app/gateway/internal/pages/register/page_templ.go rename to internal/gateway/pages/register/page_templ.go diff --git a/app/gateway/internal/pages/register/profile.templ b/internal/gateway/pages/register/profile.templ similarity index 100% rename from app/gateway/internal/pages/register/profile.templ rename to internal/gateway/pages/register/profile.templ diff --git a/app/gateway/internal/pages/register/profile_templ.go b/internal/gateway/pages/register/profile_templ.go similarity index 96% rename from app/gateway/internal/pages/register/profile_templ.go rename to internal/gateway/pages/register/profile_templ.go index da23c1b2d..f233b4795 100644 --- a/app/gateway/internal/pages/register/profile_templ.go +++ b/internal/gateway/pages/register/profile_templ.go @@ -60,7 +60,7 @@ func formCreateProfile(action string, method string, data CreateProfileData) tem var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(method) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/profile.templ`, Line: 19, Col: 55} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/profile.templ`, Line: 19, Col: 55} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -111,7 +111,7 @@ func formCreateProfile(action string, method string, data CreateProfileData) tem var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(data.IsHumanLabel()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `app/gateway/internal/pages/register/profile.templ`, Line: 37, Col: 56} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `internal/gateway/pages/register/profile.templ`, Line: 37, Col: 56} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) if templ_7745c5c3_Err != nil { diff --git a/app/gateway/routes.go b/internal/gateway/routes.go similarity index 78% rename from app/gateway/routes.go rename to internal/gateway/routes.go index 569c733bf..66fd62688 100644 --- a/app/gateway/routes.go +++ b/internal/gateway/routes.go @@ -3,10 +3,10 @@ package gateway import ( "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/config" - "github.com/onsonr/sonr/app/gateway/handlers" - "github.com/onsonr/sonr/app/gateway/internal/database" - "github.com/onsonr/sonr/app/gateway/internal/session" + "github.com/onsonr/sonr/internal/gateway/config" + "github.com/onsonr/sonr/internal/gateway/database" + "github.com/onsonr/sonr/internal/gateway/handlers" + "github.com/onsonr/sonr/internal/gateway/session" "github.com/onsonr/sonr/pkg/common/response" ) diff --git a/app/gateway/internal/session/context.go b/internal/gateway/session/context.go similarity index 97% rename from app/gateway/internal/session/context.go rename to internal/gateway/session/context.go index 9014b846c..4f7dbc7f6 100644 --- a/app/gateway/internal/session/context.go +++ b/internal/gateway/session/context.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/internal/database" + "github.com/onsonr/sonr/internal/gateway/database" "github.com/onsonr/sonr/pkg/common" "github.com/segmentio/ksuid" ) diff --git a/app/gateway/internal/session/db.go b/internal/gateway/session/db.go similarity index 100% rename from app/gateway/internal/session/db.go rename to internal/gateway/session/db.go diff --git a/app/gateway/internal/session/middleware.go b/internal/gateway/session/middleware.go similarity index 91% rename from app/gateway/internal/session/middleware.go rename to internal/gateway/session/middleware.go index d9f37fd74..1112a7f78 100644 --- a/app/gateway/internal/session/middleware.go +++ b/internal/gateway/session/middleware.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/config" - "github.com/onsonr/sonr/app/gateway/internal/database" + "github.com/onsonr/sonr/internal/gateway/config" + "github.com/onsonr/sonr/internal/gateway/database" "gorm.io/gorm" ) diff --git a/app/gateway/internal/session/session.go b/internal/gateway/session/session.go similarity index 98% rename from app/gateway/internal/session/session.go rename to internal/gateway/session/session.go index cf2718f95..6043987ba 100644 --- a/app/gateway/internal/session/session.go +++ b/internal/gateway/session/session.go @@ -2,7 +2,7 @@ package session import ( "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/internal/database" + "github.com/onsonr/sonr/internal/gateway/database" ) // ╭───────────────────────────────────────────────────────╮ diff --git a/app/gateway/types/Config.pkl.go b/internal/gateway/types/Config.pkl.go similarity index 100% rename from app/gateway/types/Config.pkl.go rename to internal/gateway/types/Config.pkl.go diff --git a/app/gateway/types/Ctx.pkl.go b/internal/gateway/types/Ctx.pkl.go similarity index 100% rename from app/gateway/types/Ctx.pkl.go rename to internal/gateway/types/Ctx.pkl.go diff --git a/app/gateway/types/init.pkl.go b/internal/gateway/types/init.pkl.go similarity index 100% rename from app/gateway/types/init.pkl.go rename to internal/gateway/types/init.pkl.go diff --git a/app/vault/fetch.go b/internal/vault/fetch.go similarity index 100% rename from app/vault/fetch.go rename to internal/vault/fetch.go diff --git a/app/vault/handlers/accounts_handler.go b/internal/vault/handlers/accounts_handler.go similarity index 100% rename from app/vault/handlers/accounts_handler.go rename to internal/vault/handlers/accounts_handler.go diff --git a/app/vault/handlers/authorization_handler.go b/internal/vault/handlers/authorization_handler.go similarity index 100% rename from app/vault/handlers/authorization_handler.go rename to internal/vault/handlers/authorization_handler.go diff --git a/app/vault/handlers/connect_handler.go b/internal/vault/handlers/connect_handler.go similarity index 100% rename from app/vault/handlers/connect_handler.go rename to internal/vault/handlers/connect_handler.go diff --git a/app/vault/handlers/credentials_handler.go b/internal/vault/handlers/credentials_handler.go similarity index 100% rename from app/vault/handlers/credentials_handler.go rename to internal/vault/handlers/credentials_handler.go diff --git a/app/vault/handlers/dash_handler.go b/internal/vault/handlers/dash_handler.go similarity index 100% rename from app/vault/handlers/dash_handler.go rename to internal/vault/handlers/dash_handler.go diff --git a/app/vault/handlers/index_handler.go b/internal/vault/handlers/index_handler.go similarity index 93% rename from app/vault/handlers/index_handler.go rename to internal/vault/handlers/index_handler.go index 44f26b449..4ffc6f892 100644 --- a/app/vault/handlers/index_handler.go +++ b/internal/vault/handlers/index_handler.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/labstack/echo/v4" - session "github.com/onsonr/sonr/app/vault/internal" - "github.com/onsonr/sonr/app/vault/internal/pages/index" + "github.com/onsonr/sonr/internal/vault/pages/index" + session "github.com/onsonr/sonr/internal/vault/session" "github.com/onsonr/sonr/pkg/common/response" ) diff --git a/app/vault/handlers/resolver_handler.go b/internal/vault/handlers/resolver_handler.go similarity index 100% rename from app/vault/handlers/resolver_handler.go rename to internal/vault/handlers/resolver_handler.go diff --git a/app/vault/handlers/transaction_handler.go b/internal/vault/handlers/transaction_handler.go similarity index 100% rename from app/vault/handlers/transaction_handler.go rename to internal/vault/handlers/transaction_handler.go diff --git a/app/vault/handlers/wallet_handler.go b/internal/vault/handlers/wallet_handler.go similarity index 100% rename from app/vault/handlers/wallet_handler.go rename to internal/vault/handlers/wallet_handler.go diff --git a/app/vault/internal/pages/authenticate/model.go b/internal/vault/pages/authenticate/model.go similarity index 100% rename from app/vault/internal/pages/authenticate/model.go rename to internal/vault/pages/authenticate/model.go diff --git a/app/vault/internal/pages/authorize/model.go b/internal/vault/pages/authorize/model.go similarity index 100% rename from app/vault/internal/pages/authorize/model.go rename to internal/vault/pages/authorize/model.go diff --git a/app/vault/internal/pages/dashboard/page.templ b/internal/vault/pages/dashboard/page.templ similarity index 100% rename from app/vault/internal/pages/dashboard/page.templ rename to internal/vault/pages/dashboard/page.templ diff --git a/app/vault/internal/pages/dashboard/page_templ.go b/internal/vault/pages/dashboard/page_templ.go similarity index 100% rename from app/vault/internal/pages/dashboard/page_templ.go rename to internal/vault/pages/dashboard/page_templ.go diff --git a/app/vault/internal/pages/index/error.templ b/internal/vault/pages/index/error.templ similarity index 100% rename from app/vault/internal/pages/index/error.templ rename to internal/vault/pages/index/error.templ diff --git a/app/vault/internal/pages/index/error_templ.go b/internal/vault/pages/index/error_templ.go similarity index 100% rename from app/vault/internal/pages/index/error_templ.go rename to internal/vault/pages/index/error_templ.go diff --git a/app/vault/internal/pages/index/page.templ b/internal/vault/pages/index/page.templ similarity index 100% rename from app/vault/internal/pages/index/page.templ rename to internal/vault/pages/index/page.templ diff --git a/app/vault/internal/pages/index/page_templ.go b/internal/vault/pages/index/page_templ.go similarity index 100% rename from app/vault/internal/pages/index/page_templ.go rename to internal/vault/pages/index/page_templ.go diff --git a/app/vault/internal/pages/wallet/model.go b/internal/vault/pages/wallet/model.go similarity index 100% rename from app/vault/internal/pages/wallet/model.go rename to internal/vault/pages/wallet/model.go diff --git a/app/vault/internal/pages/wallet/page.templ b/internal/vault/pages/wallet/page.templ similarity index 100% rename from app/vault/internal/pages/wallet/page.templ rename to internal/vault/pages/wallet/page.templ diff --git a/app/vault/internal/pages/wallet/page_templ.go b/internal/vault/pages/wallet/page_templ.go similarity index 100% rename from app/vault/internal/pages/wallet/page_templ.go rename to internal/vault/pages/wallet/page_templ.go diff --git a/app/vault/internal/pages/wallet/scripts.templ b/internal/vault/pages/wallet/scripts.templ similarity index 100% rename from app/vault/internal/pages/wallet/scripts.templ rename to internal/vault/pages/wallet/scripts.templ diff --git a/app/vault/internal/pages/wallet/scripts_templ.go b/internal/vault/pages/wallet/scripts_templ.go similarity index 100% rename from app/vault/internal/pages/wallet/scripts_templ.go rename to internal/vault/pages/wallet/scripts_templ.go diff --git a/app/vault/routes.go b/internal/vault/routes.go similarity index 83% rename from app/vault/routes.go rename to internal/vault/routes.go index 9c313bb02..28f842706 100644 --- a/app/vault/routes.go +++ b/internal/vault/routes.go @@ -7,9 +7,9 @@ package vault import ( "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/vault/handlers" - session "github.com/onsonr/sonr/app/vault/internal" - "github.com/onsonr/sonr/app/vault/types" + "github.com/onsonr/sonr/internal/vault/handlers" + session "github.com/onsonr/sonr/internal/vault/session" + "github.com/onsonr/sonr/internal/vault/types" ) // RegisterRoutes registers the Decentralized Web Node API routes. diff --git a/app/vault/internal/context.go b/internal/vault/session/context.go similarity index 100% rename from app/vault/internal/context.go rename to internal/vault/session/context.go diff --git a/app/vault/internal/middleware.go b/internal/vault/session/middleware.go similarity index 97% rename from app/vault/internal/middleware.go rename to internal/vault/session/middleware.go index 6c1602686..5f2fb701a 100644 --- a/app/vault/internal/middleware.go +++ b/internal/vault/session/middleware.go @@ -6,7 +6,7 @@ import ( "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/vault/types" + "github.com/onsonr/sonr/internal/vault/types" "github.com/onsonr/sonr/pkg/common" ) diff --git a/app/vault/internal/session.go b/internal/vault/session/session.go similarity index 100% rename from app/vault/internal/session.go rename to internal/vault/session/session.go diff --git a/app/vault/types/Config.pkl.go b/internal/vault/types/Config.pkl.go similarity index 100% rename from app/vault/types/Config.pkl.go rename to internal/vault/types/Config.pkl.go diff --git a/app/vault/types/DWN.pkl.go b/internal/vault/types/DWN.pkl.go similarity index 100% rename from app/vault/types/DWN.pkl.go rename to internal/vault/types/DWN.pkl.go diff --git a/app/vault/types/Environment.pkl.go b/internal/vault/types/Environment.pkl.go similarity index 100% rename from app/vault/types/Environment.pkl.go rename to internal/vault/types/Environment.pkl.go diff --git a/app/vault/types/Schema.pkl.go b/internal/vault/types/Schema.pkl.go similarity index 100% rename from app/vault/types/Schema.pkl.go rename to internal/vault/types/Schema.pkl.go diff --git a/app/vault/types/init.pkl.go b/internal/vault/types/init.pkl.go similarity index 100% rename from app/vault/types/init.pkl.go rename to internal/vault/types/init.pkl.go diff --git a/app/vault/wasm.go b/internal/vault/wasm.go similarity index 100% rename from app/vault/wasm.go rename to internal/vault/wasm.go diff --git a/pkg/didauth/resolver/conn.go b/pkg/didauth/resolver/conn.go index 525d55462..69f6601a7 100644 --- a/pkg/didauth/resolver/conn.go +++ b/pkg/didauth/resolver/conn.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/labstack/echo/v4" - "github.com/onsonr/sonr/app/gateway/config" + "github.com/onsonr/sonr/internal/gateway/config" "google.golang.org/grpc" )