From cf2c691585072c4aa2de7bf97261b1a2bf3004a3 Mon Sep 17 00:00:00 2001 From: Bad Date: Wed, 21 Oct 2020 19:22:23 +0200 Subject: [PATCH 1/2] Make font feedback red on error --- src/js/login.js | 14 +++++++------- src/sass/login.sass | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/js/login.js b/src/js/login.js index de32932..c49ad98 100644 --- a/src/js/login.js +++ b/src/js/login.js @@ -50,12 +50,12 @@ class Feedback extends ElemJS { this.loading = state } - message(content) { - if (content) { - this.class("form-feedback") - } else { - this.removeClass("form-feedback") - } + message(content, isError) { + this.removeClass("form-feedback") + this.removeClass("form-error") + if (content) this.class("form-feedback") + if(isError) this.class("form-error") + this.messageSpan.text(content) } } @@ -141,7 +141,7 @@ class Form extends ElemJS { cancel(message) { this.processing = false feedback.setLoading(false) - feedback.message(message) + feedback.message(message, true) } } diff --git a/src/sass/login.sass b/src/sass/login.sass index e4820ee..235fad4 100644 --- a/src/sass/login.sass +++ b/src/sass/login.sass @@ -38,6 +38,9 @@ width: 100% margin: -0.5em 0 -0.8em +.form-error + color: red + @keyframes spin 0% transform: rotate(0deg) From c8351e8f0c52ea9bb43e7975920ecf036798b8d3 Mon Sep 17 00:00:00 2001 From: Bad Date: Wed, 21 Oct 2020 19:43:21 +0200 Subject: [PATCH 2/2] Warn when assuming https --- src/js/login.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/js/login.js b/src/js/login.js index c49ad98..33d2006 100644 --- a/src/js/login.js +++ b/src/js/login.js @@ -80,7 +80,10 @@ class Form extends ElemJS { let currentAddress = homeserver.value let ok = false while (!ok) { - if (!currentAddress.match(/^https?:\/\//)) currentAddress = "https://" + currentAddress + if (!currentAddress.match(/^https?:\/\//)) { + console.warn(`${currentAddress} doesn't specify the protocol, assuming https`) + currentAddress = "https://" + currentAddress + } currentAddress = currentAddress.replace(/\/*$/, "") this.status(`Looking up homeserver... trying ${currentAddress}`) try {