diff --git a/package.json b/package.json index 92b875e..cdaf48e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite dev", "build": "vite build", - "preview": "vite preview", + "preview": "vite preview --host", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch", "format": "prettier --write .", @@ -23,7 +23,7 @@ "@tailwindcss/forms": "^0.5.10", "@types/spotify-web-api-node": "^5.0.11", "autoprefixer": "^10.4.20", - "bits-ui": "1.0.0-next.82", + "bits-ui": "1.0.0-next.86", "clsx": "^2.1.1", "eslint": "^9.19.0", "eslint-config-prettier": "^10.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 40510f0..a5c842c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,8 +58,8 @@ importers: specifier: ^10.4.20 version: 10.4.20(postcss@8.5.1) bits-ui: - specifier: 1.0.0-next.82 - version: 1.0.0-next.82(svelte@5.19.1) + specifier: 1.0.0-next.86 + version: 1.0.0-next.86(svelte@5.19.1) clsx: specifier: ^2.1.1 version: 2.1.1 @@ -828,8 +828,8 @@ packages: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} engines: {node: '>=8'} - bits-ui@1.0.0-next.82: - resolution: {integrity: sha512-h8Rtv577qLLEsRJgXVWwOvPZf+aqEqmlhjIJsWVPbQPkosRt3FMf+XV1S8LZ6NomFgbqH5e9CIoMt81I/XD53Q==} + bits-ui@1.0.0-next.86: + resolution: {integrity: sha512-C2sTO3sasGoRhoMG2CUUsGfOhAoRL5Jc4pVB6AxoKQ+FBmX/uG9K1tW44eT/801iMoH+QeaH6fNCnoshpZtS8A==} engines: {node: '>=18', pnpm: '>=8.7.0'} peerDependencies: svelte: ^5.11.0 @@ -1666,11 +1666,6 @@ packages: run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - runed@0.20.0: - resolution: {integrity: sha512-YqPxaUdWL5nUXuSF+/v8a+NkVN8TGyEGbQwTA25fLY35MR/2bvZ1c6sCbudoo1kT4CAJPh4kUkcgGVxW127WKw==} - peerDependencies: - svelte: ^5.7.0 - runed@0.23.2: resolution: {integrity: sha512-AhHCb5/B+YQW6ar1pzhGQOQy+byfjCH63ofuhrexSWwQKhC0EbQ60Z/wMYwETLo3ZubhwlNryxBt0seOMOrVFQ==} peerDependencies: @@ -1814,8 +1809,8 @@ packages: peerDependencies: svelte: ^3.0.0 || ^4.0.0 || ^5.0.0-next.1 - svelte-toolbelt@0.7.0: - resolution: {integrity: sha512-i/Tv4NwAWWqJnK5H0F8y/ubDnogDYlwwyzKhrspTUFzrFuGnYshqd2g4/R43ds841wmaFiSW/HsdsdWhPOlrAA==} + svelte-toolbelt@0.7.1: + resolution: {integrity: sha512-HcBOcR17Vx9bjaOceUvxkY3nGmbBmCBBbuWLLEWO6jtmWH8f/QoWmbyUfQZrpDINH39en1b8mptfPQT9VKQ1xQ==} engines: {node: '>=18', pnpm: '>=8.7.0'} peerDependencies: svelte: ^5.0.0 @@ -2587,7 +2582,7 @@ snapshots: binary-extensions@2.3.0: {} - bits-ui@1.0.0-next.82(svelte@5.19.1): + bits-ui@1.0.0-next.86(svelte@5.19.1): dependencies: '@floating-ui/core': 1.6.9 '@floating-ui/dom': 1.6.13 @@ -2595,7 +2590,7 @@ snapshots: esm-env: 1.2.2 runed: 0.23.2(svelte@5.19.1) svelte: 5.19.1 - svelte-toolbelt: 0.7.0(svelte@5.19.1) + svelte-toolbelt: 0.7.1(svelte@5.19.1) brace-expansion@1.1.11: dependencies: @@ -3341,11 +3336,6 @@ snapshots: dependencies: queue-microtask: 1.2.3 - runed@0.20.0(svelte@5.19.1): - dependencies: - esm-env: 1.2.2 - svelte: 5.19.1 - runed@0.23.2(svelte@5.19.1): dependencies: esm-env: 1.2.2 @@ -3539,10 +3529,10 @@ snapshots: dependencies: svelte: 5.19.1 - svelte-toolbelt@0.7.0(svelte@5.19.1): + svelte-toolbelt@0.7.1(svelte@5.19.1): dependencies: clsx: 2.1.1 - runed: 0.20.0(svelte@5.19.1) + runed: 0.23.2(svelte@5.19.1) style-to-object: 1.0.8 svelte: 5.19.1 diff --git a/src/app.css b/src/app.css index b17f5e5..eb586c0 100644 --- a/src/app.css +++ b/src/app.css @@ -90,3 +90,26 @@ } } } + +/* Modern browsers with `scrollbar-*` support */ +@supports (scrollbar-width: auto) { + html { + scrollbar-color: var(--scrollbar-color-thumb) var(--scrollbar-color-track); + scrollbar-width: var(--scrollbar-width); + } +} + +/* Legacy browsers with `::-webkit-scrollbar-*` support */ +@supports selector(::-webkit-scrollbar) { + html::-webkit-scrollbar-thumb { + background: var(--scrollbar-color-thumb); + } + html::-webkit-scrollbar-track { + background: var(--scrollbar-color-track); + } + html::-webkit-scrollbar { + display: none; + max-width: var(--scrollbar-width-legacy); + max-height: var(--scrollbar-width-legacy); + } +} diff --git a/src/lib/assets/vaukuivali/carcrash.jpg b/src/lib/assets/vaukuivali/carcrash.jpg new file mode 100644 index 0000000..09a5154 Binary files /dev/null and b/src/lib/assets/vaukuivali/carcrash.jpg differ diff --git a/src/lib/assets/vaukuivali/chainsaw.jpg b/src/lib/assets/vaukuivali/chainsaw.jpg new file mode 100644 index 0000000..3e0bc36 Binary files /dev/null and b/src/lib/assets/vaukuivali/chainsaw.jpg differ diff --git a/src/lib/assets/vaukuivali/conversation.jpg b/src/lib/assets/vaukuivali/conversation.jpg new file mode 100644 index 0000000..5c55f0c Binary files /dev/null and b/src/lib/assets/vaukuivali/conversation.jpg differ diff --git a/src/lib/assets/vaukuivali/eardamage.jpg b/src/lib/assets/vaukuivali/eardamage.jpg new file mode 100644 index 0000000..beace56 Binary files /dev/null and b/src/lib/assets/vaukuivali/eardamage.jpg differ diff --git a/src/lib/assets/vaukuivali/fighters.jpg b/src/lib/assets/vaukuivali/fighters.jpg new file mode 100644 index 0000000..a0504cc Binary files /dev/null and b/src/lib/assets/vaukuivali/fighters.jpg differ diff --git a/src/lib/assets/vaukuivali/genn.webp b/src/lib/assets/vaukuivali/genn.webp new file mode 100644 index 0000000..4eb21b7 Binary files /dev/null and b/src/lib/assets/vaukuivali/genn.webp differ diff --git a/src/lib/assets/vaukuivali/harley.jpg b/src/lib/assets/vaukuivali/harley.jpg new file mode 100644 index 0000000..3352fed Binary files /dev/null and b/src/lib/assets/vaukuivali/harley.jpg differ diff --git a/src/lib/assets/vaukuivali/kaubamaja.jpg b/src/lib/assets/vaukuivali/kaubamaja.jpg new file mode 100644 index 0000000..7d75182 Binary files /dev/null and b/src/lib/assets/vaukuivali/kaubamaja.jpg differ diff --git a/src/lib/assets/vaukuivali/landing.jpg b/src/lib/assets/vaukuivali/landing.jpg new file mode 100644 index 0000000..0880596 Binary files /dev/null and b/src/lib/assets/vaukuivali/landing.jpg differ diff --git a/src/lib/assets/vaukuivali/oldwatch.jpg b/src/lib/assets/vaukuivali/oldwatch.jpg new file mode 100644 index 0000000..bce48ab Binary files /dev/null and b/src/lib/assets/vaukuivali/oldwatch.jpg differ diff --git a/src/lib/assets/vaukuivali/roomtone.jpg b/src/lib/assets/vaukuivali/roomtone.jpg new file mode 100644 index 0000000..f77962e Binary files /dev/null and b/src/lib/assets/vaukuivali/roomtone.jpg differ diff --git a/src/lib/assets/vaukuivali/tv.jpg b/src/lib/assets/vaukuivali/tv.jpg new file mode 100644 index 0000000..2800efd Binary files /dev/null and b/src/lib/assets/vaukuivali/tv.jpg differ diff --git a/src/lib/components/ui/collapsible/index.ts b/src/lib/components/ui/collapsible/index.ts new file mode 100644 index 0000000..8e968f0 --- /dev/null +++ b/src/lib/components/ui/collapsible/index.ts @@ -0,0 +1,15 @@ +import { Collapsible as CollapsiblePrimitive } from "bits-ui"; + +const Root: typeof CollapsiblePrimitive.Root = CollapsiblePrimitive.Root; +const Trigger: typeof CollapsiblePrimitive.Trigger = CollapsiblePrimitive.Trigger; +const Content: typeof CollapsiblePrimitive.Content = CollapsiblePrimitive.Content; + +export { + Root, + Content, + Trigger, + // + Root as Collapsible, + Content as CollapsibleContent, + Trigger as CollapsibleTrigger, +}; diff --git a/src/lib/data/games.ts b/src/lib/data/games.ts index e268680..58ce091 100644 --- a/src/lib/data/games.ts +++ b/src/lib/data/games.ts @@ -1,21 +1,26 @@ import type { GamesObj } from '$lib/types'; const games: GamesObj = { - epochalypse: { - name: 'Epochalypse', - image: '', - description: 'Varsti veel üks Y2K. Kui nostalgiline!' - }, - pakubiiti: { - name: 'Paku biiti', - image: '', - description: 'Sorteeri kolme suvalise muusika albumi pealkiri, artistid ja pilt.' - }, - '': { - name: 'Rohkem mänge soon™', - image: '', - description: '' - } + vaukuivali: { + name: 'Vau kui vali', + image: '', + description: 'Intuitiivsem arusaam igapäevahelide tõelisest valjudusest.' + }, + epochalypse: { + name: 'Epochalypse', + image: '', + description: 'Varsti veel üks Y2K. Kui nostalgiline!' + }, + pakubiiti: { + name: 'Paku biiti', + image: '', + description: 'Sorteeri kolme suvalise muusika albumi pealkiri, artistid ja pilt.' + }, + '': { + name: 'Rohkem mänge soon™', + image: '', + description: '' + } }; export default games; diff --git a/src/routes/vinge/+layout.svelte b/src/routes/vinge/+layout.svelte index e583d27..8608759 100644 --- a/src/routes/vinge/+layout.svelte +++ b/src/routes/vinge/+layout.svelte @@ -19,3 +19,16 @@ {@render children()} + +{#if data?.name === 'Vau kui vali'} + +{/if} diff --git a/src/routes/vinge/vaukuivali/+page.svelte b/src/routes/vinge/vaukuivali/+page.svelte new file mode 100644 index 0000000..82b90c0 --- /dev/null +++ b/src/routes/vinge/vaukuivali/+page.svelte @@ -0,0 +1,466 @@ + + +{#snippet checkpoint(db: number, passed: boolean)} +
+ {db}dBA +
+{/snippet} + +{#snippet timeCard(point: SoundCheckpoint)} +
+

+ {point.db}dBA - + {getElapsedTime(soundCheckpoints.at(0)?.crossedTime, point.crossedTime)} +

+
+{/snippet} + + + +{#if innerWidth === 0 || innerHeight === 0} +
+ +
+{:else} +
+
+
+
+ {#each decibelMeter as digit, i} +
+ +
+ {/each} +
+
+
+ {#each soundCheckpoints as { db }} +
+ {@render checkpoint(db, currentDecibel >= db)} +
+ {/each} +
+
+
+
+
+ +
+

+ {#if currentCheckpoint?.db === 0} + Vau kui vali! + {:else} + {currentCheckpoint?.title} + {/if} +

+ {#if currentCheckpoint?.db === 0} +

+ Nagu paljud võivad teada, on detsibellide skaala logaritmiline.
60dB on 2x valjem, + kui 50dB. +

+

+ See info ei jõudnud mulle eriti kohale.
Intuitiivsemaks arusaamiseks tegin selle + lehe.
Proovi, keri alla. +

+ {:else} +

+ {currentCheckpoint?.description} +

+ {/if} +
+
+
+
+ + +
+

Sul läks ikka kaua...

+ + {#snippet child({ props })} + + {/snippet} + +
+ {@render timeCard(soundCheckpoints.at(-1) as SoundCheckpoint)} + + {#each soundCheckpoints.slice(1, -1).reverse() as point} + {@render timeCard(point)} + {/each} + + + +
+
+ Helitugevuste allikad: +
    +
  • + Fastl, H., & Florentine, M. (2010). Loudness in Daily Environments. Springer Handbook of + Auditory Research, 199–221. doi:10.1007/978-1-4419-6712-1_8 +
    • +
  • + Purdue University PPE training materials +
    • +
+
+ +
+{/if} diff --git a/src/routes/vinge/vaukuivali/SevenSegmentDigit.svelte b/src/routes/vinge/vaukuivali/SevenSegmentDigit.svelte new file mode 100644 index 0000000..2923a5c --- /dev/null +++ b/src/routes/vinge/vaukuivali/SevenSegmentDigit.svelte @@ -0,0 +1,86 @@ + + +{#snippet segment(index: number, position: string, vertical: boolean, dot: boolean = false)} +
+{/snippet} + +
+ {#if pattern} + + {@render segment(0, `left: ${segWidth * (1 + 2 * padding)}rem; top: 0;`, false)} + + + {@render segment(1, `right: 0; top: ${segWidth * (1 + (2 * padding) / aspectRatio)}rem;`, true)} + + + {@render segment( + 2, + `bottom: ${segWidth * (1 + (2 * padding) / aspectRatio)}rem; right: 0;`, + true + )} + + + {@render segment(3, `bottom: 0; left: ${segWidth * (1 + 2 * padding)}rem;`, false)} + + + {@render segment( + 4, + `bottom: ${segWidth * (1 + (2 * padding) / aspectRatio)}rem; left: 0;`, + true + )} + + + {@render segment(5, `left: 0; top: ${segWidth * (1 + (2 * padding) / aspectRatio)}rem;`, true)} + + + {@render segment( + 6, + `left: ${segWidth * (1 + 2 * padding)}rem; top: 50%; margin-top: -${segWidth / 2}rem;`, + false + )} + + {#if decimal} + {@render segment(7, `bottom: 0; right: -${segWidth / aspectRatio}rem;`, false, true)} + {/if} + {/if} +