From 40b4a0657f6e65adf34d5a0a6a881382f46e32b3 Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Fri, 26 Nov 2021 20:42:56 +0100 Subject: [PATCH 1/4] Code input is now case in-sensitive --- frontend/components/AccessCodePage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/components/AccessCodePage.vue b/frontend/components/AccessCodePage.vue index 83af4b2..ddd4d44 100644 --- a/frontend/components/AccessCodePage.vue +++ b/frontend/components/AccessCodePage.vue @@ -57,7 +57,7 @@ export default { video.paused ? video.play() : video.pause(); }, submit() { - const site = __sites__.find(site => site.code == this.code); + const site = __sites__.find(site => site.code?.toLowerCase() == this.code?.toLowerCase()); if (site) { createCookie("accesscode", site.code, 14); From 0d14305dedd577bc6bdfc124a8345d2685053993 Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Fri, 26 Nov 2021 20:43:11 +0100 Subject: [PATCH 2/4] Make sure we also add the path when redirecting successfull code input This is most relevant when SMS is sent to device used to watch the lottery. --- frontend/components/AccessCodePage.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/components/AccessCodePage.vue b/frontend/components/AccessCodePage.vue index ddd4d44..612db24 100644 --- a/frontend/components/AccessCodePage.vue +++ b/frontend/components/AccessCodePage.vue @@ -61,7 +61,11 @@ export default { if (site) { createCookie("accesscode", site.code, 14); - window.location.href = `${window.location.protocol}//${site.domain}`; + const path = (location.pathname+location.search).substr(1) + const redirectUrl = `${window.location.protocol}//${site.domain}/${path}` + window.location.href = redirectUrl; + } else { + this.smh() } return; From 3a6a9122e110369ce90327ffb005d1263172488d Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Fri, 26 Nov 2021 20:44:58 +0100 Subject: [PATCH 3/4] Some shake animation on unsuccessful code input --- frontend/components/AccessCodePage.vue | 39 ++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/frontend/components/AccessCodePage.vue b/frontend/components/AccessCodePage.vue index 612db24..4ed692f 100644 --- a/frontend/components/AccessCodePage.vue +++ b/frontend/components/AccessCodePage.vue @@ -11,7 +11,7 @@ -
+
@@ -56,6 +56,13 @@ export default { const { video } = this.$refs; video.paused ? video.play() : video.pause(); }, + smh() { + let inputContainer = document.getElementById('code-container') + inputContainer.classList.add('shake') + if (this.timeout) + clearTimeout(this.timeout) + this.timeout = setTimeout(() => inputContainer.classList.remove('shake'), 600); + }, submit() { const site = __sites__.find(site => site.code?.toLowerCase() == this.code?.toLowerCase()); @@ -67,8 +74,6 @@ export default { } else { this.smh() } - - return; }, }, }; @@ -131,6 +136,11 @@ video { width: 80%; } + &.shake { + animation: shake 0.6s cubic-bezier(0.36, 0.07, 0.19, 0.97) both; + animation-iteration-count: infinite; + } + input { max-width: 24rem; width: 100%; @@ -209,4 +219,27 @@ video { .button-container { margin-top: 4rem; } + +@keyframes shake { + 10%, + 90% { + transform: translate3d(-1px, 0, 0); + } + + 20%, + 80% { + transform: translate3d(2px, 0, 0); + } + + 30%, + 50%, + 70% { + transform: translate3d(-4px, 0, 0); + } + + 40%, + 60% { + transform: translate3d(4px, 0, 0); + } +} From e1daf00609591de2a406cf93e6e7bea820658170 Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Fri, 26 Nov 2021 20:45:03 +0100 Subject: [PATCH 4/4] Make text more readable --- frontend/components/AccessCodePage.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/components/AccessCodePage.vue b/frontend/components/AccessCodePage.vue index 4ed692f..bbf23b9 100644 --- a/frontend/components/AccessCodePage.vue +++ b/frontend/components/AccessCodePage.vue @@ -159,6 +159,7 @@ video { button { height: 100%; max-height: unset; + font-weight: bold; } } @@ -194,6 +195,7 @@ video { label { color: rgba(255, 255, 255, 0.82); + text-shadow: 1px 1px black; font-size: 1.5rem; font-weight: 500; }