From cb98a4fb55697f101f86cf058a47096a3ba4f1e3 Mon Sep 17 00:00:00 2001 From: Sumukh Date: Sun, 9 Jun 2024 02:02:42 -0700 Subject: [PATCH 1/2] update base login pages --- appname/assets.py | 29 +++---- appname/templates/auth/invite.html | 48 ++++++----- appname/templates/auth/login.html | 70 ++++++++-------- appname/templates/auth/oauth_only_login.html | 43 +++++++--- appname/templates/auth/reauth.html | 30 ++++--- .../auth/request_password_reset.html | 55 ++++++------ appname/templates/auth/reset_password.html | 46 +++++----- appname/templates/auth/signup.html | 84 +++++++++---------- appname/templates/helpers/_formhelpers.html | 4 +- appname/templates/lander/index.html | 12 +-- appname/templates/tabler/401.html | 26 ++++-- appname/templates/tabler/minimal_base.html | 19 +++-- 12 files changed, 250 insertions(+), 216 deletions(-) diff --git a/appname/assets.py b/appname/assets.py index 9a83b343..bab331cd 100755 --- a/appname/assets.py +++ b/appname/assets.py @@ -1,7 +1,7 @@ from flask_assets import Bundle common_css = Bundle( - 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css', + 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css', 'css/vendor/helper.css', 'css/main.css', 'css/overrides.css', @@ -10,9 +10,8 @@ ) common_js = Bundle( - 'https://code.jquery.com/jquery-3.2.1.slim.min.js', - 'https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js', - 'https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js', + 'https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js', + 'https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js', Bundle( 'js/main.js', filters='jsmin' @@ -33,19 +32,15 @@ ) tabler_css = Bundle( - 'https://rawcdn.githack.com/Sumukh/Ignite/70bf953851a356e785528b56ca105042074a3d5a/appname/static/tabler/css/dashboard.css', + 'https://cdn.jsdelivr.net/npm/@tabler/core@latest/dist/css/tabler.min.css', + 'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/css/tabler-vendors.min.css', 'css/overrides.css', filters='cssmin', output='public/css/tabler.css' ) tabler_js = Bundle( - 'tabler/js/vendors/jquery-3.2.1.min.js', - 'tabler/js/vendors/bootstrap.bundle.min.js', - 'tabler/js/vendors/circle-progress.min.js', - 'tabler/js/vendors/selectize.min.js', - 'tabler/js/vendors/jquery.tablesorter.min.js', - 'tabler/js/core.js', + 'https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta17/dist/js/tabler.min.js', output='public/js/tabler.js' ) @@ -55,14 +50,10 @@ ) tabler_plugins_js = Bundle( - 'tabler/js/vendors/chart.bundle.min.js', - 'tabler/js/vendors/jquery.sparkline.min.js', - 'tabler/js/vendors/jquery-jvectormap-2.0.3.min.js', - 'tabler/js/vendors/jquery-jvectormap-de-merc.js', - 'tabler/js/vendors/jquery-jvectormap-world-mill.js', - 'tabler/js/plugins/charts-c3/js/d3.v3.min.js', - 'tabler/js/plugins/charts-c3/js/c3.min.js', - 'tabler/js/plugins/input-mask/js/jquery.mask.min.js', + 'https://cdn.jsdelivr.net/npm/apexcharts', + 'https://cdn.jsdelivr.net/npm/choices.js@9.0.1/public/assets/scripts/choices.min.js', + 'https://cdn.jsdelivr.net/npm/litepicker/dist/litepicker.js', + 'https://cdn.jsdelivr.net/npm/tom-select@2.3.1/dist/js/tom-select.complete.min.js', # Other Plugins as needed. output='public/js/tabler-plugins.js' ) diff --git a/appname/templates/auth/invite.html b/appname/templates/auth/invite.html index f71acefc..70a10fc0 100644 --- a/appname/templates/auth/invite.html +++ b/appname/templates/auth/invite.html @@ -4,34 +4,36 @@ {% block title %}appname Signup{% endblock %} {% block body %} -
-
-
- + + {% include 'tabler/_footer.html' with context %} {% endblock %} diff --git a/appname/templates/auth/login.html b/appname/templates/auth/login.html index d5eeb5c7..5b545f78 100644 --- a/appname/templates/auth/login.html +++ b/appname/templates/auth/login.html @@ -5,45 +5,43 @@ {% block title %}appname Login Example{% endblock %} {% block body %} -
-
-
- {% include 'tabler/_footer.html' with context %} diff --git a/appname/templates/auth/oauth_only_login.html b/appname/templates/auth/oauth_only_login.html index 42f1a6f8..737f487d 100644 --- a/appname/templates/auth/oauth_only_login.html +++ b/appname/templates/auth/oauth_only_login.html @@ -15,25 +15,44 @@
- {% if features.oauth %} - - Login with Google - - {% else %} - It is not possible to login to appname right now because OAuth Login has not been configured. - {% endif %}
- {% if constants.ALLOW_SIGNUPS %} -
- Don't have an account yet? Sign Up -
- {% endif %}
+ +
+
+
+ + {{ render_flashes() }} + + +
+
+
+

Log in to appname

+ + {% if features.oauth %} + + Login with Google + + {% else %} + It is not possible to login to appname right now because OAuth Login has not been configured. + {% endif %} + {% if constants.ALLOW_SIGNUPS %} +
+ Don't have an account yet? Sign Up +
+ {% endif %} +
+
+
+
+
+ {% include 'tabler/_footer.html' with context %} {% endblock %} diff --git a/appname/templates/auth/reauth.html b/appname/templates/auth/reauth.html index 6a2b2c8e..e3b73c96 100644 --- a/appname/templates/auth/reauth.html +++ b/appname/templates/auth/reauth.html @@ -4,17 +4,25 @@ {% block title %}appname Login Example{% endblock %} {% block body %} -
-
-
-