add device type
add postEditType to TypeController update form.html and messages.html for saving types add updateType in DeviceRegistryService add WebClient deviceRegistryTypesUpdate in DeviceRegisterWebClientCalls.kt add getEditType to TypeController update type form.html for edit device type add Type Response toTypeForm in Mapping.kt add getType to DeviceRegistryService add WebClient deviceRegistryType in DeviceRegisterWebClientCalls.kt update edit link in device type list.html add getCreateType and postCreateType to TypeController add device type form.html add TypeFormadd TypeForm toTypeRequest in Mapping.kt add TypeForm add createType to DeviceRegistryService add deviceRegistryTypesCreate in DeviceRegisterWebClientCalls.kt add TypeNameDuplicateException add DeviceRegistryException extract validationErrors from postCreateAccount in AccountController to util Controller update AccountController getAccounts and TypeController getTypes with max show value add redis for spring boot session - make RemoteUserDetail Serializable - add application properties - add dependencies add TypeController add list.html for type extract fragment pagination.html from users.html add DeviceRegistryService with getTypes add DeviceRegisterWebClientCalls.kt with deviceRegistryTypes set up hlaeja device registry add type to layout menu add type to admin SecurityConfiguration
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
<span th:text="${pagination.size}"/>
|
||||
</div>
|
||||
<div class="mt-[-2px]">
|
||||
<a th:href="@{/account/create}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors text-sm">$ Create New Account</a>
|
||||
<a th:href="@{/account/create}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors text-sm">Create New Account</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overflow-x-auto">
|
||||
@@ -39,29 +39,13 @@
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="mt-6 text-sm" th:classappend="${pagination.showSize} ? 'space-y-2' : ''">
|
||||
<div th:if="${pagination.showSize}" class="mt-6 flex justify-between items-center text-sm">
|
||||
<span th:if="${pagination.first}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Previous</span>
|
||||
<a th:unless="${pagination.first}" th:href="@{'/account/page-' + ${pagination.previous} + '/show-' + ${pagination.show}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Previous</a>
|
||||
<a th:if="${pagination.hasMore}" th:href="@{'/account/page-' + ${pagination.next} + '/show-' + ${pagination.show}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Next</a>
|
||||
<span th:unless="${pagination.hasMore}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Next</span>
|
||||
</div>
|
||||
<div th:unless="${pagination.showSize}" class="mt-6 flex justify-between items-center text-sm">
|
||||
<span th:if="${pagination.first}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Previous</span>
|
||||
<a th:unless="${pagination.first}" th:href="@{'/account/page-' + ${pagination.previous}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Previous</a>
|
||||
<a th:if="${pagination.hasMore}" th:href="@{'/account/page-' + ${pagination.next}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Next</a>
|
||||
<span th:unless="${pagination.hasMore}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Next</span>
|
||||
</div>
|
||||
</div>
|
||||
<!--/*/<th:block th:replace="~{pagination :: pagination('/account', ${pagination})}"/>/*/-->
|
||||
</div>
|
||||
</main>
|
||||
<!--/*/<th:block th:replace="~{layout.html :: footer}"/>/*/-->
|
||||
<!--/*/<th:block th:replace="~{layout.html :: script}"/>/*/-->
|
||||
<script>
|
||||
// Assuming makeLocalTime is defined elsewhere or needs to be added
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
makeLocalTime(document.querySelectorAll('.utcTimestamp'));
|
||||
});
|
||||
document.addEventListener('DOMContentLoaded', () => makeLocalTime(document.querySelectorAll('.utcTimestamp')));
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
44
src/main/resources/templates/device/type/form.html
Normal file
44
src/main/resources/templates/device/type/form.html
Normal file
@@ -0,0 +1,44 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns:th="http://www.thymeleaf.org">
|
||||
<th:block th:replace="~{layout.html :: documentHead ('Hlaeja Management')}"/>
|
||||
<body class="bg-gray-900 text-green-400 min-h-screen flex flex-col">
|
||||
<th:block th:replace="~{layout.html :: header}"/>
|
||||
<main class="container mx-auto p-4 flex-grow flex items-center justify-center">
|
||||
<div class="w-full max-w-3xl">
|
||||
<div class="flex justify-between items-end mb-4">
|
||||
<div>
|
||||
<h2 class="text-lg sm:text-xl terminal-glow" th:if="${type} == null" th:text="'Create Device Type'"></h2>
|
||||
<h2 class="text-lg sm:text-xl terminal-glow" th:unless="${type} == null" th:text="'Edit Device Type'"></h2>
|
||||
</div>
|
||||
<div th:if="${type} != null" class="text-xs text-green-600">
|
||||
Created: <span class="utcTimestamp" th:data-timestamp="${type.timestamp}"></span>
|
||||
</div>
|
||||
</div>
|
||||
<hr class="border-green-900 mb-4">
|
||||
<th:block th:replace="~{messages :: messageDisplay(messageList=${validationErrors}, error=true, styleClass='text-red-600')}"/>
|
||||
<th:block th:replace="~{messages :: messageDisplay(messageList=${successMessage}, error=false, styleClass='text-green-600')}"/>
|
||||
<form th:action="${type} == null ? @{/type/create} : @{/type-{id}(id=${type.id})}" th:method="post">
|
||||
<div class="bg-gray-800 p-6 rounded-lg border border-green-900">
|
||||
<div class="mb-4">
|
||||
<label for="username" class="block text-sm mb-2">Name</label>
|
||||
<input th:field="*{typeForm.name}" id="username" type="text" placeholder="Enter name..." class="w-full bg-gray-900 border border-green-900 rounded px-3 py-2 text-green-400 focus:outline-none focus:border-green-600">
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<label class="block text-sm mb-2" for="textarea">Description</label>
|
||||
<textarea id="textarea" th:field="*{typeForm.description}" rows="12" class="w-full bg-gray-900 border border-green-900 rounded px-3 py-2 text-green-400 focus:outline-none focus:border-green-600" placeholder="Enter description..."></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-4 flex justify-end space-x-4">
|
||||
<a href="/type" class="bg-gray-800 hover:bg-gray-700 text-green-400 px-4 py-2 rounded border border-green-900 transition-colors inline-block" th:text="${type} == null ? 'Cancel' : 'Go Back'"/>
|
||||
<button type="submit" class="bg-green-900 hover:bg-green-800 text-green-400 px-4 py-2 rounded border border-green-600 transition-colors" th:text="${type} == null ? 'Create' : 'Save'"/>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
<th:block th:replace="~{layout.html :: footer}"/>
|
||||
<th:block th:replace="~{layout.html :: script}"/>
|
||||
<script th:if="${type} != null">
|
||||
document.addEventListener('DOMContentLoaded', () => makeLocalTime(document.querySelectorAll('.utcTimestamp')));
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
55
src/main/resources/templates/device/type/list.html
Normal file
55
src/main/resources/templates/device/type/list.html
Normal file
@@ -0,0 +1,55 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html lang="en" xmlns:th="http://www.thymeleaf.org">
|
||||
<!--/*/<th:block th:replace="~{layout.html :: documentHead ('Hlaeja Management')}"/>/*/-->
|
||||
<body class="bg-gray-900 text-green-400 min-h-screen flex flex-col">
|
||||
<!--/*/<th:block th:replace="~{layout.html :: header}"/>/*/-->
|
||||
<main class="container mx-auto p-4 flex-grow">
|
||||
<div class="bg-gray-800 p-6 rounded-lg border border-green-900">
|
||||
<h1 class="text-lg sm:text-xl mb-4 terminal-glow">Device Types</h1>
|
||||
<hr class="border-green-900 mb-4">
|
||||
<div class="flex justify-between items-center mb-4">
|
||||
<div th:if="${pagination.start > pagination.size}" class="text-sm">
|
||||
Show page <span th:text="${pagination.page}"/> items 0 - 0
|
||||
</div>
|
||||
<div th:unless="${pagination.start > pagination.size}" class="text-sm">
|
||||
Show page <span th:text="${pagination.page}"/>
|
||||
items <span th:text="${pagination.start}"/> -
|
||||
<span th:text="${pagination.size}"/>
|
||||
</div>
|
||||
<div class="mt-[-2px]">
|
||||
<a th:href="@{/type/create}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors text-sm">Create New Type</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overflow-x-auto">
|
||||
<table class="w-full text-sm">
|
||||
<thead>
|
||||
<tr class="border-b border-green-900">
|
||||
<th class="py-2 px-4 text-left">Name</th>
|
||||
<th class="py-2 px-4 text-left">Time</th>
|
||||
<th class="py-2 px-4 text-left">ID</th>
|
||||
<th class="py-2 px-4 text-left">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr th:if="${items.isEmpty()}">
|
||||
<td colspan="4" class="py-2 px-4 text-center text-green-600">No accounts found</td>
|
||||
</tr>
|
||||
<tr th:each="item : ${items}" class="border-b border-gray-700 hover:bg-gray-700">
|
||||
<td th:text="${item.name}" class="py-2 px-4"></td>
|
||||
<td th:data-timestamp="${item.timestamp}" class="py-2 px-4 utcTimestamp"></td>
|
||||
<td th:text="${item.id}" class="py-2 px-4"></td>
|
||||
<td class="py-2 px-4"><a th:href="@{/type-{id}(id=${item.id})}">Edit</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<!--/*/<th:block th:replace="~{pagination :: pagination('/type', ${pagination})}"/>/*/-->
|
||||
</div>
|
||||
</main>
|
||||
<!--/*/<th:block th:replace="~{layout.html :: footer}"/>/*/-->
|
||||
<!--/*/<th:block th:replace="~{layout.html :: script}"/>/*/-->
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', () => makeLocalTime(document.querySelectorAll('.utcTimestamp')));
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -22,6 +22,7 @@
|
||||
<div id="dropdown-menu" class="hidden absolute right-0 mt-2 w-48 bg-gray-800 border border-green-900 shadow-lg z-10">
|
||||
<th:block th:if="${remoteUser.hasRole('admin')}">
|
||||
<a href="/account" class="block px-4 py-2 text-sm hover:bg-gray-700 hover:text-green-300 transition-colors">Account</a>
|
||||
<a href="/type" class="block px-4 py-2 text-sm hover:bg-gray-700 hover:text-green-300 transition-colors">Device Type</a>
|
||||
<hr class="dropdown-divider">
|
||||
</th:block>
|
||||
<th:block th:if="${remoteUser.authenticated}">
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<!-- Single Message Case -->
|
||||
<th:block th:case="1">
|
||||
<span th:if="${error}">Validation Error:</span>
|
||||
<span th:unless="${error}">Validation:</span>
|
||||
<span th:unless="${error}">Information:</span>
|
||||
<span th:text="${messageList[0]}"></span>
|
||||
</th:block>
|
||||
<!-- Multiple Messages Case -->
|
||||
|
||||
19
src/main/resources/templates/pagination.html
Normal file
19
src/main/resources/templates/pagination.html
Normal file
@@ -0,0 +1,19 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
<th:block th:fragment="pagination(baseUrl, pagination)">
|
||||
<div class="mt-6 text-sm" th:classappend="${pagination.showSize} ? 'space-y-2' : ''">
|
||||
<div th:if="${pagination.showSize}" class="mt-6 flex justify-between items-center text-sm">
|
||||
<span th:if="${pagination.first}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Previous</span>
|
||||
<a th:unless="${pagination.first}" th:href="@{${baseUrl} + '/page-' + ${pagination.previous} + '/show-' + ${pagination.show}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Previous</a>
|
||||
<a th:if="${pagination.hasMore}" th:href="@{${baseUrl} + '/page-' + ${pagination.next} + '/show-' + ${pagination.show}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Next</a>
|
||||
<span th:unless="${pagination.hasMore}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Next</span>
|
||||
</div>
|
||||
<div th:unless="${pagination.showSize}" class="mt-6 flex justify-between items-center text-sm">
|
||||
<span th:if="${pagination.first}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Previous</span>
|
||||
<a th:unless="${pagination.first}" th:href="@{${baseUrl} + '/page-' + ${pagination.previous}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Previous</a>
|
||||
<a th:if="${pagination.hasMore}" th:href="@{${baseUrl} + '/page-' + ${pagination.next}}" class="px-3 py-1 bg-gray-700 hover:bg-gray-600 rounded border border-green-900 transition-colors">Next</a>
|
||||
<span th:unless="${pagination.hasMore}" class="px-3 py-1 bg-gray-800 text-gray-500 rounded border border-green-900">Next</span>
|
||||
</div>
|
||||
</div>
|
||||
</th:block>
|
||||
</html>
|
||||
Reference in New Issue
Block a user