From c0676e198cbf11803c601e267954d18b1edbbb54 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 4 Dec 2022 17:40:32 +0200 Subject: [PATCH] convert "var" to "let" and "const" --- chat/global.d.ts | 2 +- .../assets/js/comments+submission_listing.js | 4 +- files/assets/js/comments_v.js | 8 +- files/assets/js/core.js | 31 ++++--- files/assets/js/fireworks.js | 18 ++-- files/assets/js/gif_modal.js | 16 ++-- files/assets/js/lottery.js | 2 +- files/assets/js/markdown.js | 30 +++---- files/assets/js/mobile_navigation_bar.js | 14 ++-- files/assets/js/register_service_worker.js | 2 +- files/assets/js/ricardo.js | 8 +- files/assets/js/settings_blocks.js | 22 ----- files/assets/js/settings_profile.js | 4 +- files/assets/js/settings_security.js | 35 +++++++- files/assets/js/signup.js | 8 +- files/assets/js/sort_table.js | 2 +- files/assets/js/submit.js | 12 +-- files/routes/settings.py | 2 +- files/templates/comments.html | 2 +- files/templates/home.html | 2 +- files/templates/modals/2fa.html | 54 ------------ files/templates/modals/blockuser.html | 22 ----- files/templates/settings/security.html | 83 ++++++++++++++++++- files/templates/submit_hats.html | 4 +- files/templates/submit_marseys.html | 4 +- files/templates/update_assets.html | 4 +- 26 files changed, 201 insertions(+), 194 deletions(-) delete mode 100644 files/assets/js/settings_blocks.js delete mode 100644 files/templates/modals/2fa.html delete mode 100644 files/templates/modals/blockuser.html diff --git a/chat/global.d.ts b/chat/global.d.ts index 34ba5119f..a2e584d33 100644 --- a/chat/global.d.ts +++ b/chat/global.d.ts @@ -1,4 +1,4 @@ -declare var process: { +declare const process: { env: Record; }; diff --git a/files/assets/js/comments+submission_listing.js b/files/assets/js/comments+submission_listing.js index 2a7636182..3a605b428 100644 --- a/files/assets/js/comments+submission_listing.js +++ b/files/assets/js/comments+submission_listing.js @@ -124,8 +124,8 @@ function bet_vote(t, oid) { for(let el of document.getElementsByClassName('cost')) { el.classList.add('d-none') } - var scoretext = document.getElementById('option-' + oid); - var score = Number(scoretext.textContent); + const scoretext = document.getElementById('option-' + oid); + const score = Number(scoretext.textContent); scoretext.textContent = score + 1; document.getElementById("user-coins-amount").innerText = parseInt(document.getElementById("user-coins-amount").innerText) - 200; diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index 7ce72287e..49f17b490 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -250,7 +250,7 @@ function post_comment(fullname, hide){ } document.onpaste = function(event) { - var focused = document.activeElement; + const focused = document.activeElement; const files = structuredClone(event.clipboardData.files); if (files.length > 4) @@ -262,7 +262,7 @@ document.onpaste = function(event) { if (!files.length) return if (focused.id.includes('reply-form-body-')) { - var fullname = focused.dataset.fullname; + const fullname = focused.dataset.fullname; f=document.getElementById('file-upload-reply-' + fullname); try { let filename = '' @@ -275,7 +275,7 @@ document.onpaste = function(event) { catch(e) {} } else if (focused.id.includes('comment-edit-body-')) { - var id = focused.dataset.id; + const id = focused.dataset.id; f=document.getElementById('file-edit-reply-' + id); let filename = '' for (const file of files) @@ -285,7 +285,7 @@ document.onpaste = function(event) { document.getElementById('filename-edit-reply-' + id).textContent = filename; } else if (focused.id.includes('post-edit-box-')) { - var id = focused.dataset.id; + const id = focused.dataset.id; f=document.getElementById('file-upload-edit-' + id); let filename = '' for (const file of files) diff --git a/files/assets/js/core.js b/files/assets/js/core.js index 007ddafd4..52f36060e 100644 --- a/files/assets/js/core.js +++ b/files/assets/js/core.js @@ -156,9 +156,9 @@ function autoExpand(field) { field.style.height = 'inherit'; - var computed = window.getComputedStyle(field); + let computed = window.getComputedStyle(field); - var height = parseInt(computed.getPropertyValue('border-top-width'), 10) + let height = parseInt(computed.getPropertyValue('border-top-width'), 10) + parseInt(computed.getPropertyValue('padding-top'), 10) + field.scrollHeight + parseInt(computed.getPropertyValue('padding-bottom'), 10) @@ -182,7 +182,7 @@ function smoothScrollTop() // Click navbar to scroll back to top const nav = document.getElementsByTagName('nav') -if (nav) { +if (nav.length) { nav[0].addEventListener('click', (e) => { if (e.target.id === "navbar" || e.target.classList.contains("container-fluid") || @@ -272,7 +272,7 @@ function bs_trigger(e) { } } -var bsTriggerOnReady = function() { +let bsTriggerOnReady = function() { bs_trigger(document); } @@ -313,13 +313,13 @@ function showmore() { } function formatDate(d) { - var year = d.getFullYear(); - var monthAbbr = d.toLocaleDateString('en-us', {month: 'short'}); - var day = d.getDate(); - var hour = ("0" + d.getHours()).slice(-2); - var minute = ("0" + d.getMinutes()).slice(-2); - var second = ("0" + d.getSeconds()).slice(-2); - var tzAbbr = d.toLocaleTimeString('en-us', {timeZoneName: 'short'}).split(' ')[2]; + let year = d.getFullYear(); + let monthAbbr = d.toLocaleDateString('en-us', {month: 'short'}); + let day = d.getDate(); + let hour = ("0" + d.getHours()).slice(-2); + let minute = ("0" + d.getMinutes()).slice(-2); + let second = ("0" + d.getSeconds()).slice(-2); + let tzAbbr = d.toLocaleTimeString('en-us', {timeZoneName: 'short'}).split(' ')[2]; return (day + " " + monthAbbr + " " + year + " " + hour + ":" + minute + ":" + second + " " + tzAbbr); @@ -383,15 +383,12 @@ function sendFormXHR(e, extraActionsOnSuccess) { document.getElementById('toast-post-error-text').innerText = "Error, please try again later." try { let data=JSON.parse(xhr.response); - var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')); - myToast.show(); + bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); document.getElementById('toast-post-error-text').innerText = data["error"]; if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"]; } catch(e) { - var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')); - myToast.hide(); - var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')); - myToast.show(); + bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).hide(); + bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); } } }; diff --git a/files/assets/js/fireworks.js b/files/assets/js/fireworks.js index 6a4f00c9c..aec5fac37 100644 --- a/files/assets/js/fireworks.js +++ b/files/assets/js/fireworks.js @@ -1,28 +1,28 @@ const fireworks = document.getElementsByClassName("firework") -var counter = 0 +let counter = 0 for (let firework of fireworks){ -var timeout = 2000 * counter +const timeout = 2000 * counter counter++ setTimeout(() => { setInterval(() => { firework.firstElementChild.src = "/i/firework-trail.webp" - var xpos = Math.floor(Math.random() * 80) + 5 - var ypos = 95 + const xpos = Math.floor(Math.random() * 80) + 5 + let ypos = 95 firework.style.top=ypos+"%" firework.style.left=xpos+"%" firework.style.display="inline-block" - var hue = Math.floor(Math.random()*360)+1 + const hue = Math.floor(Math.random()*360)+1 firework.style.filter="hue-rotate("+hue+"deg)" - var id = null - var height = Math.floor(Math.random()*60)+15 + let id = null + const height = Math.floor(Math.random()*60)+15 clearInterval(id); id = setInterval(frame, 20); - var vnum = Math.floor(Math.random()*1000) + const vnum = Math.floor(Math.random()*1000) function frame() { if (ypos <= height) { @@ -35,4 +35,4 @@ setTimeout(() => { } }, 5000) }, timeout) -} \ No newline at end of file +} diff --git a/files/assets/js/gif_modal.js b/files/assets/js/gif_modal.js index c11375bdc..09f5346cd 100644 --- a/files/assets/js/gif_modal.js +++ b/files/assets/js/gif_modal.js @@ -13,15 +13,15 @@ async function getGif(searchTerm) { document.getElementById('gifSearch').value = null; } - var loadGIFs = document.getElementById('gifs-load-more'); + const loadGIFs = document.getElementById('gifs-load-more'); - var noGIFs = document.getElementById('no-gifs-found'); + const noGIFs = document.getElementById('no-gifs-found'); - var container = document.getElementById('GIFs'); + const container = document.getElementById('GIFs'); - var backBtn = document.getElementById('gifs-back-btn'); + const backBtn = document.getElementById('gifs-back-btn'); - var cancelBtn = document.getElementById('gifs-cancel-btn'); + const cancelBtn = document.getElementById('gifs-cancel-btn'); container.innerHTML = ''; @@ -43,9 +43,9 @@ async function getGif(searchTerm) { let response = await fetch("/giphy?searchTerm=" + searchTerm + "&limit=48"); let data = await response.json() - var max = data.length - 1 + const max = data.length - 1 data = data.data - var gifURL = []; + const gifURL = []; if (max <= 0) { noGIFs.innerHTML = '

Aw shucks. No GIFs found...

'; @@ -53,7 +53,7 @@ async function getGif(searchTerm) { loadGIFs.innerHTML = null; } else { - for (var i = 0; i < 48; i++) { + for (let i = 0; i < 48; i++) { gifURL[i] = "https://media.giphy.com/media/" + data[i].id + "/giphy.webp"; if (data[i].username==''){ container.innerHTML += ('
'); diff --git a/files/assets/js/lottery.js b/files/assets/js/lottery.js index b758b3c6b..f2e5e4612 100644 --- a/files/assets/js/lottery.js +++ b/files/assets/js/lottery.js @@ -1,5 +1,5 @@ let purchaseQuantity = 1; -var lotteryOnReady = function () { +const lotteryOnReady = function () { checkLotteryStats(); // Show ticket being pulled. diff --git a/files/assets/js/markdown.js b/files/assets/js/markdown.js index 5aa9a1322..fcb2a7dd8 100644 --- a/files/assets/js/markdown.js +++ b/files/assets/js/markdown.js @@ -54,17 +54,17 @@ function markdown(t) { input = input.replace(/\|\|(.*?)\|\|/g, '$1') input = input.replace(/(\n|^)>([^ >][^\n]*)/g, '$1\>$2') - var emojis = Array.from(input.matchAll(/:([a-z0-9_\-!#@]{1,36}):(?!\/)/gi)) + const emojis = Array.from(input.matchAll(/:([a-z0-9_\-!#@]{1,36}):(?!\/)/gi)) if(emojis != null){ for(i = 0; i < emojis.length; i++){ - var old = emojis[i][0]; + const old = emojis[i][0]; if (old.includes('marseyrandom')) continue - var emoji = old.replace(/[:!@#]/g,'').toLowerCase(); - var mirroredClass = old.indexOf('!') == -1 ? '' : 'mirrored'; - var emojiClass = old.indexOf('#') == -1 ? 'emoji' : 'emoji-lg'; + const emoji = old.replace(/[:!@#]/g,'').toLowerCase(); + const mirroredClass = old.indexOf('!') == -1 ? '' : 'mirrored'; + const emojiClass = old.indexOf('#') == -1 ? 'emoji' : 'emoji-lg'; if (emoji.endsWith('pat') && emoji != 'marseyunpettablepat') { emoji = emoji.substr(0, emoji.length - 3); - var url = old.indexOf('@') != -1 ? `/@${emoji}/pic` : `/e/${emoji}.webp`; + const url = old.indexOf('@') != -1 ? `/@${emoji}/pic` : `/e/${emoji}.webp`; input = input.replace(old, ``); } else { input = input.replace(old, ``); @@ -75,8 +75,8 @@ function markdown(t) { let options = Array.from(input.matchAll(/\s*\$\$([^\$\n]+)\$\$\s*/gi)) if(options != null){ for(i = 0; i < options.length; i++){ - var option = options[i][0]; - var option2 = option.replace(/\$\$/g, '').replace(/\n/g, '') + const option = options[i][0]; + const option2 = option.replace(/\$\$/g, '').replace(/\n/g, '') input = input.replace(option, ''); input += `
`; } @@ -85,8 +85,8 @@ function markdown(t) { options = Array.from(input.matchAll(/\s*&&([^\$\n]+)&&\s*/gi)) if(options != null){ for(i = 0; i < options.length; i++){ - var option = options[i][0]; - var option2 = option.replace(/&&/g, '').replace(/\n/g, '') + const option = options[i][0]; + const option2 = option.replace(/&&/g, '').replace(/\n/g, '') input = input.replace(option, ''); input += `
`; } @@ -100,13 +100,13 @@ function markdown(t) { function charLimit(form, text) { - var input = document.getElementById(form); + const input = document.getElementById(form); - var text = document.getElementById(text); + text = document.getElementById(text); - var length = input.value.length; + const length = input.value.length; - var maxLength = input.getAttribute("maxlength"); + const maxLength = input.getAttribute("maxlength"); if (length >= maxLength) { text.style.color = "#E53E3E"; @@ -123,4 +123,4 @@ function charLimit(form, text) { function remove_dialog() { window.onbeforeunload = null; -} \ No newline at end of file +} diff --git a/files/assets/js/mobile_navigation_bar.js b/files/assets/js/mobile_navigation_bar.js index 731daf02f..992f0b537 100644 --- a/files/assets/js/mobile_navigation_bar.js +++ b/files/assets/js/mobile_navigation_bar.js @@ -1,14 +1,14 @@ -var prevScrollpos = window.pageYOffset; +let prevScrollpos = window.pageYOffset; window.onscroll = function () { - var currentScrollPos = window.pageYOffset; + const currentScrollPos = window.pageYOffset; - var topBar = document.getElementById("fixed-bar-mobile"); + const topBar = document.getElementById("fixed-bar-mobile"); - var bottomBar = document.getElementById("mobile-bottom-navigation-bar"); + const bottomBar = document.getElementById("mobile-bottom-navigation-bar"); - var dropdown = document.getElementById("mobileSortDropdown"); + const dropdown = document.getElementById("mobileSortDropdown"); - var navbar = document.getElementById("navbar"); + const navbar = document.getElementById("navbar"); if (bottomBar != null) { if (prevScrollpos > currentScrollPos && (window.innerHeight + currentScrollPos) < (document.body.offsetHeight - 65)) { @@ -41,4 +41,4 @@ window.onscroll = function () { } } prevScrollpos = currentScrollPos; -} \ No newline at end of file +} diff --git a/files/assets/js/register_service_worker.js b/files/assets/js/register_service_worker.js index ecdd757aa..8aee8d990 100644 --- a/files/assets/js/register_service_worker.js +++ b/files/assets/js/register_service_worker.js @@ -16,7 +16,7 @@ function urlB64ToUint8Array(base64String) { } function updateSubscriptionOnServer(subscription, apiEndpoint) { - var formData = new FormData(); + const formData = new FormData(); formData.append("subscription_json", JSON.stringify(subscription)); const xhr = createXhrWithFormKey( diff --git a/files/assets/js/ricardo.js b/files/assets/js/ricardo.js index a7b178d6d..c1fe3d43c 100644 --- a/files/assets/js/ricardo.js +++ b/files/assets/js/ricardo.js @@ -1,7 +1,7 @@ -var isleft = true +const isleft = true setInterval(() => { let ricardo1 = document.getElementById("ricardo1") - var height = Math.floor(Math.random()*60)+10 + const height = Math.floor(Math.random()*60)+10 if (ricardo1) { ricardo1.firstElementChild.src = "" @@ -20,7 +20,7 @@ setInterval(() => { setInterval(() => { let ricardo2 = document.getElementById("ricardo2") - var xpos = Math.floor(Math.random()*9)*10 + const xpos = Math.floor(Math.random()*9)*10 if (ricardo2) ricardo2.style.left=xpos+"%" -}, 1700) \ No newline at end of file +}, 1700) diff --git a/files/assets/js/settings_blocks.js b/files/assets/js/settings_blocks.js deleted file mode 100644 index 2b928e5f3..000000000 --- a/files/assets/js/settings_blocks.js +++ /dev/null @@ -1,22 +0,0 @@ -function block_user() { - var usernameField = document.getElementById("exile-username"); - var isValidUsername = usernameField.checkValidity(); - username = usernameField.value; - if (isValidUsername) { - const xhr = new XMLHttpRequest(); - xhr.open("post", "/settings/block"); - xhr.setRequestHeader('xhr', 'xhr'); - f=new FormData(); - f.append("username", username); - f.append("formkey", formkey()); - xhr.onload=function(){ - if (xhr.status<300) { - location.reload(); - } - else { - showToast(false, "Error, please try again later."); - } - } - xhr.send(f) - } -} \ No newline at end of file diff --git a/files/assets/js/settings_profile.js b/files/assets/js/settings_profile.js index 86ac08879..6fa6ec9b0 100644 --- a/files/assets/js/settings_profile.js +++ b/files/assets/js/settings_profile.js @@ -9,7 +9,7 @@ function post(url) { }; function updatebgselection(){ - var bgselector = document.getElementById("backgroundSelector"); + const bgselector = document.getElementById("backgroundSelector"); const backgrounds = [ { folder: "glitter", @@ -96,7 +96,7 @@ function updatebgselection(){ updatebgselection(); document.onpaste = function(event) { - var focused = document.activeElement; + const focused = document.activeElement; if (focused.id == 'bio-text') { const files = structuredClone(event.clipboardData.files); diff --git a/files/assets/js/settings_security.js b/files/assets/js/settings_security.js index b56f5b42e..58bff296e 100644 --- a/files/assets/js/settings_security.js +++ b/files/assets/js/settings_security.js @@ -7,4 +7,37 @@ const twoStepModal = bootstrap.Modal.getOrCreateInstance(document.getElementById function emailVerifyText() { document.getElementById("email-verify-text").innerHTML = "Verification email sent! Please check your inbox."; -} \ No newline at end of file +} + +function block_user() { + const usernameField = document.getElementById("block-username"); + const isValidUsername = usernameField.checkValidity(); + username = usernameField.value; + if (isValidUsername) { + const xhr = new XMLHttpRequest(); + xhr.open("post", "/settings/block"); + xhr.setRequestHeader('xhr', 'xhr'); + f=new FormData(); + f.append("username", username); + f.append("formkey", formkey()); + xhr.onload=function(){ + if (xhr.status<300) { + location.reload(); + } + else { + showToast(false, "Error, please try again later."); + } + } + xhr.send(f) + } +} + +function unblock_user(t, url) { + postToast(t, url, + { + }, + () => { + t.parentElement.parentElement.remove(); + } + ); +} diff --git a/files/assets/js/signup.js b/files/assets/js/signup.js index a05318540..72bd14fc6 100644 --- a/files/assets/js/signup.js +++ b/files/assets/js/signup.js @@ -1,8 +1,8 @@ document.getElementById('password-register').addEventListener('input', function () { - var charCount = document.getElementById("password-register").value; - var id = document.getElementById("passwordHelpRegister"); - var successID = document.getElementById("passwordHelpSuccess"); + const charCount = document.getElementById("password-register").value; + const id = document.getElementById("passwordHelpRegister"); + const successID = document.getElementById("passwordHelpSuccess"); if (charCount.length >= 8) { id.classList.add("d-none"); @@ -38,4 +38,4 @@ document.getElementById('username-register').addEventListener('input', function }) } } -}); \ No newline at end of file +}); diff --git a/files/assets/js/sort_table.js b/files/assets/js/sort_table.js index ae26a11b9..98c01ceed 100644 --- a/files/assets/js/sort_table.js +++ b/files/assets/js/sort_table.js @@ -10,7 +10,7 @@ function sort_table(n) { if (!('sortKey' in x.dataset)) { x = x.getElementsByTagName('a')[0] || x; } - var attr; + let attr; if ('sortKey' in x.dataset) { attr = x.dataset.sortKey; } else if ('time' in x.dataset) { diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js index 93df4c15d..26b3416c1 100644 --- a/files/assets/js/submit.js +++ b/files/assets/js/submit.js @@ -83,7 +83,7 @@ document.onpaste = function(event) { document.getElementById('urlblock').classList.add('d-none'); if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () {document.getElementById('image-preview').setAttribute('src', this.result);}); } @@ -102,7 +102,7 @@ document.getElementById('file-upload').addEventListener('change', function(){ filename = f.files[0].name.toLowerCase() if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () {document.getElementById('image-preview').setAttribute('src', this.result);}); } @@ -128,15 +128,15 @@ function savetext() { function autoSuggestTitle() { - var urlField = document.getElementById("post-url"); + const urlField = document.getElementById("post-url"); - var titleField = document.getElementById("post-title"); + const titleField = document.getElementById("post-title"); - var isValidURL = urlField.checkValidity(); + const isValidURL = urlField.checkValidity(); if (isValidURL && urlField.value.length > 0 && titleField.value === "") { - var x = new XMLHttpRequest(); + const x = new XMLHttpRequest(); x.withCredentials=true; x.onreadystatechange = function() { if (x.readyState == 4 && x.status == 200 && !titleField.value) { diff --git a/files/routes/settings.py b/files/routes/settings.py index 8e53b6e35..8cfaf6ce3 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -619,7 +619,7 @@ def settings_unblock_user(v): if not v.shadowbanned and user.admin_level >= PERMS['USER_BLOCKS_VISIBLE']: send_notification(user.id, f"@{v.username} has unblocked you!") cache.delete_memoized(frontlist) - return {"message": f"@{user.username} unblocked."} + return {"message": f"@{user.username} unblocked successfully!"} @app.get("/settings/apps") @auth_required diff --git a/files/templates/comments.html b/files/templates/comments.html index 0bc55e6fe..5d16b65eb 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -895,7 +895,7 @@ }; const base64Mark = btoa(markTemplate("{{v.id}}")); - var style = document.createElement('style'); + const style = document.createElement('style'); style.innerHTML = `.actual-post:not(.deleted, .banned),.comment-section>.comment{background-image:url("data:image/svg+xml;base64,${base64Mark}")}`; document.getElementsByTagName('head')[0].appendChild(style); } diff --git a/files/templates/home.html b/files/templates/home.html index 9006c6e8c..04cbcb557 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -201,7 +201,7 @@ tt.show() document.getElementsByClassName('tooltip')[0].onclick = function(e) { tt.hide() - var xhr = new XMLHttpRequest(); + const xhr = new XMLHttpRequest(); xhr.withCredentials=true; xhr.open("POST", '/dismiss_mobile_tip', true); xhr.setRequestHeader('xhr', 'xhr'); diff --git a/files/templates/modals/2fa.html b/files/templates/modals/2fa.html deleted file mode 100644 index 764775356..000000000 --- a/files/templates/modals/2fa.html +++ /dev/null @@ -1,54 +0,0 @@ - diff --git a/files/templates/modals/blockuser.html b/files/templates/modals/blockuser.html deleted file mode 100644 index 6ba4c9280..000000000 --- a/files/templates/modals/blockuser.html +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html index 6495e4140..cfd92e876 100644 --- a/files/templates/settings/security.html +++ b/files/templates/settings/security.html @@ -177,7 +177,7 @@ {% include "user_in_table.html" %} - + {% else %} @@ -198,13 +198,88 @@ -{%- include 'modals/2fa.html' -%} -{%- include 'modals/blockuser.html' -%} + + + + - {% endblock %} diff --git a/files/templates/submit_hats.html b/files/templates/submit_hats.html index 1be920cbf..bd56c6adf 100644 --- a/files/templates/submit_hats.html +++ b/files/templates/submit_hats.html @@ -81,7 +81,7 @@ document.getElementById('filename-show').textContent = filename; if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () { document.getElementById('image-preview').setAttribute('src', this.result); @@ -97,7 +97,7 @@ filename = f.files[0].name.toLowerCase() if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () { document.getElementById('image-preview').setAttribute('src', this.result); diff --git a/files/templates/submit_marseys.html b/files/templates/submit_marseys.html index 971397df6..491f01e26 100644 --- a/files/templates/submit_marseys.html +++ b/files/templates/submit_marseys.html @@ -83,7 +83,7 @@ document.getElementById('filename-show').textContent = filename; if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () { document.getElementById('image-preview').setAttribute('src', this.result); @@ -99,7 +99,7 @@ filename = f.files[0].name.toLowerCase() if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () { document.getElementById('image-preview').setAttribute('src', this.result); diff --git a/files/templates/update_assets.html b/files/templates/update_assets.html index ddfb41f1d..fa8be03fa 100644 --- a/files/templates/update_assets.html +++ b/files/templates/update_assets.html @@ -75,7 +75,7 @@ document.getElementById('filename-show').textContent = filename; if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () { document.getElementById('image-preview').setAttribute('src', this.result); @@ -91,7 +91,7 @@ filename = f.files[0].name.toLowerCase() if (IMAGE_FORMATS.some(s => filename.endsWith(s))) { - var fileReader = new FileReader(); + const fileReader = new FileReader(); fileReader.readAsDataURL(f.files[0]); fileReader.addEventListener("load", function () { document.getElementById('image-preview').setAttribute('src', this.result);