refactor: use web folder as recommended

tombrereton · Jan 10, 2024 · 69292ca · 69292ca
1 parent 036d078
commit 69292ca
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/internal/server/integration_server_test.go b/internal/server/integration_server_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestIntegrationWebServer(t *testing.T) {
-	config := Config{IsDevelopment: false, TemplateDir: "../../templates/", Port: "3000"}
+	config := Config{IsDevelopment: false, TemplateDir: "../../web/templates/", Port: "3000"}
 	app := NewWebServer(&config)
 	ts := httptest.NewServer(app.Router)
 	defer ts.Close()

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "scripts": {
-    "watch:tailwind": "npx tailwindcss -i ./static/css/main.css -o ./static/css/styles.css --watch",
+    "watch:tailwind": "npx tailwindcss -i ./web/static/css/main.css -o ./web/static/css/styles.css --watch",
     "watch:go": "air",
     "dev": "concurrently \"npm run watch:tailwind\" \"npm run watch:go\"",
     "test": "go test ./...",

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,6 +1,6 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-  content: ["./templates/**/*.{html,js}"],
+  content: ["./web/templates/**/*.{html,js}"],
   theme: {
     extend: {},
   },

diff --git a/static/css/main.css → web/static/css/main.css b/static/css/main.css → web/static/css/main.css
diff --git a/templates/htmx-demo.html → web/templates/htmx-demo.html b/templates/htmx-demo.html → web/templates/htmx-demo.html
diff --git a/templates/landing.html → web/templates/landing.html b/templates/landing.html → web/templates/landing.html