Skip to content

Commit ad06d0e

Browse files
author
Prad N
committed
refactor: restructure application views into reusable blocks
1 parent 9d4311d commit ad06d0e

24 files changed

+215
-17
lines changed

‎.taskfile.dist.yml

+15-14
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
version: "3"
44
silent: true
55

6-
vars:
7-
NEXT_PATCH_VERSION:
8-
sh: cz bump --get-next --increment PATCH
9-
NEXT_MINOR_VERSION:
10-
sh: cz bump --get-next --increment MINOR
11-
PROJECT_VERSION:
12-
sh: cz version -p
13-
MILESTONE:
14-
sh: gh milestone list --json title,number --jq ".[]" | rg 'v{{.NEXT_MINOR_VERSION}}' | jq -r ".number"
15-
MILESTONE_TITLE:
16-
sh: gh milestone list --json title,number --jq ".[]" | rg 'v{{.NEXT_MINOR_VERSION}}' | jq -r ".title"
17-
MILESTONE_PROGRESS:
18-
sh: gh milestone list --json title,progressPercentage --jq ".[]" | rg 'v{{.NEXT_MINOR_VERSION}}' | jq -r ".progressPercentage"
19-
6+
# vars:
7+
# NEXT_PATCH_VERSION:
8+
# sh: cz bump --get-next --increment PATCH
9+
# NEXT_MINOR_VERSION:
10+
# sh: cz bump --get-next --increment MINOR
11+
# PROJECT_VERSION:
12+
# sh: cz version -p
13+
# MILESTONE:
14+
# sh: gh milestone list --json title,number --jq ".[]" | rg 'v{{.NEXT_MINOR_VERSION}}' | jq -r ".number"
15+
# MILESTONE_TITLE:
16+
# sh: gh milestone list --json title,number --jq ".[]" | rg 'v{{.NEXT_MINOR_VERSION}}' | jq -r ".title"
17+
# MILESTONE_PROGRESS:
18+
# sh: gh milestone list --json title,progressPercentage --jq ".[]" | rg 'v{{.NEXT_MINOR_VERSION}}' | jq -r ".progressPercentage"
19+
#
2020
tasks:
2121
default:
2222
cmds:
@@ -107,6 +107,7 @@ tasks:
107107

108108
gen:sqlc:
109109
internal: true
110+
dir: sink
110111
sources:
111112
- pkg/sink/query.sql
112113
- pkg/sink/schema.sql

‎app/views/auth/view.templ ‎app/blocks/authorize/components.templ

File renamed without changes.

‎app/views/auth/view_templ.go ‎app/blocks/authorize/components_templ.go

File renamed without changes.

‎app/views/auth/model.go ‎app/blocks/authorize/models.go

File renamed without changes.

‎app/blocks/errors/components.templ

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package errors
2+
3+
import "strconv"
4+
5+
templ View(code int) {
6+
<html>
7+
<head>
8+
<title>Error</title>
9+
</head>
10+
<body>
11+
<h1>Error</h1>
12+
<p>Code: { codeStr(code) }</p>
13+
</body>
14+
</html>
15+
}
16+
17+
func codeStr(code int) string {
18+
return strconv.Itoa(code)
19+
}

‎app/blocks/errors/components_templ.go

+59
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/blocks/errors/models.go

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package errors

‎app/views/claim/view.templ ‎app/blocks/login/components.templ

File renamed without changes.

‎app/views/claim/view_templ.go ‎app/blocks/login/components_templ.go

File renamed without changes.

‎app/views/claim/model.go ‎app/blocks/login/models.go

File renamed without changes.

‎app/blocks/register/components.templ

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package register
2+
3+
templ View() {
4+
<html>
5+
<head>
6+
<title>Sonr</title>
7+
</head>
8+
<body>
9+
<h1>Auth View</h1>
10+
</body>
11+
</html>
12+
}

‎app/blocks/register/components_templ.go

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/blocks/register/models.go

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package register

‎app/views/search/view.templ ‎app/blocks/search/components.templ

File renamed without changes.

‎app/views/search/view_templ.go ‎app/blocks/search/components_templ.go

File renamed without changes.

‎app/views/search/model.go ‎app/blocks/search/models.go

File renamed without changes.

‎app/views/wallet/view.templ ‎app/blocks/wallet/components.templ

File renamed without changes.

‎app/views/wallet/view_templ.go ‎app/blocks/wallet/components_templ.go

File renamed without changes.

‎app/views/wallet/model.go ‎app/blocks/wallet/models.go

File renamed without changes.

‎app/context/config.go ‎app/context/settings.go

File renamed without changes.

‎app/handlers/error_handler.go

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,34 @@
11
package handlers
22

3-
import "github.com/labstack/echo/v4"
3+
import (
4+
"github.com/a-h/templ"
5+
"github.com/labstack/echo/v4"
6+
"github.com/onsonr/motr/app/blocks/errors"
7+
"github.com/onsonr/motr/pkg/render"
8+
)
49

510
func ErrorManager() echo.HTTPErrorHandler {
611
return func(err error, c echo.Context) {
712
if he, ok := err.(*echo.HTTPError); ok {
813
c.Logger().Errorf("Error: %v", he.Message)
914
}
15+
RenderErrorView(c, err)
1016
}
1117
}
1218

13-
func RenderErrorView(c echo.Context, err error) error {
14-
return nil
19+
func RenderErrorView(c echo.Context, err error) {
20+
render.EchoTempl(c, getViewForError(err))
21+
}
22+
23+
func getViewForError(err error) templ.Component {
24+
switch err.(type) {
25+
case *echo.HTTPError:
26+
return getHTTPStatusCodeView(err.(*echo.HTTPError).Code)
27+
default:
28+
return errors.View(500)
29+
}
30+
}
31+
32+
func getHTTPStatusCodeView(code int) templ.Component {
33+
return errors.View(code)
1534
}

‎app/handlers/info_handler.go

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package handlers

‎app/handlers/redirect_handler.go

+16
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@ package handlers
22

33
import "github.com/labstack/echo/v4"
44

5+
//
6+
// █████████████████████████████████████████████████████████████
7+
// ██╔════════════╗█████████████████╔════════════╗██████████████
8+
// ██║ Register: ╠═══▶ Minted ████║ Register: ╠═══▶ Error ███
9+
// ██║ Success ║████ View ████║ Fail ║████ View ███
10+
// ██╚════════════╝█████████████████╚════════════╝██████████████
11+
// ██╔════════════╗█████████████████╔════════════╗██████████████
12+
// ██║ Login: ╠═══▶ Callback ███║ Login: ╠═══▶Callback██
13+
// ██║ Success ║████ Redirect ███║ Fail ║████ Error ██
14+
// ██╚════════════╝█████████████████╚════════════╝██████████████
15+
// ██╔════════════╗█████████████████╔════════════╗██████████████
16+
// ██║ Authorize: ╠═══▶ Callback ███║ Authorize: ╠═══▶Callback██
17+
// ██║ Granted ║████ Redirect ███║ Denied ║████ Error ██
18+
// ██╚════════════╝█████████████████╚════════════╝██████████████
19+
// █████████████████████████████████████████████████████████████
20+
521
// RedirectServiceCallback handles the authentication state and redirectes to the service's Callback URL
622
func RedirectServiceCallback(c echo.Context) error {
723
// TODO: Implement

‎pkg/render/render.go

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package render
2+
3+
import (
4+
"bytes"
5+
6+
"github.com/a-h/templ"
7+
"github.com/labstack/echo/v4"
8+
)
9+
10+
func EchoTempl(c echo.Context, cmp templ.Component) error {
11+
// Create a buffer to store the rendered HTML
12+
buf := &bytes.Buffer{}
13+
// Render the component to the buffer
14+
err := cmp.Render(c.Request().Context(), buf)
15+
if err != nil {
16+
return err
17+
}
18+
19+
// Set the content type
20+
c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTML)
21+
22+
// Write the buffered content to the response
23+
_, err = c.Response().Write(buf.Bytes())
24+
if err != nil {
25+
return err
26+
}
27+
c.Response().WriteHeader(200)
28+
return nil
29+
}

0 commit comments

Comments
 (0)