Skip to content

Commit

Permalink
Merge pull request #13 from rpkyrych/KHARKITEC-21
Browse files Browse the repository at this point in the history
Added Categories list page
  • Loading branch information
rpkyrych authored Sep 4, 2018
2 parents a60181a + 10f06ff commit 58fd3a5
Show file tree
Hide file tree
Showing 5 changed files with 108 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Backoffice/src/main/resources/templates/addCategory.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
Сategories
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">View</a>
<a class="dropdown-item" href="/category/all/">View</a>
<a class="dropdown-item" href="/category/">Add</a>
<a class="dropdown-item" href="#">Edit</a>
<div class="dropdown-divider"></div>
Expand Down
2 changes: 1 addition & 1 deletion Backoffice/src/main/resources/templates/addObject.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
Сategories
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">View</a>
<a class="dropdown-item" href="/category/all/">View</a>
<a class="dropdown-item" href="/category/">Add</a>
<a class="dropdown-item" href="#">Edit</a>
<div class="dropdown-divider"></div>
Expand Down
2 changes: 1 addition & 1 deletion Backoffice/src/main/resources/templates/allBuildings.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
Сategories
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">View</a>
<a class="dropdown-item" href="/category/all/">View</a>
<a class="dropdown-item" href="/category/">Add</a>
<a class="dropdown-item" href="#">Edit</a>
<div class="dropdown-divider"></div>
Expand Down
104 changes: 104 additions & 0 deletions Backoffice/src/main/resources/templates/allCategories.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<!DOCTYPE HTML>
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>View All Categories Page</title>

<!-- Bootstrap -->
<!-- Latest compiled and minified Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">

<!-- jQuery library -->
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"></script>

<!-- Popper -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>

<!-- Latest compiled and minified Bootstrap JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<link href="../static/css/main.css" rel="stylesheet">
</head>

<body>
<nav class="navbar sticky-top navbar-expand-lg navbar-dark bg-info text-white" id="option">
<a class="navbar-brand" href="#">Kharkitecture</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-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="navbarSupportedContent1">

<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/">Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Building
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="/building/all">View</a>
<a class="dropdown-item" href="/building/">Add</a>
<a class="dropdown-item" href="#">Edit</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown1" role="button" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
Сategories
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="/category/all/">View</a>
<a class="dropdown-item" href="/category/">Add</a>
<a class="dropdown-item" href="#">Edit</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Something else here</a>
</div>
</li>

<li class="nav-item">
<a class="nav-link" href="#">Map</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Mail <span class="badge badge-pill badge-light">8</span></a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">

<button type="button" class="btn btn-link text-white">Search</button>
</form>
<i class="fa fa-power-off" aria-hidden="true"></i>
</div>
</nav>

<table id="excelDataTable" border="1">
<tr>
<th>id</th>
<th>Name</th>
<th>Total buildings</th>
</tr>
<tr th:each="category : ${categories}">
<td th:text="${category.id}"></td>
<td th:text="${category.name}"></td>
<td th:text="${category.totalItemsCount}"></td>
</tr>
</table>

<footer>
</footer>
</body>
</html>
2 changes: 1 addition & 1 deletion Backoffice/src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
Сategories
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="#">View</a>
<a class="dropdown-item" href="/category/all/">View</a>
<a class="dropdown-item" href="/category/">Add</a>
<a class="dropdown-item" href="#">Edit</a>
<div class="dropdown-divider"></div>
Expand Down

0 comments on commit 58fd3a5

Please sign in to comment.