diff --git a/app/main.go b/app/main.go index 0a695da..6022fdf 100644 --- a/app/main.go +++ b/app/main.go @@ -87,7 +87,7 @@ func createApp() *iris.Application { app.Logger().SetLevel(common.Config.Application.LogLevel) app.Use(sessionsEngine.Handler()) app.UseRouter(accessLog.Handler) - app.RegisterView(iris.Jet("./app/templates", ".jet").Reload(true)) + app.RegisterView(iris.Django("./app/templates", ".html").Reload(true)) views.CreateRouter(app) return app } diff --git a/app/templates/base/base.jet b/app/templates/base/base.html similarity index 91% rename from app/templates/base/base.jet rename to app/templates/base/base.html index 62a0c12..65bc0cf 100644 --- a/app/templates/base/base.jet +++ b/app/templates/base/base.html @@ -1,4 +1,4 @@ -{{ title := "Hello world" }} +{% set title = "Hello world" %} @@ -26,7 +26,7 @@
- {{ yield mainContent() }} + {% block mainContent %}{% endblock %}
diff --git a/app/templates/components/table_component.jet b/app/templates/components/table_component.html similarity index 53% rename from app/templates/components/table_component.jet rename to app/templates/components/table_component.html index 79599b2..657fb15 100644 --- a/app/templates/components/table_component.jet +++ b/app/templates/components/table_component.html @@ -1,4 +1,4 @@ -{{ block usersTable(users) }} +{% macro usersTable(users) %} @@ -9,16 +9,16 @@ - {{ range users }} + {% for user in users %} - - - + + + - {{ end }} + {% endfor %}
- {{ .Id }} + {{ user.Id }} {{ .FirstName }}{{ .LastName }}{{ .Email }}{{ user.FirstName }}{{ user.LastName }}{{ user.Email }}
-{{ end }} +{% endmacro %} diff --git a/app/templates/pages/index.html b/app/templates/pages/index.html new file mode 100644 index 0000000..d7235ab --- /dev/null +++ b/app/templates/pages/index.html @@ -0,0 +1,28 @@ +{% extends "/base/base.html" %} + + +{% block mainContent %} + +
+
+
+ + +
+
+ + +
+ + +
+
+ +
+

Bacon ipsum dolor amet leberkas kevin meatball pork loin beef ribs prosciutto, turducken bacon bresaola tri-tip. Strip steak flank shankle, sirloin short ribs shoulder meatball pork chop kevin ribeye jowl ham pork belly turducken jerky. Flank tongue short loin ham hock brisket turducken tail filet mignon cupim. Pork capicola buffalo kevin jowl chicken. Filet mignon brisket pig, landjaeger sausage cow fatback drumstick chicken buffalo tenderloin spare ribs.

+

Swine shankle porchetta pancetta. Buffalo chicken turducken ground round kevin shoulder, salami pig t-bone beef ribs tri-tip tongue pork belly doner. Landjaeger meatloaf short loin biltong. Alcatra tongue shankle, tri-tip pancetta porchetta tenderloin corned beef pastrami rump. Bresaola chislic beef kielbasa sausage, ball tip burgdoggen boudin capicola short loin tenderloin buffalo landjaeger.

+
+ +{% endblock %} diff --git a/app/templates/pages/index.jet b/app/templates/pages/index.html.bup similarity index 95% rename from app/templates/pages/index.jet rename to app/templates/pages/index.html.bup index 0b8a27e..75260fb 100644 --- a/app/templates/pages/index.jet +++ b/app/templates/pages/index.html.bup @@ -1,5 +1,5 @@ -{{ extends "/base/base.jet" }} -{{ import "/components/table_component.jet" }} +{{ extends "/base/base.html" }} +{{ import "/components/table_component.html" }} {{ block mainContent() }} diff --git a/app/views/index.go b/app/views/index.go index 545de7f..0b11c81 100644 --- a/app/views/index.go +++ b/app/views/index.go @@ -7,7 +7,7 @@ import ( ) func GetIndexPage(ctx iris.Context) { - if err := ctx.View("pages/index.jet"); err != nil { + if err := ctx.View("pages/index.html"); err != nil { showError(ctx, err) return } diff --git a/go.mod b/go.mod index f44610b..639df6d 100644 --- a/go.mod +++ b/go.mod @@ -23,6 +23,7 @@ require ( github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fatih/structs v1.1.0 // indirect github.com/flosch/pongo2/v4 v4.0.2 // indirect + github.com/flosch/pongo2/v6 v6.0.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/gomarkdown/markdown v0.0.0-20230922112808-5421fefb8386 // indirect github.com/google/uuid v1.3.1 // indirect diff --git a/go.sum b/go.sum index cad4b7f..47038a8 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= +github.com/flosch/pongo2/v6 v6.0.0 h1:lsGru8IAzHgIAw6H2m4PCyleO58I40ow6apih0WprMU= +github.com/flosch/pongo2/v6 v6.0.0/go.mod h1:CuDpFm47R0uGGE7z13/tTlt1Y6zdxvr2RLT5LJhsHEU= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=