MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity
MarseyWorld/files/templates/login_2fa.html

101 lines
2.9 KiB
HTML
Raw Normal View History

Add assetcache.asset_siteimg, has_logo. Commit began by changing the duplicated SITE_NAME conditional in the header to use a `has_logo` param, much like the recent `has_sidebar`. From there, a need to include site-specific assets in assetcache was revealed, adding the `asset_siteimg(...)` macro. This was applied quite broadly, though not comprehensively.
2022-07-01 05:55:53 +00:00
{%- from 'util/assetcache.html' import asset, asset_siteimg with context -%}
templates: Fix improper plurals, create helpers. Previously, the three instances of 'Report[s]' and one instance of 'Coin[s]' in the UI templates were always pluralized, even when they referred to a singular instance. This has been corrected by creating a `plural` helper macro. Additionally, this was used as impetus to create `utils/helpers.html` to eventually move more recurring template logic into macros.
2022-06-07 09:26:22 +00:00
{%- import 'util/helpers.html' as help -%}
mn
2022-05-04 23:09:46 +00:00
<!DOCTYPE html>
<html lang="en">
<head>
Add assetcache.asset_siteimg, has_logo. Commit began by changing the duplicated SITE_NAME conditional in the header to use a `has_logo` param, much like the recent `has_sidebar`. From there, a need to include site-specific assets in assetcache was revealed, adding the `asset_siteimg(...)` macro. This was applied quite broadly, though not comprehensively.
2022-07-01 05:55:53 +00:00
<link rel="icon" type="image/webp" href="{{asset_siteimg('icon.webp')}}">
sdf
2022-05-27 20:03:23 +00:00
stop using app.config for our own stuff
2022-06-24 15:08:57 +00:00
<meta name="description" content="{{DESCRIPTION}}">
mn
2022-05-04 23:09:46 +00:00
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'; connect-src 'self'; object-src 'none';">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="author" content="">
<title>2-Step Login - {{SITE_NAME}}</title>
fix 500 errors
2022-06-24 01:28:34 +00:00
<style>:root{--primary:#{{DEFAULT_COLOR}}</style>
Templates: create assetcache template. For too long, we've Replace-All'd to increment site asset version numbers. This is a task that has an obvious solution using the templating engine. As such, we now have templates/util/assetcache.html which contains a dict of version numbers and a macro to generate the versioned name of an asset. Going forward, it is recommended that all future replace-all uses are used as opportunities to switch to the macro. Do remember to import the macro in all top-level templates, if not already present. Recommended form: {%- from 'util/assetcache.html' import asset -%} Then add a key to CACHE_VER in util/assetcache.html. Then replace the asset path in templates eg: {{asset('css/main.css')}} For all future versions of those assets, one can simply increment the value in util/assetcache.html instead. This will greatly reduce git spam touching unrelated files and generally be clearer and easier.
2022-05-27 02:47:32 +00:00
<link rel="stylesheet" href="{{asset('css/main.css')}}">
stop using app.config for our own stuff
2022-06-24 15:08:57 +00:00
<link rel="stylesheet" href="/assets/css/{{DEFAULT_THEME}}.css?v=57">
mn
2022-05-04 23:09:46 +00:00
</head>
<body id="login">
<div class="container-fluid position-absolute h-100 p-0 overflow-auto">
<div class="row no-gutters h-100">
<div class="col-12 col-md-6 my-auto p-3">
<div class="row justify-content-center">
<div class="col-10 col-md-7">
<div class="mb-5">
<a href="/" class="text-decoration-none"><span class="h3 text-primary">‎</span></a>
</div>
<div id="login-form" class="">
<h1 class="h2">Two-step login</h1>
<p class="text-muted mb-md-5">To login, please enter the 6-digit verification code generated in your authenticator app.</p>
{% if failed %}
<div class="alert alert-danger alert-dismissible fade show d-flex my-3" role="alert">
<i class="fas fa-exclamation-circle my-auto"></i>
<div>
Invalid verification code. Please try again.
</div>
<button class="close" data-bs-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endif %}
<form action="/login" method="post" class="mt-md-3" id="login">
<input type="hidden" name="username" value="{{v.username}}">
<input type="hidden" name="redirect" value="{{redirect}}">
<input type="hidden" name="time" value="{{time}}">
<input type="hidden" name="hash" value="{{hash}}">
<label for="2fa_token" class="mt-3">Your verification code</label>
<input autocomplete="off" class="form-control" id="2fa_token" name="2fa_token" type="text" placeholder="6-digit code">
<small><a href="/lost_2fa">Lost your 2FA device?</a></small>
<button class="btn btn-primary login w-100 mt-3" id="login_button">Sign in</button>
</form>
</div>
</div>
</div>
</div>
<div class="col-12 col-md-6 d-none d-md-block">
<div class="splash-wrapper">
<div class="splash-overlay"></div>
change deux cover
2022-07-28 17:23:02 +00:00
<img alt="cover" loading="lazy" class="splash-img" src="{{asset_siteimg('cover.webp')}}"></img>
mn
2022-05-04 23:09:46 +00:00
</div>
</div>
</div>
</div>
</body>
</html>