Tailwind CSS for formatting (#13)

* boot-strapped tailwind css

* improved logging

* removing noise

datafetcher/handlers/accounts.go

@@ -30,6 +30,7 @@ func NewAccountHandler(log *log.Logger, upclient *upclient.APIClient, auth conte
 
 func (h *AccountHandler) Post(w http.ResponseWriter, r *http.Request) {}
 func (h *AccountHandler) Get(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "text/html charset=utf-8")
 	filterOwnershipType := upclient.OwnershipTypeEnum("INDIVIDUAL")
 	accountChannel := make(chan upclient.AccountResource, 10)
 	clonedChannels := Clone(accountChannel, 2)

datafetcher/handlers/basehandler.go

@@ -24,7 +24,7 @@ type BaseHandler struct {
 }
 
 func (h *BaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.Log.Println(fmt.Sprintf("%s %s params: %s", r.Method, h.Uri, r.URL.Query()))
+	h.Log.Println(fmt.Sprintf("%s %s params: %s", r.Method, r.RequestURI, r.URL.Query()))
 	switch r.Method {
 	case http.MethodPost:
 		h.Handler.Post(w, r)

datafetcher/handlers/static.go

@@ -0,0 +1,38 @@
+package handlers
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"path/filepath"
+)
+
+type StaticFileHandler struct {
+	*BaseHandler
+}
+
+func NewStaticFileHandler(log *log.Logger) *StaticFileHandler {
+	handler := &StaticFileHandler{}
+	handler.BaseHandler = &BaseHandler{
+		Uri:      "/static/",
+		Log:      log,
+		UpClient: nil,
+		UpAuth:   nil,
+		Handler:  handler}
+	return handler
+}
+func (s *StaticFileHandler) Get(w http.ResponseWriter, r *http.Request) {
+	if r.RequestURI != "/static/css/output.css" {
+		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		return
+	}
+	filePath := r.URL.Path[len("/static/"):]
+	fullPath := filepath.Join(".", "static", filePath)
+	s.Log.Println(fmt.Sprintf("Attempting to serve path: %s", fullPath))
+	http.ServeFile(w, r, fullPath)
+}
+
+func (s *StaticFileHandler) Post(w http.ResponseWriter, r *http.Request) {
+	s.Log.Println("Unsupported HTTP Method")
+	http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+}

datafetcher/handlers/transactions-csv.go

@@ -21,8 +21,7 @@ func NewTransactionCsvHandler(log *log.Logger, upclient *upclient.APIClient, aut
 		Log:      log,
 		UpClient: upclient,
 		UpAuth:   auth,
-		Handler:  handler, // Set the Handler interface to the specific handler
-	}
+		Handler:  handler}
 	return handler
 }
 

datafetcher/server.go

@@ -2,7 +2,6 @@ package datafetcher
 
 import (
 	"context"
-	"fmt"
 	"log"
 	"net/http"
 	"time"
@@ -14,12 +13,6 @@ import (
 	"github.com/alexedwards/scs/v2"
 )
 
-// homePage function to handle requests to the root URL
-func homePage(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "Welcome to the HomePage!")
-	fmt.Println("Endpoint Hit: homePage")
-}
-
 func getInfo(w http.ResponseWriter, r *http.Request) {
 
 }
@@ -40,11 +33,6 @@ type GlobalState struct {
 	Count int
 }
 
-const (
-	AccountIdQueryParam      = "accountId"
-	TransactionNumQueryParam = "numTransaction"
-)
-
 var global GlobalState
 var sessionManager *scs.SessionManager
 
@@ -93,12 +81,12 @@ func HandleRequests(upBankToken string, log *log.Logger) {
 	accountHandler := handlers.NewAccountHandler(log, apiClient, auth)
 	transactionsHandler := handlers.NewTransactionHandler(log, apiClient, auth, accountHandler)
 	transactionsCsvHandler := handlers.NewTransactionCsvHandler(log, apiClient, auth)
+	staticFileHandler := handlers.NewStaticFileHandler(log)
 	mux := http.NewServeMux()
 	mux.HandleFunc(accountHandler.Uri, accountHandler.ServeHTTP)
 	mux.HandleFunc(transactionsHandler.Uri, transactionsHandler.ServeHTTP)
 	mux.HandleFunc(transactionsCsvHandler.Uri, transactionsCsvHandler.ServeHTTP)
-
-	mux.HandleFunc("/", homePage)
+	mux.HandleFunc(staticFileHandler.Uri, staticFileHandler.ServeHTTP)
 	mux.HandleFunc("/info", getInfo)
 	mux.Handle("/time", NewNowHandler(time.Now))
 	mux.HandleFunc("/counter", handleInfo)

datafetcher/templates/accounts.templ

@@ -7,12 +7,12 @@ import (
 )
 
 templ AccountDetails(accounts <-chan upclient.AccountResource) {
-	<h1>Accounts</h1>
+	<h1 class="text-4xl">Accounts - Details</h1>
 	<ul>
 		for account := range accounts {
 			@templ.Flush() {
 				<div>
-					<h2>{ account.Attributes.DisplayName }</h2>
+					<h2 class="text-xl font-bold">{ account.Attributes.DisplayName }</h2>
 					<p>Account Type: { strings.ToTitle(string(account.Attributes.AccountType)) }</p>
 					<p>Balance: { account.Attributes.Balance.CurrencyCode } { account.Attributes.Balance.Value }</p>
 					<p>Created At: { account.Attributes.CreatedAt.String() }</p>
@@ -25,7 +25,7 @@ templ AccountDetails(accounts <-chan upclient.AccountResource) {
 }
 
 templ AccountButtons(accounts <-chan upclient.AccountResource) {
-	<h1>Accounts</h1>
+	<h1 class="text-4xl">Accounts</h1>
 	<ul>
 		<form action="/transactions" method="GET">
 			<button type="submit">All accounts</button>
@@ -46,6 +46,8 @@ templ Accounts(accounts1 <-chan upclient.AccountResource, accounts2 <-chan upcli
 		<head>
 			<meta charset="UTF-8"/>
 			<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+			<script src="https://unpkg.com/htmx.org@1.9.11"></script>
+			<link rel="stylesheet" href="/static/css/output.css"/>
 			<title>Accounts</title>
 		</head>
 		<body>

datafetcher/templates/accounts_templ.txt

@@ -0,0 +1,19 @@
+<h1 class=\"text-4xl\">Accounts - Details</h1><ul>
+<div><h2 class=\"text-xl font-bold\">
+</h2><p>Account Type: 
+</p><p>Balance: 
+
+</p><p>Created At: 
+</p><p>Id: 
+</p></div><hr>
+</ul>
+<h1 class=\"text-4xl\">Accounts</h1><ul><form action=\"/transactions\" method=\"GET\"><button type=\"submit\">All accounts</button></form>
+<form action=\"/transactions\" method=\"GET\"><button type=\"submit\" name=\"
+\" value=\"
+\">
+
+
+</button></form>
+</ul>
+<!doctype html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"><script src=\"https://unpkg.com/htmx.org@1.9.11\"></script><link rel=\"stylesheet\" href=\"/static/css/output.css\"><title>Accounts</title></head><body>
+</body></html>