diff --git a/.gitignore b/.gitignore index 8b941de..e9b4af1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ /foo /server /node_modules -/web/view/static +/backend/view/static /budget-* /cmd/server/rice-box.go diff --git a/web/controller/app/controller.go b/backend/controller/app/controller.go similarity index 80% rename from web/controller/app/controller.go rename to backend/controller/app/controller.go index 7cff73b..6865bd8 100644 --- a/web/controller/app/controller.go +++ b/backend/controller/app/controller.go @@ -3,8 +3,8 @@ package app import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/view" - "gitnet.fr/deblan/budget/web/view/template/app" + "gitnet.fr/deblan/budget/backend/view" + "gitnet.fr/deblan/budget/backend/view/template/app" ) type Controller struct { diff --git a/web/controller/auth/controller.go b/backend/controller/auth/controller.go similarity index 93% rename from web/controller/auth/controller.go rename to backend/controller/auth/controller.go index c0e3a6e..5fb6c6c 100644 --- a/web/controller/auth/controller.go +++ b/backend/controller/auth/controller.go @@ -6,8 +6,8 @@ import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/manager" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/view" - "gitnet.fr/deblan/budget/web/view/template/auth" + "gitnet.fr/deblan/budget/backend/view" + "gitnet.fr/deblan/budget/backend/view/template/auth" ) type Controller struct { diff --git a/web/controller/bank_account/controller.go b/backend/controller/bank_account/controller.go similarity index 97% rename from web/controller/bank_account/controller.go rename to backend/controller/bank_account/controller.go index 85052d6..12fed67 100644 --- a/web/controller/bank_account/controller.go +++ b/backend/controller/bank_account/controller.go @@ -3,7 +3,7 @@ package bank_account import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/controller/crud" + "gitnet.fr/deblan/budget/backend/controller/crud" "gorm.io/gorm" ) diff --git a/web/controller/category/controller.go b/backend/controller/category/controller.go similarity index 98% rename from web/controller/category/controller.go rename to backend/controller/category/controller.go index 4bd89f4..019f615 100644 --- a/web/controller/category/controller.go +++ b/backend/controller/category/controller.go @@ -4,7 +4,7 @@ import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/manager" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/controller/crud" + "gitnet.fr/deblan/budget/backend/controller/crud" "gorm.io/gorm" ) diff --git a/web/controller/collabora/controller.go b/backend/controller/collabora/controller.go similarity index 96% rename from web/controller/collabora/controller.go rename to backend/controller/collabora/controller.go index 70579df..83f592a 100644 --- a/web/controller/collabora/controller.go +++ b/backend/controller/collabora/controller.go @@ -15,8 +15,8 @@ import ( "gitnet.fr/deblan/budget/config" "gitnet.fr/deblan/budget/database/model" f "gitnet.fr/deblan/budget/file" - "gitnet.fr/deblan/budget/web/view" - tpl "gitnet.fr/deblan/budget/web/view/template/collabora" + "gitnet.fr/deblan/budget/backend/view" + tpl "gitnet.fr/deblan/budget/backend/view/template/collabora" ) func getToken() string { diff --git a/web/controller/crud/config.go b/backend/controller/crud/config.go similarity index 100% rename from web/controller/crud/config.go rename to backend/controller/crud/config.go diff --git a/web/controller/crud/crud.go b/backend/controller/crud/crud.go similarity index 100% rename from web/controller/crud/crud.go rename to backend/controller/crud/crud.go diff --git a/web/controller/crud/pager.go b/backend/controller/crud/pager.go similarity index 100% rename from web/controller/crud/pager.go rename to backend/controller/crud/pager.go diff --git a/web/controller/file/controller.go b/backend/controller/file/controller.go similarity index 98% rename from web/controller/file/controller.go rename to backend/controller/file/controller.go index f48f50b..661ba4e 100644 --- a/web/controller/file/controller.go +++ b/backend/controller/file/controller.go @@ -11,7 +11,7 @@ import ( "gitnet.fr/deblan/budget/config" "gitnet.fr/deblan/budget/database/model" f "gitnet.fr/deblan/budget/file" - "gitnet.fr/deblan/budget/web/controller/crud" + "gitnet.fr/deblan/budget/backend/controller/crud" ) type Controller struct { diff --git a/web/controller/saving_account/controller.go b/backend/controller/saving_account/controller.go similarity index 98% rename from web/controller/saving_account/controller.go rename to backend/controller/saving_account/controller.go index 852e7b8..b19d201 100644 --- a/web/controller/saving_account/controller.go +++ b/backend/controller/saving_account/controller.go @@ -3,7 +3,7 @@ package saving_account import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/controller/crud" + "gitnet.fr/deblan/budget/backend/controller/crud" "gorm.io/gorm" ) diff --git a/web/controller/transaction/controller.go b/backend/controller/transaction/controller.go similarity index 98% rename from web/controller/transaction/controller.go rename to backend/controller/transaction/controller.go index a2f8344..ee9ecb5 100644 --- a/web/controller/transaction/controller.go +++ b/backend/controller/transaction/controller.go @@ -8,7 +8,7 @@ import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/manager" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/controller/crud" + "gitnet.fr/deblan/budget/backend/controller/crud" "gorm.io/gorm" ) diff --git a/web/controller/user/controller.go b/backend/controller/user/controller.go similarity index 98% rename from web/controller/user/controller.go rename to backend/controller/user/controller.go index c7ca19a..55c6423 100644 --- a/web/controller/user/controller.go +++ b/backend/controller/user/controller.go @@ -3,7 +3,7 @@ package user import ( "github.com/labstack/echo/v4" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/controller/crud" + "gitnet.fr/deblan/budget/backend/controller/crud" "gorm.io/gorm" ) diff --git a/backend/router/router.go b/backend/router/router.go new file mode 100644 index 0000000..3458fd0 --- /dev/null +++ b/backend/router/router.go @@ -0,0 +1,26 @@ +package router + +import ( + "github.com/labstack/echo/v4" + "gitnet.fr/deblan/budget/backend/controller/app" + "gitnet.fr/deblan/budget/backend/controller/auth" + "gitnet.fr/deblan/budget/backend/controller/bank_account" + "gitnet.fr/deblan/budget/backend/controller/category" + "gitnet.fr/deblan/budget/backend/controller/collabora" + "gitnet.fr/deblan/budget/backend/controller/file" + "gitnet.fr/deblan/budget/backend/controller/saving_account" + "gitnet.fr/deblan/budget/backend/controller/transaction" + "gitnet.fr/deblan/budget/backend/controller/user" +) + +func RegisterControllers(e *echo.Echo) { + auth.New(e) + app.New(e) + user.New(e) + bank_account.New(e) + saving_account.New(e) + category.New(e) + transaction.New(e) + collabora.New(e) + file.New(e) +} diff --git a/web/view/template/app/page.templ b/backend/view/template/app/page.templ similarity index 73% rename from web/view/template/app/page.templ rename to backend/view/template/app/page.templ index 2f85491..0f52e8c 100644 --- a/web/view/template/app/page.templ +++ b/backend/view/template/app/page.templ @@ -1,6 +1,6 @@ package app -import "gitnet.fr/deblan/budget/web/view/template" +import "gitnet.fr/deblan/budget/backend/view/template" templ Page() { diff --git a/web/view/template/app/page_templ.go b/backend/view/template/app/page_templ.go similarity index 97% rename from web/view/template/app/page_templ.go rename to backend/view/template/app/page_templ.go index 9cd7f57..1ff522d 100644 --- a/web/view/template/app/page_templ.go +++ b/backend/view/template/app/page_templ.go @@ -8,7 +8,7 @@ package app import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -import "gitnet.fr/deblan/budget/web/view/template" +import "gitnet.fr/deblan/budget/backend/view/template" func Page() templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { diff --git a/web/view/template/auth/login.templ b/backend/view/template/auth/login.templ similarity index 96% rename from web/view/template/auth/login.templ rename to backend/view/template/auth/login.templ index fb9572d..c429698 100644 --- a/web/view/template/auth/login.templ +++ b/backend/view/template/auth/login.templ @@ -1,6 +1,6 @@ package auth -import "gitnet.fr/deblan/budget/web/view/template" +import "gitnet.fr/deblan/budget/backend/view/template" templ Page(hasError bool) { diff --git a/web/view/template/auth/login_templ.go b/backend/view/template/auth/login_templ.go similarity index 98% rename from web/view/template/auth/login_templ.go rename to backend/view/template/auth/login_templ.go index 1df6fff..8e57ce8 100644 --- a/web/view/template/auth/login_templ.go +++ b/backend/view/template/auth/login_templ.go @@ -8,7 +8,7 @@ package auth import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -import "gitnet.fr/deblan/budget/web/view/template" +import "gitnet.fr/deblan/budget/backend/view/template" func Page(hasError bool) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { diff --git a/web/view/template/base.templ b/backend/view/template/base.templ similarity index 89% rename from web/view/template/base.templ rename to backend/view/template/base.templ index b7e4def..ddea5a1 100644 --- a/web/view/template/base.templ +++ b/backend/view/template/base.templ @@ -1,6 +1,6 @@ package template -import "gitnet.fr/deblan/budget/web/view" +import "gitnet.fr/deblan/budget/backend/view" templ Fav(url string) { diff --git a/web/view/template/base_templ.go b/backend/view/template/base_templ.go similarity index 95% rename from web/view/template/base_templ.go rename to backend/view/template/base_templ.go index 8125c00..2023999 100644 --- a/web/view/template/base_templ.go +++ b/backend/view/template/base_templ.go @@ -8,7 +8,7 @@ package template import "github.com/a-h/templ" import templruntime "github.com/a-h/templ/runtime" -import "gitnet.fr/deblan/budget/web/view" +import "gitnet.fr/deblan/budget/backend/view" func Fav(url string) templ.Component { return templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { @@ -38,7 +38,7 @@ func Fav(url string) templ.Component { var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(url) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/view/template/base.templ`, Line: 6, Col: 48} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `backend/view/template/base.templ`, Line: 6, Col: 48} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { @@ -88,7 +88,7 @@ func Head(title string) templ.Component { var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(title) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/view/template/base.templ`, Line: 14, Col: 16} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `backend/view/template/base.templ`, Line: 14, Col: 16} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { diff --git a/web/view/template/collabora/iframe.templ b/backend/view/template/collabora/iframe.templ similarity index 100% rename from web/view/template/collabora/iframe.templ rename to backend/view/template/collabora/iframe.templ diff --git a/web/view/template/collabora/iframe_templ.go b/backend/view/template/collabora/iframe_templ.go similarity index 95% rename from web/view/template/collabora/iframe_templ.go rename to backend/view/template/collabora/iframe_templ.go index 1ed66ee..a8b6062 100644 --- a/web/view/template/collabora/iframe_templ.go +++ b/backend/view/template/collabora/iframe_templ.go @@ -45,7 +45,7 @@ func Iframe(url, token string) templ.Component { var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(token) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/view/template/collabora/iframe.templ`, Line: 7, Col: 45} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `backend/view/template/collabora/iframe.templ`, Line: 7, Col: 45} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { diff --git a/web/view/view.go b/backend/view/view.go similarity index 100% rename from web/view/view.go rename to backend/view/view.go diff --git a/cmd/server/server.go b/cmd/server/server.go index 4c8853c..d8a6ead 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -17,7 +17,7 @@ import ( "gitnet.fr/deblan/budget/config" "gitnet.fr/deblan/budget/database/manager" "gitnet.fr/deblan/budget/database/model" - "gitnet.fr/deblan/budget/web/router" + "gitnet.fr/deblan/budget/backend/router" ) type TemplateRenderer struct { @@ -48,7 +48,7 @@ func main() { e.Validator = &AppValidator{validator: validator.New()} e.Static("/static", "static") - assetHandler := http.FileServer(rice.MustFindBox("../../web/view/static").HTTPBox()) + assetHandler := http.FileServer(rice.MustFindBox("../../backend/view/static").HTTPBox()) e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", assetHandler))) e.Use(middleware.Logger()) router.RegisterControllers(e) diff --git a/web/router/router.go b/web/router/router.go deleted file mode 100644 index a5180ef..0000000 --- a/web/router/router.go +++ /dev/null @@ -1,26 +0,0 @@ -package router - -import ( - "github.com/labstack/echo/v4" - "gitnet.fr/deblan/budget/web/controller/app" - "gitnet.fr/deblan/budget/web/controller/auth" - "gitnet.fr/deblan/budget/web/controller/bank_account" - "gitnet.fr/deblan/budget/web/controller/category" - "gitnet.fr/deblan/budget/web/controller/collabora" - "gitnet.fr/deblan/budget/web/controller/file" - "gitnet.fr/deblan/budget/web/controller/saving_account" - "gitnet.fr/deblan/budget/web/controller/transaction" - "gitnet.fr/deblan/budget/web/controller/user" -) - -func RegisterControllers(e *echo.Echo) { - auth.New(e) - app.New(e) - user.New(e) - bank_account.New(e) - saving_account.New(e) - category.New(e) - transaction.New(e) - collabora.New(e) - file.New(e) -} diff --git a/webpack.config.js b/webpack.config.js index 58c040f..07b335c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,7 +8,7 @@ if (!Encore.isRuntimeEnvironmentConfigured()) { Encore // directory where compiled assets will be stored - .setOutputPath('web/view/static') + .setOutputPath('backend/view/static') // public path used by the web server to access the output path .setPublicPath('/static') // only needed for CDN's or subdirectory deploy