diff --git a/handlers/Index.go b/handlers/Index.go index 672fc1b..a259557 100644 --- a/handlers/Index.go +++ b/handlers/Index.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" "jirku.sk/mcmamina/template/components" "jirku.sk/mcmamina/template/pages" ) diff --git a/handlers/SupportedUs.go b/handlers/SupportedUs.go index e531696..67172a0 100644 --- a/handlers/SupportedUs.go +++ b/handlers/SupportedUs.go @@ -5,7 +5,7 @@ import ( "log/slog" "net/http" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" "jirku.sk/mcmamina/template/components" "jirku.sk/mcmamina/template/pages" ) diff --git a/main.go b/main.go index 2806f7e..cc40bec 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ import ( "github.com/joho/godotenv" "jirku.sk/mcmamina/handlers" "jirku.sk/mcmamina/pkg/middleware" - "jirku.sk/mcmamina/services" + "jirku.sk/mcmamina/pkg/services" ) // .env keys diff --git a/models/calendar.go b/pkg/models/calendar.go similarity index 100% rename from models/calendar.go rename to pkg/models/calendar.go diff --git a/models/calendar_test.go b/pkg/models/calendar_test.go similarity index 100% rename from models/calendar_test.go rename to pkg/models/calendar_test.go diff --git a/models/sponsor.go b/pkg/models/sponsor.go similarity index 100% rename from models/sponsor.go rename to pkg/models/sponsor.go diff --git a/services/calendar.go b/pkg/services/calendar.go similarity index 99% rename from services/calendar.go rename to pkg/services/calendar.go index 8270f75..4f6744a 100644 --- a/services/calendar.go +++ b/pkg/services/calendar.go @@ -11,7 +11,7 @@ import ( "google.golang.org/api/calendar/v3" "google.golang.org/api/googleapi" "google.golang.org/api/option" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" ) type CalendarService struct { diff --git a/services/calendar_test.go b/pkg/services/calendar_test.go similarity index 94% rename from services/calendar_test.go rename to pkg/services/calendar_test.go index a535f0a..128b933 100644 --- a/services/calendar_test.go +++ b/pkg/services/calendar_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/joho/godotenv" - "jirku.sk/mcmamina/services" + "jirku.sk/mcmamina/pkg/services" ) func TestCalendar(t *testing.T) { diff --git a/services/css.go b/pkg/services/css.go similarity index 100% rename from services/css.go rename to pkg/services/css.go diff --git a/services/mail.go b/pkg/services/mail.go similarity index 100% rename from services/mail.go rename to pkg/services/mail.go diff --git a/services/mail_test.go b/pkg/services/mail_test.go similarity index 89% rename from services/mail_test.go rename to pkg/services/mail_test.go index 1fa12c2..bf9b778 100644 --- a/services/mail_test.go +++ b/pkg/services/mail_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "jirku.sk/mcmamina/services" + "jirku.sk/mcmamina/pkg/services" ) func TestMailSend(t *testing.T) { diff --git a/services/recaptcha.go b/pkg/services/recaptcha.go similarity index 100% rename from services/recaptcha.go rename to pkg/services/recaptcha.go diff --git a/services/sponsor.go b/pkg/services/sponsor.go similarity index 99% rename from services/sponsor.go rename to pkg/services/sponsor.go index 1232f9d..3761d6b 100644 --- a/services/sponsor.go +++ b/pkg/services/sponsor.go @@ -3,7 +3,7 @@ package services import ( "context" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" ) type SponsorService struct{} diff --git a/template/components/twoWeeksCalendar.templ b/template/components/twoWeeksCalendar.templ index f09244e..73f0f77 100644 --- a/template/components/twoWeeksCalendar.templ +++ b/template/components/twoWeeksCalendar.templ @@ -2,7 +2,7 @@ package components import ( "time" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" ) templ TwoWeeksCalendar(days []models.Day, today time.Time) { diff --git a/template/pages/Index.templ b/template/pages/Index.templ index 0a1775f..3144b54 100644 --- a/template/pages/Index.templ +++ b/template/pages/Index.templ @@ -4,7 +4,7 @@ import ( "time" "jirku.sk/mcmamina/template/layout" "jirku.sk/mcmamina/template/components" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" ) type IndexPageDto struct { diff --git a/template/pages/SupportedUs.templ b/template/pages/SupportedUs.templ index 1de5916..c970323 100644 --- a/template/pages/SupportedUs.templ +++ b/template/pages/SupportedUs.templ @@ -4,7 +4,7 @@ package pages import ( "jirku.sk/mcmamina/template/layout" "jirku.sk/mcmamina/template/components" - "jirku.sk/mcmamina/models" + "jirku.sk/mcmamina/pkg/models" "fmt" )