Tweak frontend
This commit is contained in:
@ -9,24 +9,47 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Document</title>
|
<title>Document</title>
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css">
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css">
|
||||||
|
<link rel="stylesheet" href="/static/styles.css">
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div class="container mt-3">
|
<header class="navbar">
|
||||||
<h1>{{ title }}</h1>
|
<div class="container">
|
||||||
|
<nav class="main navbar navbar-expand-lg">
|
||||||
<ul class="nav">
|
<div class="container-fluid">
|
||||||
|
<a class="navbar-brand" href="/">
|
||||||
|
<img src="/static/example.png" alt="">
|
||||||
|
</a>
|
||||||
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
|
||||||
|
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
|
||||||
|
aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||||
|
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a href="/" class="nav-link">Frontpage</a>
|
<a href="/" class='nav-link {{ if .activePage == "index" }}active{{ end }}'>
|
||||||
|
Frontpage
|
||||||
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a href="/users" class="nav-link">Users</a>
|
<a href="/users" class='nav-link {{ if .activePage == "users" }}active{{ end }}'>
|
||||||
|
Users
|
||||||
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a href="/about" class="nav-link">About</a>
|
<a href="/about" class='nav-link {{ if .activePage == "about" }}active{{ end }}'>
|
||||||
|
About
|
||||||
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="container mt-3">
|
||||||
<main>
|
<main>
|
||||||
{{ yield mainContent() }}
|
{{ yield mainContent() }}
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@ -4,9 +4,8 @@
|
|||||||
|
|
||||||
{{ block mainContent() }}
|
{{ block mainContent() }}
|
||||||
|
|
||||||
<div class="row mt-5">
|
<div class="row mt-5 mb-5">
|
||||||
<div class="col">
|
<form class="col-6" method="post" action="/">
|
||||||
<form method="post" action="/">
|
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label class="form-label">Email address</label>
|
<label class="form-label">Email address</label>
|
||||||
<input type="email" name="email" class="form-control" value="edkirin@gmail.com">
|
<input type="email" name="email" class="form-control" value="edkirin@gmail.com">
|
||||||
@ -20,11 +19,6 @@
|
|||||||
Submit
|
Submit
|
||||||
</button>
|
</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<img src="/static/sample.jpg" class="img-fluid" alt="">
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,6 @@
|
|||||||
|
|
||||||
<h3>Users</h3>
|
<h3>Users</h3>
|
||||||
|
|
||||||
{{ yield usersTable(users=users) }}
|
{{ yield usersTable(users=.users) }}
|
||||||
|
|
||||||
{{ end }}
|
{{ end }}
|
||||||
@ -3,7 +3,11 @@ package views
|
|||||||
import "github.com/kataras/iris/v12"
|
import "github.com/kataras/iris/v12"
|
||||||
|
|
||||||
func GetAboutPage(ctx iris.Context) {
|
func GetAboutPage(ctx iris.Context) {
|
||||||
if err := ctx.View("pages/about.jet"); err != nil {
|
vars := iris.Map{
|
||||||
|
"activePage": "about",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ctx.View("pages/about.jet", vars); err != nil {
|
||||||
showError(ctx, err)
|
showError(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,7 +7,11 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func GetIndexPage(ctx iris.Context) {
|
func GetIndexPage(ctx iris.Context) {
|
||||||
if err := ctx.View("pages/index.jet"); err != nil {
|
vars := iris.Map{
|
||||||
|
"activePage": "index",
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ctx.View("pages/index.jet", vars); err != nil {
|
||||||
showError(ctx, err)
|
showError(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,9 +27,12 @@ func GetUsersPage(ctx iris.Context) {
|
|||||||
isActive := true
|
isActive := true
|
||||||
users := userRepository.List(&repository.UserFilter{IsActive: &isActive}, &pagination, &ordering)
|
users := userRepository.List(&repository.UserFilter{IsActive: &isActive}, &pagination, &ordering)
|
||||||
|
|
||||||
ctx.ViewData("users", users)
|
vars := iris.Map{
|
||||||
|
"activePage": "users",
|
||||||
|
"users": users,
|
||||||
|
}
|
||||||
|
|
||||||
if err := ctx.View("pages/users.jet"); err != nil {
|
if err := ctx.View("pages/users.jet", vars); err != nil {
|
||||||
showError(ctx, err)
|
showError(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -43,6 +46,7 @@ func EditUserPage(ctx iris.Context) {
|
|||||||
user := userRepository.Get(&filter)
|
user := userRepository.Get(&filter)
|
||||||
|
|
||||||
vars := iris.Map{
|
vars := iris.Map{
|
||||||
|
"activePage": "users",
|
||||||
"user": user,
|
"user": user,
|
||||||
"currentPath": ctx.Path(),
|
"currentPath": ctx.Path(),
|
||||||
"backlink": "/users",
|
"backlink": "/users",
|
||||||
|
|||||||
BIN
static/example.png
Normal file
BIN
static/example.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB |
6
static/styles.css
Normal file
6
static/styles.css
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
header.navbar {
|
||||||
|
background-color: #e0e0e0;
|
||||||
|
}
|
||||||
|
header.navbar .navbar-brand img {
|
||||||
|
max-height: 80px;
|
||||||
|
}/*# sourceMappingURL=styles.css.map */
|
||||||
1
static/styles.css.map
Normal file
1
static/styles.css.map
Normal file
@ -0,0 +1 @@
|
|||||||
|
{"version":3,"sources":["styles.scss","styles.css"],"names":[],"mappings":"AAAA;EACI,yBAAA;ACCJ;ADAI;EACI,gBAAA;ACER","file":"styles.css"}
|
||||||
6
static/styles.scss
Normal file
6
static/styles.scss
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
header.navbar {
|
||||||
|
background-color: #e0e0e0;
|
||||||
|
.navbar-brand img {
|
||||||
|
max-height: 80px;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user