fix(app): set services placeholder (#4)

kobamkode · Aug 24, 2024 · 21f40ef · 21f40ef
1 parent 1201d51
commit 21f40ef
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-run:
+run: gen build-css
 	go run cmd/app/main.go
 
 gen:
@@ -18,5 +18,5 @@ migrate-up:
 migrate-down:
 	go run cmd/migrate/main.go -run=down
 
-build-tailwind:
+build-css:
 	npx tailwindcss -i ./assets/css/src.css -o ./assets/css/dist.css
diff --git a/internal/admin/dashboard.go b/internal/admin/dashboard.go
@@ -0,0 +1,14 @@
+package admin
+
+import (
+	"os"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func DashboardPage(c *fiber.Ctx) error {
+	return c.Render("dashboard", fiber.Map{
+		"AppName": os.Getenv("APP_NAME"),
+		"Title":   "Hello, Dashboard!",
+	}, "layouts/main")
+}
diff --git a/internal/api/ping.go b/internal/api/ping.go
@@ -0,0 +1,10 @@
+package api
+
+import "github.com/gofiber/fiber/v2"
+
+func Ping(c *fiber.Ctx) error {
+	return c.Status(fiber.StatusOK).JSON(fiber.Map{
+		"message": "PONG",
+	})
+}
+
diff --git a/internal/routes/routes.go b/internal/routes/routes.go
@@ -3,7 +3,9 @@ package routes
 import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/kobamkode/terigu/internal/home"
+	"github.com/kobamkode/terigu/internal/admin"
+	"github.com/kobamkode/terigu/internal/api"
+	"github.com/kobamkode/terigu/internal/web"
 )
 
 type handler struct {
@@ -16,14 +18,16 @@ func NewHandler(app *fiber.App, pool *pgxpool.Pool) *handler {
 }
 
 func (h *handler) Web() {
-	h.app.Get("/", home.HomePage)
+	h.app.Get("/", web.HomePage)
 }
 
 func (h *handler) API() {
-	_ = h.app.Group("/api")
+	r := h.app.Group("/api")
+	r.Get("/ping", api.Ping)
 
 }
 
 func (h *handler) Admin() {
-	_ = h.app.Group("/admin")
+	r := h.app.Group("/admin")
+	r.Get("/", admin.DashboardPage)
 }
diff --git a/internal/home/home.go → internal/web/home.go b/internal/home/home.go → internal/web/home.go
@@ -1,4 +1,4 @@
-package home
+package web
 
 import (
 	"os"
@@ -7,7 +7,7 @@ import (
 )
 
 func HomePage(c *fiber.Ctx) error {
-	return c.Render("index", fiber.Map{
+	return c.Render("home", fiber.Map{
 		"AppName": os.Getenv("APP_NAME"),
 		"Title":   "Hello, World!",
 	}, "layouts/main")

diff --git a/views/index.html → views/dashboard.html b/views/index.html → views/dashboard.html
diff --git a/views/home.html b/views/home.html
@@ -0,0 +1 @@
+<h1 class="text-3xl font-bold underline">{{.Title}}</h1>
diff --git a/views/layouts/main.html b/views/layouts/main.html
@@ -8,7 +8,9 @@
 </head>
 
 <body>
-	{{embed}}
+	<div class="">
+		{{embed}}
+	</div>
 </body>
 
 </html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<h1 class="text-3xl font-bold underline">{{.Title}}</h1>