Merge pull request #15 from fgtago/dw-pc-home

add default errorpage handler
fgtago · Jun 15, 2024 · 4111acf · 4111acf
2 parents 97a14f4 + 028904c
commit 4111acf
Show file tree

Hide file tree

Showing 24 changed files with 190 additions and 160 deletions.
diff --git a/appsmodel/configuration.go b/appsmodel/configuration.go
@@ -26,5 +26,6 @@ type Configuration struct {
 	Logging struct {
 		Enabled bool `yaml:"enabled"`
 	} `yaml:"logging"`
-	ConfigPath string
+	ShowServerError bool `yaml:"showservererror"`
+	ConfigPath      string
 }
diff --git a/appsmodel/pagevariable.go b/appsmodel/pagevariable.go
@@ -1,6 +1,8 @@
 package appsmodel
 
 type PageVariable struct {
-	Title string
-	Data  any
+	Title            string
+	HttpErrorNumber  int
+	HttpErrorMessage string
+	Data             any
 }
diff --git a/appsmodel/webservice.go b/appsmodel/webservice.go
@@ -13,6 +13,7 @@ type Webservice struct {
 	AllowedAsset    map[string]*[]string
 	CurrentWsDir    string
 	ApplicationData any
+	ShowServerError bool
 }
 
 var ws *Webservice

diff --git a/defaulthandlers/errorpagehandler.go b/defaulthandlers/errorpagehandler.go
@@ -0,0 +1,75 @@
+package defaulthandlers
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+
+	"github.com/agungdhewe/dwlog"
+	"github.com/fgtago/fgweb/appsmodel"
+)
+
+func ErrorPageHandler(errnum int, errmsg string, pv *appsmodel.PageVariable, w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	ws := appsmodel.GetWebservice()
+	device := ctx.Value(appsmodel.DeviceKeyName).(appsmodel.Device)
+
+	pv.Title = "Error"
+	pv.HttpErrorNumber = errnum
+	pv.HttpErrorMessage = errmsg
+
+	// TODO: implmentasikan tpl
+	tpl, exists, err := ws.TplMgr.GetPage("errorpage", device.Type)
+	if err != nil {
+		dwlog.Error(err.Error())
+		simpleErrorPage(errnum, errmsg, w)
+		return
+	}
+
+	if !exists {
+		simpleErrorPage(errnum, errmsg, w)
+		return
+	}
+
+	// render page
+	buff := new(bytes.Buffer)
+	err = tpl.Execute(buff, &pv)
+	if err != nil {
+		dwlog.Error(err.Error())
+		simpleErrorPage(errnum, errmsg, w)
+		return
+	}
+
+	// send bufer to browser
+	w.WriteHeader(errnum)
+	_, err = buff.WriteTo(w)
+	if err != nil {
+		dwlog.Error(err.Error())
+		simpleErrorPage(errnum, errmsg, w)
+		return
+	}
+
+}
+
+func simpleErrorPage(errnum int, errmsg string, w http.ResponseWriter) {
+	w.WriteHeader(errnum)
+
+	html := `<!DOCTYPE html>
+	<html lang="en">
+	<head>
+		<meta charset="UTF-8">
+		<title>Error</title>
+		<meta name="viewport"
+		      content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+		<meta http-equiv="X-UA-Compatible" content="ie=edge">	
+		<link rel="icon" type="image/x-icon" href="favicon.ico">
+	</head>
+	<body>
+		<h1>Error %d</h1>
+		<p>%s</p>
+	</body>
+	</html>
+	`
+
+	fmt.Fprintf(w, html, errnum, errmsg)
+}
diff --git a/defaulthandlers/pagehomehandler.go b/defaulthandlers/pagehomehandler.go
diff --git a/defaulthandlers/pageloginhandler.go b/defaulthandlers/pageloginhandler.go
diff --git a/defaulthandlers/simplepagehandler.go b/defaulthandlers/simplepagehandler.go
@@ -0,0 +1,59 @@
+package defaulthandlers
+
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+
+	"github.com/agungdhewe/dwlog"
+	"github.com/fgtago/fgweb/appsmodel"
+)
+
+func SimplePageHandler(pagename string, pv *appsmodel.PageVariable, w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	ws := appsmodel.GetWebservice()
+	device := ctx.Value(appsmodel.DeviceKeyName).(appsmodel.Device)
+
+	// TODO: implmentasikan tpl
+	tpl, exists, err := ws.TplMgr.GetPage(pagename, device.Type)
+	if err != nil {
+		if ws.ShowServerError {
+			ErrorPageHandler(500, err.Error(), pv, w, r)
+		} else {
+			dwlog.Error(err.Error())
+			ErrorPageHandler(500, "internal server error", pv, w, r)
+		}
+		return
+	}
+
+	if !exists {
+		// error 404
+		ErrorPageHandler(404, fmt.Sprintf("page %s not found", pagename), pv, w, r)
+		return
+	}
+
+	// render page
+	buff := new(bytes.Buffer)
+	err = tpl.Execute(buff, &pv)
+	if err != nil {
+		if ws.ShowServerError {
+			ErrorPageHandler(500, err.Error(), pv, w, r)
+		} else {
+			dwlog.Error(err.Error())
+			ErrorPageHandler(500, "internal server error", pv, w, r)
+		}
+		return
+	}
+
+	// send bufer to browser
+	_, err = buff.WriteTo(w)
+	if err != nil {
+		if ws.ShowServerError {
+			ErrorPageHandler(500, err.Error(), pv, w, r)
+		} else {
+			dwlog.Error(err.Error())
+			ErrorPageHandler(500, "internal server error", pv, w, r)
+		}
+		return
+	}
+}
diff --git a/fgweb.go b/fgweb.go
@@ -105,6 +105,13 @@ func httpRequestHandler(hnd RouteHandlerFunc) *chi.Mux {
 	// handle dari main program
 	hnd(mux)
 
+	// kalau halaman tidak ditemukan
+	mux.NotFound(func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		pv := ctx.Value(appsmodel.PageVariableKeyName).(*appsmodel.PageVariable)
+		defaulthandlers.ErrorPageHandler(404, "page not found", pv, w, r)
+	})
+
 	return mux
 }
 

diff --git a/main/config-dev.yml b/main/config-dev.yml
@@ -14,13 +14,13 @@ cookie:
 
 template:
   cached: false
-  dir: "../data/templates/v2"  
+  dir: "data/templates/v2"  
   options:
   - missingkey=error
 
 application:
-  pagedir: "../data/pages"
-  contentdir: "../data/content"
+  pagedir: "data/pages"
+  contentdir: "data/content"
 
 logging:
   enabled: true

diff --git a/main/data/pages/errorpage/errorpage.html b/main/data/pages/errorpage/errorpage.html
@@ -0,0 +1,12 @@
+{{template "layoutdasar" .}}
+
+{{define "pagestyle"}}
+{{end}}
+
+
+{{define "pagecontent"}}
+<div>
+	<h1>Error {{.HttpErrorNumber}}</h1>
+	{{.HttpErrorMessage}}
+</div>
+{{end}}
diff --git a/main/data/pages/errorpage/errorpage.yml b/main/data/pages/errorpage/errorpage.yml
@@ -0,0 +1,10 @@
+title: Home
+
+device:
+  mobile:
+    - errorpage.html
+  tablet:
+    - errorpage.html
+  desktop:
+    - errorpage.html
+
diff --git a/data/pages/home/home.css → main/data/pages/home/home.css b/data/pages/home/home.css → main/data/pages/home/home.css
diff --git a/data/pages/home/home.html → main/data/pages/home/home.html b/data/pages/home/home.html → main/data/pages/home/home.html
diff --git a/data/pages/home/home.yml → main/data/pages/home/home.yml b/data/pages/home/home.yml → main/data/pages/home/home.yml
diff --git a/data/pages/login/login.css → main/data/pages/login/login.css b/data/pages/login/login.css → main/data/pages/login/login.css
diff --git a/data/pages/login/login.html → main/data/pages/login/login.html b/data/pages/login/login.html → main/data/pages/login/login.html
diff --git a/data/pages/login/login.yml → main/data/pages/login/login.yml b/data/pages/login/login.yml → main/data/pages/login/login.yml
diff --git a/data/templates/v2/device.jpg → main/data/templates/v2/device.jpg b/data/templates/v2/device.jpg → main/data/templates/v2/device.jpg
diff --git a/data/templates/v2/layout.css → main/data/templates/v2/layout.css b/data/templates/v2/layout.css → main/data/templates/v2/layout.css
diff --git a/data/templates/v2/layout.html → main/data/templates/v2/layout.html b/data/templates/v2/layout.html → main/data/templates/v2/layout.html
diff --git a/data/templates/v2/mobile~device.jpg → main/data/templates/v2/mobile~device.jpg b/data/templates/v2/mobile~device.jpg → main/data/templates/v2/mobile~device.jpg
diff --git a/data/templates/v2/tablet~device.jpg → main/data/templates/v2/tablet~device.jpg b/data/templates/v2/tablet~device.jpg → main/data/templates/v2/tablet~device.jpg
diff --git a/data/templates/v2/v2.yml → main/data/templates/v2/v2.yml b/data/templates/v2/v2.yml → main/data/templates/v2/v2.yml