From 65709049d70d614d98876df2def6f43fd7630a1c Mon Sep 17 00:00:00 2001 From: Bronku Date: Thu, 19 Jun 2025 21:48:06 +0200 Subject: [PATCH] removed 'internal' directory --- {internal/auth => auth}/auth.go | 4 +-- {internal/auth => auth}/credentials.go | 2 +- {internal/auth => auth}/get.go | 0 {internal/auth => auth}/session.go | 2 +- {internal/auth => auth}/templates/login.html | 0 {internal/auth => auth}/token.go | 4 +-- cmd/iroon/main.go | 26 ------------------ {internal/crypto => crypto}/crypto.go | 0 {internal/logging => logging}/error.go | 0 {internal/logging => logging}/logger.go | 0 main.go | 21 ++++++++++++-- {internal/models => models}/auth.go | 0 {internal/models => models}/data.go | 0 {internal/models => models}/user.go | 0 {internal/server => server}/fetcher.go | 0 {internal/server => server}/get.go | 2 +- {internal/server => server}/http.go | 0 {internal/server => server}/post.go | 2 +- {internal/server => server}/server.go | 2 +- .../fontawesome/css/fontawesome.min.css | 0 .../static/fontawesome/css/solid.css | 0 .../fontawesome/webfonts/fa-solid-900.ttf | Bin .../fontawesome/webfonts/fa-solid-900.woff2 | Bin .../server => server}/static/htmx2.04.js | 0 {internal/server => server}/static/order.js | 0 {internal/server => server}/static/style.css | 0 {internal/server => server}/template.go | 2 +- .../server => server}/templates/cake.gohtml | 0 .../server => server}/templates/cakes.gohtml | 0 .../templates/confirmation.gohtml | 0 .../templates/layout/layout.gohtml | 0 .../templates/layout/nav.gohtml | 0 .../server => server}/templates/order.gohtml | 0 .../server => server}/templates/orders.gohtml | 0 {internal/store => store}/cake.go | 2 +- {internal/store => store}/migrations.go | 0 {internal/store => store}/migrations/1.sql | 0 {internal/store => store}/order.go | 2 +- {internal/store => store}/session.go | 2 +- {internal/store => store}/store.go | 2 +- {internal/store => store}/store_test.go | 0 {internal/store => store}/user.go | 4 +-- 42 files changed, 35 insertions(+), 44 deletions(-) rename {internal/auth => auth}/auth.go (91%) rename {internal/auth => auth}/credentials.go (89%) rename {internal/auth => auth}/get.go (100%) rename {internal/auth => auth}/session.go (97%) rename {internal/auth => auth}/templates/login.html (100%) rename {internal/auth => auth}/token.go (86%) delete mode 100644 cmd/iroon/main.go rename {internal/crypto => crypto}/crypto.go (100%) rename {internal/logging => logging}/error.go (100%) rename {internal/logging => logging}/logger.go (100%) rename {internal/models => models}/auth.go (100%) rename {internal/models => models}/data.go (100%) rename {internal/models => models}/user.go (100%) rename {internal/server => server}/fetcher.go (100%) rename {internal/server => server}/get.go (98%) rename {internal/server => server}/http.go (100%) rename {internal/server => server}/post.go (97%) rename {internal/server => server}/server.go (96%) rename {internal/server => server}/static/fontawesome/css/fontawesome.min.css (100%) rename {internal/server => server}/static/fontawesome/css/solid.css (100%) rename {internal/server => server}/static/fontawesome/webfonts/fa-solid-900.ttf (100%) rename {internal/server => server}/static/fontawesome/webfonts/fa-solid-900.woff2 (100%) rename {internal/server => server}/static/htmx2.04.js (100%) rename {internal/server => server}/static/order.js (100%) rename {internal/server => server}/static/style.css (100%) rename {internal/server => server}/template.go (95%) rename {internal/server => server}/templates/cake.gohtml (100%) rename {internal/server => server}/templates/cakes.gohtml (100%) rename {internal/server => server}/templates/confirmation.gohtml (100%) rename {internal/server => server}/templates/layout/layout.gohtml (100%) rename {internal/server => server}/templates/layout/nav.gohtml (100%) rename {internal/server => server}/templates/order.gohtml (100%) rename {internal/server => server}/templates/orders.gohtml (100%) rename {internal/store => store}/cake.go (98%) rename {internal/store => store}/migrations.go (100%) rename {internal/store => store}/migrations/1.sql (100%) rename {internal/store => store}/order.go (99%) rename {internal/store => store}/session.go (96%) rename {internal/store => store}/store.go (93%) rename {internal/store => store}/store_test.go (100%) rename {internal/store => store}/user.go (92%) diff --git a/internal/auth/auth.go b/auth/auth.go similarity index 91% rename from internal/auth/auth.go rename to auth/auth.go index 10dce25..568a7d5 100644 --- a/internal/auth/auth.go +++ b/auth/auth.go @@ -6,8 +6,8 @@ import ( "log" "net/http" - "github.com/Bronku/iroon/internal/models" - "github.com/Bronku/iroon/internal/store" + "github.com/Bronku/iroon/models" + "github.com/Bronku/iroon/store" ) type Authenticator struct { diff --git a/internal/auth/credentials.go b/auth/credentials.go similarity index 89% rename from internal/auth/credentials.go rename to auth/credentials.go index e82e22f..d376d50 100644 --- a/internal/auth/credentials.go +++ b/auth/credentials.go @@ -3,7 +3,7 @@ package auth import ( "errors" - "github.com/Bronku/iroon/internal/crypto" + "github.com/Bronku/iroon/crypto" ) func (a *Authenticator) verifyCredentials(login, password string) error { diff --git a/internal/auth/get.go b/auth/get.go similarity index 100% rename from internal/auth/get.go rename to auth/get.go diff --git a/internal/auth/session.go b/auth/session.go similarity index 97% rename from internal/auth/session.go rename to auth/session.go index 6add9dc..7c3ad0d 100644 --- a/internal/auth/session.go +++ b/auth/session.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" ) func (a *Authenticator) getSession(r *http.Request) (models.Token, error) { diff --git a/internal/auth/templates/login.html b/auth/templates/login.html similarity index 100% rename from internal/auth/templates/login.html rename to auth/templates/login.html diff --git a/internal/auth/token.go b/auth/token.go similarity index 86% rename from internal/auth/token.go rename to auth/token.go index 3ae52f4..0288c93 100644 --- a/internal/auth/token.go +++ b/auth/token.go @@ -4,8 +4,8 @@ import ( "net/http" "time" - "github.com/Bronku/iroon/internal/crypto" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/crypto" + "github.com/Bronku/iroon/models" ) func (a *Authenticator) newSession(user string) (http.Cookie, error) { diff --git a/cmd/iroon/main.go b/cmd/iroon/main.go deleted file mode 100644 index 606bf14..0000000 --- a/cmd/iroon/main.go +++ /dev/null @@ -1,26 +0,0 @@ -package iroon - -import ( - "fmt" - "log" - "net/http" - - "github.com/Bronku/iroon/internal/auth" - "github.com/Bronku/iroon/internal/logging" - "github.com/Bronku/iroon/internal/server" - "github.com/Bronku/iroon/internal/store" -) - -func Run() { - s := store.OpenStore("./foo.db") - s.AddUser("admin", "secret") - defer s.Close() - h := server.New(s) - defer h.Close() - - var handler http.Handler = h - handler = logging.Middleware(handler) - handler = auth.New(s).Middleware(handler) - fmt.Println("starting server") - log.Fatal(http.ListenAndServe(":8080", handler)) -} diff --git a/internal/crypto/crypto.go b/crypto/crypto.go similarity index 100% rename from internal/crypto/crypto.go rename to crypto/crypto.go diff --git a/internal/logging/error.go b/logging/error.go similarity index 100% rename from internal/logging/error.go rename to logging/error.go diff --git a/internal/logging/logger.go b/logging/logger.go similarity index 100% rename from internal/logging/logger.go rename to logging/logger.go diff --git a/main.go b/main.go index 1ffc634..4e432ea 100644 --- a/main.go +++ b/main.go @@ -1,9 +1,26 @@ package main import ( - "github.com/Bronku/iroon/cmd/iroon" + "fmt" + "log" + "net/http" + + "github.com/Bronku/iroon/auth" + "github.com/Bronku/iroon/logging" + "github.com/Bronku/iroon/server" + "github.com/Bronku/iroon/store" ) func main() { - iroon.Run() + s := store.OpenStore("./foo.db") + s.AddUser("admin", "secret") + defer s.Close() + h := server.New(s) + defer h.Close() + + var handler http.Handler = h + handler = logging.Middleware(handler) + handler = auth.New(s).Middleware(handler) + fmt.Println("starting server") + log.Fatal(http.ListenAndServe(":8080", handler)) } diff --git a/internal/models/auth.go b/models/auth.go similarity index 100% rename from internal/models/auth.go rename to models/auth.go diff --git a/internal/models/data.go b/models/data.go similarity index 100% rename from internal/models/data.go rename to models/data.go diff --git a/internal/models/user.go b/models/user.go similarity index 100% rename from internal/models/user.go rename to models/user.go diff --git a/internal/server/fetcher.go b/server/fetcher.go similarity index 100% rename from internal/server/fetcher.go rename to server/fetcher.go diff --git a/internal/server/get.go b/server/get.go similarity index 98% rename from internal/server/get.go rename to server/get.go index 8d8449a..5f80827 100644 --- a/internal/server/get.go +++ b/server/get.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" ) func monthInterval(y int, m time.Month) (firstDay, lastDay time.Time) { diff --git a/internal/server/http.go b/server/http.go similarity index 100% rename from internal/server/http.go rename to server/http.go diff --git a/internal/server/post.go b/server/post.go similarity index 97% rename from internal/server/post.go rename to server/post.go index a0353d3..549d685 100644 --- a/internal/server/post.go +++ b/server/post.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" ) func (h *Server) postCake(r *http.Request) (any, int, error) { diff --git a/internal/server/server.go b/server/server.go similarity index 96% rename from internal/server/server.go rename to server/server.go index 61a6a86..4fc3097 100644 --- a/internal/server/server.go +++ b/server/server.go @@ -5,7 +5,7 @@ import ( "html/template" "net/http" - "github.com/Bronku/iroon/internal/store" + "github.com/Bronku/iroon/store" ) type Server struct { diff --git a/internal/server/static/fontawesome/css/fontawesome.min.css b/server/static/fontawesome/css/fontawesome.min.css similarity index 100% rename from internal/server/static/fontawesome/css/fontawesome.min.css rename to server/static/fontawesome/css/fontawesome.min.css diff --git a/internal/server/static/fontawesome/css/solid.css b/server/static/fontawesome/css/solid.css similarity index 100% rename from internal/server/static/fontawesome/css/solid.css rename to server/static/fontawesome/css/solid.css diff --git a/internal/server/static/fontawesome/webfonts/fa-solid-900.ttf b/server/static/fontawesome/webfonts/fa-solid-900.ttf similarity index 100% rename from internal/server/static/fontawesome/webfonts/fa-solid-900.ttf rename to server/static/fontawesome/webfonts/fa-solid-900.ttf diff --git a/internal/server/static/fontawesome/webfonts/fa-solid-900.woff2 b/server/static/fontawesome/webfonts/fa-solid-900.woff2 similarity index 100% rename from internal/server/static/fontawesome/webfonts/fa-solid-900.woff2 rename to server/static/fontawesome/webfonts/fa-solid-900.woff2 diff --git a/internal/server/static/htmx2.04.js b/server/static/htmx2.04.js similarity index 100% rename from internal/server/static/htmx2.04.js rename to server/static/htmx2.04.js diff --git a/internal/server/static/order.js b/server/static/order.js similarity index 100% rename from internal/server/static/order.js rename to server/static/order.js diff --git a/internal/server/static/style.css b/server/static/style.css similarity index 100% rename from internal/server/static/style.css rename to server/static/style.css diff --git a/internal/server/template.go b/server/template.go similarity index 95% rename from internal/server/template.go rename to server/template.go index d3fe64b..79197ee 100644 --- a/internal/server/template.go +++ b/server/template.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "github.com/Bronku/iroon/internal/logging" + "github.com/Bronku/iroon/logging" ) //go:embed templates/* diff --git a/internal/server/templates/cake.gohtml b/server/templates/cake.gohtml similarity index 100% rename from internal/server/templates/cake.gohtml rename to server/templates/cake.gohtml diff --git a/internal/server/templates/cakes.gohtml b/server/templates/cakes.gohtml similarity index 100% rename from internal/server/templates/cakes.gohtml rename to server/templates/cakes.gohtml diff --git a/internal/server/templates/confirmation.gohtml b/server/templates/confirmation.gohtml similarity index 100% rename from internal/server/templates/confirmation.gohtml rename to server/templates/confirmation.gohtml diff --git a/internal/server/templates/layout/layout.gohtml b/server/templates/layout/layout.gohtml similarity index 100% rename from internal/server/templates/layout/layout.gohtml rename to server/templates/layout/layout.gohtml diff --git a/internal/server/templates/layout/nav.gohtml b/server/templates/layout/nav.gohtml similarity index 100% rename from internal/server/templates/layout/nav.gohtml rename to server/templates/layout/nav.gohtml diff --git a/internal/server/templates/order.gohtml b/server/templates/order.gohtml similarity index 100% rename from internal/server/templates/order.gohtml rename to server/templates/order.gohtml diff --git a/internal/server/templates/orders.gohtml b/server/templates/orders.gohtml similarity index 100% rename from internal/server/templates/orders.gohtml rename to server/templates/orders.gohtml diff --git a/internal/store/cake.go b/store/cake.go similarity index 98% rename from internal/store/cake.go rename to store/cake.go index cfaf659..f21eff7 100644 --- a/internal/store/cake.go +++ b/store/cake.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" ) func (s *Store) cakeCount() int { diff --git a/internal/store/migrations.go b/store/migrations.go similarity index 100% rename from internal/store/migrations.go rename to store/migrations.go diff --git a/internal/store/migrations/1.sql b/store/migrations/1.sql similarity index 100% rename from internal/store/migrations/1.sql rename to store/migrations/1.sql diff --git a/internal/store/order.go b/store/order.go similarity index 99% rename from internal/store/order.go rename to store/order.go index e021be2..d06c53c 100644 --- a/internal/store/order.go +++ b/store/order.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" ) // #todo update labels in templates diff --git a/internal/store/session.go b/store/session.go similarity index 96% rename from internal/store/session.go rename to store/session.go index 76d5b8d..2b41d7c 100644 --- a/internal/store/session.go +++ b/store/session.go @@ -3,7 +3,7 @@ package store import ( "time" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" ) func (s *Store) AddSession(token, userName string, expiration time.Time) error { diff --git a/internal/store/store.go b/store/store.go similarity index 93% rename from internal/store/store.go rename to store/store.go index 2877676..d5788fa 100644 --- a/internal/store/store.go +++ b/store/store.go @@ -4,7 +4,7 @@ import ( "database/sql" "log" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/models" _ "github.com/knaka/go-sqlite3-fts5" _ "github.com/mattn/go-sqlite3" ) diff --git a/internal/store/store_test.go b/store/store_test.go similarity index 100% rename from internal/store/store_test.go rename to store/store_test.go diff --git a/internal/store/user.go b/store/user.go similarity index 92% rename from internal/store/user.go rename to store/user.go index ef4e874..eefd0a9 100644 --- a/internal/store/user.go +++ b/store/user.go @@ -3,8 +3,8 @@ package store import ( "errors" - "github.com/Bronku/iroon/internal/crypto" - "github.com/Bronku/iroon/internal/models" + "github.com/Bronku/iroon/crypto" + "github.com/Bronku/iroon/models" ) func (s *Store) AddUser(login, password string) error {