diff --git a/.gitignore b/.gitignore index 6653908..10e9324 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ **/.DS_Store node_modules/ dist/ -# .secret/ +.secret/ +.svelte-kit/ diff --git a/package-lock.json b/package-lock.json index e6ad192..ce03001 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,14 +1,16 @@ { "name": "spacesocial-client", - "version": "0.1.1", + "version": "0.2.0_rev2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "spacesocial-client", - "version": "0.1.1", + "version": "0.2.0_rev2", "license": "ISC", "devDependencies": { + "@sveltejs/adapter-auto": "^3.2.2", + "@sveltejs/kit": "^2.5.17", "@sveltejs/vite-plugin-svelte": "^3.1.1", "svelte": "^4.2.18", "vite": "^5.3.1" @@ -472,6 +474,13 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@polka/url": { + "version": "1.0.0-next.25", + "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz", + "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==", + "dev": true, + "license": "MIT" + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.18.0", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz", @@ -696,6 +705,52 @@ "win32" ] }, + "node_modules/@sveltejs/adapter-auto": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-3.2.2.tgz", + "integrity": "sha512-Mso5xPCA8zgcKrv+QioVlqMZkyUQ5MjDJiEPuG/Z7cV/5tmwV7LmcVWk5tZ+H0NCOV1x12AsoSpt/CwFwuVXMA==", + "dev": true, + "license": "MIT", + "dependencies": { + "import-meta-resolve": "^4.1.0" + }, + "peerDependencies": { + "@sveltejs/kit": "^2.0.0" + } + }, + "node_modules/@sveltejs/kit": { + "version": "2.5.17", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.17.tgz", + "integrity": "sha512-wiADwq7VreR3ctOyxilAZOfPz3Jiy2IIp2C8gfafhTdQaVuGIHllfqQm8dXZKADymKr3uShxzgLZFT+a+CM4kA==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@types/cookie": "^0.6.0", + "cookie": "^0.6.0", + "devalue": "^5.0.0", + "esm-env": "^1.0.0", + "import-meta-resolve": "^4.1.0", + "kleur": "^4.1.5", + "magic-string": "^0.30.5", + "mrmime": "^2.0.0", + "sade": "^1.8.1", + "set-cookie-parser": "^2.6.0", + "sirv": "^2.0.4", + "tiny-glob": "^0.2.9" + }, + "bin": { + "svelte-kit": "svelte-kit.js" + }, + "engines": { + "node": ">=18.13" + }, + "peerDependencies": { + "@sveltejs/vite-plugin-svelte": "^3.0.0", + "svelte": "^4.0.0 || ^5.0.0-next.0", + "vite": "^5.0.3" + } + }, "node_modules/@sveltejs/vite-plugin-svelte": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-3.1.1.tgz", @@ -737,6 +792,13 @@ "vite": "^5.0.0" } }, + "node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/estree": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", @@ -791,6 +853,16 @@ "periscopic": "^3.1.0" } }, + "node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/css-tree": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", @@ -843,6 +915,13 @@ "node": ">=6" } }, + "node_modules/devalue": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.0.0.tgz", + "integrity": "sha512-gO+/OMXF7488D+u3ue+G7Y4AA3ZmUnB3eHJXmBTgNHvr4ZNzl36A0ZtG+XCRNYCkYx/bFmw4qtkoFLa+wSrwAA==", + "dev": true, + "license": "MIT" + }, "node_modules/esbuild": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", @@ -882,6 +961,13 @@ "@esbuild/win32-x64": "0.21.5" } }, + "node_modules/esm-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.0.0.tgz", + "integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==", + "dev": true, + "license": "MIT" + }, "node_modules/estree-walker": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", @@ -907,6 +993,31 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/globalyzer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", + "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true, + "license": "MIT" + }, + "node_modules/import-meta-resolve": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz", + "integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==", + "dev": true, + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/is-reference": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.2.tgz", @@ -951,6 +1062,26 @@ "dev": true, "license": "CC0-1.0" }, + "node_modules/mri": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/mrmime": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", + "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -1061,6 +1192,41 @@ "fsevents": "~2.3.2" } }, + "node_modules/sade": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/sade/-/sade-1.8.1.tgz", + "integrity": "sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==", + "dev": true, + "license": "MIT", + "dependencies": { + "mri": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/set-cookie-parser": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz", + "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/sirv": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", + "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@polka/url": "^1.0.0-next.24", + "mrmime": "^2.0.0", + "totalist": "^3.0.0" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/source-map-js": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", @@ -1110,6 +1276,27 @@ "svelte": "^3.19.0 || ^4.0.0" } }, + "node_modules/tiny-glob": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz", + "integrity": "sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==", + "dev": true, + "license": "MIT", + "dependencies": { + "globalyzer": "0.1.0", + "globrex": "^0.1.2" + } + }, + "node_modules/totalist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", + "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/vite": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz", diff --git a/package.json b/package.json index 5ba3874..406243b 100644 --- a/package.json +++ b/package.json @@ -2,15 +2,18 @@ "name": "spacesocial-client", "version": "0.2.0_rev2", "description": "social media for the galaxy-wide-web! 🌌", + "private": true, "type": "module", "scripts": { "dev": "vite --host 0.0.0.0", "build": "vite build", "preview": "vite preview" }, - "author": "", - "license": "ISC", + "author": "ari melody ", + "license": "GPL-3.0", "devDependencies": { + "@sveltejs/adapter-auto": "^3.2.2", + "@sveltejs/kit": "^2.5.17", "@sveltejs/vite-plugin-svelte": "^3.1.1", "svelte": "^4.2.18", "vite": "^5.3.1" diff --git a/index.html b/src/app.html similarity index 72% rename from index.html rename to src/app.html index 84feba1..bfa4811 100644 --- a/index.html +++ b/src/app.html @@ -5,10 +5,10 @@ space social + %sveltekit.head% - -
+ +
%sveltekit.body%
- diff --git a/src/App.svelte b/src/lib/App.svelte similarity index 100% rename from src/App.svelte rename to src/lib/App.svelte diff --git a/src/app.css b/src/lib/app.css similarity index 100% rename from src/app.css rename to src/lib/app.css diff --git a/src/client/api.js b/src/lib/client/api.js similarity index 100% rename from src/client/api.js rename to src/lib/client/api.js diff --git a/src/client/client.js b/src/lib/client/client.js similarity index 96% rename from src/client/client.js rename to src/lib/client/client.js index 862f1d2..5153c52 100644 --- a/src/client/client.js +++ b/src/lib/client/client.js @@ -1,4 +1,3 @@ -import { version as APP_VERSION } from '../../package.json'; import { Instance, server_types } from './instance.js'; import * as api from './api.js'; import { get, writable } from 'svelte/store'; @@ -25,7 +24,8 @@ export class Client { static get() { if (get(client)) return client; let new_client = new Client(); - window.peekie = new_client; + if (typeof window !== typeof undefined) + window.peekie = new_client; new_client.load(); client.set(new_client); return client; @@ -157,6 +157,7 @@ export class Client { } save() { + if (typeof localStorage === typeof undefined) return; localStorage.setItem(save_name, JSON.stringify({ version: APP_VERSION, instance: { @@ -168,6 +169,7 @@ export class Client { } load() { + if (typeof localStorage === typeof undefined) return; let json = localStorage.getItem(save_name); if (!json) return false; let saved = JSON.parse(json); diff --git a/src/client/instance.js b/src/lib/client/instance.js similarity index 100% rename from src/client/instance.js rename to src/lib/client/instance.js diff --git a/src/emoji.js b/src/lib/emoji.js similarity index 100% rename from src/emoji.js rename to src/lib/emoji.js diff --git a/src/main.js b/src/lib/main.js similarity index 100% rename from src/main.js rename to src/lib/main.js diff --git a/src/post.js b/src/lib/post.js similarity index 100% rename from src/post.js rename to src/lib/post.js diff --git a/src/sound.js b/src/lib/sound.js similarity index 60% rename from src/sound.js rename to src/lib/sound.js index bc12022..aac2cef 100644 --- a/src/sound.js +++ b/src/lib/sound.js @@ -1,8 +1,12 @@ -const sounds = { - "default": new Audio("/sound/log.ogg"), - "post": new Audio("/sound/success.ogg"), - "boost": new Audio("/sound/hello.ogg"), -}; +let sounds; + +if (typeof Audio !== typeof undefined) { + sounds = { + "default": new Audio("/sound/log.ogg"), + "post": new Audio("/sound/success.ogg"), + "boost": new Audio("/sound/hello.ogg"), + }; +} export function play_sound(name) { if (name === false) return; diff --git a/src/time.js b/src/lib/time.js similarity index 100% rename from src/time.js rename to src/lib/time.js diff --git a/src/ui/Button.svelte b/src/lib/ui/Button.svelte similarity index 100% rename from src/ui/Button.svelte rename to src/lib/ui/Button.svelte diff --git a/src/ui/Error.svelte b/src/lib/ui/Error.svelte similarity index 100% rename from src/ui/Error.svelte rename to src/lib/ui/Error.svelte diff --git a/src/ui/Feed.svelte b/src/lib/ui/Feed.svelte similarity index 100% rename from src/ui/Feed.svelte rename to src/lib/ui/Feed.svelte diff --git a/src/ui/Navigation.svelte b/src/lib/ui/Navigation.svelte similarity index 98% rename from src/ui/Navigation.svelte rename to src/lib/ui/Navigation.svelte index 5b77519..b17ba17 100644 --- a/src/ui/Navigation.svelte +++ b/src/lib/ui/Navigation.svelte @@ -1,6 +1,5 @@ + +
+ +
+ +
+ +
+ {#if ready} + + {:else} +
+
+

Space Social

+

Welcome, fediverse user!

+

Please enter your instance domain to log in.

+
+ + {#if instance_url_error} +

{instance_url_error}

+ {/if} +
+
+ +

+ Please note this is + extremely experimental software; + things are likely to break! +
+ If that's all cool with you, welcome aboard! +

+ +

made with ❤️ by ari melody, 2024

+
+
+ {/if} +
+ +
+ +
+ +
+ + diff --git a/public/font/inter/Inter-Black.woff2 b/static/font/inter/Inter-Black.woff2 similarity index 100% rename from public/font/inter/Inter-Black.woff2 rename to static/font/inter/Inter-Black.woff2 diff --git a/public/font/inter/Inter-BlackItalic.woff2 b/static/font/inter/Inter-BlackItalic.woff2 similarity index 100% rename from public/font/inter/Inter-BlackItalic.woff2 rename to static/font/inter/Inter-BlackItalic.woff2 diff --git a/public/font/inter/Inter-Bold.woff2 b/static/font/inter/Inter-Bold.woff2 similarity index 100% rename from public/font/inter/Inter-Bold.woff2 rename to static/font/inter/Inter-Bold.woff2 diff --git a/public/font/inter/Inter-BoldItalic.woff2 b/static/font/inter/Inter-BoldItalic.woff2 similarity index 100% rename from public/font/inter/Inter-BoldItalic.woff2 rename to static/font/inter/Inter-BoldItalic.woff2 diff --git a/public/font/inter/Inter-ExtraBold.woff2 b/static/font/inter/Inter-ExtraBold.woff2 similarity index 100% rename from public/font/inter/Inter-ExtraBold.woff2 rename to static/font/inter/Inter-ExtraBold.woff2 diff --git a/public/font/inter/Inter-ExtraBoldItalic.woff2 b/static/font/inter/Inter-ExtraBoldItalic.woff2 similarity index 100% rename from public/font/inter/Inter-ExtraBoldItalic.woff2 rename to static/font/inter/Inter-ExtraBoldItalic.woff2 diff --git a/public/font/inter/Inter-ExtraLight.woff2 b/static/font/inter/Inter-ExtraLight.woff2 similarity index 100% rename from public/font/inter/Inter-ExtraLight.woff2 rename to static/font/inter/Inter-ExtraLight.woff2 diff --git a/public/font/inter/Inter-ExtraLightItalic.woff2 b/static/font/inter/Inter-ExtraLightItalic.woff2 similarity index 100% rename from public/font/inter/Inter-ExtraLightItalic.woff2 rename to static/font/inter/Inter-ExtraLightItalic.woff2 diff --git a/public/font/inter/Inter-Italic.woff2 b/static/font/inter/Inter-Italic.woff2 similarity index 100% rename from public/font/inter/Inter-Italic.woff2 rename to static/font/inter/Inter-Italic.woff2 diff --git a/public/font/inter/Inter-Light.woff2 b/static/font/inter/Inter-Light.woff2 similarity index 100% rename from public/font/inter/Inter-Light.woff2 rename to static/font/inter/Inter-Light.woff2 diff --git a/public/font/inter/Inter-LightItalic.woff2 b/static/font/inter/Inter-LightItalic.woff2 similarity index 100% rename from public/font/inter/Inter-LightItalic.woff2 rename to static/font/inter/Inter-LightItalic.woff2 diff --git a/public/font/inter/Inter-Medium.woff2 b/static/font/inter/Inter-Medium.woff2 similarity index 100% rename from public/font/inter/Inter-Medium.woff2 rename to static/font/inter/Inter-Medium.woff2 diff --git a/public/font/inter/Inter-MediumItalic.woff2 b/static/font/inter/Inter-MediumItalic.woff2 similarity index 100% rename from public/font/inter/Inter-MediumItalic.woff2 rename to static/font/inter/Inter-MediumItalic.woff2 diff --git a/public/font/inter/Inter-Regular.woff2 b/static/font/inter/Inter-Regular.woff2 similarity index 100% rename from public/font/inter/Inter-Regular.woff2 rename to static/font/inter/Inter-Regular.woff2 diff --git a/public/font/inter/Inter-SemiBold.woff2 b/static/font/inter/Inter-SemiBold.woff2 similarity index 100% rename from public/font/inter/Inter-SemiBold.woff2 rename to static/font/inter/Inter-SemiBold.woff2 diff --git a/public/font/inter/Inter-SemiBoldItalic.woff2 b/static/font/inter/Inter-SemiBoldItalic.woff2 similarity index 100% rename from public/font/inter/Inter-SemiBoldItalic.woff2 rename to static/font/inter/Inter-SemiBoldItalic.woff2 diff --git a/public/font/inter/Inter-Thin.woff2 b/static/font/inter/Inter-Thin.woff2 similarity index 100% rename from public/font/inter/Inter-Thin.woff2 rename to static/font/inter/Inter-Thin.woff2 diff --git a/public/font/inter/Inter-ThinItalic.woff2 b/static/font/inter/Inter-ThinItalic.woff2 similarity index 100% rename from public/font/inter/Inter-ThinItalic.woff2 rename to static/font/inter/Inter-ThinItalic.woff2 diff --git a/public/font/inter/InterDisplay-Black.woff2 b/static/font/inter/InterDisplay-Black.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Black.woff2 rename to static/font/inter/InterDisplay-Black.woff2 diff --git a/public/font/inter/InterDisplay-BlackItalic.woff2 b/static/font/inter/InterDisplay-BlackItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-BlackItalic.woff2 rename to static/font/inter/InterDisplay-BlackItalic.woff2 diff --git a/public/font/inter/InterDisplay-Bold.woff2 b/static/font/inter/InterDisplay-Bold.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Bold.woff2 rename to static/font/inter/InterDisplay-Bold.woff2 diff --git a/public/font/inter/InterDisplay-BoldItalic.woff2 b/static/font/inter/InterDisplay-BoldItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-BoldItalic.woff2 rename to static/font/inter/InterDisplay-BoldItalic.woff2 diff --git a/public/font/inter/InterDisplay-ExtraBold.woff2 b/static/font/inter/InterDisplay-ExtraBold.woff2 similarity index 100% rename from public/font/inter/InterDisplay-ExtraBold.woff2 rename to static/font/inter/InterDisplay-ExtraBold.woff2 diff --git a/public/font/inter/InterDisplay-ExtraBoldItalic.woff2 b/static/font/inter/InterDisplay-ExtraBoldItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-ExtraBoldItalic.woff2 rename to static/font/inter/InterDisplay-ExtraBoldItalic.woff2 diff --git a/public/font/inter/InterDisplay-ExtraLight.woff2 b/static/font/inter/InterDisplay-ExtraLight.woff2 similarity index 100% rename from public/font/inter/InterDisplay-ExtraLight.woff2 rename to static/font/inter/InterDisplay-ExtraLight.woff2 diff --git a/public/font/inter/InterDisplay-ExtraLightItalic.woff2 b/static/font/inter/InterDisplay-ExtraLightItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-ExtraLightItalic.woff2 rename to static/font/inter/InterDisplay-ExtraLightItalic.woff2 diff --git a/public/font/inter/InterDisplay-Italic.woff2 b/static/font/inter/InterDisplay-Italic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Italic.woff2 rename to static/font/inter/InterDisplay-Italic.woff2 diff --git a/public/font/inter/InterDisplay-Light.woff2 b/static/font/inter/InterDisplay-Light.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Light.woff2 rename to static/font/inter/InterDisplay-Light.woff2 diff --git a/public/font/inter/InterDisplay-LightItalic.woff2 b/static/font/inter/InterDisplay-LightItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-LightItalic.woff2 rename to static/font/inter/InterDisplay-LightItalic.woff2 diff --git a/public/font/inter/InterDisplay-Medium.woff2 b/static/font/inter/InterDisplay-Medium.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Medium.woff2 rename to static/font/inter/InterDisplay-Medium.woff2 diff --git a/public/font/inter/InterDisplay-MediumItalic.woff2 b/static/font/inter/InterDisplay-MediumItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-MediumItalic.woff2 rename to static/font/inter/InterDisplay-MediumItalic.woff2 diff --git a/public/font/inter/InterDisplay-Regular.woff2 b/static/font/inter/InterDisplay-Regular.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Regular.woff2 rename to static/font/inter/InterDisplay-Regular.woff2 diff --git a/public/font/inter/InterDisplay-SemiBold.woff2 b/static/font/inter/InterDisplay-SemiBold.woff2 similarity index 100% rename from public/font/inter/InterDisplay-SemiBold.woff2 rename to static/font/inter/InterDisplay-SemiBold.woff2 diff --git a/public/font/inter/InterDisplay-SemiBoldItalic.woff2 b/static/font/inter/InterDisplay-SemiBoldItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-SemiBoldItalic.woff2 rename to static/font/inter/InterDisplay-SemiBoldItalic.woff2 diff --git a/public/font/inter/InterDisplay-Thin.woff2 b/static/font/inter/InterDisplay-Thin.woff2 similarity index 100% rename from public/font/inter/InterDisplay-Thin.woff2 rename to static/font/inter/InterDisplay-Thin.woff2 diff --git a/public/font/inter/InterDisplay-ThinItalic.woff2 b/static/font/inter/InterDisplay-ThinItalic.woff2 similarity index 100% rename from public/font/inter/InterDisplay-ThinItalic.woff2 rename to static/font/inter/InterDisplay-ThinItalic.woff2 diff --git a/public/font/inter/InterVariable-Italic.woff2 b/static/font/inter/InterVariable-Italic.woff2 similarity index 100% rename from public/font/inter/InterVariable-Italic.woff2 rename to static/font/inter/InterVariable-Italic.woff2 diff --git a/public/font/inter/InterVariable.woff2 b/static/font/inter/InterVariable.woff2 similarity index 100% rename from public/font/inter/InterVariable.woff2 rename to static/font/inter/InterVariable.woff2 diff --git a/public/font/inter/LICENSE.txt b/static/font/inter/LICENSE.txt similarity index 100% rename from public/font/inter/LICENSE.txt rename to static/font/inter/LICENSE.txt diff --git a/public/font/inter/inter.css b/static/font/inter/inter.css similarity index 100% rename from public/font/inter/inter.css rename to static/font/inter/inter.css diff --git a/public/sound/hello.ogg b/static/sound/hello.ogg similarity index 100% rename from public/sound/hello.ogg rename to static/sound/hello.ogg diff --git a/public/sound/log.ogg b/static/sound/log.ogg similarity index 100% rename from public/sound/log.ogg rename to static/sound/log.ogg diff --git a/public/sound/success.ogg b/static/sound/success.ogg similarity index 100% rename from public/sound/success.ogg rename to static/sound/success.ogg diff --git a/svelte.config.js b/svelte.config.js index 61eb947..dde3e5f 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,7 +1,18 @@ -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' +import adapter from '@sveltejs/adapter-auto'; +import * as child_process from 'node:child_process'; + +/** @type {import('@sveltejs/kit').Config} */ +const config = { + kit: { + // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. + // If your environment is not supported, or you settled on a specific environment, switch out the adapter. + // See https://kit.svelte.dev/docs/adapters for more information about adapters. + adapter: adapter(), + version: { + name: child_process.execSync('git rev-parse HEAD').toString().trim() + } + }, +}; + +export default config; -export default { - // Consult https://svelte.dev/docs#compile-time-svelte-preprocess - // for more information about preprocessors - preprocess: vitePreprocess(), -} diff --git a/vite.config.js b/vite.config.js index 5f1c8cb..35c3801 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,7 +1,17 @@ -import { defineConfig } from 'vite' -import { svelte } from '@sveltejs/vite-plugin-svelte' +import { sveltekit } from '@sveltejs/kit/vite'; +import { defineConfig } from 'vite'; +import { readFileSync } from 'fs'; +import { fileURLToPath } from 'url'; + +const packageFile = fileURLToPath(new URL('package.json', import.meta.url)); +const packageData = readFileSync(packageFile, 'utf8'); +const packageJSON = JSON.parse(packageData); + -// https://vitejs.dev/config/ export default defineConfig({ - plugins: [svelte()], -}) + plugins: [sveltekit()], + define: { + APP_VERSION: JSON.stringify(packageJSON.version) + } +}); +