diff --git a/admin/vite.config.ts b/admin/vite.config.ts index d7670df..f466163 100644 --- a/admin/vite.config.ts +++ b/admin/vite.config.ts @@ -22,7 +22,7 @@ export default defineConfig(({ command }) => ({ base: command === 'build' ? './' : '/', plugins: [vue(), tailwindcss(), devBase()], build: { - outDir: '../boardwalk/dist', + outDir: '../modules/boardwalk/dist', emptyOutDir: true, sourcemap: false, }, diff --git a/cmd/summer/main.go b/cmd/summer/main.go index 6d38f04..e0fcc89 100644 --- a/cmd/summer/main.go +++ b/cmd/summer/main.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" "git.golem15.com/golem15/summercms/internal/build" "git.golem15.com/golem15/summercms/internal/dev" ) diff --git a/cmd/summer/main_test.go b/cmd/summer/main_test.go index 53b1411..e7a8711 100644 --- a/cmd/summer/main_test.go +++ b/cmd/summer/main_test.go @@ -11,7 +11,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" ) func TestToolCommandNames(t *testing.T) { diff --git a/cmd/summer/parity.go b/cmd/summer/parity.go index 165fd07..ef0ad1b 100644 --- a/cmd/summer/parity.go +++ b/cmd/summer/parity.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strings" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/tide" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/tide" ) func parityProxyCommand() bonfire.Command { diff --git a/cmd/summer/parity_contract_test.go b/cmd/summer/parity_contract_test.go index 2121d24..f584a51 100644 --- a/cmd/summer/parity_contract_test.go +++ b/cmd/summer/parity_contract_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/tide" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/tide" ) func TestParityCommandContract(t *testing.T) { diff --git a/cmd/summer/parity_test.go b/cmd/summer/parity_test.go index 9d783b9..9d5231c 100644 --- a/cmd/summer/parity_test.go +++ b/cmd/summer/parity_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" ) func TestParityCommands(t *testing.T) { diff --git a/cmd/summer/runtime.go b/cmd/summer/runtime.go index c0b24a3..ae91256 100644 --- a/cmd/summer/runtime.go +++ b/cmd/summer/runtime.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" "git.golem15.com/golem15/summercms/internal/build" ) diff --git a/examples/hello/hello_test.go b/examples/hello/hello_test.go index db91692..105d187 100644 --- a/examples/hello/hello_test.go +++ b/examples/hello/hello_test.go @@ -11,15 +11,15 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/postcard" - "git.golem15.com/golem15/summercms/surf" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/postcard" + "git.golem15.com/golem15/summercms/modules/surf" + "git.golem15.com/golem15/summercms/modules/towel" ) func TestGreeterHelloPrintsLayeredConfig(t *testing.T) { diff --git a/examples/hello/main.go b/examples/hello/main.go index 96b7d95..8968153 100644 --- a/examples/hello/main.go +++ b/examples/hello/main.go @@ -7,13 +7,13 @@ import ( "io" "os" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/surf" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/surf" ) func main() { diff --git a/examples/hello/plugins/base/plugin.go b/examples/hello/plugins/base/plugin.go index 7e58d6c..3aabf1a 100644 --- a/examples/hello/plugins/base/plugin.go +++ b/examples/hello/plugins/base/plugin.go @@ -4,9 +4,9 @@ import ( "embed" "io/fs" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) var ( diff --git a/examples/hello/plugins/greeter/plugin.go b/examples/hello/plugins/greeter/plugin.go index de7bea1..c22a694 100644 --- a/examples/hello/plugins/greeter/plugin.go +++ b/examples/hello/plugins/greeter/plugin.go @@ -5,13 +5,13 @@ import ( "fmt" "net/http" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" "git.golem15.com/golem15/summercms/modules/festival" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/surf" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/surf" + "git.golem15.com/golem15/summercms/modules/towel" ) var ( diff --git a/examples/hello/plugins/greeter/plugin_test.go b/examples/hello/plugins/greeter/plugin_test.go index bb87b09..e300052 100644 --- a/examples/hello/plugins/greeter/plugin_test.go +++ b/examples/hello/plugins/greeter/plugin_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" ) type extraMsg struct{ msg string } diff --git a/examples/hello/plugins/optional/plugin.go b/examples/hello/plugins/optional/plugin.go index 160dd72..c74ddbd 100644 --- a/examples/hello/plugins/optional/plugin.go +++ b/examples/hello/plugins/optional/plugin.go @@ -4,9 +4,9 @@ import ( "embed" "io/fs" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) //go:embed config diff --git a/internal/build/build.go b/internal/build/build.go index 53f5c73..dc5f329 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -85,14 +85,14 @@ func generateMain(m Manifest) ([]byte, error) { b.WriteString("\t\"fmt\"\n") b.WriteString("\t\"io\"\n") b.WriteString("\t\"os\"\n\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/backpack\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/bonfire\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/cabana\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/compass\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/lagoon\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/pact\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/party\"\n") - b.WriteString("\t\"git.golem15.com/golem15/summercms/surf\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/backpack\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/bonfire\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/cabana\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/compass\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/lagoon\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/pact\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/party\"\n") + b.WriteString("\t\"git.golem15.com/golem15/summercms/modules/surf\"\n") b.WriteString(")\n\n") b.WriteString("func main() {\n") b.WriteString("\tif err := run(os.Args[1:], os.Stdout); err != nil {\n") diff --git a/internal/build/build_test.go b/internal/build/build_test.go index c1a0b09..3565250 100644 --- a/internal/build/build_test.go +++ b/internal/build/build_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/cabana" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/cabana" + "git.golem15.com/golem15/summercms/modules/pact" ) func TestLoadHelloManifest(t *testing.T) { diff --git a/internal/build/stubs/artifacts.tmpl b/internal/build/stubs/artifacts.tmpl index 968c839..950d10f 100644 --- a/internal/build/stubs/artifacts.tmpl +++ b/internal/build/stubs/artifacts.tmpl @@ -44,7 +44,7 @@ package console import ( "context" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" ) // {{.Func}} returns the {{.CommandName}} console command. @@ -68,7 +68,7 @@ import ( "context" "fmt" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/pact" ) // {{.Ident}}Args is the typed payload for {{.Kind}}. @@ -93,7 +93,7 @@ func {{.Func}}() pact.Job { return {{.Worker}}{} } package controllers -import "git.golem15.com/golem15/summercms/pact" +import "git.golem15.com/golem15/summercms/modules/pact" type {{.Worker}} struct{} diff --git a/internal/build/stubs/plugin.tmpl b/internal/build/stubs/plugin.tmpl index 200dabf..3807a0b 100644 --- a/internal/build/stubs/plugin.tmpl +++ b/internal/build/stubs/plugin.tmpl @@ -4,10 +4,10 @@ import ( "embed" "io/fs" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" "github.com/go-gormigrate/gormigrate/v2" ) @@ -62,7 +62,7 @@ func init() { {{define "routes.go"}}package {{.Package}} -import "git.golem15.com/golem15/summercms/pact" +import "git.golem15.com/golem15/summercms/modules/pact" var _ pact.HasRoutes = (*Plugin)(nil) diff --git a/internal/build/stubs/registry.tmpl b/internal/build/stubs/registry.tmpl index 7ed71f8..482157b 100644 --- a/internal/build/stubs/registry.tmpl +++ b/internal/build/stubs/registry.tmpl @@ -3,8 +3,8 @@ package {{.Package}} import ( - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/pact" "github.com/go-gormigrate/gormigrate/v2" {{- range .Imports}} {{printf "%q" .}} diff --git a/backpack/app.go b/modules/backpack/app.go similarity index 96% rename from backpack/app.go rename to modules/backpack/app.go index 6aef873..230afb4 100644 --- a/backpack/app.go +++ b/modules/backpack/app.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" "git.golem15.com/golem15/summercms/modules/festival" ) diff --git a/backpack/app_test.go b/modules/backpack/app_test.go similarity index 88% rename from backpack/app_test.go rename to modules/backpack/app_test.go index 3876621..ad8fb2b 100644 --- a/backpack/app_test.go +++ b/modules/backpack/app_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) func TestEventBusesAreAppScoped(t *testing.T) { @@ -42,7 +42,7 @@ func TestDoesNotImportParty(t *testing.T) { if err != nil { t.Fatal(err) } - if path == "git.golem15.com/golem15/summercms/party" { + if path == "git.golem15.com/golem15/summercms/modules/party" { t.Fatalf("%s imports party", name) } } diff --git a/backpack/services.go b/modules/backpack/services.go similarity index 100% rename from backpack/services.go rename to modules/backpack/services.go diff --git a/backpack/services_test.go b/modules/backpack/services_test.go similarity index 97% rename from backpack/services_test.go rename to modules/backpack/services_test.go index 4515a13..5986d0c 100644 --- a/backpack/services_test.go +++ b/modules/backpack/services_test.go @@ -4,8 +4,8 @@ import ( "sync" "testing" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" ) type ping interface { diff --git a/boardwalk/boardwalk.go b/modules/boardwalk/boardwalk.go similarity index 100% rename from boardwalk/boardwalk.go rename to modules/boardwalk/boardwalk.go diff --git a/boardwalk/boardwalk_test.go b/modules/boardwalk/boardwalk_test.go similarity index 100% rename from boardwalk/boardwalk_test.go rename to modules/boardwalk/boardwalk_test.go diff --git a/boardwalk/dist/assets/dm-mono-latin-400-normal--0xN8mdc.woff b/modules/boardwalk/dist/assets/dm-mono-latin-400-normal--0xN8mdc.woff similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-400-normal--0xN8mdc.woff rename to modules/boardwalk/dist/assets/dm-mono-latin-400-normal--0xN8mdc.woff diff --git a/boardwalk/dist/assets/dm-mono-latin-400-normal-4GdczIuU.woff2 b/modules/boardwalk/dist/assets/dm-mono-latin-400-normal-4GdczIuU.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-400-normal-4GdczIuU.woff2 rename to modules/boardwalk/dist/assets/dm-mono-latin-400-normal-4GdczIuU.woff2 diff --git a/boardwalk/dist/assets/dm-mono-latin-500-normal-CN8Miw6E.woff b/modules/boardwalk/dist/assets/dm-mono-latin-500-normal-CN8Miw6E.woff similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-500-normal-CN8Miw6E.woff rename to modules/boardwalk/dist/assets/dm-mono-latin-500-normal-CN8Miw6E.woff diff --git a/boardwalk/dist/assets/dm-mono-latin-500-normal-DRMDZjhP.woff2 b/modules/boardwalk/dist/assets/dm-mono-latin-500-normal-DRMDZjhP.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-500-normal-DRMDZjhP.woff2 rename to modules/boardwalk/dist/assets/dm-mono-latin-500-normal-DRMDZjhP.woff2 diff --git a/boardwalk/dist/assets/dm-mono-latin-ext-400-normal-1aZr6b2b.woff b/modules/boardwalk/dist/assets/dm-mono-latin-ext-400-normal-1aZr6b2b.woff similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-ext-400-normal-1aZr6b2b.woff rename to modules/boardwalk/dist/assets/dm-mono-latin-ext-400-normal-1aZr6b2b.woff diff --git a/boardwalk/dist/assets/dm-mono-latin-ext-400-normal-C2zvOubV.woff2 b/modules/boardwalk/dist/assets/dm-mono-latin-ext-400-normal-C2zvOubV.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-ext-400-normal-C2zvOubV.woff2 rename to modules/boardwalk/dist/assets/dm-mono-latin-ext-400-normal-C2zvOubV.woff2 diff --git a/boardwalk/dist/assets/dm-mono-latin-ext-500-normal-BtRyHRi6.woff2 b/modules/boardwalk/dist/assets/dm-mono-latin-ext-500-normal-BtRyHRi6.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-ext-500-normal-BtRyHRi6.woff2 rename to modules/boardwalk/dist/assets/dm-mono-latin-ext-500-normal-BtRyHRi6.woff2 diff --git a/boardwalk/dist/assets/dm-mono-latin-ext-500-normal-Dw3M13d8.woff b/modules/boardwalk/dist/assets/dm-mono-latin-ext-500-normal-Dw3M13d8.woff similarity index 100% rename from boardwalk/dist/assets/dm-mono-latin-ext-500-normal-Dw3M13d8.woff rename to modules/boardwalk/dist/assets/dm-mono-latin-ext-500-normal-Dw3M13d8.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-400-normal-BwCSEQnW.woff b/modules/boardwalk/dist/assets/dm-sans-latin-400-normal-BwCSEQnW.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-400-normal-BwCSEQnW.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-400-normal-BwCSEQnW.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-400-normal-CW0RaeGs.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-400-normal-CW0RaeGs.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-400-normal-CW0RaeGs.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-400-normal-CW0RaeGs.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-500-normal-B9HHJjqV.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-500-normal-B9HHJjqV.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-500-normal-B9HHJjqV.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-500-normal-B9HHJjqV.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-500-normal-Dr3UlScf.woff b/modules/boardwalk/dist/assets/dm-sans-latin-500-normal-Dr3UlScf.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-500-normal-Dr3UlScf.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-500-normal-Dr3UlScf.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-600-normal-Aqo67rzb.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-600-normal-Aqo67rzb.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-600-normal-Aqo67rzb.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-600-normal-Aqo67rzb.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-600-normal-BmdmIIQ2.woff b/modules/boardwalk/dist/assets/dm-sans-latin-600-normal-BmdmIIQ2.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-600-normal-BmdmIIQ2.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-600-normal-BmdmIIQ2.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-700-normal-CUSSCpQX.woff b/modules/boardwalk/dist/assets/dm-sans-latin-700-normal-CUSSCpQX.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-700-normal-CUSSCpQX.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-700-normal-CUSSCpQX.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-700-normal-DvUfVpUG.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-700-normal-DvUfVpUG.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-700-normal-DvUfVpUG.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-700-normal-DvUfVpUG.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BjWJ59Pq.woff b/modules/boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BjWJ59Pq.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BjWJ59Pq.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BjWJ59Pq.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BtiwyxMk.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BtiwyxMk.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BtiwyxMk.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-400-normal-BtiwyxMk.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-500-normal-BJfUCQsA.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-ext-500-normal-BJfUCQsA.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-500-normal-BJfUCQsA.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-500-normal-BJfUCQsA.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-500-normal-DR84L5F-.woff b/modules/boardwalk/dist/assets/dm-sans-latin-ext-500-normal-DR84L5F-.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-500-normal-DR84L5F-.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-500-normal-DR84L5F-.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-600-normal-4vooXBpG.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-ext-600-normal-4vooXBpG.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-600-normal-4vooXBpG.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-600-normal-4vooXBpG.woff2 diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-600-normal-DRtaDpgU.woff b/modules/boardwalk/dist/assets/dm-sans-latin-ext-600-normal-DRtaDpgU.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-600-normal-DRtaDpgU.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-600-normal-DRtaDpgU.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-700-normal-BLI3TTWz.woff b/modules/boardwalk/dist/assets/dm-sans-latin-ext-700-normal-BLI3TTWz.woff similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-700-normal-BLI3TTWz.woff rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-700-normal-BLI3TTWz.woff diff --git a/boardwalk/dist/assets/dm-sans-latin-ext-700-normal-CJIcxD6K.woff2 b/modules/boardwalk/dist/assets/dm-sans-latin-ext-700-normal-CJIcxD6K.woff2 similarity index 100% rename from boardwalk/dist/assets/dm-sans-latin-ext-700-normal-CJIcxD6K.woff2 rename to modules/boardwalk/dist/assets/dm-sans-latin-ext-700-normal-CJIcxD6K.woff2 diff --git a/boardwalk/dist/assets/index-BAlwlQ8W.js b/modules/boardwalk/dist/assets/index-BAlwlQ8W.js similarity index 100% rename from boardwalk/dist/assets/index-BAlwlQ8W.js rename to modules/boardwalk/dist/assets/index-BAlwlQ8W.js diff --git a/boardwalk/dist/assets/index-CLf0gZ3D.css b/modules/boardwalk/dist/assets/index-CLf0gZ3D.css similarity index 100% rename from boardwalk/dist/assets/index-CLf0gZ3D.css rename to modules/boardwalk/dist/assets/index-CLf0gZ3D.css diff --git a/boardwalk/dist/index.html b/modules/boardwalk/dist/index.html similarity index 100% rename from boardwalk/dist/index.html rename to modules/boardwalk/dist/index.html diff --git a/bonfire/command.go b/modules/bonfire/command.go similarity index 100% rename from bonfire/command.go rename to modules/bonfire/command.go diff --git a/bonfire/command_test.go b/modules/bonfire/command_test.go similarity index 100% rename from bonfire/command_test.go rename to modules/bonfire/command_test.go diff --git a/bonfire/output.go b/modules/bonfire/output.go similarity index 100% rename from bonfire/output.go rename to modules/bonfire/output.go diff --git a/bonfire/output_test.go b/modules/bonfire/output_test.go similarity index 100% rename from bonfire/output_test.go rename to modules/bonfire/output_test.go diff --git a/bonfire/prompts.go b/modules/bonfire/prompts.go similarity index 100% rename from bonfire/prompts.go rename to modules/bonfire/prompts.go diff --git a/bonfire/prompts_test.go b/modules/bonfire/prompts_test.go similarity index 100% rename from bonfire/prompts_test.go rename to modules/bonfire/prompts_test.go diff --git a/bonfire/root.go b/modules/bonfire/root.go similarity index 100% rename from bonfire/root.go rename to modules/bonfire/root.go diff --git a/bonfire/widgets.go b/modules/bonfire/widgets.go similarity index 100% rename from bonfire/widgets.go rename to modules/bonfire/widgets.go diff --git a/bouncer/audience_test.go b/modules/bouncer/audience_test.go similarity index 100% rename from bouncer/audience_test.go rename to modules/bouncer/audience_test.go diff --git a/bouncer/backend_guard_test.go b/modules/bouncer/backend_guard_test.go similarity index 100% rename from bouncer/backend_guard_test.go rename to modules/bouncer/backend_guard_test.go diff --git a/bouncer/blacklist.go b/modules/bouncer/blacklist.go similarity index 100% rename from bouncer/blacklist.go rename to modules/bouncer/blacklist.go diff --git a/bouncer/blacklist_test.go b/modules/bouncer/blacklist_test.go similarity index 100% rename from bouncer/blacklist_test.go rename to modules/bouncer/blacklist_test.go diff --git a/bouncer/context.go b/modules/bouncer/context.go similarity index 100% rename from bouncer/context.go rename to modules/bouncer/context.go diff --git a/bouncer/context_test.go b/modules/bouncer/context_test.go similarity index 100% rename from bouncer/context_test.go rename to modules/bouncer/context_test.go diff --git a/bouncer/cookie_guard_test.go b/modules/bouncer/cookie_guard_test.go similarity index 100% rename from bouncer/cookie_guard_test.go rename to modules/bouncer/cookie_guard_test.go diff --git a/bouncer/guard.go b/modules/bouncer/guard.go similarity index 100% rename from bouncer/guard.go rename to modules/bouncer/guard.go diff --git a/bouncer/jwt.go b/modules/bouncer/jwt.go similarity index 100% rename from bouncer/jwt.go rename to modules/bouncer/jwt.go diff --git a/bouncer/jwt_guard_test.go b/modules/bouncer/jwt_guard_test.go similarity index 100% rename from bouncer/jwt_guard_test.go rename to modules/bouncer/jwt_guard_test.go diff --git a/bouncer/jwt_test.go b/modules/bouncer/jwt_test.go similarity index 100% rename from bouncer/jwt_test.go rename to modules/bouncer/jwt_test.go diff --git a/bouncer/mint.go b/modules/bouncer/mint.go similarity index 100% rename from bouncer/mint.go rename to modules/bouncer/mint.go diff --git a/bouncer/mint_test.go b/modules/bouncer/mint_test.go similarity index 100% rename from bouncer/mint_test.go rename to modules/bouncer/mint_test.go diff --git a/bouncer/password.go b/modules/bouncer/password.go similarity index 100% rename from bouncer/password.go rename to modules/bouncer/password.go diff --git a/bouncer/password_test.go b/modules/bouncer/password_test.go similarity index 100% rename from bouncer/password_test.go rename to modules/bouncer/password_test.go diff --git a/bouncer/phase07_coverage_test.go b/modules/bouncer/phase07_coverage_test.go similarity index 100% rename from bouncer/phase07_coverage_test.go rename to modules/bouncer/phase07_coverage_test.go diff --git a/bouncer/refresh.go b/modules/bouncer/refresh.go similarity index 100% rename from bouncer/refresh.go rename to modules/bouncer/refresh.go diff --git a/bouncer/refresh_test.go b/modules/bouncer/refresh_test.go similarity index 100% rename from bouncer/refresh_test.go rename to modules/bouncer/refresh_test.go diff --git a/bouncer/registry.go b/modules/bouncer/registry.go similarity index 100% rename from bouncer/registry.go rename to modules/bouncer/registry.go diff --git a/bouncer/registry_coverage_test.go b/modules/bouncer/registry_coverage_test.go similarity index 100% rename from bouncer/registry_coverage_test.go rename to modules/bouncer/registry_coverage_test.go diff --git a/bouncer/registry_test.go b/modules/bouncer/registry_test.go similarity index 100% rename from bouncer/registry_test.go rename to modules/bouncer/registry_test.go diff --git a/cabana/admin_openapi.go b/modules/cabana/admin_openapi.go similarity index 100% rename from cabana/admin_openapi.go rename to modules/cabana/admin_openapi.go diff --git a/cabana/admin_paths_test.go b/modules/cabana/admin_paths_test.go similarity index 100% rename from cabana/admin_paths_test.go rename to modules/cabana/admin_paths_test.go diff --git a/cabana/auth.go b/modules/cabana/auth.go similarity index 99% rename from cabana/auth.go rename to modules/cabana/auth.go index 48f329a..06cb8a1 100644 --- a/cabana/auth.go +++ b/modules/cabana/auth.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" "gorm.io/gorm" ) diff --git a/cabana/auth_test.go b/modules/cabana/auth_test.go similarity index 97% rename from cabana/auth_test.go rename to modules/cabana/auth_test.go index 043c12b..b17697b 100644 --- a/cabana/auth_test.go +++ b/modules/cabana/auth_test.go @@ -19,14 +19,14 @@ import ( "testing/fstest" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/cabana" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/surf" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/cabana" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/surf" _ "github.com/jackc/pgx/v5/stdlib" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/modules/postgres" diff --git a/cabana/bulk_test.go b/modules/cabana/bulk_test.go similarity index 99% rename from cabana/bulk_test.go rename to modules/cabana/bulk_test.go index 60e399e..7fa5809 100644 --- a/cabana/bulk_test.go +++ b/modules/cabana/bulk_test.go @@ -11,7 +11,7 @@ import ( "sync" "testing" - "git.golem15.com/golem15/summercms/bouncer" + "git.golem15.com/golem15/summercms/modules/bouncer" "gorm.io/gorm" ) diff --git a/cabana/commands.go b/modules/cabana/commands.go similarity index 96% rename from cabana/commands.go rename to modules/cabana/commands.go index b5cf919..07a2dc2 100644 --- a/cabana/commands.go +++ b/modules/cabana/commands.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/lagoon" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/lagoon" "gorm.io/gorm" ) diff --git a/cabana/commands_test.go b/modules/cabana/commands_test.go similarity index 95% rename from cabana/commands_test.go rename to modules/cabana/commands_test.go index dea5406..3b01178 100644 --- a/cabana/commands_test.go +++ b/modules/cabana/commands_test.go @@ -12,12 +12,12 @@ import ( "os" "path/filepath" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/cabana" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/lagoon" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/cabana" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/lagoon" "gorm.io/gorm" ) diff --git a/cabana/contracts.go b/modules/cabana/contracts.go similarity index 98% rename from cabana/contracts.go rename to modules/cabana/contracts.go index 02beba5..b3f23b3 100644 --- a/cabana/contracts.go +++ b/modules/cabana/contracts.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" "gorm.io/gorm" ) diff --git a/cabana/crud.go b/modules/cabana/crud.go similarity index 99% rename from cabana/crud.go rename to modules/cabana/crud.go index ca3b6ec..43b3130 100644 --- a/cabana/crud.go +++ b/modules/cabana/crud.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/pact" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/cabana/crud_lifecycle_test.go b/modules/cabana/crud_lifecycle_test.go similarity index 99% rename from cabana/crud_lifecycle_test.go rename to modules/cabana/crud_lifecycle_test.go index 90dd477..98e1417 100644 --- a/cabana/crud_lifecycle_test.go +++ b/modules/cabana/crud_lifecycle_test.go @@ -11,9 +11,9 @@ import ( "sync/atomic" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" "gorm.io/gorm" ) diff --git a/cabana/crud_test.go b/modules/cabana/crud_test.go similarity index 100% rename from cabana/crud_test.go rename to modules/cabana/crud_test.go diff --git a/cabana/csrf.go b/modules/cabana/csrf.go similarity index 100% rename from cabana/csrf.go rename to modules/cabana/csrf.go diff --git a/cabana/export_test.go b/modules/cabana/export_test.go similarity index 100% rename from cabana/export_test.go rename to modules/cabana/export_test.go diff --git a/cabana/filter_options_test.go b/modules/cabana/filter_options_test.go similarity index 96% rename from cabana/filter_options_test.go rename to modules/cabana/filter_options_test.go index 7b851d1..8a01706 100644 --- a/cabana/filter_options_test.go +++ b/modules/cabana/filter_options_test.go @@ -9,10 +9,10 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/towel" "gorm.io/gorm" ) diff --git a/cabana/filter_schema.go b/modules/cabana/filter_schema.go similarity index 98% rename from cabana/filter_schema.go rename to modules/cabana/filter_schema.go index c1da8ed..a643979 100644 --- a/cabana/filter_schema.go +++ b/modules/cabana/filter_schema.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/towel" "github.com/goccy/go-yaml/ast" ) diff --git a/cabana/form_schema.go b/modules/cabana/form_schema.go similarity index 99% rename from cabana/form_schema.go rename to modules/cabana/form_schema.go index c678c75..4bf17d6 100644 --- a/cabana/form_schema.go +++ b/modules/cabana/form_schema.go @@ -12,9 +12,9 @@ import ( "context" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/towel" "github.com/goccy/go-yaml" "github.com/goccy/go-yaml/ast" ) diff --git a/cabana/form_schema_test.go b/modules/cabana/form_schema_test.go similarity index 98% rename from cabana/form_schema_test.go rename to modules/cabana/form_schema_test.go index 869fcaf..386afa9 100644 --- a/cabana/form_schema_test.go +++ b/modules/cabana/form_schema_test.go @@ -10,11 +10,11 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/towel" ) const formConfig = `name: demo.form diff --git a/cabana/http.go b/modules/cabana/http.go similarity index 98% rename from cabana/http.go rename to modules/cabana/http.go index 056996f..bca3ac3 100644 --- a/cabana/http.go +++ b/modules/cabana/http.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/boardwalk" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/phrasebook" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/boardwalk" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/phrasebook" "gorm.io/gorm" ) diff --git a/cabana/lang.go b/modules/cabana/lang.go similarity index 100% rename from cabana/lang.go rename to modules/cabana/lang.go diff --git a/cabana/list_schema.go b/modules/cabana/list_schema.go similarity index 98% rename from cabana/list_schema.go rename to modules/cabana/list_schema.go index 49d2d5c..618af43 100644 --- a/cabana/list_schema.go +++ b/modules/cabana/list_schema.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/towel" "github.com/goccy/go-yaml" "github.com/goccy/go-yaml/ast" "gorm.io/gorm" diff --git a/cabana/list_schema_test.go b/modules/cabana/list_schema_test.go similarity index 99% rename from cabana/list_schema_test.go rename to modules/cabana/list_schema_test.go index 02e489d..19e93c5 100644 --- a/cabana/list_schema_test.go +++ b/modules/cabana/list_schema_test.go @@ -9,9 +9,9 @@ import ( "testing/fstest" "time" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/towel" "gorm.io/gorm" ) diff --git a/cabana/messages.go b/modules/cabana/messages.go similarity index 99% rename from cabana/messages.go rename to modules/cabana/messages.go index cc4a5aa..b73ee05 100644 --- a/cabana/messages.go +++ b/modules/cabana/messages.go @@ -7,7 +7,7 @@ import ( "reflect" "sort" - "git.golem15.com/golem15/summercms/phrasebook" + "git.golem15.com/golem15/summercms/modules/phrasebook" ) // MessageForms is one controller message resolved to its CLDR plural forms diff --git a/cabana/messages_test.go b/modules/cabana/messages_test.go similarity index 98% rename from cabana/messages_test.go rename to modules/cabana/messages_test.go index c5cafc9..8df44b3 100644 --- a/cabana/messages_test.go +++ b/modules/cabana/messages_test.go @@ -10,9 +10,9 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/towel" ) type langPlugin struct { diff --git a/cabana/metadata_settings_test.go b/modules/cabana/metadata_settings_test.go similarity index 97% rename from cabana/metadata_settings_test.go rename to modules/cabana/metadata_settings_test.go index d798ce9..1f3a198 100644 --- a/cabana/metadata_settings_test.go +++ b/modules/cabana/metadata_settings_test.go @@ -10,10 +10,10 @@ import ( "testing/fstest" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" "gorm.io/gorm" ) diff --git a/cabana/navigation.go b/modules/cabana/navigation.go similarity index 95% rename from cabana/navigation.go rename to modules/cabana/navigation.go index a20c1a4..e2003fb 100644 --- a/cabana/navigation.go +++ b/modules/cabana/navigation.go @@ -4,9 +4,9 @@ import ( "context" "sort" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" ) // NavigationEntry is one permission-filtered backend navigation item. diff --git a/cabana/openapi_conformance_test.go b/modules/cabana/openapi_conformance_test.go similarity index 98% rename from cabana/openapi_conformance_test.go rename to modules/cabana/openapi_conformance_test.go index 6544f34..9650ce8 100644 --- a/cabana/openapi_conformance_test.go +++ b/modules/cabana/openapi_conformance_test.go @@ -15,14 +15,14 @@ import ( "testing/fstest" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/cabana" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/surf" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/cabana" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/surf" "gorm.io/gorm" ) diff --git a/cabana/phase09_contract_test.go b/modules/cabana/phase09_contract_test.go similarity index 100% rename from cabana/phase09_contract_test.go rename to modules/cabana/phase09_contract_test.go diff --git a/cabana/phase10_auth_test.go b/modules/cabana/phase10_auth_test.go similarity index 98% rename from cabana/phase10_auth_test.go rename to modules/cabana/phase10_auth_test.go index 0da1218..1cdadae 100644 --- a/cabana/phase10_auth_test.go +++ b/modules/cabana/phase10_auth_test.go @@ -13,11 +13,11 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/cabana" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/cabana" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) // TestPhase10CookieAuth pins the D-19 session transport: cookie login and diff --git a/cabana/phase10_coverage_test.go b/modules/cabana/phase10_coverage_test.go similarity index 98% rename from cabana/phase10_coverage_test.go rename to modules/cabana/phase10_coverage_test.go index 05bc5ab..81e4c44 100644 --- a/cabana/phase10_coverage_test.go +++ b/modules/cabana/phase10_coverage_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" "github.com/golang-jwt/jwt/v5" "gorm.io/gorm" ) diff --git a/cabana/phase10_csrf_test.go b/modules/cabana/phase10_csrf_test.go similarity index 97% rename from cabana/phase10_csrf_test.go rename to modules/cabana/phase10_csrf_test.go index c8cfa0f..d8dcd8d 100644 --- a/cabana/phase10_csrf_test.go +++ b/modules/cabana/phase10_csrf_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" ) // TestPhase10CSRF walks every state-changing route service.mount registers. diff --git a/cabana/prefix.go b/modules/cabana/prefix.go similarity index 96% rename from cabana/prefix.go rename to modules/cabana/prefix.go index 29d0c53..4515ede 100644 --- a/cabana/prefix.go +++ b/modules/cabana/prefix.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "git.golem15.com/golem15/summercms/backpack" + "git.golem15.com/golem15/summercms/modules/backpack" ) // DefaultAdminPrefix is the admin mount path when backend.uri is unset. diff --git a/cabana/query.go b/modules/cabana/query.go similarity index 99% rename from cabana/query.go rename to modules/cabana/query.go index b826413..193e18b 100644 --- a/cabana/query.go +++ b/modules/cabana/query.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/pact" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/cabana/query_test.go b/modules/cabana/query_test.go similarity index 98% rename from cabana/query_test.go rename to modules/cabana/query_test.go index 2f4a4a5..a9974a5 100644 --- a/cabana/query_test.go +++ b/modules/cabana/query_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" tcpostgres "github.com/testcontainers/testcontainers-go/modules/postgres" pgdriver "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/cabana/refresh_revocation_test.go b/modules/cabana/refresh_revocation_test.go similarity index 98% rename from cabana/refresh_revocation_test.go rename to modules/cabana/refresh_revocation_test.go index 6fd7b53..09ab7dd 100644 --- a/cabana/refresh_revocation_test.go +++ b/modules/cabana/refresh_revocation_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/cabana" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/cabana" ) // TestAdminRefreshRevocation pins CR-01: POST {prefix}/api/v1/auth/refresh diff --git a/cabana/registry.go b/modules/cabana/registry.go similarity index 98% rename from cabana/registry.go rename to modules/cabana/registry.go index 4fbb679..7b863eb 100644 --- a/cabana/registry.go +++ b/modules/cabana/registry.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) type controllerRef struct { diff --git a/cabana/relation.go b/modules/cabana/relation.go similarity index 99% rename from cabana/relation.go rename to modules/cabana/relation.go index 335f7f0..ad29f0c 100644 --- a/cabana/relation.go +++ b/modules/cabana/relation.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" "github.com/goccy/go-yaml" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/cabana/relation_field.go b/modules/cabana/relation_field.go similarity index 99% rename from cabana/relation_field.go rename to modules/cabana/relation_field.go index 22432bd..7bc9e7d 100644 --- a/cabana/relation_field.go +++ b/modules/cabana/relation_field.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/pact" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/cabana/relation_field_test.go b/modules/cabana/relation_field_test.go similarity index 99% rename from cabana/relation_field_test.go rename to modules/cabana/relation_field_test.go index 54e2e89..6981b5d 100644 --- a/cabana/relation_field_test.go +++ b/modules/cabana/relation_field_test.go @@ -12,8 +12,8 @@ import ( "testing/fstest" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" "gorm.io/gorm" ) diff --git a/cabana/relation_test.go b/modules/cabana/relation_test.go similarity index 100% rename from cabana/relation_test.go rename to modules/cabana/relation_test.go diff --git a/cabana/schema.go b/modules/cabana/schema.go similarity index 100% rename from cabana/schema.go rename to modules/cabana/schema.go diff --git a/cabana/schema_types.go b/modules/cabana/schema_types.go similarity index 100% rename from cabana/schema_types.go rename to modules/cabana/schema_types.go diff --git a/cabana/security_coverage_test.go b/modules/cabana/security_coverage_test.go similarity index 99% rename from cabana/security_coverage_test.go rename to modules/cabana/security_coverage_test.go index 5d8107a..9296f0c 100644 --- a/cabana/security_coverage_test.go +++ b/modules/cabana/security_coverage_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" ) // adminRoute is one logical admin route. key is method plus the path relative diff --git a/cabana/security_test.go b/modules/cabana/security_test.go similarity index 96% rename from cabana/security_test.go rename to modules/cabana/security_test.go index 519aa2c..3a4a851 100644 --- a/cabana/security_test.go +++ b/modules/cabana/security_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" ) type orderController struct { diff --git a/cabana/settings.go b/modules/cabana/settings.go similarity index 98% rename from cabana/settings.go rename to modules/cabana/settings.go index 8214ad7..24d5768 100644 --- a/cabana/settings.go +++ b/modules/cabana/settings.go @@ -10,8 +10,8 @@ import ( "reflect" "strings" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/pact" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/cabana/testdata/list/all_columns.yaml b/modules/cabana/testdata/list/all_columns.yaml similarity index 100% rename from cabana/testdata/list/all_columns.yaml rename to modules/cabana/testdata/list/all_columns.yaml diff --git a/cabana/testdata/list/all_filters.yaml b/modules/cabana/testdata/list/all_filters.yaml similarity index 100% rename from cabana/testdata/list/all_filters.yaml rename to modules/cabana/testdata/list/all_filters.yaml diff --git a/compass/config.go b/modules/compass/config.go similarity index 100% rename from compass/config.go rename to modules/compass/config.go diff --git a/compass/config_test.go b/modules/compass/config_test.go similarity index 100% rename from compass/config_test.go rename to modules/compass/config_test.go diff --git a/compass/env.go b/modules/compass/env.go similarity index 100% rename from compass/env.go rename to modules/compass/env.go diff --git a/compass/env_test.go b/modules/compass/env_test.go similarity index 100% rename from compass/env_test.go rename to modules/compass/env_test.go diff --git a/compass/persist.go b/modules/compass/persist.go similarity index 100% rename from compass/persist.go rename to modules/compass/persist.go diff --git a/compass/persist_test.go b/modules/compass/persist_test.go similarity index 100% rename from compass/persist_test.go rename to modules/compass/persist_test.go diff --git a/fetchguard/fetch.go b/modules/fetchguard/fetch.go similarity index 98% rename from fetchguard/fetch.go rename to modules/fetchguard/fetch.go index 3e5c9de..b9c2a76 100644 --- a/fetchguard/fetch.go +++ b/modules/fetchguard/fetch.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) // Result is a successful (including non-2xx, including 3xx) Fetch response. diff --git a/fetchguard/fetch_coverage_test.go b/modules/fetchguard/fetch_coverage_test.go similarity index 100% rename from fetchguard/fetch_coverage_test.go rename to modules/fetchguard/fetch_coverage_test.go diff --git a/fetchguard/fetch_test.go b/modules/fetchguard/fetch_test.go similarity index 99% rename from fetchguard/fetch_test.go rename to modules/fetchguard/fetch_test.go index 41d7520..7ee7c02 100644 --- a/fetchguard/fetch_test.go +++ b/modules/fetchguard/fetch_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) func TestFetchMalformedURL(t *testing.T) { diff --git a/fetchguard/ip.go b/modules/fetchguard/ip.go similarity index 100% rename from fetchguard/ip.go rename to modules/fetchguard/ip.go diff --git a/fetchguard/ip_test.go b/modules/fetchguard/ip_test.go similarity index 100% rename from fetchguard/ip_test.go rename to modules/fetchguard/ip_test.go diff --git a/fetchguard/policy.go b/modules/fetchguard/policy.go similarity index 98% rename from fetchguard/policy.go rename to modules/fetchguard/policy.go index b861010..4a58284 100644 --- a/fetchguard/policy.go +++ b/modules/fetchguard/policy.go @@ -6,7 +6,7 @@ import ( "math" "time" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) // Mode selects host-allow-list vs any-public-host. The private/loopback/ diff --git a/lagoon/attach/app_test.go b/modules/lagoon/attach/app_test.go similarity index 50% rename from lagoon/attach/app_test.go rename to modules/lagoon/attach/app_test.go index 895984f..27f3415 100644 --- a/lagoon/attach/app_test.go +++ b/modules/lagoon/attach/app_test.go @@ -1,8 +1,8 @@ package attach import ( - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" ) func backpackApp(cfg *compass.Config) *backpack.App { diff --git a/lagoon/attach/bucket.go b/modules/lagoon/attach/bucket.go similarity index 95% rename from lagoon/attach/bucket.go rename to modules/lagoon/attach/bucket.go index 2ec0a65..412ed04 100644 --- a/lagoon/attach/bucket.go +++ b/modules/lagoon/attach/bucket.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" "gocloud.dev/blob" _ "gocloud.dev/blob/fileblob" _ "gocloud.dev/blob/memblob" diff --git a/lagoon/attach/bucket_test.go b/modules/lagoon/attach/bucket_test.go similarity index 97% rename from lagoon/attach/bucket_test.go rename to modules/lagoon/attach/bucket_test.go index 9366a6a..c151dd7 100644 --- a/lagoon/attach/bucket_test.go +++ b/modules/lagoon/attach/bucket_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" "gocloud.dev/blob" "gocloud.dev/blob/memblob" ) diff --git a/lagoon/attach/file.go b/modules/lagoon/attach/file.go similarity index 100% rename from lagoon/attach/file.go rename to modules/lagoon/attach/file.go diff --git a/lagoon/attach/file_test.go b/modules/lagoon/attach/file_test.go similarity index 100% rename from lagoon/attach/file_test.go rename to modules/lagoon/attach/file_test.go diff --git a/lagoon/attach/lifecycle_test.go b/modules/lagoon/attach/lifecycle_test.go similarity index 98% rename from lagoon/attach/lifecycle_test.go rename to modules/lagoon/attach/lifecycle_test.go index bff9a9a..0373b01 100644 --- a/lagoon/attach/lifecycle_test.go +++ b/modules/lagoon/attach/lifecycle_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/lagoon/attach" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/lagoon/attach" _ "github.com/jackc/pgx/v5/stdlib" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/modules/postgres" diff --git a/lagoon/attach/migrations.go b/modules/lagoon/attach/migrations.go similarity index 100% rename from lagoon/attach/migrations.go rename to modules/lagoon/attach/migrations.go diff --git a/lagoon/attach/static.go b/modules/lagoon/attach/static.go similarity index 100% rename from lagoon/attach/static.go rename to modules/lagoon/attach/static.go diff --git a/lagoon/attach/static_test.go b/modules/lagoon/attach/static_test.go similarity index 100% rename from lagoon/attach/static_test.go rename to modules/lagoon/attach/static_test.go diff --git a/lagoon/attach/thumb.go b/modules/lagoon/attach/thumb.go similarity index 100% rename from lagoon/attach/thumb.go rename to modules/lagoon/attach/thumb.go diff --git a/lagoon/attach/thumb_test.go b/modules/lagoon/attach/thumb_test.go similarity index 100% rename from lagoon/attach/thumb_test.go rename to modules/lagoon/attach/thumb_test.go diff --git a/lagoon/backend_admin_migrations.go b/modules/lagoon/backend_admin_migrations.go similarity index 100% rename from lagoon/backend_admin_migrations.go rename to modules/lagoon/backend_admin_migrations.go diff --git a/lagoon/backend_admin_migrations_test.go b/modules/lagoon/backend_admin_migrations_test.go similarity index 99% rename from lagoon/backend_admin_migrations_test.go rename to modules/lagoon/backend_admin_migrations_test.go index 1db9c35..fef4c72 100644 --- a/lagoon/backend_admin_migrations_test.go +++ b/modules/lagoon/backend_admin_migrations_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/party" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) diff --git a/lagoon/commands.go b/modules/lagoon/commands.go similarity index 93% rename from lagoon/commands.go rename to modules/lagoon/commands.go index bc230b0..3b297c6 100644 --- a/lagoon/commands.go +++ b/modules/lagoon/commands.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/party" "gorm.io/gorm" ) diff --git a/lagoon/connection.go b/modules/lagoon/connection.go similarity index 97% rename from lagoon/connection.go rename to modules/lagoon/connection.go index d774fc1..faf393e 100644 --- a/lagoon/connection.go +++ b/modules/lagoon/connection.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" _ "github.com/jackc/pgx/v5/stdlib" "gorm.io/driver/postgres" "gorm.io/gorm" diff --git a/lagoon/connection_test.go b/modules/lagoon/connection_test.go similarity index 97% rename from lagoon/connection_test.go rename to modules/lagoon/connection_test.go index 5685f02..5114bd7 100644 --- a/lagoon/connection_test.go +++ b/modules/lagoon/connection_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" "gorm.io/gorm" ) diff --git a/lagoon/encrypted.go b/modules/lagoon/encrypted.go similarity index 98% rename from lagoon/encrypted.go rename to modules/lagoon/encrypted.go index 0782055..e97e3df 100644 --- a/lagoon/encrypted.go +++ b/modules/lagoon/encrypted.go @@ -13,8 +13,8 @@ import ( "strings" "sync" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" ) const ( diff --git a/lagoon/encrypted_test.go b/modules/lagoon/encrypted_test.go similarity index 98% rename from lagoon/encrypted_test.go rename to modules/lagoon/encrypted_test.go index 9746928..0f7362c 100644 --- a/lagoon/encrypted_test.go +++ b/modules/lagoon/encrypted_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) func TestEncryptedRoundTrip(t *testing.T) { diff --git a/lagoon/fill.go b/modules/lagoon/fill.go similarity index 100% rename from lagoon/fill.go rename to modules/lagoon/fill.go diff --git a/lagoon/fill_fuzz_test.go b/modules/lagoon/fill_fuzz_test.go similarity index 100% rename from lagoon/fill_fuzz_test.go rename to modules/lagoon/fill_fuzz_test.go diff --git a/lagoon/fill_test.go b/modules/lagoon/fill_test.go similarity index 100% rename from lagoon/fill_test.go rename to modules/lagoon/fill_test.go diff --git a/lagoon/hidden_marshal_test.go b/modules/lagoon/hidden_marshal_test.go similarity index 100% rename from lagoon/hidden_marshal_test.go rename to modules/lagoon/hidden_marshal_test.go diff --git a/lagoon/jsonable.go b/modules/lagoon/jsonable.go similarity index 100% rename from lagoon/jsonable.go rename to modules/lagoon/jsonable.go diff --git a/lagoon/jsonable_test.go b/modules/lagoon/jsonable_test.go similarity index 100% rename from lagoon/jsonable_test.go rename to modules/lagoon/jsonable_test.go diff --git a/lagoon/keygen.go b/modules/lagoon/keygen.go similarity index 91% rename from lagoon/keygen.go rename to modules/lagoon/keygen.go index 950dc89..e575cbe 100644 --- a/lagoon/keygen.go +++ b/modules/lagoon/keygen.go @@ -5,7 +5,7 @@ import ( "crypto/rand" "encoding/base64" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" ) // KeyGenerateCommand prints a fresh 32-byte base64 app.key and performs no diff --git a/lagoon/keygen_test.go b/modules/lagoon/keygen_test.go similarity index 94% rename from lagoon/keygen_test.go rename to modules/lagoon/keygen_test.go index 513ec63..a25e7cc 100644 --- a/lagoon/keygen_test.go +++ b/modules/lagoon/keygen_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" ) func TestEncryptedKeyGeneratePrints32ByteBase64(t *testing.T) { diff --git a/lagoon/laravel_decrypt.go b/modules/lagoon/laravel_decrypt.go similarity index 100% rename from lagoon/laravel_decrypt.go rename to modules/lagoon/laravel_decrypt.go diff --git a/lagoon/laravel_decrypt_test.go b/modules/lagoon/laravel_decrypt_test.go similarity index 100% rename from lagoon/laravel_decrypt_test.go rename to modules/lagoon/laravel_decrypt_test.go diff --git a/lagoon/lifecycle.go b/modules/lagoon/lifecycle.go similarity index 100% rename from lagoon/lifecycle.go rename to modules/lagoon/lifecycle.go diff --git a/lagoon/lifecycle_test.go b/modules/lagoon/lifecycle_test.go similarity index 100% rename from lagoon/lifecycle_test.go rename to modules/lagoon/lifecycle_test.go diff --git a/lagoon/migrations.go b/modules/lagoon/migrations.go similarity index 96% rename from lagoon/migrations.go rename to modules/lagoon/migrations.go index 319e42b..1559bb9 100644 --- a/lagoon/migrations.go +++ b/modules/lagoon/migrations.go @@ -6,9 +6,9 @@ import ( "strings" "unicode" - "git.golem15.com/golem15/summercms/lagoon/attach" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/lagoon/attach" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) diff --git a/lagoon/migrations_test.go b/modules/lagoon/migrations_test.go similarity index 97% rename from lagoon/migrations_test.go rename to modules/lagoon/migrations_test.go index 043d2e4..e5c127f 100644 --- a/lagoon/migrations_test.go +++ b/modules/lagoon/migrations_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) diff --git a/lagoon/order.go b/modules/lagoon/order.go similarity index 100% rename from lagoon/order.go rename to modules/lagoon/order.go diff --git a/lagoon/order_test.go b/modules/lagoon/order_test.go similarity index 100% rename from lagoon/order_test.go rename to modules/lagoon/order_test.go diff --git a/lagoon/paginate.go b/modules/lagoon/paginate.go similarity index 100% rename from lagoon/paginate.go rename to modules/lagoon/paginate.go diff --git a/lagoon/paginate_test.go b/modules/lagoon/paginate_test.go similarity index 100% rename from lagoon/paginate_test.go rename to modules/lagoon/paginate_test.go diff --git a/lagoon/postgres_test.go b/modules/lagoon/postgres_test.go similarity index 100% rename from lagoon/postgres_test.go rename to modules/lagoon/postgres_test.go diff --git a/lagoon/relations.go b/modules/lagoon/relations.go similarity index 100% rename from lagoon/relations.go rename to modules/lagoon/relations.go diff --git a/lagoon/relations_test.go b/modules/lagoon/relations_test.go similarity index 100% rename from lagoon/relations_test.go rename to modules/lagoon/relations_test.go diff --git a/lagoon/validate.go b/modules/lagoon/validate.go similarity index 99% rename from lagoon/validate.go rename to modules/lagoon/validate.go index 68b8ecd..cf38918 100644 --- a/lagoon/validate.go +++ b/modules/lagoon/validate.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "git.golem15.com/golem15/summercms/phrasebook" + "git.golem15.com/golem15/summercms/modules/phrasebook" "github.com/go-playground/validator/v10" "gorm.io/gorm" ) diff --git a/lagoon/validate_test.go b/modules/lagoon/validate_test.go similarity index 100% rename from lagoon/validate_test.go rename to modules/lagoon/validate_test.go diff --git a/pact/capabilities.go b/modules/pact/capabilities.go similarity index 99% rename from pact/capabilities.go rename to modules/pact/capabilities.go index bc4a3a6..9bdf93f 100644 --- a/pact/capabilities.go +++ b/modules/pact/capabilities.go @@ -5,7 +5,7 @@ import ( "io/fs" "net/http" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" "github.com/go-gormigrate/gormigrate/v2" "gorm.io/gorm" ) diff --git a/pact/capabilities_test.go b/modules/pact/capabilities_test.go similarity index 98% rename from pact/capabilities_test.go rename to modules/pact/capabilities_test.go index ac94465..2ceae89 100644 --- a/pact/capabilities_test.go +++ b/modules/pact/capabilities_test.go @@ -5,7 +5,7 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/bonfire" + "git.golem15.com/golem15/summercms/modules/bonfire" "github.com/go-gormigrate/gormigrate/v2" ) diff --git a/party/registry.go b/modules/party/registry.go similarity index 96% rename from party/registry.go rename to modules/party/registry.go index 524d6be..630cd39 100644 --- a/party/registry.go +++ b/modules/party/registry.go @@ -5,10 +5,10 @@ import ( "strings" "sync" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/postcard" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/postcard" ) // Plugin is the required descriptor every compiled plugin implements. diff --git a/party/registry_test.go b/modules/party/registry_test.go similarity index 98% rename from party/registry_test.go rename to modules/party/registry_test.go index 2b959fd..d420b5d 100644 --- a/party/registry_test.go +++ b/modules/party/registry_test.go @@ -9,12 +9,12 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/phrasebook" - "git.golem15.com/golem15/summercms/postcard" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/phrasebook" + "git.golem15.com/golem15/summercms/modules/postcard" ) type tracePlugin struct { diff --git a/phrasebook/backend/lang/en/lang.yaml b/modules/phrasebook/backend/lang/en/lang.yaml similarity index 100% rename from phrasebook/backend/lang/en/lang.yaml rename to modules/phrasebook/backend/lang/en/lang.yaml diff --git a/phrasebook/backend/lang/pl/lang.yaml b/modules/phrasebook/backend/lang/pl/lang.yaml similarity index 100% rename from phrasebook/backend/lang/pl/lang.yaml rename to modules/phrasebook/backend/lang/pl/lang.yaml diff --git a/phrasebook/lang.go b/modules/phrasebook/lang.go similarity index 100% rename from phrasebook/lang.go rename to modules/phrasebook/lang.go diff --git a/phrasebook/lang/en/validate.yaml b/modules/phrasebook/lang/en/validate.yaml similarity index 100% rename from phrasebook/lang/en/validate.yaml rename to modules/phrasebook/lang/en/validate.yaml diff --git a/phrasebook/lang/pl/validate.yaml b/modules/phrasebook/lang/pl/validate.yaml similarity index 100% rename from phrasebook/lang/pl/validate.yaml rename to modules/phrasebook/lang/pl/validate.yaml diff --git a/phrasebook/loader.go b/modules/phrasebook/loader.go similarity index 100% rename from phrasebook/loader.go rename to modules/phrasebook/loader.go diff --git a/phrasebook/phase10_test.go b/modules/phrasebook/phase10_test.go similarity index 99% rename from phrasebook/phase10_test.go rename to modules/phrasebook/phase10_test.go index 785119f..19681b9 100644 --- a/phrasebook/phase10_test.go +++ b/modules/phrasebook/phase10_test.go @@ -11,7 +11,7 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" + "git.golem15.com/golem15/summercms/modules/backpack" ) func TestPhase10Forms(t *testing.T) { diff --git a/phrasebook/translator.go b/modules/phrasebook/translator.go similarity index 98% rename from phrasebook/translator.go rename to modules/phrasebook/translator.go index 5491683..a1dcf78 100644 --- a/phrasebook/translator.go +++ b/modules/phrasebook/translator.go @@ -10,9 +10,9 @@ import ( "unicode" "unicode/utf8" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/towel" "github.com/nicksnyder/go-i18n/v2/i18n" "github.com/nicksnyder/go-i18n/v2/i18n/template" "golang.org/x/text/language" diff --git a/phrasebook/translator_test.go b/modules/phrasebook/translator_test.go similarity index 98% rename from phrasebook/translator_test.go rename to modules/phrasebook/translator_test.go index d73f608..2afdc57 100644 --- a/phrasebook/translator_test.go +++ b/modules/phrasebook/translator_test.go @@ -11,9 +11,9 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/towel" ) func TestTranslationSmoke(t *testing.T) { diff --git a/postcard/assets/default.htm b/modules/postcard/assets/default.htm similarity index 100% rename from postcard/assets/default.htm rename to modules/postcard/assets/default.htm diff --git a/postcard/drivers.go b/modules/postcard/drivers.go similarity index 100% rename from postcard/drivers.go rename to modules/postcard/drivers.go diff --git a/postcard/mailer.go b/modules/postcard/mailer.go similarity index 96% rename from postcard/mailer.go rename to modules/postcard/mailer.go index b223ecb..5328f68 100644 --- a/postcard/mailer.go +++ b/modules/postcard/mailer.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" ) // Message is the Send contract for plugin callers. diff --git a/postcard/mailer_test.go b/modules/postcard/mailer_test.go similarity index 99% rename from postcard/mailer_test.go rename to modules/postcard/mailer_test.go index df481af..4907f8c 100644 --- a/postcard/mailer_test.go +++ b/modules/postcard/mailer_test.go @@ -12,8 +12,8 @@ import ( "testing/fstest" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" ) func TestMailRenderSmoke(t *testing.T) { diff --git a/postcard/mailpit_test.go b/modules/postcard/mailpit_test.go similarity index 100% rename from postcard/mailpit_test.go rename to modules/postcard/mailpit_test.go diff --git a/postcard/smtp_test.go b/modules/postcard/smtp_test.go similarity index 100% rename from postcard/smtp_test.go rename to modules/postcard/smtp_test.go diff --git a/postcard/templates.go b/modules/postcard/templates.go similarity index 100% rename from postcard/templates.go rename to modules/postcard/templates.go diff --git a/postcard/templates_test.go b/modules/postcard/templates_test.go similarity index 100% rename from postcard/templates_test.go rename to modules/postcard/templates_test.go diff --git a/surf/admin_prefix_test.go b/modules/surf/admin_prefix_test.go similarity index 96% rename from surf/admin_prefix_test.go rename to modules/surf/admin_prefix_test.go index c7d615d..0cd9588 100644 --- a/surf/admin_prefix_test.go +++ b/modules/surf/admin_prefix_test.go @@ -9,10 +9,10 @@ import ( "testing" "testing/fstest" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) // TestPhase10AdminPrefixCollision fails boot when a plugin other than cabana diff --git a/surf/bodylimit.go b/modules/surf/bodylimit.go similarity index 100% rename from surf/bodylimit.go rename to modules/surf/bodylimit.go diff --git a/surf/bodylimit_test.go b/modules/surf/bodylimit_test.go similarity index 98% rename from surf/bodylimit_test.go rename to modules/surf/bodylimit_test.go index df65d5f..5069d3f 100644 --- a/surf/bodylimit_test.go +++ b/modules/surf/bodylimit_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) func TestBodyLimitDefaultRejectsOversizedBody(t *testing.T) { diff --git a/surf/clientip.go b/modules/surf/clientip.go similarity index 97% rename from surf/clientip.go rename to modules/surf/clientip.go index 21a44ec..9514215 100644 --- a/surf/clientip.go +++ b/modules/surf/clientip.go @@ -6,7 +6,7 @@ import ( "net/netip" "strings" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) // ClientIP is the single source of client IP for limiter keys (D-04). diff --git a/surf/clientip_test.go b/modules/surf/clientip_test.go similarity index 100% rename from surf/clientip_test.go rename to modules/surf/clientip_test.go diff --git a/surf/cors.go b/modules/surf/cors.go similarity index 98% rename from surf/cors.go rename to modules/surf/cors.go index a9ab1ee..8fd113d 100644 --- a/surf/cors.go +++ b/modules/surf/cors.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) // CORSConfig matches Laravel config/cors.php keys. diff --git a/surf/cors_coverage_test.go b/modules/surf/cors_coverage_test.go similarity index 100% rename from surf/cors_coverage_test.go rename to modules/surf/cors_coverage_test.go diff --git a/surf/cors_test.go b/modules/surf/cors_test.go similarity index 95% rename from surf/cors_test.go rename to modules/surf/cors_test.go index 1480c26..a3b2147 100644 --- a/surf/cors_test.go +++ b/modules/surf/cors_test.go @@ -7,9 +7,9 @@ import ( "path/filepath" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" + "git.golem15.com/golem15/summercms/modules/party" ) func TestCORSLaravelGlobMatchesNestedPaths(t *testing.T) { diff --git a/surf/limiter.go b/modules/surf/limiter.go similarity index 98% rename from surf/limiter.go rename to modules/surf/limiter.go index 94ed9a5..244bc51 100644 --- a/surf/limiter.go +++ b/modules/surf/limiter.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" ) const tooManyAttemptsBody = `{"message":"Too Many Attempts."}` diff --git a/surf/limiter_coverage_test.go b/modules/surf/limiter_coverage_test.go similarity index 98% rename from surf/limiter_coverage_test.go rename to modules/surf/limiter_coverage_test.go index a4bbef8..cf9232f 100644 --- a/surf/limiter_coverage_test.go +++ b/modules/surf/limiter_coverage_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/compass" ) // Gap (b): MemoryStore's sweep goroutine (purge), not Attempt's lazy expiry. diff --git a/surf/limiter_store.go b/modules/surf/limiter_store.go similarity index 100% rename from surf/limiter_store.go rename to modules/surf/limiter_store.go diff --git a/surf/limiter_test.go b/modules/surf/limiter_test.go similarity index 98% rename from surf/limiter_test.go rename to modules/surf/limiter_test.go index a22c56d..20b21ec 100644 --- a/surf/limiter_test.go +++ b/modules/surf/limiter_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) func TestMemoryStoreAtomicAttempt(t *testing.T) { diff --git a/surf/locale_from_principal.go b/modules/surf/locale_from_principal.go similarity index 82% rename from surf/locale_from_principal.go rename to modules/surf/locale_from_principal.go index 24de6be..ec0704f 100644 --- a/surf/locale_from_principal.go +++ b/modules/surf/locale_from_principal.go @@ -3,8 +3,8 @@ package surf import ( "net/http" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/towel" ) // LocaleFromPrincipal overrides the header locale with the authenticated diff --git a/surf/locale_from_principal_test.go b/modules/surf/locale_from_principal_test.go similarity index 93% rename from surf/locale_from_principal_test.go rename to modules/surf/locale_from_principal_test.go index 07d7716..6066f9f 100644 --- a/surf/locale_from_principal_test.go +++ b/modules/surf/locale_from_principal_test.go @@ -5,8 +5,8 @@ import ( "net/http/httptest" "testing" - "git.golem15.com/golem15/summercms/bouncer" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/bouncer" + "git.golem15.com/golem15/summercms/modules/towel" ) func TestLocaleFromPrincipal(t *testing.T) { diff --git a/surf/middleware_test.go b/modules/surf/middleware_test.go similarity index 97% rename from surf/middleware_test.go rename to modules/surf/middleware_test.go index c535412..ba27b01 100644 --- a/surf/middleware_test.go +++ b/modules/surf/middleware_test.go @@ -7,10 +7,10 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/towel" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/towel" ) type assemblePlugin struct { diff --git a/surf/params.go b/modules/surf/params.go similarity index 100% rename from surf/params.go rename to modules/surf/params.go diff --git a/surf/params_test.go b/modules/surf/params_test.go similarity index 100% rename from surf/params_test.go rename to modules/surf/params_test.go diff --git a/surf/routelist_command.go b/modules/surf/routelist_command.go similarity index 85% rename from surf/routelist_command.go rename to modules/surf/routelist_command.go index 7bf4453..323f3d3 100644 --- a/surf/routelist_command.go +++ b/modules/surf/routelist_command.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/party" ) // RouteListCommand builds the router the same way ServeCommand does, then diff --git a/surf/router.go b/modules/surf/router.go similarity index 98% rename from surf/router.go rename to modules/surf/router.go index 02cfcc4..93df5ff 100644 --- a/surf/router.go +++ b/modules/surf/router.go @@ -8,12 +8,12 @@ import ( "strings" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/cabana" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" - "git.golem15.com/golem15/summercms/towel" - "git.golem15.com/golem15/summercms/wire" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/cabana" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" + "git.golem15.com/golem15/summercms/modules/towel" + "git.golem15.com/golem15/summercms/modules/wire" ) // Use names a middleware list for Group, matching PHP ->middleware(). diff --git a/surf/router_test.go b/modules/surf/router_test.go similarity index 99% rename from surf/router_test.go rename to modules/surf/router_test.go index bdaaf9a..05f6e2b 100644 --- a/surf/router_test.go +++ b/modules/surf/router_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) type routePlugin struct { diff --git a/surf/routetable.go b/modules/surf/routetable.go similarity index 100% rename from surf/routetable.go rename to modules/surf/routetable.go diff --git a/surf/routetable_coverage_test.go b/modules/surf/routetable_coverage_test.go similarity index 98% rename from surf/routetable_coverage_test.go rename to modules/surf/routetable_coverage_test.go index 5b8da19..651d27e 100644 --- a/surf/routetable_coverage_test.go +++ b/modules/surf/routetable_coverage_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/pact" + "git.golem15.com/golem15/summercms/modules/pact" ) // Gap (c): RegisterHouseMiddlewareFactory duplicate-name failure. The diff --git a/surf/routetable_test.go b/modules/surf/routetable_test.go similarity index 95% rename from surf/routetable_test.go rename to modules/surf/routetable_test.go index b182045..a5c8558 100644 --- a/surf/routetable_test.go +++ b/modules/surf/routetable_test.go @@ -5,9 +5,9 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/pact" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/pact" + "git.golem15.com/golem15/summercms/modules/party" ) func TestRouteTableRawFlagAndStickyInheritance(t *testing.T) { diff --git a/surf/serve.go b/modules/surf/serve.go similarity index 89% rename from surf/serve.go rename to modules/surf/serve.go index 34b164f..02f2c03 100644 --- a/surf/serve.go +++ b/modules/surf/serve.go @@ -11,11 +11,11 @@ import ( "syscall" "time" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/bonfire" - "git.golem15.com/golem15/summercms/lagoon" - "git.golem15.com/golem15/summercms/lagoon/attach" - "git.golem15.com/golem15/summercms/party" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/bonfire" + "git.golem15.com/golem15/summercms/modules/lagoon" + "git.golem15.com/golem15/summercms/modules/lagoon/attach" + "git.golem15.com/golem15/summercms/modules/party" "gocloud.dev/blob" ) diff --git a/surf/serve_test.go b/modules/surf/serve_test.go similarity index 92% rename from surf/serve_test.go rename to modules/surf/serve_test.go index 8a2d5cc..d508719 100644 --- a/surf/serve_test.go +++ b/modules/surf/serve_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "git.golem15.com/golem15/summercms/backpack" - "git.golem15.com/golem15/summercms/compass" + "git.golem15.com/golem15/summercms/modules/backpack" + "git.golem15.com/golem15/summercms/modules/compass" "gocloud.dev/blob" ) diff --git a/tide/capture_test.go b/modules/tide/capture_test.go similarity index 100% rename from tide/capture_test.go rename to modules/tide/capture_test.go diff --git a/tide/diff.go b/modules/tide/diff.go similarity index 100% rename from tide/diff.go rename to modules/tide/diff.go diff --git a/tide/diff_contract_test.go b/modules/tide/diff_contract_test.go similarity index 100% rename from tide/diff_contract_test.go rename to modules/tide/diff_contract_test.go diff --git a/tide/diff_test.go b/modules/tide/diff_test.go similarity index 100% rename from tide/diff_test.go rename to modules/tide/diff_test.go diff --git a/tide/fixture.go b/modules/tide/fixture.go similarity index 100% rename from tide/fixture.go rename to modules/tide/fixture.go diff --git a/tide/flow.go b/modules/tide/flow.go similarity index 100% rename from tide/flow.go rename to modules/tide/flow.go diff --git a/tide/flow_contract_test.go b/modules/tide/flow_contract_test.go similarity index 100% rename from tide/flow_contract_test.go rename to modules/tide/flow_contract_test.go diff --git a/tide/flow_test.go b/modules/tide/flow_test.go similarity index 100% rename from tide/flow_test.go rename to modules/tide/flow_test.go diff --git a/tide/headers_test.go b/modules/tide/headers_test.go similarity index 100% rename from tide/headers_test.go rename to modules/tide/headers_test.go diff --git a/tide/manifest.go b/modules/tide/manifest.go similarity index 100% rename from tide/manifest.go rename to modules/tide/manifest.go diff --git a/tide/manifest_contract_test.go b/modules/tide/manifest_contract_test.go similarity index 100% rename from tide/manifest_contract_test.go rename to modules/tide/manifest_contract_test.go diff --git a/tide/manifest_test.go b/modules/tide/manifest_test.go similarity index 100% rename from tide/manifest_test.go rename to modules/tide/manifest_test.go diff --git a/tide/normalize.go b/modules/tide/normalize.go similarity index 100% rename from tide/normalize.go rename to modules/tide/normalize.go diff --git a/tide/normalize_test.go b/modules/tide/normalize_test.go similarity index 100% rename from tide/normalize_test.go rename to modules/tide/normalize_test.go diff --git a/tide/proxy.go b/modules/tide/proxy.go similarity index 100% rename from tide/proxy.go rename to modules/tide/proxy.go diff --git a/tide/proxy_security_test.go b/modules/tide/proxy_security_test.go similarity index 100% rename from tide/proxy_security_test.go rename to modules/tide/proxy_security_test.go diff --git a/tide/proxy_test.go b/modules/tide/proxy_test.go similarity index 100% rename from tide/proxy_test.go rename to modules/tide/proxy_test.go diff --git a/tide/record.go b/modules/tide/record.go similarity index 100% rename from tide/record.go rename to modules/tide/record.go diff --git a/tide/replay.go b/modules/tide/replay.go similarity index 100% rename from tide/replay.go rename to modules/tide/replay.go diff --git a/tide/report.go b/modules/tide/report.go similarity index 100% rename from tide/report.go rename to modules/tide/report.go diff --git a/tide/roundtrip_test.go b/modules/tide/roundtrip_test.go similarity index 100% rename from tide/roundtrip_test.go rename to modules/tide/roundtrip_test.go diff --git a/tide/rules.go b/modules/tide/rules.go similarity index 100% rename from tide/rules.go rename to modules/tide/rules.go diff --git a/tide/rules_test.go b/modules/tide/rules_test.go similarity index 100% rename from tide/rules_test.go rename to modules/tide/rules_test.go diff --git a/tide/testdata/one-route-spec.yaml b/modules/tide/testdata/one-route-spec.yaml similarity index 100% rename from tide/testdata/one-route-spec.yaml rename to modules/tide/testdata/one-route-spec.yaml diff --git a/tide/variables.go b/modules/tide/variables.go similarity index 100% rename from tide/variables.go rename to modules/tide/variables.go diff --git a/towel/context.go b/modules/towel/context.go similarity index 100% rename from towel/context.go rename to modules/towel/context.go diff --git a/towel/context_test.go b/modules/towel/context_test.go similarity index 100% rename from towel/context_test.go rename to modules/towel/context_test.go diff --git a/wire/response.go b/modules/wire/response.go similarity index 100% rename from wire/response.go rename to modules/wire/response.go diff --git a/wire/response_coverage_test.go b/modules/wire/response_coverage_test.go similarity index 100% rename from wire/response_coverage_test.go rename to modules/wire/response_coverage_test.go diff --git a/wire/response_test.go b/modules/wire/response_test.go similarity index 100% rename from wire/response_test.go rename to modules/wire/response_test.go diff --git a/wristband/authorize.go b/modules/wristband/authorize.go similarity index 100% rename from wristband/authorize.go rename to modules/wristband/authorize.go diff --git a/wristband/authorize_test.go b/modules/wristband/authorize_test.go similarity index 100% rename from wristband/authorize_test.go rename to modules/wristband/authorize_test.go diff --git a/wristband/client_issue.go b/modules/wristband/client_issue.go similarity index 100% rename from wristband/client_issue.go rename to modules/wristband/client_issue.go diff --git a/wristband/consent.go b/modules/wristband/consent.go similarity index 100% rename from wristband/consent.go rename to modules/wristband/consent.go diff --git a/wristband/consent_test.go b/modules/wristband/consent_test.go similarity index 100% rename from wristband/consent_test.go rename to modules/wristband/consent_test.go diff --git a/wristband/crypto.go b/modules/wristband/crypto.go similarity index 100% rename from wristband/crypto.go rename to modules/wristband/crypto.go diff --git a/wristband/phase08_coverage_test.go b/modules/wristband/phase08_coverage_test.go similarity index 100% rename from wristband/phase08_coverage_test.go rename to modules/wristband/phase08_coverage_test.go diff --git a/wristband/redirect_html.go b/modules/wristband/redirect_html.go similarity index 100% rename from wristband/redirect_html.go rename to modules/wristband/redirect_html.go diff --git a/wristband/register.go b/modules/wristband/register.go similarity index 100% rename from wristband/register.go rename to modules/wristband/register.go diff --git a/wristband/registration_test.go b/modules/wristband/registration_test.go similarity index 100% rename from wristband/registration_test.go rename to modules/wristband/registration_test.go diff --git a/wristband/server.go b/modules/wristband/server.go similarity index 100% rename from wristband/server.go rename to modules/wristband/server.go diff --git a/wristband/server_test.go b/modules/wristband/server_test.go similarity index 100% rename from wristband/server_test.go rename to modules/wristband/server_test.go diff --git a/wristband/stores.go b/modules/wristband/stores.go similarity index 100% rename from wristband/stores.go rename to modules/wristband/stores.go diff --git a/wristband/token.go b/modules/wristband/token.go similarity index 100% rename from wristband/token.go rename to modules/wristband/token.go diff --git a/wristband/token_test.go b/modules/wristband/token_test.go similarity index 100% rename from wristband/token_test.go rename to modules/wristband/token_test.go diff --git a/scripts/check-admin-dist.sh b/scripts/check-admin-dist.sh index 552be65..9dd1503 100755 --- a/scripts/check-admin-dist.sh +++ b/scripts/check-admin-dist.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # Drift gate for the committed admin SPA build (D-04). Rebuilds admin/ from # the committed lockfile into a temporary directory and fails when the result -# differs from boardwalk/dist, the tree the Go binary embeds. After changing -# the SPA, rebuild with `npm --prefix admin run build` and commit the result. +# differs from modules/boardwalk/dist, the tree the Go binary embeds. After +# changing the SPA, rebuild with `npm --prefix admin run build` and commit the result. set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" @@ -19,8 +19,8 @@ trap 'rm -rf "$TMP"' EXIT (cd admin && node_modules/.bin/vite build --outDir "$TMP/dist" --emptyOutDir --logLevel warn) -if ! diff -r "$TMP/dist" boardwalk/dist; then - echo "check-admin-dist: boardwalk/dist is stale; run npm --prefix admin run build and commit boardwalk/dist" >&2 +if ! diff -r "$TMP/dist" modules/boardwalk/dist; then + echo "check-admin-dist: modules/boardwalk/dist is stale; run npm --prefix admin run build and commit modules/boardwalk/dist" >&2 exit 1 fi -echo "check-admin-dist: boardwalk/dist matches a fresh build" +echo "check-admin-dist: modules/boardwalk/dist matches a fresh build" diff --git a/scripts/check-admin-openapi.sh b/scripts/check-admin-openapi.sh index 77a52ee..bc2b0b2 100755 --- a/scripts/check-admin-openapi.sh +++ b/scripts/check-admin-openapi.sh @@ -29,7 +29,7 @@ TMP="$(mktemp -d)" trap 'rm -rf "$TMP"' EXIT go run github.com/swaggo/swag/cmd/swag@v1.16.6 init \ - --dir cabana \ + --dir modules/cabana \ --generalInfo admin_openapi.go \ --output "$TMP" \ --outputTypes json \ diff --git a/scripts/check-phase10.sh b/scripts/check-phase10.sh index 87936e6..b949a47 100755 --- a/scripts/check-phase10.sh +++ b/scripts/check-phase10.sh @@ -157,7 +157,7 @@ expect_detect() { } # The directories the hygiene stage scans, copied for the self-test. -HYGIENE_DIRS=(admin/src admin/tests admin/openapi admin/package.json boardwalk cabana phrasebook) +HYGIENE_DIRS=(admin/src admin/tests admin/openapi admin/package.json modules/boardwalk modules/cabana modules/phrasebook) run_self_test() { bash -n "${BASH_SOURCE[0]}" @@ -165,7 +165,7 @@ run_self_test() { expect_detect fail 1 '{"Action":"pass","Package":"p","Test":"TestA"} {"Action":"fail","Package":"p","Test":"TestPhase10CSRF"}' expect_detect skip 2 '{"Action":"skip","Package":"p","Test":"TestPhase10AssembledAcceptance"}' - expect_detect zero 3 '{"Action":"pass","Package":"git.golem15.com/golem15/summercms/cabana"}' + expect_detect zero 3 '{"Action":"pass","Package":"git.golem15.com/golem15/summercms/modules/cabana"}' expect_detect nonjson 4 '{"Action":"pass",' expect_detect build 1 '{"Action":"build-fail","ImportPath":"p"} {"Action":"pass","Package":"q","Test":"TestA"}' @@ -250,10 +250,10 @@ run_go() { } run_security() { - phase10_tests "$ROOT" ./cabana TestPhase10CookieAuth TestPhase10CSRF TestPhase10Prefix TestPhase10RelationForgedID TestPhase10Bundle TestPhase10Coverage - phase10_tests "$ROOT" ./bouncer TestPhase10CookieGuard - phase10_tests "$ROOT" ./surf TestPhase10AdminPrefixCollision - phase10_go "$ROOT" ./boardwalk + phase10_tests "$ROOT" ./modules/cabana TestPhase10CookieAuth TestPhase10CSRF TestPhase10Prefix TestPhase10RelationForgedID TestPhase10Bundle TestPhase10Coverage + phase10_tests "$ROOT" ./modules/bouncer TestPhase10CookieGuard + phase10_tests "$ROOT" ./modules/surf TestPhase10AdminPrefixCollision + phase10_go "$ROOT" ./modules/boardwalk phase10_tests "$APP" ./plugins/golem15/fonoteka TestPhase10CollectionOwnerReadOnly TestPhase10AdminAuth "$ROOT/scripts/check-phase9.sh" --security echo "phase10 security passed" @@ -262,7 +262,7 @@ run_security() { run_postgres() { phase10_tests "$APP" ./plugins/golem15/fonoteka TestPhase10TracerSPA TestPhase10AdminAuth TestPhase10AlbumRelations \ TestPhase10Controllers TestPhase10AssembledAcceptance - phase10_tests "$ROOT" ./cabana TestPhase10RelationOptions TestPhase10RelationSave TestPhase10OpenAPIConformance TestPhase10Coverage + phase10_tests "$ROOT" ./modules/cabana TestPhase10RelationOptions TestPhase10RelationSave TestPhase10OpenAPIConformance TestPhase10Coverage echo "phase10 postgres passed" } @@ -288,7 +288,7 @@ run_spa() { run_openapi() { "$ROOT/scripts/check-admin-openapi.sh" --check - phase10_tests "$ROOT" ./cabana TestPhase10OpenAPIConformance TestPhase09ContractInventory + phase10_tests "$ROOT" ./modules/cabana TestPhase10OpenAPIConformance TestPhase09ContractInventory (cd "$APP" && bash scripts/check-openapi.sh) if ! git -C "$APP" diff --quiet -- docs/openapi.json; then git -C "$APP" diff --stat -- docs/openapi.json >&2 @@ -313,7 +313,7 @@ hygiene_checks() { local hits # Application or Polish catalogue names in framework code, tests and build. hits="$(cd "$tree" && grep -rniIE 'pl[yý]tarium|fonoteka|albumy|kolekcj|winyl|p[lł]yt[aęy]' \ - admin/src admin/tests admin/openapi boardwalk cabana phrasebook 2>/dev/null || true)" + admin/src admin/tests admin/openapi modules/boardwalk modules/cabana modules/phrasebook 2>/dev/null || true)" [[ -z "$hits" ]] || fail "application names in the framework: $hits" # Plugin and server strings are rendered as text only. hits="$(cd "$tree" && grep -rnE 'v-html|innerHTML|outerHTML|insertAdjacentHTML' admin/src 2>/dev/null || true)" @@ -334,11 +334,11 @@ hygiene_checks() { grep -v '^admin/src/state/useSidebar.ts:' || true)" [[ -z "$hits" ]] || fail "browser storage outside admin/src/state/useSidebar.ts: $hits" # The embedded build loads nothing from another origin. - hits="$(cd "$tree" && grep -noE '(src|href)="(https?:)?//[^"]*"|url\((["'"'"']?)(https?:)?//' boardwalk/dist/index.html boardwalk/dist/assets/*.css 2>/dev/null || true)" - [[ -z "$hits" ]] || fail "boardwalk/dist references another origin: $hits" - hits="$(cd "$tree" && grep -ohE 'https?://[A-Za-z0-9.-]+' boardwalk/dist/assets/*.js 2>/dev/null | sort -u | + hits="$(cd "$tree" && grep -noE '(src|href)="(https?:)?//[^"]*"|url\((["'"'"']?)(https?:)?//' modules/boardwalk/dist/index.html modules/boardwalk/dist/assets/*.css 2>/dev/null || true)" + [[ -z "$hits" ]] || fail "modules/boardwalk/dist references another origin: $hits" + hits="$(cd "$tree" && grep -ohE 'https?://[A-Za-z0-9.-]+' modules/boardwalk/dist/assets/*.js 2>/dev/null | sort -u | grep -vxE 'http://www\.w3\.org|https://vuejs\.org|http://local' || true)" - [[ -z "$hits" ]] || fail "boardwalk/dist JS names another origin: $hits" + [[ -z "$hits" ]] || fail "modules/boardwalk/dist JS names another origin: $hits" # Icons: named imports only, and never the deprecated lucide package. hits="$(cd "$tree" && grep -rnE "import \* as [A-Za-z_]+ from '@lucide/vue'|lucide-vue-next" admin/src admin/package.json 2>/dev/null || true)" [[ -z "$hits" ]] || fail "lucide namespace import or deprecated package: $hits" diff --git a/scripts/check-phase2.sh b/scripts/check-phase2.sh index e755cfd..396a808 100755 --- a/scripts/check-phase2.sh +++ b/scripts/check-phase2.sh @@ -129,7 +129,7 @@ fi cd "$ROOT" go build -o "$SMOKE_DIR/summer" ./cmd/summer "$SMOKE_DIR/summer" parity:record \ - --spec tide/testdata/one-route-spec.yaml \ + --spec modules/tide/testdata/one-route-spec.yaml \ --target "http://127.0.0.1:${SMOKE_PORT}" \ --output "$SMOKE_DIR/sample.yaml" "$SMOKE_DIR/summer" parity:replay \ diff --git a/scripts/check-phase3.sh b/scripts/check-phase3.sh index ed3c0a8..5df1c60 100755 --- a/scripts/check-phase3.sh +++ b/scripts/check-phase3.sh @@ -113,7 +113,7 @@ fi cd "$ROOT" go build -o "$SMOKE_DIR/summer" ./cmd/summer "$SMOKE_DIR/summer" parity:record \ - --spec tide/testdata/one-route-spec.yaml \ + --spec modules/tide/testdata/one-route-spec.yaml \ --target "http://127.0.0.1:${SMOKE_PORT}" \ --output "$SMOKE_DIR/sample.yaml" "$SMOKE_DIR/summer" parity:replay \ diff --git a/scripts/check-phase4.sh b/scripts/check-phase4.sh index a5c0011..fc98363 100755 --- a/scripts/check-phase4.sh +++ b/scripts/check-phase4.sh @@ -31,6 +31,6 @@ echo "==> hello go test" go -C examples/hello test ./... echo "==> race internal/build phrasebook postcard" -go test -race ./internal/build ./phrasebook ./postcard +go test -race ./internal/build ./modules/phrasebook ./modules/postcard echo "phase4 check passed" diff --git a/scripts/check-phase9.sh b/scripts/check-phase9.sh index e12f3d3..eaf6345 100755 --- a/scripts/check-phase9.sh +++ b/scripts/check-phase9.sh @@ -101,7 +101,7 @@ run_self_test() { phase9_detect "$log" rm -f "$log" expect_detect_fails skip '{"Action":"skip","Test":"TestPhase09MigrationsFreshRollback"}' - expect_detect_fails zero '{"Action":"pass","Package":"git.golem15.com/golem15/summercms/lagoon"}' + expect_detect_fails zero '{"Action":"pass","Package":"git.golem15.com/golem15/summercms/modules/lagoon"}' expect_detect_fails fail '{"Action":"fail","Test":"TestPhase09ContractInventory"}' for flag in --self-test --security --postgres --openapi --evidence --all; do grep -q -- "$flag" "${BASH_SOURCE[0]}" || { @@ -113,20 +113,20 @@ run_self_test() { } run_security() { - phase9_go "$ROOT" ./bouncer ./cabana -run '^TestPhase09' + phase9_go "$ROOT" ./modules/bouncer ./modules/cabana -run '^TestPhase09' phase9_go "$APP" ./plugins/golem15/fonoteka -run '^TestPhase09Security' echo "phase9 security passed" } run_postgres() { - phase9_go "$ROOT" ./lagoon -run '^TestPhase09MigrationsFreshRollback$' + phase9_go "$ROOT" ./modules/lagoon -run '^TestPhase09MigrationsFreshRollback$' phase9_go "$APP" ./plugins/golem15/fonoteka -run '^TestPhase09AssembledAcceptance$' echo "phase9 postgres passed" } run_openapi() { (cd "$APP" && bash scripts/check-openapi.sh) - phase9_go "$ROOT" ./cabana -run '^TestPhase09ContractInventory$' + phase9_go "$ROOT" ./modules/cabana -run '^TestPhase09ContractInventory$' echo "phase9 openapi passed" }