refactor: use internal and web folders

tombrereton · Jan 14, 2024 · b10bfb3 · b10bfb3
1 parent 0202f40
commit b10bfb3
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 11 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/tombrereton/go-hot-reload/application"
+	"github.com/tombrereton/go-hot-reload/internal/application"
 )
 
 func main() {

diff --git a/application/app.go → internal/application/app.go b/application/app.go → internal/application/app.go
diff --git a/application/routes.go → internal/application/routes.go b/application/routes.go → internal/application/routes.go
@@ -3,7 +3,7 @@ package application
 import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
-	"github.com/tombrereton/go-hot-reload/handler"
+	"github.com/tombrereton/go-hot-reload/internal/handler"
 )
 
 func loadRoutes() *chi.Mux {

diff --git a/handler/marketing.go → internal/handler/marketing.go b/handler/marketing.go → internal/handler/marketing.go
@@ -5,9 +5,9 @@ import (
 
 	"github.com/mavolin/go-htmx"
 
-	"github.com/tombrereton/go-hot-reload/model"
-	"github.com/tombrereton/go-hot-reload/view/layout"
-	"github.com/tombrereton/go-hot-reload/view/marketing"
+	"github.com/tombrereton/go-hot-reload/internal/model"
+	"github.com/tombrereton/go-hot-reload/web/view/layout"
+	"github.com/tombrereton/go-hot-reload/web/view/marketing"
 )
 
 type Marketing struct {

diff --git a/handler/static.go → internal/handler/static.go b/handler/static.go → internal/handler/static.go
@@ -12,7 +12,7 @@ type Static struct {
 func (h *Static) GetStaticFiles() *chi.Mux {
 	r := chi.NewRouter()
 
-	fs := http.FileServer(http.Dir("static"))
+	fs := http.FileServer(http.Dir("web/static"))
 	r.Handle("/*", http.StripPrefix("/static/", fs))
 
 	return r

diff --git a/model/user.go → internal/model/user.go b/model/user.go → internal/model/user.go
diff --git a/static/css/input.css → web/static/css/input.css b/static/css/input.css → web/static/css/input.css
diff --git a/static/css/output.css → web/static/css/output.css b/static/css/output.css → web/static/css/output.css
@@ -642,6 +642,11 @@ video {
   background-color: rgb(71 85 105 / var(--tw-bg-opacity));
 }
 
+.bg-green-500 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(34 197 94 / var(--tw-bg-opacity));
+}
+
 .bg-gradient-to-tr {
   background-image: linear-gradient(to top right, var(--tw-gradient-stops));
 }
@@ -692,6 +697,15 @@ video {
   padding-bottom: 0.25rem;
 }
 
+.text-lg {
+  font-size: 1.125rem;
+  line-height: 1.75rem;
+}
+
+.font-extrabold {
+  font-weight: 800;
+}
+
 .text-white {
   --tw-text-opacity: 1;
   color: rgb(255 255 255 / var(--tw-text-opacity));

diff --git a/view/components/footer.templ → web/view/components/footer.templ b/view/components/footer.templ → web/view/components/footer.templ
diff --git a/view/components/footer_templ.go → web/view/components/footer_templ.go b/view/components/footer_templ.go → web/view/components/footer_templ.go
diff --git a/view/components/header.templ → web/view/components/header.templ b/view/components/header.templ → web/view/components/header.templ
diff --git a/view/components/header_templ.go → web/view/components/header_templ.go b/view/components/header_templ.go → web/view/components/header_templ.go
diff --git a/view/layout/base.templ → web/view/layout/base.templ b/view/layout/base.templ → web/view/layout/base.templ
@@ -1,6 +1,6 @@
 package layout
 
-import "github.com/tombrereton/go-hot-reload/view/components"
+import "github.com/tombrereton/go-hot-reload/web/view/components"
 
 templ Base(contents templ.Component) {
 	<!DOCTYPE html>

diff --git a/view/layout/base_templ.go → web/view/layout/base_templ.go b/view/layout/base_templ.go → web/view/layout/base_templ.go
diff --git a/view/marketing/about.templ → web/view/marketing/about.templ b/view/marketing/about.templ → web/view/marketing/about.templ
diff --git a/view/marketing/about_templ.go → web/view/marketing/about_templ.go b/view/marketing/about_templ.go → web/view/marketing/about_templ.go
diff --git a/view/marketing/landing.templ → web/view/marketing/landing.templ b/view/marketing/landing.templ → web/view/marketing/landing.templ
@@ -1,7 +1,7 @@
 package marketing
 
 import (
-	"github.com/tombrereton/go-hot-reload/model"
+	"github.com/tombrereton/go-hot-reload/internal/model"
 )
 
 templ LandingPage(user model.User) {

diff --git a/view/marketing/landing_templ.go → web/view/marketing/landing_templ.go b/view/marketing/landing_templ.go → web/view/marketing/landing_templ.go