Compare commits

..

2 Commits

Author SHA1 Message Date
6a7584d628 Merge branch 'main' into pongo-templating 2023-10-26 13:28:20 +02:00
e92a56c393 Initial 2023-10-26 13:25:10 +02:00
8 changed files with 45 additions and 14 deletions

View File

@ -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
}

View File

@ -1,4 +1,4 @@
{{ title := "Hello world" }}
{% set title = "Hello world" %}
<!DOCTYPE html>
<html lang="en">
@ -26,7 +26,7 @@
</ul>
<main>
{{ yield mainContent() }}
{% block mainContent %}{% endblock %}
</main>
</div>
</body>

View File

@ -1,4 +1,4 @@
{{ block usersTable(users) }}
{% macro usersTable(users) %}
<table class="table table-hover">
<thead>
<tr>
@ -9,16 +9,16 @@
</tr>
</thead>
<tbody>
{{ range users }}
{% for user in users %}
<tr>
<td>
<a href="/users/{{ .Id }}">{{ .Id }}</a>
<a href="/users/{{ user.Id }}">{{ user.Id }}</a>
</td>
<td>{{ .FirstName }}</td>
<td>{{ .LastName }}</td>
<td>{{ .Email }}</td>
<td>{{ user.FirstName }}</td>
<td>{{ user.LastName }}</td>
<td>{{ user.Email }}</td>
</tr>
{{ end }}
{% endfor %}
</tbody>
</table>
{{ end }}
{% endmacro %}

View File

@ -0,0 +1,28 @@
{% extends "/base/base.html" %}
{% block mainContent %}
<div class="row">
<form class="mb-5 col-4 ms-auto me-auto" method="post" action="/">
<div class="mb-3">
<label class="form-label">Email address</label>
<input type="email" name="email" class="form-control" value="edkirin@gmail.com">
</div>
<div class="mb-3">
<label class="form-label">Password</label>
<input type="text" name="password" class="form-control" value="tralala">
</div>
<button type="submit" class="btn btn-success">
Submit
</button>
</form>
</div>
<div class="lead">
<p>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.</p>
<p>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.</p>
</div>
{% endblock %}

View File

@ -1,5 +1,5 @@
{{ extends "/base/base.jet" }}
{{ import "/components/table_component.jet" }}
{{ extends "/base/base.html" }}
{{ import "/components/table_component.html" }}
{{ block mainContent() }}

View File

@ -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
}

1
go.mod
View File

@ -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

2
go.sum
View File

@ -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=