refactor: stuff yop

This commit is contained in:
afn 2023-01-10 03:37:20 -05:00
parent f21e7954d1
commit 00817068f8
3 changed files with 45 additions and 51 deletions

View File

@ -47,6 +47,7 @@ body {
--white: #fff; --white: #fff;
--accent-color: #9fd5ff; --accent-color: #9fd5ff;
--accent-color-two: hsl(207, 65%, 90%); --accent-color-two: hsl(207, 65%, 90%);
--accent-low-opacity: #4b5f798a;
--bg-color: hsl(240, 2%, 11%); --bg-color: hsl(240, 2%, 11%);
--grey-one: #252b31; --grey-one: #252b31;
--grey-two: #28313b; --grey-two: #28313b;

View File

@ -17,7 +17,6 @@
selected = selected; selected = selected;
} }
console.log(selected); console.log(selected);
localStorage.setItem('selected', JSON.stringify(selected));
}; };
</script> </script>
@ -68,7 +67,7 @@
} }
.clicked { .clicked {
background-color: var(--grey-three); background-color: var(--accent-low-opacity);
} }
.clicked h2, .clicked h2,

View File

@ -15,15 +15,8 @@
let min = 0; let min = 0;
let max = logoAmount; let max = logoAmount;
let token: string = ''; let token: string = '';
let submit = false; let submit = false;
$: finalPage = currentPage >= logoPages;
// try {
// currentPage = Number(localStorage.getItem('currentPage')) || 0;
// selected = JSON.parse(localStorage.getItem('selected')) || [];
// } catch (err) {
// console.log(err);
// }
// TODO: catch blocks. // TODO: catch blocks.
async function exchange_token(bot_token: string) { async function exchange_token(bot_token: string) {
@ -45,7 +38,7 @@
// you will never see shittier code tm // you will never see shittier code tm
// will refactor later maybe idk // will refactor later maybe idk
// Reply: don't think we need to refactor because nobody cares if this code is shit lol // Reply: don't think we need to refactor because nobody cares if this code is shit lol
onMount(async () => { onMount(async () => {
window['use_token'] = exchange_token; window['use_token'] = exchange_token;
window['submit_poll'] = submitBallot; window['submit_poll'] = submitBallot;
@ -87,9 +80,9 @@
}); });
function previousPage() { function previousPage() {
if (currentPage <= 0 || submit) return null; if (currentPage <= 0) return null;
currentPage--; currentPage--;
// localStorage.setItem('currentPage', currentPage.toString()); submit = false;
min = currentPage * logoAmount; min = currentPage * logoAmount;
max = min + logoAmount; max = min + logoAmount;
@ -99,7 +92,6 @@
function nextPage() { function nextPage() {
if (currentPage >= logoPages || submit) return null; if (currentPage >= logoPages || submit) return null;
currentPage++; currentPage++;
// localStorage.setItem('currentPage', currentPage.toString());
min = currentPage * logoAmount; min = currentPage * logoAmount;
max = min + logoAmount; max = min + logoAmount;
@ -107,11 +99,10 @@
} }
function clearLogos() { function clearLogos() {
if (submit) { if (submit) {
return; return;
} }
selected = []; selected = [];
// localStorage.setItem('selected', JSON.stringify(selected));
} }
async function submitBallot() { async function submitBallot() {
@ -138,8 +129,6 @@
throw Error('Vote not cast.'); throw Error('Vote not cast.');
} }
} }
$: finalPage = currentPage >= logoPages;
</script> </script>
<svelte:head> <svelte:head>
@ -203,11 +192,29 @@
<h6>No logos have been selected.</h6> <h6>No logos have been selected.</h6>
</div> </div>
{/if} {/if}
{#if submit}
<div style="text-align: center;">
{#await submitBallot()}
<h6 in:fly={{ x: transitionDirection, easing: expoOut, duration: 1000 }}>
Submitting...
</h6>
{:then _}
<h6 in:fly={{ x: transitionDirection, easing: expoOut, duration: 1000 }}>
Your vote has been cast.
</h6>
{:catch err}
<h6 in:fly={{ x: transitionDirection, easing: expoOut, duration: 1000 }}>
An error occured. Try again later.
<br />
{err}
</h6>
{/await}
</div>
{/if}
</div> </div>
<div class="buttons-container"> <div class="buttons-container">
<Button on:click={previousPage} unclickable={currentPage <= 0 || submit} <Button on:click={previousPage} unclickable={currentPage <= 0}>Previous</Button>
>Previous</Button
>
<Button <Button
kind="primary" kind="primary"
on:click={finalPage ? () => (submit = true) : nextPage} on:click={finalPage ? () => (submit = true) : nextPage}
@ -216,22 +223,6 @@
{finalPage ? 'Submit' : 'Next'} {finalPage ? 'Submit' : 'Next'}
</Button> </Button>
</div> </div>
{#if submit}
<div style="text-align: center;">
{#await submitBallot()}
<h6>Submitting...</h6>
{:then _}
<h6>Your vote has been cast.</h6>
{:catch err}
<h6>
An error occured. Try again later.
<br />
{err}
</h6>
{/await}
</div>
{/if}
</main> </main>
<style> <style>
@ -276,18 +267,21 @@
border-top: 1px solid var(--grey-three); border-top: 1px solid var(--grey-three);
} }
/* This is better for large screens, but I am not entirely sure about the media query... */ @media screen and (orientation: landscape) and (min-width: 1500px) and (min-height: 950px) {
/* @media screen and (orientation: landscape) and (min-width: 1500px) and (min-height: 950px) { .buttons-container {
.buttons-container { justify-content: center;
justify-content: center; z-index: unset;
z-index: unset; position: unset;
position: unset; bottom: unset;
bottom: unset; right: unset;
right: unset; border-top: none;
border-top: unset; background-color: transparent;
background-color: inherit; }
}
} */ :global(.wrapper) {
padding-bottom: 0;
}
}
button { button {
background-color: transparent; background-color: transparent;