From ca90df83e9d839500846a18fb046f45ccb3322e1 Mon Sep 17 00:00:00 2001 From: Luca Bosin Date: Mon, 21 Aug 2023 22:04:10 +0200 Subject: [PATCH] Add responsive and lazy image loading --- .vscode/tasks.json | 2 +- package-lock.json | 92 ++++++++++++------ package.json | 3 + src/lib/components/Gallery.svelte | 48 ++++----- src/lib/components/Photo.svelte | 16 ++- src/lib/styles/base.css | 34 +++++++ src/lib/types.d.ts | 2 - src/lib/util/album.js | 9 +- src/routes/+error.svelte | 11 --- src/routes/+layout.svelte | 12 +-- src/routes/{g => }/+page.svelte | 0 .../[[timestamp]]/+page.server.js} | 0 .../{g => }/[slug]/[[timestamp]]/+page.svelte | 0 .../{g => }/[slug]/[[timestamp]]/.album | 0 .../[slug]/[[timestamp]]/download/+server.js | 0 .../i/[...item]/+page.server.js} | 0 .../[[timestamp]]/i/[...item]/+page.svelte | 26 +++++ .../[[timestamp]]/i/[...item]/.image-frame | 0 .../i/[...item]/download/+server.js | 0 .../i/[...item]/t/[[width]]/+server.js | 2 + .../i/[...item]/t/[[width]]/.thumbnail | 0 .../[slug]/[[timestamp]]/random/+server.js | 0 src/routes/g/.gallery | 0 .../[[timestamp]]/i/[...item]/+page.svelte | 19 ---- start.sh | 4 + static/favicon.png | Bin 1571 -> 1057 bytes static/vime-default.css | 4 + static/vime-light.css | 1 + static/vime.svelte | 10 ++ svelte.config.js | 3 +- 30 files changed, 197 insertions(+), 101 deletions(-) create mode 100644 src/lib/styles/base.css rename src/routes/{g => }/+page.svelte (100%) rename src/routes/{g/[slug]/[[timestamp]]/+page.js => [slug]/[[timestamp]]/+page.server.js} (100%) rename src/routes/{g => }/[slug]/[[timestamp]]/+page.svelte (100%) rename src/routes/{g => }/[slug]/[[timestamp]]/.album (100%) rename src/routes/{g => }/[slug]/[[timestamp]]/download/+server.js (100%) rename src/routes/{g/[slug]/[[timestamp]]/i/[...item]/+page.js => [slug]/[[timestamp]]/i/[...item]/+page.server.js} (100%) create mode 100644 src/routes/[slug]/[[timestamp]]/i/[...item]/+page.svelte rename src/routes/{g => }/[slug]/[[timestamp]]/i/[...item]/.image-frame (100%) rename src/routes/{g => }/[slug]/[[timestamp]]/i/[...item]/download/+server.js (100%) rename src/routes/{g => }/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js (93%) rename src/routes/{g => }/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/.thumbnail (100%) rename src/routes/{g => }/[slug]/[[timestamp]]/random/+server.js (100%) delete mode 100644 src/routes/g/.gallery delete mode 100644 src/routes/g/[slug]/[[timestamp]]/i/[...item]/+page.svelte create mode 100755 start.sh create mode 100644 static/vime-default.css create mode 100644 static/vime-light.css create mode 100644 static/vime.svelte diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3702941..03062f0 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "Build & Deploy", "type": "shell", - "command": "npm run build && rsync -arzP --progress --delete-after --force --update --inplace --times ./build ./package.json ./package-lock.json root@f.bosin.ch:/home/sveltekit" + "command": "npm run build && rsync -arzP --progress --delete-after --force --update --inplace --times ./build ./package.json ./package-lock.json ./start.sh root@f.bosin.ch:/home/sveltekit" }, { "label": "Restart Server", diff --git a/package-lock.json b/package-lock.json index 2066469..ae16ebf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,8 @@ "name": "f.bosin.ch", "version": "0.0.1", "dependencies": { + "@vime/core": "^5.4.1", + "@vime/svelte": "^5.4.1", "node-stream-zip": "^1.15.0", "sharp": "^0.32.4" }, @@ -22,6 +24,7 @@ "prettier-plugin-svelte": "^2.10.1", "svelte": "^4.0.5", "svelte-check": "^3.4.3", + "svelte-preprocess": "^5.0.4", "typescript": "^5.0.0", "vite": "^4.4.2" } @@ -39,7 +42,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", - "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -493,7 +495,6 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", - "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -507,7 +508,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", - "dev": true, "engines": { "node": ">=6.0.0" } @@ -516,7 +516,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", - "dev": true, "engines": { "node": ">=6.0.0" } @@ -524,14 +523,12 @@ "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.18", "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", - "dev": true, "dependencies": { "@jridgewell/resolve-uri": "3.1.0", "@jridgewell/sourcemap-codec": "1.4.14" @@ -540,8 +537,7 @@ "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.14", "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", @@ -676,6 +672,18 @@ } } }, + "node_modules/@stencil/core": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/@stencil/core/-/core-2.5.2.tgz", + "integrity": "sha512-bgjPXkSzzg1WnTgVUm6m5ZzpKt602WmA/QljODAW1xVN40OHJdbGblzF/F6MFzqv2c5Cy30CB41arc8qADIdcQ==", + "bin": { + "stencil": "bin/stencil" + }, + "engines": { + "node": ">=12.10.0", + "npm": ">=6.0.0" + } + }, "node_modules/@sveltejs/adapter-auto": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-auto/-/adapter-auto-2.1.0.tgz", @@ -806,8 +814,12 @@ "node_modules/@types/estree": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz", - "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==", - "dev": true + "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==" + }, + "node_modules/@types/fscreen": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/fscreen/-/fscreen-1.0.1.tgz", + "integrity": "sha512-hV2d0BreihMGtrg+EdAFOIl/O2EL5vhAheHJUztGE/lPFZIN8ZCpGFL8hCbtyi1CfhKjDRCf47sHjP+FwJ4q0Q==" }, "node_modules/@types/pug": { "version": "2.0.6", @@ -821,11 +833,32 @@ "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==", "dev": true }, + "node_modules/@vime/core": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/@vime/core/-/core-5.4.1.tgz", + "integrity": "sha512-ZFpV3xqZJ5tvh5rZOYKRh8zFzNIKr2ZcK6L75nJjFjbWt/ZmFF2nMBxtD9/hC4Xjk9v7hp1+P9cmctL674VFgA==", + "dependencies": { + "@stencil/core": "2.5.2", + "@types/fscreen": "^1.0.1", + "fscreen": "^1.2.0", + "mitt": "^3.0.0", + "stencil-wormhole": "^3.4.1" + } + }, + "node_modules/@vime/svelte": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/@vime/svelte/-/svelte-5.4.1.tgz", + "integrity": "sha512-I0wnPpfkGIsx8149z32nAVBZ2YTjLTLrpnTFNs+6yV07ynvgEDvfTQEa3F6cx4XDerDROBk3nkpB6W6dtdt52Q==", + "hasInstallScript": true, + "peerDependencies": { + "@vime/core": "5.4.1", + "svelte": "^3.0.0 || ^4.0.0" + } + }, "node_modules/acorn": { "version": "8.10.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -905,7 +938,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", - "dev": true, "dependencies": { "dequal": "^2.0.3" } @@ -914,7 +946,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", - "dev": true, "dependencies": { "dequal": "^2.0.3" } @@ -1119,7 +1150,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/code-red/-/code-red-1.0.3.tgz", "integrity": "sha512-kVwJELqiILQyG5aeuyKFbdsI1fmQy1Cmf7dQ8eGmVuJoaRVdwey7WaMknr2ZFeVSYSKT0rExsa8EGw0aoI/1QQ==", - "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.14", "@types/estree": "^1.0.0", @@ -1132,7 +1162,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "dev": true, "dependencies": { "@types/estree": "^1.0.0" } @@ -1213,7 +1242,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", - "dev": true, "dependencies": { "mdn-data": "2.0.30", "source-map-js": "^1.0.1" @@ -1292,7 +1320,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", - "dev": true, "engines": { "node": ">=6" } @@ -1732,6 +1759,11 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "node_modules/fscreen": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fscreen/-/fscreen-1.2.0.tgz", + "integrity": "sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg==" + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -2108,8 +2140,7 @@ "node_modules/locate-character": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz", - "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==", - "dev": true + "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==" }, "node_modules/locate-path": { "version": "6.0.0", @@ -2158,8 +2189,7 @@ "node_modules/mdn-data": { "version": "2.0.30", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", - "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", - "dev": true + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==" }, "node_modules/merge2": { "version": "1.4.1", @@ -2235,6 +2265,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/mitt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", + "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==" + }, "node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", @@ -2446,7 +2481,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/periscopic/-/periscopic-3.1.0.tgz", "integrity": "sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==", - "dev": true, "dependencies": { "@types/estree": "^1.0.0", "estree-walker": "^3.0.0", @@ -2457,7 +2491,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "dev": true, "dependencies": { "@types/estree": "^1.0.0" } @@ -2466,7 +2499,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz", "integrity": "sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==", - "dev": true, "dependencies": { "@types/estree": "*" } @@ -3104,11 +3136,15 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/stencil-wormhole": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/stencil-wormhole/-/stencil-wormhole-3.4.1.tgz", + "integrity": "sha512-ppYTcWTJnIl4ZAKwF39LTA9f/ypHfbVefsHdN2hpMQGrR57wt1TieZo9tlCM/r1Y4SFiZ5yz/cjho564C921Xw==" + }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", @@ -3199,7 +3235,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.1.2.tgz", "integrity": "sha512-/evA8U6CgOHe5ZD1C1W3va9iJG7mWflcCdghBORJaAhD2JzrVERJty/2gl0pIPrJYBGZwZycH6onYf+64XXF9g==", - "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", "@jridgewell/sourcemap-codec": "^1.4.15", @@ -3346,7 +3381,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "dev": true, "dependencies": { "@types/estree": "^1.0.0" } @@ -3355,7 +3389,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.1.tgz", "integrity": "sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==", - "dev": true, "dependencies": { "@types/estree": "*" } @@ -3364,7 +3397,6 @@ "version": "0.30.2", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.2.tgz", "integrity": "sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==", - "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, diff --git a/package.json b/package.json index c374645..6b9d8af 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,14 @@ "prettier-plugin-svelte": "^2.10.1", "svelte": "^4.0.5", "svelte-check": "^3.4.3", + "svelte-preprocess": "^5.0.4", "typescript": "^5.0.0", "vite": "^4.4.2" }, "type": "module", "dependencies": { + "@vime/core": "^5.4.1", + "@vime/svelte": "^5.4.1", "node-stream-zip": "^1.15.0", "sharp": "^0.32.4" } diff --git a/src/lib/components/Gallery.svelte b/src/lib/components/Gallery.svelte index 66fe61c..f881ab8 100644 --- a/src/lib/components/Gallery.svelte +++ b/src/lib/components/Gallery.svelte @@ -1,37 +1,37 @@ -
- +
+ {#if layout === 'grid'} +
    + {#each items as item (item.item)} + +
  • +

    {item.item}

    +

    + Title: {#if item.title}{$strf(item.title)}{:else}no title{/if}
    + Description: {#if item.description}{$strf(item.description)}{:else}no description{/if}
    + Links: Open • Download
    + Thumbnails: Small • Medium • Large • Full +

    + +
    • + {/each} +
+ {:else} + layout not available + {/if}
\ No newline at end of file + diff --git a/src/routes/g/+page.svelte b/src/routes/+page.svelte similarity index 100% rename from src/routes/g/+page.svelte rename to src/routes/+page.svelte diff --git a/src/routes/g/[slug]/[[timestamp]]/+page.js b/src/routes/[slug]/[[timestamp]]/+page.server.js similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/+page.js rename to src/routes/[slug]/[[timestamp]]/+page.server.js diff --git a/src/routes/g/[slug]/[[timestamp]]/+page.svelte b/src/routes/[slug]/[[timestamp]]/+page.svelte similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/+page.svelte rename to src/routes/[slug]/[[timestamp]]/+page.svelte diff --git a/src/routes/g/[slug]/[[timestamp]]/.album b/src/routes/[slug]/[[timestamp]]/.album similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/.album rename to src/routes/[slug]/[[timestamp]]/.album diff --git a/src/routes/g/[slug]/[[timestamp]]/download/+server.js b/src/routes/[slug]/[[timestamp]]/download/+server.js similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/download/+server.js rename to src/routes/[slug]/[[timestamp]]/download/+server.js diff --git a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/+page.js b/src/routes/[slug]/[[timestamp]]/i/[...item]/+page.server.js similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/i/[...item]/+page.js rename to src/routes/[slug]/[[timestamp]]/i/[...item]/+page.server.js diff --git a/src/routes/[slug]/[[timestamp]]/i/[...item]/+page.svelte b/src/routes/[slug]/[[timestamp]]/i/[...item]/+page.svelte new file mode 100644 index 0000000..13fcbc6 --- /dev/null +++ b/src/routes/[slug]/[[timestamp]]/i/[...item]/+page.svelte @@ -0,0 +1,26 @@ + + +
+ {#if data.item} + {(data.item.title + {:else} + Deine Mudda + {/if} +
+ + diff --git a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/.image-frame b/src/routes/[slug]/[[timestamp]]/i/[...item]/.image-frame similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/i/[...item]/.image-frame rename to src/routes/[slug]/[[timestamp]]/i/[...item]/.image-frame diff --git a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/download/+server.js b/src/routes/[slug]/[[timestamp]]/i/[...item]/download/+server.js similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/i/[...item]/download/+server.js rename to src/routes/[slug]/[[timestamp]]/i/[...item]/download/+server.js diff --git a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js b/src/routes/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js similarity index 93% rename from src/routes/g/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js rename to src/routes/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js index 2f51e17..987488c 100644 --- a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js +++ b/src/routes/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/+server.js @@ -1,5 +1,6 @@ import { getFile } from '$lib/util/album'; import { getFileName, getFilePath, getZipName } from '$lib/util/links'; +import { error } from '@sveltejs/kit'; import sharp from 'sharp'; /** @type {import('./$types').RequestHandler} */ @@ -25,6 +26,7 @@ export async function GET({ params }) { thumbnail = thumbnail || await sharp(content).resize(width).webp({ quality: 90 }).toBuffer(); } catch (err) { console.error(`${err.stack}`.replaceAll('/home/sveltekit', '.')); + throw error(500, 'Error getting thumbnail'); } return new Response(thumbnail, { headers: { diff --git a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/.thumbnail b/src/routes/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/.thumbnail similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/.thumbnail rename to src/routes/[slug]/[[timestamp]]/i/[...item]/t/[[width]]/.thumbnail diff --git a/src/routes/g/[slug]/[[timestamp]]/random/+server.js b/src/routes/[slug]/[[timestamp]]/random/+server.js similarity index 100% rename from src/routes/g/[slug]/[[timestamp]]/random/+server.js rename to src/routes/[slug]/[[timestamp]]/random/+server.js diff --git a/src/routes/g/.gallery b/src/routes/g/.gallery deleted file mode 100644 index e69de29..0000000 diff --git a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/+page.svelte b/src/routes/g/[slug]/[[timestamp]]/i/[...item]/+page.svelte deleted file mode 100644 index f67ca84..0000000 --- a/src/routes/g/[slug]/[[timestamp]]/i/[...item]/+page.svelte +++ /dev/null @@ -1,19 +0,0 @@ - - -{#if data.item} -{(data.item.title -{:else} -

Item not found.

-{/if} - - diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..51b79be --- /dev/null +++ b/start.sh @@ -0,0 +1,4 @@ +#!/bin/bash +ORIGIN=https://f.bosin.ch/g +cd /home/sveltekit +node build diff --git a/static/favicon.png b/static/favicon.png index 825b9e65af7c104cfb07089bb28659393b4f2097..b7f09cbcd67bb18d4adb1aed42dfbca2d0a89b81 100644 GIT binary patch literal 1057 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 P00000NkvXXu0mjfx;pm( diff --git a/static/vime-default.css b/static/vime-default.css new file mode 100644 index 0000000..5770404 --- /dev/null +++ b/static/vime-default.css @@ -0,0 +1,4 @@ +vm-player{--vm-color-dark:#313131;--vm-color-gray-100:rgba(0, 0, 0, 0.1);--vm-color-gray-200:rgba(0, 0, 0, 0.27);--vm-color-gray-300:rgba(0, 0, 0, 0.38);--vm-color-gray-500:rgba(0, 0, 0, 0.64);--vm-color-gray-600:rgba(0, 0, 0, 0.7);--vm-color-white-100:rgba(255, 255, 255, 0.1);--vm-color-white-200:rgba(255, 255, 255, 0.27);--vm-color-white-700:rgba(255, 255, 255, 0.87);--vm-fade-transition:opacity 0.3s ease-in-out;--vm-media-z-index:0;--vm-blocker-z-index:1;--vm-ui-z-index:2;--vm-loading-screen-z-index:1;--vm-poster-z-index:5;--vm-scrim-z-index:10;--vm-click-to-play-z-index:20;--vm-dbl-click-fullscreen-z-index:20;--vm-captions-z-index:30;--vm-spinner-z-index:40;--vm-controls-z-index:50;--vm-tooltip-z-index:60;--vm-menu-z-index:70;--vm-skeleton-z-index:100;--vm-player-bg:#000;--vm-player-border-radius:4px;--vm-player-font-family:'Helvetica Neue','Segoe UI',Helvetica,Arial,sans-serif;--vm-loading-screen-dot-size:12px;--vm-loading-screen-pulse-duration:1.5s;--vm-loading-screen-dot-color:var( + --vm-player-theme, + var(--vm-color-white-700) +);--vm-skeleton-color:hsl(0, 10%, 90%);--vm-skeleton-sheen-color:hsl(0, 10%, 97%);--vm-slider-thumb-width:13px;--vm-slider-thumb-height:13px;--vm-slider-thumb-bg:#fff;--vm-slider-thumb-border:2px solid transparent;--vm-slider-track-height:3px;--vm-slider-track-focused-height:5px;--vm-slider-track-color:var(--vm-color-white-200);--vm-slider-value-color:var(--vm-player-theme, #fff);--vm-tooltip-border-radius:3px;--vm-tooltip-font-size:14px;--vm-tooltip-padding:calc(var(--vm-control-spacing) / 1.5);--vm-tooltip-fade-duration:0.2s;--vm-tooltip-fade-timing-func:ease;--vm-tooltip-spacing:14px;--vm-tooltip-box-shadow:0 0 2px var(--vm-color-gray-500);--vm-tooltip-bg:var(--vm-color-dark);--vm-tooltip-color:var(--vm-color-white-700);--vm-spinner-width:80px;--vm-spinner-height:80px;--vm-spinner-thickness:3px;--vm-spinner-fill-color:#fff;--vm-spinner-track-color:var(--vm-color-white-200);--vm-spinner-spin-duration:1.1s;--vm-spinner-spin-timing-func:linear;--vm-scrim-bg:var(--vm-color-gray-300);--vm-captions-text-color:#fff;--vm-captions-font-size:18px;--vm-captions-font-size-medium:22px;--vm-captions-font-size-large:24px;--vm-captions-font-size-xlarge:28px;--vm-captions-cue-bg-color:var(--vm-color-gray-600);--vm-captions-cue-border-radius:2px;--vm-captions-cue-padding:0.2em 0.5em;--vm-controls-bg:transparent;--vm-controls-border-radius:4px;--vm-controls-padding:var(--vm-control-spacing);--vm-controls-spacing:var(--vm-control-spacing);--vm-control-group-spacing:var(--vm-control-spacing);--vm-control-border:0;--vm-control-scale:1;--vm-control-border-radius:3px;--vm-control-spacing:8px;--vm-control-padding:4px;--vm-control-icon-size:28px;--vm-control-color:#fff;--vm-control-tap-highlight:var(--vm-color-white-200);--vm-control-focus-color:#fff;--vm-control-focus-bg:var(--vm-player-theme, var(--vm-color-white-200));--vm-scrubber-loading-stripe-size:25px;--vm-scrubber-buffered-bg:var(--vm-color-white-200);--vm-scrubber-loading-stripe-color:var(--vm-color-white-200);--vm-scrubber-tooltip-spacing:10px;--vm-time-font-size:14px;--vm-time-font-weight:400;--vm-time-color:var(--vm-color-white-700);--vm-menu-color:var(--vm-color-white-700);--vm-menu-bg:var(--vm-color-dark);--vm-menu-font-size:14px;--vm-menu-font-weight:400;--vm-menu-transition:transform 0.25s ease-out;--vm-menu-item-padding:8px;--vm-menu-item-focus-color:var(--vm-menu-color);--vm-menu-item-focus-bg:var(--vm-color-white-100);--vm-menu-item-tap-highlight:var(--vm-color-white-100);--vm-menu-item-hint-color:var(--vm-menu-color);--vm-menu-item-hint-font-size:13px;--vm-menu-item-hint-opacity:0.54;--vm-menu-item-badge-color:var(--vm-menu-color);--vm-menu-item-badge-bg:transparent;--vm-menu-item-badge-font-size:10px;--vm-menu-item-arrow-color:var(--vm-menu-color);--vm-menu-item-check-icon-size:16px;--vm-menu-item-divider-color:var(--vm-color-white-100);--vm-settings-width:275px;--vm-settings-padding:8px;--vm-settings-max-height:75%;--vm-settings-border-radius:2px;--vm-settings-shadow:0 0 8px 2px var(--vm-color-gray-100);--vm-settings-scroll-width:10px;--vm-settings-scroll-thumb-color:var(--vm-color-white-200);--vm-settings-scroll-track-color:var(--vm-menu-bg);--vm-settings-transition:transform 0.2s cubic-bezier(0, 0, 0.4, 1) 0.16s,opacity 0.2s cubic-bezier(0, 0, 0.4, 1) 0.16s}vm-player[video]{--vm-tooltip-spacing:18px}vm-player[mobile],vm-player[touch]{--vm-control-border-radius:50%}vm-player[mobile]{--vm-settings-width:100%;--vm-menu-control-padding:12px calc(var(--vm-control-padding) * 2)}vm-player[audio]{--vm-controls-bg:var(--vm-color-dark);--vm-settings-max-height:200px;--vm-tooltip-spacing:10px} \ No newline at end of file diff --git a/static/vime-light.css b/static/vime-light.css new file mode 100644 index 0000000..39f15c3 --- /dev/null +++ b/static/vime-light.css @@ -0,0 +1 @@ +vm-player[theme=light]{--vm-player-bg:#fff;--vm-player-box-shadow:0 0 8px 2px var(--vm-color-gray-100);--vm-slider-track-color:var(--vm-color-gray-100);--vm-slider-value-color:var(--vm-player-theme, var(--vm-color-dark));--vm-slider-thumb-shadow:0 0 1px var(--vm-color-gray-100),0 0 0 1px var(--vm-color-gray-200);--vm-tooltip-bg:#fff;--vm-tooltip-color:var(--vm-color-dark);--vm-controls-bg:#fff;--vm-control-color:var(--vm-color-dark);--vm-control-tap-highlight:var(--vm-color-gray-100);--vm-control-focus-color:#fff;--vm-control-focus-bg:var(--vm-player-theme, var(--vm-color-dark));--vm-scrubber-buffered-bg:var(--vm-color-gray-100);--vm-scrubber-loading-stripe-color:var(--vm-color-gray-100);--vm-time-color:var(--vm-color-gray-600);--vm-menu-color:var(--vm-color-gray-600);--vm-menu-bg:#fff;--vm-menu-item-focus-bg:var(--vm-color-gray-100);--vm-menu-item-tap-highlight:var(--vm-color-gray-100);--vm-menu-item-divider-color:var(--vm-color-gray-100);--vm-settings-scroll-thumb-color:var(--vm-color-gray-100)} \ No newline at end of file diff --git a/static/vime.svelte b/static/vime.svelte new file mode 100644 index 0000000..7bc0647 --- /dev/null +++ b/static/vime.svelte @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/svelte.config.js b/svelte.config.js index 152e7a0..d59a7ba 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -6,7 +6,8 @@ const config = { // 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() + adapter: adapter(), + paths: { base: '/g', } } };