diff --git a/package.json b/package.json index 4ac9204..8122b9a 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ }, "devDependencies": { "@tsconfig/svelte": "^5.0.2", + "@types/debug": "^4.1.12", "@types/eslint": "8.56.0", "@types/lodash": "^4.14.202", "@typescript-eslint/eslint-plugin": "^6.0.0", @@ -39,7 +40,8 @@ "@sveltejs/adapter-static": "^3.0.1", "@sveltejs/kit": "^2.0.0", "@sveltejs/vite-plugin-svelte": "^3.0.0", - "@tabler/icons-svelte": "^2.47.0", + "@tabler/icons-webfont": "^2.47.0", + "debug": "^4.3.4", "lodash": "^4.17.21", "normalize.css": "^8.0.1", "svelte": "^4.2.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d8f1583..65c9a26 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,9 +20,12 @@ dependencies: '@sveltejs/vite-plugin-svelte': specifier: ^3.0.0 version: 3.0.2(svelte@4.2.9)(vite@5.0.12) - '@tabler/icons-svelte': + '@tabler/icons-webfont': specifier: ^2.47.0 - version: 2.47.0(svelte@4.2.9) + version: 2.47.0 + debug: + specifier: ^4.3.4 + version: 4.3.4 lodash: specifier: ^4.17.21 version: 4.17.21 @@ -46,6 +49,9 @@ devDependencies: '@tsconfig/svelte': specifier: ^5.0.2 version: 5.0.2 + '@types/debug': + specifier: ^4.1.12 + version: 4.1.12 '@types/eslint': specifier: 8.56.0 version: 8.56.0 @@ -90,7 +96,7 @@ devDependencies: version: 3.6.3(postcss@8.4.33)(svelte@4.2.9) wait-on: specifier: ^7.2.0 - version: 7.2.0 + version: 7.2.0(debug@4.3.4) packages: @@ -677,13 +683,10 @@ packages: - supports-color dev: false - /@tabler/icons-svelte@2.47.0(svelte@4.2.9): - resolution: {integrity: sha512-xL2NyCUUhBQv0lXylgNCpfHtMW4Ihu0hCacaYXeX+NiS1LO0geqXk/0lkrBH+u/ZLX6vyqUYNFjawjzmxthFjw==} - peerDependencies: - svelte: '>=3 <5' + /@tabler/icons-webfont@2.47.0: + resolution: {integrity: sha512-yfV9zDal0iYDmyGz4BS9IlhaaMydtLdyOrY2UAZToP65sVWj7AFIi6symNzsoBaX867xAZWVHdKcocah0BfSog==} dependencies: '@tabler/icons': 2.47.0 - svelte: 4.2.9 dev: false /@tabler/icons@2.47.0: @@ -702,6 +705,12 @@ packages: resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} dev: false + /@types/debug@4.1.12: + resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} + dependencies: + '@types/ms': 0.7.34 + dev: true + /@types/eslint@8.56.0: resolution: {integrity: sha512-FlsN0p4FhuYRjIxpbdXovvHQhtlG05O1GG/RNWvdAxTboR438IOTwmrY/vLA+Xfgg06BTkP045M3vpFwTMv1dg==} dependencies: @@ -720,6 +729,10 @@ packages: resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==} dev: true + /@types/ms@0.7.34: + resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} + dev: true + /@types/node@20.11.19: resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==} requiresBuild: true @@ -963,10 +976,10 @@ packages: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: true - /axios@1.6.7: + /axios@1.6.7(debug@4.3.4): resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==} dependencies: - follow-redirects: 1.15.5 + follow-redirects: 1.15.5(debug@4.3.4) form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -1634,7 +1647,7 @@ packages: resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} dev: true - /follow-redirects@1.15.5: + /follow-redirects@1.15.5(debug@4.3.4): resolution: {integrity: sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==} engines: {node: '>=4.0'} peerDependencies: @@ -1642,6 +1655,8 @@ packages: peerDependenciesMeta: debug: optional: true + dependencies: + debug: 4.3.4 dev: true /form-data@4.0.0: @@ -2896,12 +2911,12 @@ packages: vite: 5.0.12 dev: false - /wait-on@7.2.0: + /wait-on@7.2.0(debug@4.3.4): resolution: {integrity: sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==} engines: {node: '>=12.0.0'} hasBin: true dependencies: - axios: 1.6.7 + axios: 1.6.7(debug@4.3.4) joi: 17.12.1 lodash: 4.17.21 minimist: 1.2.8 diff --git a/src/index.css b/src/index.css index 3d613b9..c6eef53 100644 --- a/src/index.css +++ b/src/index.css @@ -9,7 +9,7 @@ body, html { background-color: black; font-family: 'B612', 'IBM Plex Sans', 'Helvetica Neue', Arial, sans-serif; - font-size: 1.5vw; + font-size: min(1.5vw, 1.5vh); } * { @@ -18,4 +18,24 @@ body, html { a { color: white; +} + + +h1, h2, h3 { + margin-top: 0; +} + +button, .button { + display: inline-flex; + align-items: center; + gap: 0.25em; + text-decoration: none; + border: 1px solid white; + cursor: pointer; + + padding: 0.25em 0.5em; + border-radius: 0.25em; + + background: black; + color: white; } \ No newline at end of file diff --git a/src/lib/Spinner.svelte b/src/lib/Spinner.svelte new file mode 100644 index 0000000..9c56791 --- /dev/null +++ b/src/lib/Spinner.svelte @@ -0,0 +1,22 @@ + + + + + diff --git a/src/lib/TestCard.svelte b/src/lib/TestCard.svelte index 72602ed..1d9016f 100644 --- a/src/lib/TestCard.svelte +++ b/src/lib/TestCard.svelte @@ -4,7 +4,8 @@ import Axes from '$lib/Axes.svelte'; import ColorGradient from '$lib/ColorGradient.svelte'; import BrightnessGradient from '$lib/BrightnessGradient.svelte'; - import { onMount } from 'svelte'; + import { createEventDispatcher } from 'svelte'; + const dispatch = createEventDispatcher<{ focus: void }>(); export let full = false; @@ -22,14 +23,9 @@ $: circleBlocks = 2 * Math.floor((Math.min(sizes.horizontalCount, sizes.verticalCount) * 0.66) / 2) + (sizes.horizontalCount % 2); - - onMount(() => { - window.addEventListener('dblclick', () => { - document.body.requestFullscreen(); - }); - }); +
dispatch('focus') && document.body.requestFullscreen()} > (sizes = ev.detail)} subdued={!full} /> diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 65cadbf..be815b5 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,10 +2,12 @@ import 'normalize.css/normalize.css'; import '@fontsource/b612'; import '@fontsource/b612/700.css'; + import '@tabler/icons-webfont/tabler-icons.css'; import '../index.css'; import TestCard from '$lib/TestCard.svelte'; import { page } from '$app/stores'; import { onMount } from 'svelte'; + import { goto } from '$app/navigation'; let idleTimeout: NodeJS.Timeout | undefined; onMount(() => { @@ -21,8 +23,11 @@ $: onlyCard = $page.url.pathname === '/card'; - + goto('/card')} />
+ {#if $page.url.pathname !== '/' && !onlyCard} + Back + {/if}
@@ -32,13 +37,16 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - max-height: 90vh; - max-width: 90vw; + height: 90vh; + width: 90vw; background: rgba(0, 0, 0, 0.8); border-radius: 0.5rem; border: 1px solid white; padding: 1rem; + + display: flex; + flex-direction: column; } :global(.hide-idle) { @@ -49,4 +57,16 @@ :global(body.idle .hide-idle) { opacity: 0; } + + .button-back { + position: absolute; + top: 1rem; + right: 1rem; + + opacity: 0.66; + transition: opacity 0.3s; + &:hover { + opacity: 1; + } + } diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 95ee655..3814569 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,14 +1,4 @@