continued

implemented HTMX
implemented ORM (sequelize)
This commit is contained in:
Kai Waggeling 2025-11-29 21:56:21 +01:00
parent 2a9bd4e81b
commit d756a192e4
71 changed files with 3822 additions and 694 deletions

View file

@ -0,0 +1,45 @@
<form class="flex flex-col gap-6 p-12" hx-post="/htmx/admin/groups/{{ group.id }}" hx-target="#admin-group-section">
<div class="w-full flex flex-row justify-between items-center">
<span class="text-2xl font-bold">
edit Group {{ group.name }}
</span>
</div>
<div class="flex flex-col gap-8">
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-3">
<label for="firstName" class="w-full text-sm font-medium">
Group Name
</label>
<input type="text" name="name" placeholder="Group Name" value="{{ group.name }}">
</div>
<div class="flex flex-col w-1/2 gap-3">
<label for="lastName" class="w-full text-sm font-medium">
Group ID
</label>
<input type="number" name="gidnumber" placeholder="1000" value="{{ group.gidnumber }}">
</div>
</div>
<div class="flex flex-row align-center gap-3">
<div class="flex flex-col w-full gap-2">
<span class="w-full text-xs uppercase" style="letter-spacing: 2px; color: var(--color-base-fg-200);">
LDAP Path
</span>
<span class="select-text">
ou={{ group.name }},{{ ldap.baseDN }}
</span>
</div>
</div>
</div>
<div class="flex w-full justify-end gap-4">
<a href="#" class="button-sm"
hx-get="/htmx/admin/groups/table"
hx-target="#admin-group-section">
<i class="ti ti-arrow-left"></i>
Back
</a>
<button type="button" class="button-sm primary-fill">
<i class="ti ti-device-floppy"></i>
Save Changes
</button>
</div>
</form>

View file

@ -0,0 +1,106 @@
<div class="flex flex-col gap-8 w-full">
<form class="card flex flex-col gap-6 p-12" hx-post="/htmx/admin/groups/{{ group.id }}" hx-target="#admin-group-section">
<div class="w-full flex flex-row justify-between items-center">
<span class="text-2xl font-thin">
edit User {{ user.username }}
</span>
</div>
<div class="flex flex-col gap-8">
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-3">
<label for="username" class="w-full text-sm font-medium">
Username
</label>
<input type="text" name="username" placeholder="Username" value="{{ user.username }}">
</div>
<div class="flex flex-col w-1/2 gap-3">
<label for="uidnumber" class="w-full text-sm font-medium">
User ID
</label>
<input type="number" name="uidnumber" placeholder="1000" value="{{ user.uidnumber }}">
</div>
</div>
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-3">
<label for="firstName" class="w-full text-sm font-medium">
First Name
</label>
<input type="text" name="firstName" class="" placeholder="John" value="{{ user.firstName }}">
</div>
<div class="flex flex-col w-1/2 gap-3">
<label for="lastName" class="w-full text-sm font-medium">
Last Name
</label>
<input type="text" name="lastName" class="" placeholder="Doe" value="{{ user.lastName }}">
</div>
</div>
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-3">
<label for="username" class="w-full text-sm font-medium">
Primary Group
</label>
<select name="primaryGroup" class="">
{% for group in groupList %}
<option value="{{ group.gidnumber }}" {% if group.isPrimaryGroup %}selected{% endif %}>{{ group.name }}</option>
{% endfor %}
</select>
</div>
<div class="flex flex-col w-1/2 gap-3">
<label for="mail" class="w-full text-sm font-medium">
Mail Address
</label>
<input type="text" name="mail" class="" placeholder="john@doe.com" value="{{ user.mail }}">
</div>
</div>
</div>
<div class="flex w-full justify-end gap-4">
<a href="#" class="button-sm"
hx-get="/htmx/admin/users/table"
hx-target="#admin-user-section">
<i class="ti ti-arrow-left"></i>
Back
</a>
<button type="button" class="button-sm primary-fill">
<i class="ti ti-device-floppy"></i>
Save Changes
</button>
</div>
</form>
<div class="card flex flex-col w-full">
<div class="w-full flex flex-row justify-between items-center py-5 px-8">
<span class="text-2xl font-thin">
manage Groups for {{ user.username }}
</span>
</div>
<div class="table grid-cols-[min-content_1fr_min-content]">
<!-- Table Header -->
<div class="thead font-bold py-2 border-b">
<div>GID</div>
<div>Name</div>
<div>Actions</div>
</div>
{% for group in groupList %}
<!-- Table Row -->
<div class="trow py-2 border-b">
<div>{{ group.gidnumber }}</div>
<div>{{ group.name }}</div>
<div class="flex flex-row justify-end align-center gap-4">
{% if not group.isPrimaryGroup and not group.isOtherGroup %}
<a href="#" class="button-sm text-xs hover:underline success-fill whitespace-nowrap"
hx-get="/htmx/admin/groups/{{ group.id }}"
hx-target="#admin-group-section">
<i class="ti ti-user-plus"></i>
</a>
{% else %}
<a href="#" class="button-sm text-xs hover:underline danger-fill whitespace-nowrap"
hx-get="/htmx/admin/groups/{{ group.id }}"
hx-target="#admin-group-section">
<i class="ti ti-user-minus"></i>
</a>
{% endif %}
</div>
</div>
{% endfor %}
</div>
</div>
</div>

View file

@ -0,0 +1,41 @@
<div class="card flex flex-col w-full">
<div class="w-full py-5 px-8 flex flex-row justify-between items-center">
<span class="text-2xl font-bold">
Users
</span>
<div class="flex flex-row gap-4 items-center">
<a href="#" class="button-sm primary-fill"
hx-get="/htmx/admin/group/create"
hx-target="#profile-data-section">
<i class="ti ti-users-plus"></i>
Create Group
</a>
</div>
</div>
<table class="w-full text-sm text-left">
<thead class="text-xs uppercase" style="background: var(--color-base-bg-200); color: var(--color-base-fg-300);">
<tr>
<th scope="col" class="px-6 py-3">
Name
</th>
<th scope="col" class="px-6 py-3">
</th>
</tr>
</thead>
<tbody>
{% for group in groupList %}
<tr class="border-b border-gray-700">
<th class="px-6 py-4 select-all font-medium whitespace-nowrap">
{{group.name}}
</th>
<td class="px-6 py-4 text-right">
<a href="#" class="font-medium hover:underline"
hx-get="/htmx/admin/groups/{{group.id}}"
hx-target="#admin-group-section">Edit</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>

View file

@ -0,0 +1,61 @@
<div class="card flex flex-col w-full">
<div class="w-full py-5 px-8 flex flex-row justify-between items-center">
<span class="text-2xl font-bold">
Users
</span>
<div class="flex flex-row gap-4 items-center">
<a href="#" class="button-sm primary-fill"
hx-get="/htmx/admin/user/create"
hx-target="#profile-data-section">
<i class="ti ti-user-plus"></i>
Create User
</a>
</div>
</div>
<table class="w-full text-sm text-left">
<thead class="text-xs uppercase" style="background: var(--color-base-bg-200); color: var(--color-base-fg-300);">
<tr>
<th scope="col" class="px-6 py-3">
Name
</th>
<th scope="col" class="px-6 py-3">
Mail
</th>
<th scope="col" class="px-6 py-3 text-center">
Enabled
</th>
<th scope="col" class="px-6 py-3">
</th>
</tr>
</thead>
<tbody>
{% for user in userList %}
<tr class="border-b dark:border-gray-700 hover:bg-gray-100 hover:dark:bg-gray-700">
<th class="px-6 py-4 select-all font-medium whitespace-nowrap">
{{user.givenname}} {{user.sn}}
</th>
<td class="px-6 py-4 select-all">
{{user.mail}}
</td>
{% if user.disabled == 1 %}
<td class="px-6 py-4 text-2xl text-center text-red-400">
<i class="ti ti-square-rounded-x-filled"></i>
</td>
{% else %}
<td class="px-6 py-4 text-2xl text-center text-green-500">
<i class="ti ti-square-rounded-check-filled"></i>
</td>
{% endif %}
<td class="px-6 py-4 text-right">
<a href="#" class="font-medium hover:underline primary-text"
hx-get="/htmx/admin/users/{{user.id}}"
hx-target="#admin-user-section">
Edit
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>

46
views/htmx/authForm.njk Normal file
View file

@ -0,0 +1,46 @@
<div class="container relative mx-auto py-12 flex flex-col justify-center items-center gap-8">
{% for error in errors %}
<!-- Login Error -->
<div class="alert-danger w-full max-w-md" role="alert">
<i class="ti ti-alert-hexagon-filled text-lg"></i>
<div class="ms-3 text-sm font-medium">
{{ error.title }}: {{ error.detail }}
</div>
</div>
{% endfor %}
<!-- Login Dialoge -->
<div id="dialoge" class="card w-full max-w-md">
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
<div class="px-4 flex flex-col items-center gap-4">
<span class="w-full block bg-center bg-no-repeat bg-contain" style="height: var(--login-logo-height); background-image: var(--login-logo-source);">
<!-- Logo Source from theme.css -->
</span>
<h1 class="text-3xl">
Welcome
</h1>
<h4 class="text-sm">
Sign In to User-Portal
</h4>
</div>
<form class="space-y-4 md:space-y-6" hx-post="/htmx/authForm" hx-target="#app">
<div>
<label for="username" class="block mb-2 text-sm font-medium">
Username
</label>
<input type="text" name="username" class="w-full" placeholder="john-doe" required="">
</div>
<div>
<label for="password" class="block mb-2 text-sm font-medium">
Password
</label>
<input type="password" name="password" class="w-full" placeholder="••••••••" required="">
</div>
<div class="flex items-center justify-end">
<a href="#" class="text-sm font-medium hover:underline">Forgot password?</a>
</div>
<button type="submit" class="w-full button primary-fill">Sign in</button>
</form>
</div>
</div>
<!-- / -->
</div>

View file

@ -0,0 +1,41 @@
<form class="flex flex-col gap-6" hx-post="/htmx/profile/data/edit" hx-target="#profile-data-section">
<div class="flex w-full">
<span class="text-2xl font-bold">
edit Personal Data
</span>
</div>
<div class="flex flex-col gap-3">
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-3">
<label for="firstName" class="w-full text-sm font-medium">
First Name
</label>
<input type="text" name="firstName" class="" placeholder="John" value="{{ data.firstName }}">
</div>
<div class="flex flex-col w-1/2 gap-3">
<label for="lastName" class="w-full text-sm font-medium">
Last Name
</label>
<input type="text" name="lastName" class="" placeholder="Doe" value="{{ data.lastName }}">
</div>
</div>
<div class="flex flex-col gap-3">
<label for="mail" class="w-full text-sm font-medium">
Mail Address
</label>
<input type="text" name="mail" class="" placeholder="john@doe.com" value="{{ data.mail }}">
</div>
</div>
<div class="flex w-full justify-end gap-4">
<a href="#" class="button-sm"
hx-get="/htmx/profile/data/show"
hx-target="#profile-data-section">
<i class="ti ti-arrow-left"></i>
Back
</a>
<button type="button" class="button-sm primary-fill">
<i class="ti ti-device-floppy"></i>
Save Changes
</button>
</div>
</form>

View file

@ -0,0 +1,49 @@
<!-- Form: create OTP-Secret -->
<div class="flex flex-col flex-auto">
<div class="flex flex-col px-8 py-6 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-600 rounded-lg shadow-sm gap-6">
<div class="flex w-full">
<h2 class="text-4xl font-bold text-gray-900 dark:text-gray-200">
Two-Factor Authentication
</h2>
</div>
<div class="flex w-full">
<div class="flex flex-col w-full px-4 py-3 text-sm bg-blue-100 dark:bg-blue-600 dark:text-white rounded-lg gap-2" role="alert">
<div class="flex items-center gap-4">
<span class="font-medium">next steps:</span>
</div>
<ul class="px-3 list-disc list-inside">
<li>scan the QR-Code with your authenticator app or add your secret manually</li>
<li>enter the generated one-time password in the input field for confirmation</li>
<li>validate the code from your authenticator app</li>
</ul>
</div>
</div>
<form class="flex gap-8" action="/profile/otp/create" method="post" enctype="application/x-www-form-urlencoded">
<div class="flex flex-col w-48">
<img class="rounded-lg w-full" src="{{ otp.qrcode }}">
</div>
<div class="flex flex-col flex-auto gap-4">
<div class="flex flex-col lg:flex-row gap-4">
<div class="flex flex-col gap-3 lg:w-4/6">
<label class="w-full text-sm font-medium text-gray-900 dark:text-white">
your OTP-Secret:
</label>
<input type="text" name="otpsecret" class="w-full p-2.5 rounded-lg bg-gray-100 dark:bg-gray-800 border border-gray-300 dark:border-gray-600 focus:border-blue-500 text-sm text-gray-900 dark:text-white" value="{{ otp.otpsecret }}" readonly>
</div>
<div class="flex flex-col gap-3 lg:flex-auto">
<label class="w-full text-sm font-medium text-gray-900 dark:text-white">
TOTP Code:
</label>
<input type="text" name="otpcode" class="w-full p-2.5 rounded-lg bg-gray-100 dark:bg-gray-800 border border-gray-300 dark:border-gray-600 focus:border-blue-500 text-sm text-gray-900 dark:text-white" placeholder="123456">
</div>
</div>
<div class="flex flex-auto"></div>
<div class="flex w-full justify-end gap-4">
<button type="submit" class="py-3 px-8 text-sm text-left rounded-lg text-blue-700 dark:text-blue-300 hover:text-gray-100 bg-gray-100 dark:bg-gray-600 hover:bg-blue-500">
Validate
</button>
</div>
</div>
</form>
</div>
</div>

View file

@ -0,0 +1,32 @@
<!-- Form: Change Password -->
<div class="flex flex-col flex-auto">
<div class="card flex flex-col px-8 py-6 gap-6">
<div class="flex w-full">
<h2 class="text-4xl font-bold text-gray-900 dark:text-gray-200">
Change Password
</h2>
</div>
<div class="flex flex-col gap-3">
<div class="flex flex-col w-1/2 gap-3">
<label for="leihgeber.person" class="text-sm font-medium text-gray-900 dark:text-white">
old Password
</label>
<input type="password" name="old_password" class="" placeholder="••••••••" value="">
</div>
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-3">
<label for="leihgeber.person" class="w-full text-sm font-medium text-gray-900 dark:text-white">
new Password
</label>
<input type="password" name="new_password_1" class="" placeholder="••••••••" value="">
</div>
<div class="flex flex-col flex-auto gap-3">
<label for="leihgeber.person" class="w-full text-sm font-medium text-gray-900 dark:text-white">
repeat new Password
</label>
<input type="password" name="new_password_2" class="" placeholder="••••••••" value="">
</div>
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,59 @@
<div class="flex flex-col gap-8">
<div class="w-full flex flex-row justify-between items-center">
<span class="text-2xl font-bold">
Personal Data
</span>
<div class="flex flex-row gap-4 items-center">
<a href="#" class="button-sm primary-fill"
hx-get="/htmx/profile/data/edit"
hx-target="#profile-data-section">
<i class="ti ti-pencil"></i>
Edit Data
</a>
<a href="#" class="button-sm primary-fill"
hx-get="/htmx/profile/password/edit"
hx-target="#profile-data-section">
<i class="ti ti-key"></i>
Edit Password
</a>
</div>
</div>
<div class="flex flex-col gap-8">
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-2">
<span class="w-full text-xs uppercase" style="letter-spacing: 2px; color: var(--color-base-fg-200);">
Username
</span>
<span class="select-text">
{{ data.username }}
</span>
</div>
<div class="flex flex-col w-1/2 gap-2">
<span class="w-full text-xs uppercase" style="letter-spacing: 2px; color: var(--color-base-fg-200);">
User ID
</span>
<span class="select-text">
{{ data.uidnumber }}
</span>
</div>
</div>
<div class="flex flex-row align-center gap-4">
<div class="flex flex-col w-1/2 gap-2">
<span class="w-full text-xs uppercase" style="letter-spacing: 2px; color: var(--color-base-fg-200);">
Name
</span>
<span class="select-text">
{{ data.firstName }} {{ data.lastName }}
</span>
</div>
<div class="flex flex-col w-1/2 gap-2">
<span class="w-full text-xs uppercase" style="letter-spacing: 2px; color: var(--color-base-fg-200);">
Mail Address
</span>
<span class="select-text">
{{ data.mail }}
</span>
</div>
</div>
</div>
</div>

View file

@ -0,0 +1,51 @@
<!-- Form: 2FA -->
<div class="flex flex-col gap-6">
<div class="w-full flex flex-row justify-between items-center">
<span class="text-2xl font-bold">
Multi-Factor Authentication
</span>
<div class="flex flex-row gap-4 items-center">
{% if otpsecret and otpsecret.length > 0 %}
<a href="#" class="button-sm primary-fill">
<i class="ti ti-cross"></i>
disable TOTP
</a>
{% else %}
<a href="#" class="button-sm primary-fill">
<i class="ti ti-check"></i>
enable TOTP
</a>
{% endif %}
</div>
</div>
{% if otp.active != true %}
<div class="flex w-full">
<div class="flex items-center w-full px-4 py-2 text-sm bg-yellow-100 dark:bg-yellow-600 dark:text-white rounded-lg gap-4" role="alert">
<i class="ti ti-alert-hexagon-filled text-lg"></i>
<div class="ms-3 text-sm font-medium">
You have not yet configured 2-factor authentication.
</div>
</div>
</div>
{% endif %}
<div class="flex gap-8">
{% if otp.active == true %}
<div class="flex flex-col w-48">
<img class="rounded-lg w-full" src="{{ otp.qrcode }}">
</div>
<div class="flex flex-col flex-auto gap-4">
<div class="flex flex-col lg:flex-row gap-4">
<div class="flex flex-col flex-auto gap-3">
<label class="w-full text-sm font-medium text-gray-900 dark:text-white">
your OTP-Secret:
</label>
<input type="text" name="otpsecret" class="" value="{{ otp.otpsecret }}" readonly>
</div>
<button type="button" class="button primary-fill">
Delete
</button>
</div>
</div>
{% endif %}
</div>
</div>

34
views/htmx/totpForm.njk Normal file
View file

@ -0,0 +1,34 @@
<div class="container relative mx-auto py-12 flex flex-col justify-center items-center gap-8">
{% for error in errors %}
<!-- TOTP Error -->
<div class="alert-danger w-full max-w-md" role="alert">
<i class="ti ti-alert-hexagon-filled text-lg"></i>
<div class="ms-3 text-sm font-medium">
{{ error.title }}: {{ error.detail }}
</div>
</div>
{% endfor %}
<!-- TOTP Dialoge -->
<div class="card w-full max-w-md">
<div class="p-6 space-y-4 md:space-y-6 sm:p-8">
<div class="px-4 flex flex-col items-center gap-4">
<span class="w-full block bg-center bg-no-repeat bg-contain" style="height: var(--login-logo-height); background-image: var(--login-logo-source);">
<!-- Logo Source from theme.css -->
</span>
<h1 class="text-3xl">
Identity Manager
</h1>
</div>
<form class="space-y-4 md:space-y-6" hx-post="/htmx/totpForm" hx-target="#app">
<div>
<label for="otpToken" class="block mb-2 text-sm font-medium">
OTP Token
</label>
<input type="text" name="otpToken" class="w-full" placeholder="123456" required="">
</div>
<button type="submit" class="w-full button primary-fill">Continue</button>
</form>
</div>
</div>
<!-- / -->
</div>