Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch "ui" into branch "dev" #831

Merged
merged 5 commits into from
Jan 2, 2024
Merged

Merge branch "ui" into branch "dev" #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
020ec53
Merge pull request #830 from bunkerity/dev
TheophileDiot Dec 29, 2023
66fa2df
Merge remote-tracking branch 'origin/dev' into ui
syrk4web Jan 2, 2024
db0f238
delete totp duplicate logo
syrk4web Jan 2, 2024
ad2253f
totp form name different from user one
syrk4web Jan 2, 2024
d091e52
enhance style
syrk4web Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ui/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ <h5 class="text-lg mb-0 text-green-500">Success</h5>
class="mx-4 lg:mx-0 col-span-2 lg:col-span-1 bg-none lg:bg-gray-50 h-full flex flex-col items-center justify-center"
>
<div
class="bg-gray-50 rounded px-4 sm:px-12 py-16 w-full max-w-[400px]"
class="bg-gray-50 rounded px-8 sm:px-12 py-16 w-full max-w-[400px]"
>
<div class="flex justify-center">
<img
class="lg:hidden max-w-60 max-h-30 mb-6"
class="lg:hidden w-full max-w-60 max-h-30 mb-6"
src="images/BUNKERWEB-print-hd.png"
alt="logo"
class="logo"
Expand Down
39 changes: 19 additions & 20 deletions src/ui/templates/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{% extends "base.html" %} {% block content %} {% set current_endpoint =
url_for(request.endpoint)[1:].split("/")[-1].strip() %}


<div
data-service-content
class="md:max-w-[600px] first-letter:w-full overflow-hidden overflow-y-auto overflow-x-auto col-span-12 p-4 relative break-words bg-white shadow-xl dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
class="md:max-w-[600px] first-letter:w-full overflow-hidden overflow-y-auto overflow-x-auto col-span-12 p-4 relative break-words bg-white shadow-xl dark:bg-slate-850 dark:shadow-dark-xl rounded-2xl bg-clip-border"
>
<h5 class="my-2 font-bold dark:text-white/90 mx-2">SETTINGS</h5>
<!-- desktop tabs -->
Expand Down Expand Up @@ -134,13 +133,13 @@ <h5 class="my-2 font-bold dark:text-white/90 mx-2">SETTINGS</h5>
method="POST"
autocomplete="off"
>
<div class="col-span-12">
<h5
class="text-xl my-1 transition duration-300 ease-in-out text-md font-bold m-0"
>
PROFILE
</h5>
</div>
<div class="col-span-12">
<h5
class="text-xl my-1 transition duration-300 ease-in-out text-md font-bold m-0"
>
PROFILE
</h5>
</div>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<input
type="hidden"
Expand Down Expand Up @@ -364,18 +363,18 @@ <h5 class="my-2 font-bold dark:text-white/90 mx-2">SETTINGS</h5>
<form
data-plugin-item="totp"
class="hidden grid grid-cols-12 w-full justify-items-center"
id="profile-form"
id="totp-form"
action="profile"
method="POST"
autocomplete="off"
>
<div class="col-span-12">
<h5
class="text-xl my-1 transition duration-300 ease-in-out text-md font-bold m-0"
>
TOTP
</h5>
</div>
<div class="col-span-12">
<h5
class="text-xl my-1 transition duration-300 ease-in-out text-md font-bold m-0"
>
TOTP
</h5>
</div>
<h5
class="{% if not is_totp %} text-red-500 {% else %} text-green-500 {% endif %} uppercase col-span-12 text-sm my-2 font-bold dark:text-white/90 mx-2"
>
Expand Down Expand Up @@ -551,9 +550,9 @@ <h5 class="my-2 font-bold dark:text-white/90 mx-2">SETTINGS</h5>
<div class="col-span-12 flex justify-center mt-6">
<button
type="submit"
id="profile-button"
name="profile-button"
value="profile"
id="totp-button"
name="totp-button"
value="totp"
class="{% if not is_totp %}valid-btn{% else %}delete-btn{% endif %}"
>
{% if not is_totp %} enable totp {% else %} disable totp {% endif %}
Expand Down
12 changes: 2 additions & 10 deletions src/ui/templates/totp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ <h5 class="text-lg mb-0 text-green-500">Success</h5>
class="mx-4 col-span-2 bg-none h-full flex flex-col items-center justify-center"
>
<div
class="bg-gray-50 rounded px-4 sm:px-12 py-16 w-full max-w-[400px]"
class="bg-gray-50 rounded px-8 sm:px-12 py-16 w-full max-w-[400px]"
>
<div class="flex justify-center">
<img
class="max-w-60 max-h-30 mb-6"
class="w-full max-w-60 max-h-30 mb-6"
src="images/BUNKERWEB-print-hd.png"
alt="logo"
class="logo"
Expand Down Expand Up @@ -128,14 +128,6 @@ <h1 class="hidden text-center font-bold dark:text-white mb-8">
<!-- particles -->
<div class="-z-10 fixed bg-primary">
<div id="particles-js" class="login-img [&>*]:bg-primary"></div>
<div class="hidden lg:flex justify-center">
<img
class="max-w-60 max-h-30"
src="images/BUNKERWEB-print-hd-blanc.png"
alt="logo"
class="images login-logo"
/>
</div>
</div>
</main>
<script src="js/tsparticles.bundle.min.js"></script>
Expand Down
Loading