chore: move services and models into pkg

Signed-off-by: Martin Jirku <martin@jirku.sk>
martinjirku · Apr 12, 2024 · 10c7ec4 · 10c7ec4
1 parent 76b649f
commit 10c7ec4
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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 → pkg/models/calendar.go b/models/calendar.go → pkg/models/calendar.go
diff --git a/models/calendar_test.go → pkg/models/calendar_test.go b/models/calendar_test.go → pkg/models/calendar_test.go
diff --git a/models/sponsor.go → pkg/models/sponsor.go b/models/sponsor.go → pkg/models/sponsor.go
diff --git a/services/calendar.go → pkg/services/calendar.go b/services/calendar.go → 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 → pkg/services/calendar_test.go b/services/calendar_test.go → 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 → pkg/services/css.go b/services/css.go → pkg/services/css.go
diff --git a/services/mail.go → pkg/services/mail.go b/services/mail.go → pkg/services/mail.go
diff --git a/services/mail_test.go → pkg/services/mail_test.go b/services/mail_test.go → 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 → pkg/services/recaptcha.go b/services/recaptcha.go → pkg/services/recaptcha.go
diff --git a/services/sponsor.go → pkg/services/sponsor.go b/services/sponsor.go → 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
@@ -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
@@ -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
@@ -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"
 )