diff --git a/.idea/modules.xml b/.idea/modules.xml index 0bbabac..16933f0 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/.idea/webserver.iml b/.idea/web.iml similarity index 100% rename from .idea/webserver.iml rename to .idea/web.iml diff --git a/common.go b/common.go index 6923d00..1f66c50 100644 --- a/common.go +++ b/common.go @@ -1,4 +1,4 @@ -package webserver +package web import "github.com/labstack/echo/v4" diff --git a/config.go b/config.go index b453a2f..2f18477 100644 --- a/config.go +++ b/config.go @@ -1,4 +1,4 @@ -package webserver +package web type Config struct { Port uint16 `yaml:"port" envconfig:"PORT"` diff --git a/context.go b/context.go index 34d4a11..6632a4c 100644 --- a/context.go +++ b/context.go @@ -1,4 +1,4 @@ -package webserver +package web import ( "errors" diff --git a/dto.go b/dto.go index 6bc81f5..03fa7bd 100644 --- a/dto.go +++ b/dto.go @@ -1,4 +1,4 @@ -package webserver +package web import "fmt" diff --git a/go.mod b/go.mod index 2943062..f10aef6 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,21 @@ -module netgarden.dev/maf/webserver +module netgarden.dev/maf/web go 1.24.1 -replace netgarden.dev/maf/maf => ../maf - -replace netgarden.dev/maf/mergefs => ../mergefs +replace ( + netgarden.dev/maf/maf => ../../maf/maf + netgarden.dev/maf/mergefs => ../../maf/mergefs +) require ( github.com/flosch/pongo2/v6 v6.0.0 github.com/labstack/echo/v4 v4.13.3 - netgarden.dev/maf/maf v0.0.0-00010101000000-000000000000 - netgarden.dev/maf/mergefs v0.0.0-00010101000000-000000000000 + netgarden.dev/maf/maf v0.0.0-20250327102624-f25d54ddf786 + netgarden.dev/maf/mergefs v0.0.0-20250327100833-ed0d8fb30bd1 ) require ( - github.com/elliotchance/orderedmap v1.6.0 // indirect + github.com/elliotchance/orderedmap v1.8.0 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect diff --git a/go.sum b/go.sum index 172b294..717c1eb 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/elliotchance/orderedmap v1.6.0 h1:xjn+kbbKXeDq6v9RVE+WYwRbYfAZKvlWfcJNxM8pvEw= -github.com/elliotchance/orderedmap v1.6.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys= +github.com/elliotchance/orderedmap v1.8.0 h1:TrOREecvh3JbS+NCgwposXG5ZTFHtEsQiCGOhPElnMw= +github.com/elliotchance/orderedmap v1.8.0/go.mod h1:wsDwEaX5jEoyhbs7x93zk2H/qv0zwuhg4inXhDkYqys= github.com/flosch/pongo2/v6 v6.0.0 h1:lsGru8IAzHgIAw6H2m4PCyleO58I40ow6apih0WprMU= github.com/flosch/pongo2/v6 v6.0.0/go.mod h1:CuDpFm47R0uGGE7z13/tTlt1Y6zdxvr2RLT5LJhsHEU= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= diff --git a/group.go b/group.go index 0f98ae9..88c5167 100644 --- a/group.go +++ b/group.go @@ -1,4 +1,4 @@ -package webserver +package web import ( "github.com/labstack/echo/v4" diff --git a/interfaces.go b/interfaces.go index a26aa7e..e424b13 100644 --- a/interfaces.go +++ b/interfaces.go @@ -1,4 +1,4 @@ -package webserver +package web import ( "github.com/flosch/pongo2/v6" diff --git a/module.go b/module.go index e13ffab..b543446 100644 --- a/module.go +++ b/module.go @@ -1,4 +1,4 @@ -package webserver +package web import ( "github.com/flosch/pongo2/v6" @@ -21,11 +21,11 @@ type Module struct { } func (m *Module) GetID() string { - return "webserver" + return "web" } func (m *Module) GetName() string { - return "webserver" + return "Web" } func (m *Module) SetManager(manager *maf.Manager) { diff --git a/module_config.go b/module_config.go index 57b9e15..38f93c8 100644 --- a/module_config.go +++ b/module_config.go @@ -1,4 +1,4 @@ -package webserver +package web type MiddlewareFuncProvider = func() MiddlewareFunc diff --git a/renderer.go b/renderer.go index dc886d4..67960e2 100644 --- a/renderer.go +++ b/renderer.go @@ -1,4 +1,4 @@ -package webserver +package web import ( "bytes" diff --git a/server.go b/server.go index 3805c4f..245d407 100644 --- a/server.go +++ b/server.go @@ -1,4 +1,4 @@ -package webserver +package web import ( "context"