Skip to content

Commit

Permalink
Revert "fix example todo"
Browse files Browse the repository at this point in the history
This reverts commit a2b286e.
  • Loading branch information
maddalax committed Sep 26, 2024
1 parent a2b286e commit 10de2f2
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 40 deletions.
24 changes: 10 additions & 14 deletions examples/todo-list/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package main

import (
"embed"
"github.com/labstack/echo/v4"
"github.com/maddalax/htmgo/framework/h"
"github.com/maddalax/htmgo/framework/service"
_ "github.com/mattn/go-sqlite3"
"io/fs"
"net/http"
"todolist/__htmgo"
"todolist/ent"
"todolist/infrastructure/db"
Expand All @@ -22,22 +22,18 @@ func main() {
return db.Provide()
})

sub, err := fs.Sub(StaticAssets, "assets/dist")

if err != nil {
panic(err)
}

h.Start(h.AppOpts{
ServiceLocator: locator,
LiveReload: true,
Register: func(app *h.App) {

sub, err := fs.Sub(StaticAssets, "assets/dist")

if err != nil {
panic(err)
}

http.FileServerFS(sub)

app.Router.Handle("/public/*", http.StripPrefix("/public", http.FileServerFS(sub)))

__htmgo.Register(app.Router)
Register: func(e *echo.Echo) {
e.StaticFS("/public", sub)
__htmgo.Register(e)
},
})
}
4 changes: 0 additions & 4 deletions examples/todo-list/pages/base/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ func RootPage(children ...h.Ren) h.Ren {
return h.Html(
h.HxExtension(h.BaseExtensions()),
h.Head(
h.Meta("viewport", "width=device-width, initial-scale=1"),
h.Meta("title", "htmgo todo mvc"),
h.Meta("description", "an example of how to build a todo mvc app with htmgo"),
h.Meta("charset", "utf-8"),
h.Link("/public/main.css", "stylesheet"),
h.Script("/public/htmgo.js"),
),
Expand Down
4 changes: 2 additions & 2 deletions examples/todo-list/partials/task/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ func CompleteAllIcon(list []*ent.Task) *h.Element {
}))

return h.Div(
h.ClassX("absolute top-1 left-5 p-2 rotate-90 text-3xl cursor-pointer", map[string]bool{
h.ClassX("absolute top-0 left-0 p-4 rotate-90 text-2xl cursor-pointer", map[string]bool{
"text-slate-400": notCompletedCount > 0,
}), h.Text("›"),
}), h.Text(""),
h.PostPartialWithQs(CompleteAll, h.NewQs("complete", h.Ternary(notCompletedCount > 0, "true", "false"))),
)
}
Expand Down
4 changes: 0 additions & 4 deletions framework/h/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ type RequestContext struct {
kv map[string]interface{}
}

func (c *RequestContext) QueryParam(key string) string {
return c.Request.URL.Query().Get(key)
}

func (c *RequestContext) Set(key string, value interface{}) {
if c.kv == nil {
c.kv = make(map[string]interface{})
Expand Down
5 changes: 1 addition & 4 deletions framework/h/qs.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (q *Qs) ToString() string {

func GetQueryParam(ctx *RequestContext, key string) string {
value, ok := ctx.URL.Query()[key]
if value == nil || !ok {
if !ok {
current := ctx.currentBrowserUrl
if current != "" {
u, err := url.Parse(current)
Expand All @@ -59,9 +59,6 @@ func GetQueryParam(ctx *RequestContext, key string) string {
}
}
}
if len(value) == 0 {
return ""
}
return value[0]
}

Expand Down
22 changes: 10 additions & 12 deletions templates/starter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package main

import (
"embed"
"github.com/labstack/echo/v4"
"github.com/maddalax/htmgo/framework/h"
"github.com/maddalax/htmgo/framework/service"
"io/fs"
"net/http"
"starter-template/__htmgo"
)

Expand All @@ -15,20 +15,18 @@ var StaticAssets embed.FS
func main() {
locator := service.NewLocator()

sub, err := fs.Sub(StaticAssets, "assets/dist")

if err != nil {
panic(err)
}

h.Start(h.AppOpts{
ServiceLocator: locator,
LiveReload: true,
Register: func(app *h.App) {
sub, err := fs.Sub(StaticAssets, "assets/dist")

if err != nil {
panic(err)
}

http.FileServerFS(sub)

app.Router.Handle("/public/*", http.StripPrefix("/public", http.FileServerFS(sub)))
__htmgo.Register(app.Router)
Register: func(e *echo.Echo) {
e.StaticFS("/public", sub)
__htmgo.Register(e)
},
})
}

0 comments on commit 10de2f2

Please sign in to comment.