gromer

git clone https://pyrossh.dev/repos/gromer.git

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.

3c331503 — Peter John

improve example

Files changed (24) hide show

_example/assets/js/htmx.json-enc.js +0 -12
_example/components/header.go +0 -65
_example/components/page.go +0 -2
_example/components/todo.go +17 -5
_example/containers/TodoCount.go +33 -0
_example/containers/TodoList.go +36 -0
_example/main.go +7 -19
_example/makefile +0 -1
_example/pages/api/recover/get.go +0 -17
_example/pages/api/todos/_todoId_/complete/post.go +0 -22
_example/pages/api/todos/_todoId_/delete.go +0 -19
_example/pages/api/todos/_todoId_/get.go +0 -15
_example/pages/api/todos/get.go +0 -39
_example/pages/api/todos/post.go +0 -27
_example/pages/get.go +36 -2
_example/pages/post.go +72 -0
_example/pages/todos/get.go +0 -69
_example/pages/todos/post.go +0 -20
_example/services/todo.go +0 -77
_example/services/todos/todo.go +103 -0
cmd/gromer/main.go +26 -18
handlebars/template.go +4 -0
http.go +71 -8
readme.md +5 -1

_example/assets/js/htmx.json-enc.js DELETED Viewed

@@ -1,12 +0,0 @@
-htmx.defineExtension('json-enc', {
-  onEvent: function (name, evt) {
-      if (name === "htmx:configRequest") {
-          evt.detail.headers['Content-Type'] = "application/json";
-      }
-  },
-  encodeParameters : function(xhr, parameters, elt) {
-      xhr.overrideMimeType('text/json');
-      return (JSON.stringify(parameters));
-  }
-});

_example/components/header.go DELETED Viewed

@@ -1,65 +0,0 @@
-package components
-import (
-	. "github.com/pyros2097/gromer/handlebars"
-)
-var _ = Css(`
-`)
-func Header() *Template {
-	return Html(`
-		<header>
-			<nav class="navbar" role="navigation" aria-label="main navigation">
-				<div class="navbar-brand">
-					<a class="navbar-item" href="https://bulma.io">
-						<img src="https://bulma.io/images/bulma-logo.png" width="112" height="28">
-					</a>
-					<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
-						<span aria-hidden="true"></span>
-						<span aria-hidden="true"></span>
-						<span aria-hidden="true"></span>
-					</a>
-				</div>
-				<div id="navbarBasicExample" class="navbar-menu">
-					<div class="navbar-start">
-						<a class="navbar-item" href="/">
-							Home
-						</a>
-						<a class="navbar-item" href="/about">
-							About
-						</a>
-						<a class="navbar-item" href="/clock">
-							Clock
-						</a>
-						<a class="navbar-item" href="/counter">
-							Counter
-						</a>
-						<a class="navbar-item" href="/api">
-							API
-						</a>
-					</div>
-					<div class="navbar-end">
-						<div class="navbar-item">
-							<div class="buttons">
-								<a class="button is-primary">
-									<strong>Sign up</strong>
-								</a>
-								<a class="button is-light">
-									Log in
-								</a>
-							</div>
-						</div>
-					</div>
-				</div>
-			</nav>
-		</header>
-	`)
-}

_example/components/page.go CHANGED Viewed

@@ -30,7 +30,6 @@ func Page(props PageProps) *Template {
 					<link rel="stylesheet" href="{{ todoCssUrl }}" />
 					<link rel="stylesheet" href="{{ stylesCssUrl }}" />
 					<script src="{{ htmxJsUrl }}"></script>
-					<script src="{{ htmxJsonUrl }}"></script>
 					<script src="{{ alpineJsUrl }}" defer=""></script>
 			</head>
 			<body>
@@ -42,7 +41,6 @@ func Page(props PageProps) *Template {
 		"todoCssUrl", gromer.GetAssetUrl(assets.FS, "css/todo.css"),
 		"stylesCssUrl", gromer.GetStylesUrl(),
 		"htmxJsUrl", gromer.GetAssetUrl(assets.FS, "js/htmx@1.7.0.js"),
-		"htmxJsonUrl", gromer.GetAssetUrl(assets.FS, "js/htmx.json-enc.js"),
 		"alpineJsUrl", gromer.GetAssetUrl(assets.FS, "js/alpinejs@3.9.6.js"),
 	)
 }

_example/components/todo.go CHANGED Viewed

@@ -1,21 +1,33 @@
 package components
 import (
-	"github.com/pyros2097/gromer/_example/services"
+	"github.com/pyros2097/gromer/_example/services/todos"
 	. "github.com/pyros2097/gromer/handlebars"
 )
+var _ = Css(`
+`)
 type TodoProps struct {
-	Todo *services.Todo `json:"todo"`
+	Todo *todos.Todo `json:"todo"`
 }
 func Todo(props TodoProps) *Template {
 	return Html(`
 		<li id="todo-{{ props.Todo.ID }}" {{#if props.Todo.Completed }} class="completed" {{/if}}>
 			<div class="view">
-				<input class="toggle" hx-post="/api/todos/{{ props.Todo.ID }}/complete" type="checkbox" {{#if props.Todo.Completed }} checked="" {{/if}} hx-target="#todo-{{ props.Todo.ID }}" hx-swap="outerHTML">
-				<label hx-get="/todos/edit/{{ props.Todo.ID }}" hx-target="#todo-{{ props.Todo.ID }}" hx-swap="outerHTML">{{ props.Todo.Text }}</label>
-				<button class="destroy" hx-delete="/api/todos/{{ props.Todo.ID }}" hx-target="#todo-{{ props.Todo.ID }}" hx-swap="delete"></button>
+				<form  hx-target="#todo-{{ props.Todo.ID }}" hx-swap="outerHTML">
+					<input type="hidden" name="intent" value="complete" />
+					<input type="hidden" name="id" value="{{ props.Todo.ID }}" />
+					<input hx-post="/" class="checkbox" type="checkbox" {{#if props.Todo.Completed }} checked="" {{/if}} />
+				</form>
+				<label>{{ props.Todo.Text }}</label>
+				<!-- <label hx-get="/todos/edit/{{ props.Todo.ID }}" hx-target="#todo-{{ props.Todo.ID }}" hx-swap="outerHTML">{{ props.Todo.Text }}</label> -->
+				<form hx-post="/" hx-target="#todo-{{ props.Todo.ID }}" hx-swap="delete">
+					<input type="hidden" name="intent" value="delete" />
+					<input type="hidden" name="id" value="{{ props.Todo.ID }}" />
+					<button class="destroy"></button>
+				</form>
 			</div>
 		</li>
 	`)

_example/containers/TodoCount.go ADDED Viewed

@@ -0,0 +1,33 @@
+package containers
+import (
+	"context"
+	. "github.com/pyros2097/gromer"
+	"github.com/pyros2097/gromer/_example/services/todos"
+	. "github.com/pyros2097/gromer/handlebars"
+)
+var _ = Css(`
+`)
+type TodoCountProps struct {
+	Page   int    `json:"page"`
+	Filter string `json:"filter"`
+}
+func TodoCount(ctx context.Context, props TodoCountProps) (*Template, error) {
+	index := Default(props.Page, 1)
+	todos, err := todos.GetAllTodo(ctx, todos.GetAllTodoParams{
+		Filter: props.Filter,
+		Limit:  index,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return Html(`
+		<span class="todo-count" id="todo-count" hx-swap-oob="true">
+			<strong>{{ count }}</strong> item left
+		</span>
+	`).Prop("count", len(todos)), nil
+}

_example/containers/TodoList.go ADDED Viewed

@@ -0,0 +1,36 @@
+package containers
+import (
+	"context"
+	. "github.com/pyros2097/gromer"
+	"github.com/pyros2097/gromer/_example/services/todos"
+	. "github.com/pyros2097/gromer/handlebars"
+)
+var _ = Css(`
+`)
+type TodoListProps struct {
+	ID     string `json:"id"`
+	Page   int    `json:"page"`
+	Filter string `json:"filter"`
+}
+func TodoList(ctx context.Context, props TodoListProps) (*Template, error) {
+	index := Default(props.Page, 1)
+	todos, err := todos.GetAllTodo(ctx, todos.GetAllTodoParams{
+		Filter: props.Filter,
+		Limit:  index,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return Html(`
+		<ul id="todo-list" class="todo-list">
+			{{#each todos as |todo|}}
+				{{#Todo todo=todo}}{{/Todo}}
+			{{/each}}
+		</ul>
+	`).Prop("todos", todos), nil
+}

_example/main.go CHANGED Viewed

@@ -2,8 +2,6 @@
 package main
 import (
-	"os"
 	"github.com/gorilla/mux"
 	"github.com/pyros2097/gromer"
 	"github.com/rs/zerolog/log"
@@ -11,26 +9,23 @@ import (
 	"github.com/pyros2097/gromer/_example/assets"
 	"github.com/pyros2097/gromer/_example/components"
+	"github.com/pyros2097/gromer/_example/containers"
 	"github.com/pyros2097/gromer/_example/pages/404"
 	"github.com/pyros2097/gromer/_example/pages"
 	"github.com/pyros2097/gromer/_example/pages/about"
-	"github.com/pyros2097/gromer/_example/pages/api/recover"
-	"github.com/pyros2097/gromer/_example/pages/api/todos"
-	"github.com/pyros2097/gromer/_example/pages/api/todos/_todoId_"
-	"github.com/pyros2097/gromer/_example/pages/api/todos/_todoId_/complete"
-	"github.com/pyros2097/gromer/_example/pages/todos"
 )
 func init() {
-	gromer.RegisterComponent(components.Header)
 	gromer.RegisterComponent(components.Page)
 	gromer.RegisterComponent(components.Todo)
+	gromer.RegisterContainer(containers.TodoCount)
+	gromer.RegisterContainer(containers.TodoList)
 }
 func main() {
-	port := os.Getenv("PORT")
 	baseRouter := mux.NewRouter()
 	baseRouter.Use(gromer.LogMiddleware)
@@ -44,25 +39,18 @@ func main() {
 	pageRouter := baseRouter.NewRoute().Subrouter()
 	gromer.ApiExplorerRoute(pageRouter, "/explorer")
 	gromer.Handle(pageRouter, "GET", "/", pages.GET)
+	gromer.Handle(pageRouter, "POST", "/", pages.POST)
 	gromer.Handle(pageRouter, "GET", "/about", about.GET)
-	gromer.Handle(pageRouter, "GET", "/todos", todos_page.GET)
-	gromer.Handle(pageRouter, "POST", "/todos", todos_page.POST)
 	apiRouter := baseRouter.NewRoute().Subrouter()
 	apiRouter.Use(gromer.CorsMiddleware)
-	gromer.Handle(apiRouter, "GET", "/api/recover", recover.GET)
-	gromer.Handle(apiRouter, "GET", "/api/todos", todos.GET)
-	gromer.Handle(apiRouter, "POST", "/api/todos", todos.POST)
-	gromer.Handle(apiRouter, "DELETE", "/api/todos/{todoId}", todos_todoId_.DELETE)
-	gromer.Handle(apiRouter, "GET", "/api/todos/{todoId}", todos_todoId_.GET)
-	gromer.Handle(apiRouter, "POST", "/api/todos/{todoId}/complete", todos_complete.POST)
-	log.Info().Msg("http server listening on http://localhost:"+port)
+	log.Info().Msg("http server listening on http://localhost:3000")
 	srv := server.New(baseRouter, nil)
-	if err := srv.ListenAndServe(":"+port); err != nil {
+	if err := srv.ListenAndServe(":3000"); err != nil {
 		log.Fatal().Stack().Err(err).Msg("failed to listen")
 	}
 }

_example/makefile CHANGED Viewed

@@ -5,7 +5,6 @@ setup:
 update:
 	gromer -pkg github.com/pyros2097/gromer/_example
-run: export PORT=3000
 run:
 	gow run main.go

_example/pages/api/recover/get.go DELETED Viewed

@@ -1,17 +0,0 @@
-package recover
-import (
-	"context"
-	"fmt"
-)
-type GetParams struct {
-	Limit int `json:"limit"`
-}
-func GET(ctx context.Context, params GetParams) (*GetParams, int, error) {
-	arr := []string{}
-	v := arr[55]
-	fmt.Printf("%s", v)
-	return &params, 200, nil
-}

_example/pages/api/todos/_todoId_/complete/post.go DELETED Viewed

@@ -1,22 +0,0 @@
-package todos_complete
-import (
-	"context"
-	todos_todoId_ "github.com/pyros2097/gromer/_example/pages/api/todos/_todoId_"
-	"github.com/pyros2097/gromer/_example/services"
-)
-func POST(ctx context.Context, id string) (*services.Todo, int, error) {
-	_, status, err := todos_todoId_.GET(ctx, id)
-	if err != nil {
-		return nil, status, err
-	}
-	todo, err := services.UpdateTodo(ctx, id, services.UpdateTodoParams{
-		Completed: true,
-	})
-	if err != nil {
-		return nil, 500, err
-	}
-	return todo, 200, nil
-}

_example/pages/api/todos/_todoId_/delete.go DELETED Viewed

@@ -1,19 +0,0 @@
-package todos_todoId_
-import (
-	"context"
-	"github.com/pyros2097/gromer/_example/services"
-)
-func DELETE(ctx context.Context, id string) (string, int, error) {
-	_, status, err := GET(ctx, id)
-	if err != nil {
-		return "", status, err
-	}
-	_, err = services.DeleteTodo(ctx, id)
-	if err != nil {
-		return id, 500, err
-	}
-	return id, 200, nil
-}

_example/pages/api/todos/_todoId_/get.go DELETED Viewed

@@ -1,15 +0,0 @@
-package todos_todoId_
-import (
-	"context"
-	"github.com/pyros2097/gromer/_example/services"
-)
-func GET(ctx context.Context, id string) (*services.Todo, int, error) {
-	todo, err := services.GetTodo(ctx, id)
-	if err != nil {
-		return nil, 500, err
-	}
-	return todo, 200, nil
-}

_example/pages/api/todos/get.go DELETED Viewed

@@ -1,39 +0,0 @@
-package todos
-import (
-	"context"
-	. "github.com/pyros2097/gromer"
-	"github.com/pyros2097/gromer/_example/services"
-)
-type GetParams struct {
-	Limit  int    `json:"limit"`
-	Filter string `json:"filter"`
-}
-func GET(ctx context.Context, params GetParams) ([]*services.Todo, int, error) {
-	limit := Default(params.Limit, 10)
-	todos := services.GetAllTodo(ctx, services.GetAllTodoParams{
-		Limit: limit,
-	})
-	if params.Filter == "completed" {
-		newTodos := []*services.Todo{}
-		for _, v := range todos {
-			if v.Completed {
-				newTodos = append(newTodos, v)
-			}
-		}
-		return newTodos, 200, nil
-	}
-	if params.Filter == "active" {
-		newTodos := []*services.Todo{}
-		for _, v := range todos {
-			if !v.Completed {
-				newTodos = append(newTodos, v)
-			}
-		}
-		return newTodos, 200, nil
-	}
-	return todos, 200, nil
-}

_example/pages/api/todos/post.go DELETED Viewed

@@ -1,27 +0,0 @@
-package todos
-import (
-	"context"
-	"time"
-	"github.com/google/uuid"
-	"github.com/pyros2097/gromer/_example/services"
-)
-type PostParams struct {
-	Text string `json:"text"`
-}
-func POST(ctx context.Context, b PostParams) (*services.Todo, int, error) {
-	todo, err := services.CreateTodo(ctx, services.Todo{
-		ID:        uuid.New().String(),
-		Text:      b.Text,
-		Completed: false,
-		CreatedAt: time.Now(),
-		UpdatedAt: time.Now(),
-	})
-	if err != nil {
-		return nil, 500, err
-	}
-	return todo, 200, nil
-}

_example/pages/get.go CHANGED Viewed

@@ -8,14 +8,48 @@ import (
 )
 type GetParams struct {
+	Page   int    `json:"page"`
+	Filter string `json:"filter"`
 }
 func GET(ctx context.Context, params GetParams) (HtmlContent, int, error) {
 	return Html(`
 		{{#Page title="gromer example"}}
+			<section class="todoapp">
+				<header class="header">
+					<h1>todos</h1>
+					<form hx-post="/" hx-target="#todo-list" hx-swap="afterbegin" _="on htmx:afterOnLoad set #text.value to ''">
+						<input type="hidden" name="intent" value="create" />
+						<input class="new-todo" id="text" name="text" placeholder="What needs to be done?" autofocus="false" autocomplete="off">
+					</form>
-			{{#Header}}{{/Header}}
+				</header>
+				<section class="main">
+					<input class="toggle-all" id="toggle-all" type="checkbox">
+					<label for="toggle-all">Mark all as complete</label>
+					{{#TodoList id="todo-list" page=page filter=filter }}{{/TodoList}}
+				</section>
+				<footer class="footer">
+					{{#TodoCount page=page filter=filter}}{{/TodoCount}}
+					<ul class="filters">
-			Home Page
+						<li>
+							<a href="?filter=all">All</a>
+						</li>
+						<li>
+							<a href="?filter=active">Active</a>
+						</li>
+						<li>
+							<a href="?filter=completed">Completed</a>
+						</li>
+					</ul>
+					<form hx-target="#todo-list" hx-post="/">
+						<input type="hidden" name="intent" value="clear_completed" />
+						<button type="submit" class="clear-completed" >Clear completed</button>
+					</form>
+				</footer>
+			</section>
 		{{/Page}}
 		`).
+		Prop("page", params.Page).
+		Prop("filter", params.Filter).
 		Render()
 }

_example/pages/post.go ADDED Viewed

@@ -0,0 +1,72 @@
+package pages
+import (
+	"context"
+	"fmt"
+	_ "github.com/pyros2097/gromer/_example/components"
+	"github.com/pyros2097/gromer/_example/services/todos"
+	. "github.com/pyros2097/gromer/handlebars"
+)
+type PostParams struct {
+	Intent string `json:"intent"`
+	ID     string `json:"id"`
+	Text   string `json:"text"`
+}
+func POST(ctx context.Context, params PostParams) (HtmlContent, int, error) {
+	if params.Intent == "clear_completed" {
+		allTodos, err := todos.GetAllTodo(ctx, todos.GetAllTodoParams{
+			Filter: "all",
+			Limit:  1000,
+		})
+		if err != nil {
+			return HtmlErr(500, err)
+		}
+		for _, t := range allTodos {
+			_, err := todos.DeleteTodo(ctx, t.ID)
+			if err != nil {
+				return HtmlErr(500, err)
+			}
+		}
+		return Html(`
+			{{#TodoList id="todo-list"}}{{/TodoList}}
+		`).Render()
+	} else if params.Intent == "create" {
+		todo, err := todos.CreateTodo(ctx, params.Text)
+		if err != nil {
+			return HtmlErr(500, err)
+		}
+		return Html(`
+			{{#Todo todo=todo}}{{/Todo}}
+			{{#TodoCount filter="all" page=1}}{{/TodoCount}}
+		`).
+			Prop("todo", todo).
+			Render()
+	} else if params.Intent == "delete" {
+		_, err := todos.DeleteTodo(ctx, params.ID)
+		if err != nil {
+			return HtmlErr(500, err)
+		}
+		return HtmlEmpty()
+	} else if params.Intent == "complete" {
+		todo, err := todos.GetTodo(ctx, params.ID)
+		if err != nil {
+			return HtmlErr(500, err)
+		}
+		_, err = todos.UpdateTodo(ctx, params.ID, todos.UpdateTodoParams{
+			Text:      todo.Text,
+			Completed: !todo.Completed,
+		})
+		if err != nil {
+			return HtmlErr(500, err)
+		}
+		return Html(`
+			{{#Todo todo=todo}}{{/Todo}}
+		`).
+			Prop("todo", todo).
+			Render()
+	}
+	return HtmlErr(404, fmt.Errorf("Intent not specified: %s", params.Intent))
+}

_example/pages/todos/get.go DELETED Viewed

@@ -1,69 +0,0 @@
-package todos_page
-import (
-	"context"
-	. "github.com/pyros2097/gromer"
-	_ "github.com/pyros2097/gromer/_example/components"
-	"github.com/pyros2097/gromer/_example/pages/api/todos"
-	. "github.com/pyros2097/gromer/handlebars"
-)
-type GetParams struct {
-	Filter string `json:"filter"`
-	Page   int    `json:"limit"`
-}
-func GET(ctx context.Context, params GetParams) (HtmlContent, int, error) {
-	index := Default(params.Page, 1)
-	todos, status, err := todos.GET(ctx, todos.GetParams{
-		Filter: params.Filter,
-		Limit:  index * 10,
-	})
-	if err != nil {
-		return HtmlErr(status, err)
-	}
-	return Html(`
-		{{#Page title="gromer example"}}
-			{{#Header}}{{/Header}}
-			<section class="todoapp">
-				<header class="header">
-					<h1>todos</h1>
-					<form hx-post="/todos" hx-target="#todo-list" hx-swap="afterbegin" hx-ext="json-enc" _="on htmx:afterOnLoad set #text.value to ''">
-						<input class="new-todo" id="text" name="text" placeholder="What needs to be done?" autofocus="false" autocomplete="off">
-					</form>
-				</header>
-				<section class="main">
-					<input class="toggle-all" id="toggle-all" type="checkbox">
-					<label for="toggle-all">Mark all as complete</label>
-					<ul id="todo-list" class="todo-list">
-						{{#each todos as |todo|}}
-							{{#Todo todo=todo}}{{/Todo}}
-						{{/each}}
-					</ul>
-				</section>
-				<footer class="footer">
-					<!-- This should be '0 items left' by default-->
-					<span class="todo-count" id="todo-count" hx-swap-oob="true">
-						<strong>1</strong> item left </span>
-					<!-- Remove this if you don't implement routing-->
-					<ul class="filters">
-						<li>
-							<a href="/todos?filter=all">All</a>
-						</li>
-						<li>
-							<a href="/todos?filter=active">Active</a>
-						</li>
-						<li>
-							<a href="/todos?filter=completed">Completed</a>
-						</li>
-					</ul>
-					<!-- Hidden if no completed items are left ↓-->
-					<button class="clear-completed" hx-post="/todos/clear-completed" hx-target="#todo-list">Clear completed</button>
-				</footer>
-			</section>
-		{{/Page}}
-		`).
-		Prop("todos", todos).
-		Render()
-}

_example/pages/todos/post.go DELETED Viewed

@@ -1,20 +0,0 @@
-package todos_page
-import (
-	"context"
-	"github.com/pyros2097/gromer/_example/pages/api/todos"
-	. "github.com/pyros2097/gromer/handlebars"
-)
-func POST(ctx context.Context, b todos.PostParams) (HtmlContent, int, error) {
-	todo, status, err := todos.POST(ctx, b)
-	if err != nil {
-		return HtmlErr(status, err)
-	}
-	return Html(`
-		{{#Todo todo=todo}}{{/Todo}}
-	`).
-		Prop("todo", todo).
-		Render()
-}

_example/services/todo.go DELETED Viewed

@@ -1,77 +0,0 @@
-// Code generated by sqlc. DO NOT EDIT.
-package services
-import (
-	"context"
-	"errors"
-	"time"
-)
-type Todo struct {
-	ID        string    `json:"id"`
-	Text      string    `json:"text"`
-	Completed bool      `json:"completed"`
-	CreatedAt time.Time `json:"createdAt"`
-	UpdatedAt time.Time `json:"updatedAt"`
-}
-var todos = []*Todo{}
-func CreateTodo(ctx context.Context, todo Todo) (*Todo, error) {
-	todos = append(todos, &todo)
-	return &todo, nil
-}
-type UpdateTodoParams struct {
-	Text      string    `json:"text"`
-	Completed bool      `json:"completed"`
-}
-func UpdateTodo(ctx context.Context, id string, params UpdateTodoParams) (*Todo, error) {
-	updateIndex := -1
-	for i, todo := range todos {
-		if todo.ID == id {
-			updateIndex = i
-		}
-	}
-	if updateIndex != -1 {
-		todos[updateIndex].Text = params.Text
-		todos[updateIndex].Completed = params.Completed
-		todos[updateIndex].UpdatedAt = time.Now()
-		return todos[updateIndex], nil
-	}
-	return nil, errors.New("Todo not found")
-}
-func DeleteTodo(ctx context.Context, id string) (string, error) {
-	deleteIndex := -1
-	for i, todo := range todos {
-		if todo.ID == id {
-			deleteIndex = i
-		}
-	}
-	if deleteIndex != -1 {
-		todos = append(todos[:deleteIndex], todos[deleteIndex+1:]...)
-		return id, nil
-	}
-	return "", errors.New("Todo not found")
-}
-func GetTodo(ctx context.Context, id string) (*Todo, error) {
-	for _, todo := range todos {
-		if todo.ID == id {
-			return todo, nil
-		}
-	}
-	return nil, errors.New("Todo not found")
-}
-type GetAllTodoParams struct {
-	Limit int `json:"limit"`
-}
-func GetAllTodo(ctx context.Context, params GetAllTodoParams) []*Todo {
-	return todos
-}

_example/services/todos/todo.go ADDED Viewed

@@ -0,0 +1,103 @@
+package todos
+import (
+	"context"
+	"errors"
+	"time"
+	"github.com/google/uuid"
+)
+type Todo struct {
+	ID        string    `json:"id"`
+	Text      string    `json:"text"`
+	Completed bool      `json:"completed"`
+	CreatedAt time.Time `json:"createdAt"`
+	UpdatedAt time.Time `json:"updatedAt"`
+}
+var globalTodos = []*Todo{}
+func CreateTodo(ctx context.Context, text string) (*Todo, error) {
+	todo := &Todo{
+		ID:        uuid.New().String(),
+		Text:      text,
+		Completed: false,
+		CreatedAt: time.Now(),
+		UpdatedAt: time.Now(),
+	}
+	globalTodos = append(globalTodos, todo)
+	return todo, nil
+}
+type UpdateTodoParams struct {
+	Text      string `json:"text"`
+	Completed bool   `json:"completed"`
+}
+func UpdateTodo(ctx context.Context, id string, params UpdateTodoParams) (*Todo, error) {
+	updateIndex := -1
+	for i, todo := range globalTodos {
+		if todo.ID == id {
+			updateIndex = i
+		}
+	}
+	if updateIndex != -1 {
+		globalTodos[updateIndex].Text = params.Text
+		globalTodos[updateIndex].Completed = params.Completed
+		globalTodos[updateIndex].UpdatedAt = time.Now()
+		return globalTodos[updateIndex], nil
+	}
+	return nil, errors.New("Todo not found")
+}
+func DeleteTodo(ctx context.Context, id string) (string, error) {
+	deleteIndex := -1
+	for i, todo := range globalTodos {
+		if todo.ID == id {
+			deleteIndex = i
+		}
+	}
+	if deleteIndex != -1 {
+		globalTodos = append(globalTodos[:deleteIndex], globalTodos[deleteIndex+1:]...)
+		return id, nil
+	}
+	return "", errors.New("Todo not found")
+}
+func GetTodo(ctx context.Context, id string) (*Todo, error) {
+	for _, todo := range globalTodos {
+		if todo.ID == id {
+			return todo, nil
+		}
+	}
+	return nil, errors.New("Todo not found")
+}
+type GetAllTodoParams struct {
+	Limit  int    `json:"limit"`
+	Filter string `json:"filter"`
+}
+func GetAllTodo(ctx context.Context, params GetAllTodoParams) ([]*Todo, error) {
+	// limit := Default(params.Limit, 10)
+	if params.Filter == "completed" {
+		newTodos := []*Todo{}
+		for _, v := range globalTodos {
+			if v.Completed {
+				newTodos = append(newTodos, v)
+			}
+		}
+		return newTodos, nil
+	}
+	if params.Filter == "active" {
+		newTodos := []*Todo{}
+		for _, v := range globalTodos {
+			if !v.Completed {
+				newTodos = append(newTodos, v)
+			}
+		}
+		return newTodos, nil
+	}
+	return globalTodos, nil
+}

cmd/gromer/main.go CHANGED Viewed

@@ -156,26 +156,31 @@ func main() {
 		}
 	}
 	componentNames := []string{}
+	containerNames := []string{}
+	for _, p := range []string{"components", "containers"} {
-	err = filepath.Walk("components",
+		err = filepath.Walk(p,
-		func(filesrc string, info os.FileInfo, err error) error {
+			func(filesrc string, info os.FileInfo, err error) error {
-			if err != nil {
+				if err != nil {
-				return err
+					return err
-			}
+				}
-			if !info.IsDir() {
+				if !info.IsDir() {
-				filename := strings.ReplaceAll(filepath.Base(filesrc), ".go", "")
+					filename := strings.ReplaceAll(filepath.Base(filesrc), ".go", "")
+					if p == "containers" {
+						containerNames = append(containerNames, strings.Title((filename)))
+					} else {
-				componentNames = append(componentNames, strings.Title((filename)))
+						componentNames = append(componentNames, strings.Title((filename)))
-			}
+					}
+				}
-			return nil
+				return nil
-		})
+			})
-	if err != nil {
+		if err != nil {
-		log.Fatal(err)
+			log.Fatal(err)
+		}
 	}
 	s, _, err := Html(`// Code generated by gromer. DO NOT EDIT.
 package main
 import (
-	"os"
 	"github.com/gorilla/mux"
 	"github.com/pyros2097/gromer"
 	"github.com/rs/zerolog/log"
@@ -183,6 +188,7 @@ import (
 	"{{ moduleName }}/assets"
 	"{{ moduleName }}/components"
+	"{{ moduleName }}/containers"
 	{{#if notFoundPkg}}"{{ moduleName }}/pages/404"{{/if}}
 	{{#each routeImports as |route| }}"{{ moduleName }}/pages{{ route.PkgPath }}"
 	{{/each}}
@@ -191,10 +197,11 @@ import (
 func init() {
 	{{#each componentNames as |name| }}gromer.RegisterComponent(components.{{ name }})
 	{{/each}}
+	{{#each containerNames as |name| }}gromer.RegisterContainer(containers.{{ name }})
+	{{/each}}
 }
 func main() {
-	port := os.Getenv("PORT")
 	baseRouter := mux.NewRouter()
 	baseRouter.Use(gromer.LogMiddleware)
 	{{#if notFoundPkg}}
@@ -216,9 +223,9 @@ func main() {
 	{{/each}}
-	log.Info().Msg("http server listening on http://localhost:"+port)
+	log.Info().Msg("http server listening on http://localhost:3000")
 	srv := server.New(baseRouter, nil)
-	if err := srv.ListenAndServe(":"+port); err != nil {
+	if err := srv.ListenAndServe(":3000"); err != nil {
 		log.Fatal().Stack().Err(err).Msg("failed to listen")
 	}
 }
@@ -228,6 +235,7 @@ func main() {
 		"apiRoutes", apiRoutes,
 		"routeImports", routeImports,
 		"componentNames", componentNames,
+		"containerNames", containerNames,
 		"notFoundPkg", notFoundPkg,
 		"tick", "`",
 	).Render()

handlebars/template.go CHANGED Viewed

@@ -111,6 +111,10 @@ func HtmlErr(status int, err error) (HtmlContent, int, error) {
 	return HtmlContent("ErrorPage/AccessDeniedPage/NotFoundPage based on status code"), status, err
 }
+func HtmlEmpty() (HtmlContent, int, error) {
+	return Html("").Render()
+}
 func Css(v string) CssContent {
 	stylesCss += CssContent(v)
 	return CssContent(v)

http.go CHANGED Viewed

@@ -114,6 +114,57 @@ func RegisterComponent(fn any, props ...string) {
 	})
 }
+func RegisterContainer(fn any, props ...string) {
+	name := getFunctionName(fn)
+	fnType := reflect.TypeOf(fn)
+	fnValue := reflect.ValueOf(fn)
+	handlebars.GlobalHelpers.Add(name, func(help handlebars.HelperContext) (template.HTML, error) {
+		args := []reflect.Value{reflect.ValueOf(context.TODO())}
+		var props any
+		if fnType.NumIn() > 1 {
+			structType := fnType.In(1)
+			instance := reflect.New(structType)
+			if structType.Kind() != reflect.Struct {
+				log.Fatal().Msgf("component '%s' props should be a struct", name)
+			}
+			rv := instance.Elem()
+			for i := 0; i < structType.NumField(); i++ {
+				if f := rv.Field(i); f.CanSet() {
+					jsonName := structType.Field(i).Tag.Get("json")
+					defaultValue := structType.Field(i).Tag.Get("default")
+					if jsonName == "children" {
+						s, err := help.Block()
+						if err != nil {
+							return "", err
+						}
+						f.Set(reflect.ValueOf(template.HTML(s)))
+					} else {
+						v := help.Context.Get(jsonName)
+						if v == nil {
+							f.Set(reflect.ValueOf(defaultValue))
+						} else {
+							f.Set(reflect.ValueOf(v))
+						}
+					}
+				}
+			}
+			args = append(args, rv)
+			props = rv.Interface()
+		}
+		res := fnValue.Call(args)
+		tpl := res[0].Interface().(*handlebars.Template)
+		// if res[1].Interface() != nil {
+		// show error in component
+		// }
+		tpl.Context.Set("props", props)
+		s, _, err := tpl.Render()
+		if err != nil {
+			return "", err
+		}
+		return template.HTML(s), nil
+	})
+}
 func RespondError(w http.ResponseWriter, status int, err error) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(status) // always write status last
@@ -178,21 +229,24 @@ func PerformRequest(route string, h interface{}, ctx interface{}, w http.Respons
 		if structType.Kind() != reflect.Struct {
 			log.Fatal().Msgf("router '%s' func final param should be a struct", route)
 		}
-		if r.Method == "POST" || r.Method == "PUT" || r.Method == "PATCH" {
-			// r.ParseForm()
-			// r.PostForm
+		method := r.Method
-			// if r.Header.Set("Content-Type") == ""
+		contentType := r.Header.Get("Content-Type")
+		if method == "GET" || ((method == "POST" || method == "PUT" || method == "PATCH") && contentType == "application/x-www-form-urlencoded") {
-			err := json.NewDecoder(r.Body).Decode(instance.Interface())
+			err := r.ParseForm()
 			if err != nil {
 				RespondError(w, 400, err)
 				return
 			}
-		} else if r.Method == "GET" {
 			rv := instance.Elem()
 			for i := 0; i < structType.NumField(); i++ {
 				if f := rv.Field(i); f.CanSet() {
 					jsonName := structType.Field(i).Tag.Get("json")
+					jsonValue := ""
+					if method == "GET" {
-					jsonValue := r.URL.Query().Get(jsonName)
+						jsonValue = r.URL.Query().Get(jsonName)
+					} else {
+						jsonValue = r.Form.Get(jsonName)
+					}
 					if f.Kind() == reflect.String {
 						f.SetString(jsonValue)
 					} else if f.Kind() == reflect.Int64 || f.Kind() == reflect.Int32 || f.Kind() == reflect.Int {
@@ -222,10 +276,19 @@ func PerformRequest(route string, h interface{}, ctx interface{}, w http.Respons
 							f.Set(reflect.ValueOf(v))
 						}
 					} else {
-						log.Fatal().Msgf("Uknown query param: '%s' '%s'", jsonName, jsonValue)
+						log.Fatal().Msgf("Uknown form param: '%s' '%s'", jsonName, jsonValue)
 					}
 				}
 			}
+		} else if (method == "POST" || method == "PUT" || method == "PATCH") && contentType == "application/json" {
+			err := json.NewDecoder(r.Body).Decode(instance.Interface())
+			if err != nil {
+				RespondError(w, 400, err)
+				return
+			}
+		} else {
+			RespondError(w, 400, fmt.Errorf("Illegal Content-Type tag found %s", contentType))
+			return
 		}
 		args = append(args, instance.Elem())
 	}

readme.md CHANGED Viewed

@@ -218,4 +218,8 @@ func main() {
 		log.Fatal().Stack().Err(err).Msg("failed to listen")
 	}
 }
-```
+```
+# TODO:
+Add inline css formatting
+ADd inline html formatting

~repos /gromer

git clone https://pyrossh.dev/repos/gromer.git

gromer is a framework and cli to build multipage web apps in golang using htmx and alpinejs.