dusk/musikspider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dusk:d144d1f9897b4c4532897e2a61825bfea0b02d21
Branches Tags
dusk:master
...
compare: dusk:319b886803e05d3c915d83254226108379311a15
Branches Tags
dusk:master

3 Commits
d144d1f989 ... 319b886803

Author SHA1 Message Date
dusk
319b886803
fix: actually use tailwind styles 2023-10-13 18:33:49 +03:00
dusk
7c8c6132a9
feat: upgrade to svelte 4 and switch to bun 2023-10-13 18:12:34 +03:00
dusk
409163319e
Update README.md 2023-05-09 20:23:43 +03:00
20 changed files with 200 additions and 2236 deletions
Show Stats Expand all files Collapse all files

2
.eslintignore
View File

@ -11,3 +11,5 @@ node_modules
pnpm-lock.yaml pnpm-lock.yaml
package-lock.json package-lock.json
yarn.lock yarn.lock
/result
bun.lockb

2
.prettierignore
View File

@ -13,3 +13,5 @@ node_modules
pnpm-lock.yaml pnpm-lock.yaml
package-lock.json package-lock.json
yarn.lock yarn.lock
/result
bun.lockb

2
README.md
View File

@ -14,7 +14,7 @@ A production build is also available at `packages.x86_64-linux.musikspider`.
# TODOs # TODOs
- [x] basic music playing and controls - [x] basic music playing and controls
- [ ] implement playlists (local) - [ ] implement playlists (local and remote)
- [ ] implement album and artist viewing - [ ] implement album and artist viewing
- [ ] implement persistence of music data, playlists and such - [ ] implement persistence of music data, playlists and such
- [ ] implement scrobbling (last.fm, etc) - [ ] implement scrobbling (last.fm, etc)

BIN
bun.lockb Executable file
View File

Binary file not shown.

188
flake.lock
View File

@ -1,96 +1,96 @@
{ {
"nodes": { "nodes": {
"naked-shell": { "naked-shell": {
"locked": { "locked": {
"lastModified": 1681286841, "lastModified": 1681286841,
"narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "mk-naked-shell", "repo": "mk-naked-shell",
"rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "yusdacra", "owner": "yusdacra",
"repo": "mk-naked-shell", "repo": "mk-naked-shell",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681126633, "lastModified": 1697059129,
"narHash": "sha256-evQ3Ct/yJDSHej16Hiq+JfxRjgm9FXu/2LBxsyorGdE=", "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db24d86dd8a4769c50d6b7295e81aa280cd93f35", "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1680213900, "lastModified": 1696019113,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2", "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"dir": "lib", "dir": "lib",
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"parts": { "parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1680392223, "lastModified": 1696343447,
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=", "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5", "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"type": "github" "type": "github"
} }
}, },
"root": { "root": {
"inputs": { "inputs": {
"naked-shell": "naked-shell", "naked-shell": "naked-shell",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"parts": "parts", "parts": "parts",
"systems": "systems" "systems": "systems"
} }
}, },
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1680978846, "lastModified": 1680978846,
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "x86_64-linux", "repo": "x86_64-linux",
"rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "x86_64-linux", "repo": "x86_64-linux",
"type": "github" "type": "github"
} }
} }
}, },
"root": "root", "root": "root",
"version": 7 "version": 7
} }

19
flake.nix
View File

@ -20,16 +20,19 @@
}: { }: {
devShells.default = config.mk-naked-shell.lib.mkNakedShell { devShells.default = config.mk-naked-shell.lib.mkNakedShell {
name = "musikspider-devshell"; name = "musikspider-devshell";
packages = with pkgs; [nodejs yarn deno]; packages = with pkgs; [nodejs_20 bun];
shellHook = ''
export PATH="$PATH:$PWD/node_modules/.bin"
'';
}; };
packages.musikspider = pkgs.mkYarnPackage { # packages.musikspider = pkgs.mkYarnPackage {
src = ./.; # src = ./.;
buildPhase = "HOME=$TMPDIR yarn --offline build"; # buildPhase = "HOME=$TMPDIR yarn --offline build";
distPhase = "true"; # distPhase = "true";
installPhase = "mv deps/musikspider/build $out"; # installPhase = "mv deps/musikspider/build $out";
}; # };
packages.default = config.packages.musikspider; # packages.default = config.packages.musikspider;
}; };
}; };
} }

42
package.json
View File

@ -12,27 +12,29 @@
"format": "prettier --plugin-search-dir . --write ." "format": "prettier --plugin-search-dir . --write ."
}, },
"devDependencies": { "devDependencies": {
"@iconify-json/line-md": "^1.1.24", "@iconify-json/line-md": "^1.1.32",
"@iconify-json/mdi": "^1.1.50", "@iconify-json/mdi": "^1.1.54",
"@skeletonlabs/skeleton": "^1.2.5", "@skeletonlabs/skeleton": "^2.3.0",
"@sveltejs/kit": "^1.15.9", "@skeletonlabs/tw-plugin": "^0.2.2",
"@typescript-eslint/eslint-plugin": "^5.59.1", "@sveltejs/kit": "^1.25.2",
"@typescript-eslint/parser": "^5.59.1", "@types/node": "^20.8.5",
"autoprefixer": "^10.4.14", "@typescript-eslint/eslint-plugin": "^6.7.5",
"eslint": "^8.39.0", "@typescript-eslint/parser": "^6.7.5",
"eslint-config-prettier": "^8.8.0", "autoprefixer": "^10.4.16",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-svelte3": "^4.0.0", "eslint-plugin-svelte3": "^4.0.0",
"postcss": "^8.4.23", "postcss": "^8.4.31",
"prettier": "^2.8.8", "prettier": "^3.0.3",
"prettier-plugin-svelte": "^2.10.0", "prettier-plugin-svelte": "^3.0.3",
"svelte": "^3.58.0", "svelte": "^4.2.1",
"svelte-adapter-deno": "^0.9.0", "svelte-adapter-bun": "^0.5.0",
"svelte-check": "^3.2.0", "svelte-check": "^3.5.2",
"tailwindcss": "^3.3.2", "tailwindcss": "^3.3.3",
"tslib": "^2.5.0", "tslib": "^2.6.2",
"typescript": "^5.0.4", "typescript": "^5.2.2",
"unplugin-icons": "^0.16.1", "unplugin-icons": "^0.17.0",
"vite": "^4.3.3" "vite": "^4.4.11"
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {

13
postcss.config.cjs Normal file
View File

@ -0,0 +1,13 @@
const tailwindcss = require('tailwindcss');
const autoprefixer = require('autoprefixer');
const config = {
plugins: [
//Some plugins, like tailwindcss/nesting, need to run before Tailwind,
tailwindcss(),
//But others, like autoprefixer, need to run after,
autoprefixer
]
};
module.exports = config;

6
postcss.config.js
View File

@ -1,6 +0,0 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {}
}
};

2
src/app.d.ts vendored
View File

@ -11,4 +11,4 @@ declare global {
} }
} }
export { }; export {};

4
src/app.html
View File

@ -1,9 +1,9 @@
<!DOCTYPE html> <!doctype html>
<html class="dark" lang="en"> <html class="dark" lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" /> <link rel="icon" href="%sveltekit.assets%/favicon.png" />
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
%sveltekit.head% %sveltekit.head%
</head> </head>

4
src/app.postcss
View File

@ -1,3 +1,7 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
html, html,
body { body {
@apply h-full overflow-hidden; @apply h-full overflow-hidden;

4
src/components/track.svelte
View File

@ -9,9 +9,11 @@
import Spinnny from '~icons/line-md/loading-loop'; import Spinnny from '~icons/line-md/loading-loop';
import IconPlay from '~icons/mdi/play'; import IconPlay from '~icons/mdi/play';
import IconMusic from '~icons/mdi/music'; import IconMusic from '~icons/mdi/music';
import { toastStore } from '@skeletonlabs/skeleton'; import { getToastStore } from '@skeletonlabs/skeleton';
import { getAudioElement, makeShareUrl } from '../utils'; import { getAudioElement, makeShareUrl } from '../utils';
const toastStore = getToastStore();
export let track_with_id: TrackWithId; export let track_with_id: TrackWithId;
let track = track_with_id.track; let track = track_with_id.track;
let track_id = track_with_id.id; let track_id = track_with_id.id;

12
src/routes/(app)/+layout.svelte
View File

@ -1,11 +1,8 @@
<script lang="ts"> <script lang="ts">
// Your selected Skeleton theme:
import '@skeletonlabs/skeleton/themes/theme-crimson.css';
// This contains the bulk of Skeletons required styles:
import '@skeletonlabs/skeleton/styles/all.css';
import '../../app.postcss'; import '../../app.postcss';
import { AppShell, Toast, toastStore } from '@skeletonlabs/skeleton'; import { AppShell, Toast, getToastStore, initializeStores } from '@skeletonlabs/skeleton';
import type { ToastSettings, ToastStore } from '@skeletonlabs/skeleton';
import { import {
address, address,
changeLoop, changeLoop,
@ -24,6 +21,9 @@
import LoopButton from '../../components/loopButton.svelte'; import LoopButton from '../../components/loopButton.svelte';
import { getAudioElement, interceptKeys } from '../../utils'; import { getAudioElement, interceptKeys } from '../../utils';
initializeStores();
const toastStore = getToastStore();
$: title = $currentTrack !== null ? `${$currentTrack.track.title} - musikspider` : `musikspider`; $: title = $currentTrack !== null ? `${$currentTrack.track.title} - musikspider` : `musikspider`;
comm.setCallbacks({ comm.setCallbacks({
@ -94,6 +94,7 @@
<title>{title}</title> <title>{title}</title>
</svelte:head> </svelte:head>
<Toast position="tr" />
<AppShell> <AppShell>
<svelte:fragment slot="footer"> <svelte:fragment slot="footer">
<div class="flex w-screen place-content-end max-sm:place-content-center"> <div class="flex w-screen place-content-end max-sm:place-content-center">
@ -109,4 +110,3 @@
</svelte:fragment> </svelte:fragment>
<slot /> <slot />
</AppShell> </AppShell>
<Toast position="tr" />

28
src/routes/share/[token]/+page.server.ts
View File

@ -3,29 +3,29 @@ import { LOCAL_MUSIKQUAD_SERVER } from '$env/static/private';
import { scheme } from '../../../utils'; import { scheme } from '../../../utils';
interface MusicInfo { interface MusicInfo {
title: string; title: string;
album: string; album: string;
artist: string; artist: string;
} }
export async function load({ params }) { export async function load({ params }) {
const token = params.token; const token = params.token;
let color = '#222222'; let color = '#222222';
const resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/info/${token}`); const resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/info/${token}`);
const info: MusicInfo = await resp.json(); const info: MusicInfo = await resp.json();
/*const thumb_resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/thumbnail/${token}`); /*const thumb_resp = await fetch(`${LOCAL_MUSIKQUAD_SERVER}/share/thumbnail/${token}`);
if (thumb_resp.ok) { if (thumb_resp.ok) {
const thumb = await thumb_resp.blob(); const thumb = await thumb_resp.blob();
const rawColor = await getColor(thumb); const rawColor = await getColor(thumb);
color = rgbToHex(rawColor[0], rawColor[1], rawColor[2]); color = rgbToHex(rawColor[0], rawColor[1], rawColor[2]);
}*/ }*/
return { return {
info, info,
color, color,
thumbnail_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/thumbnail/${token}`, thumbnail_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/thumbnail/${token}`,
audio_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/audio/${token}` audio_url: `${scheme}://${PUBLIC_MUSIKQUAD_SERVER}/share/audio/${token}`
}; };
} }

4
src/routes/share/[token]/+page.svelte
View File

@ -1,8 +1,4 @@
<script lang="ts"> <script lang="ts">
// Your selected Skeleton theme:
import '@skeletonlabs/skeleton/themes/theme-crimson.css';
// This contains the bulk of Skeletons required styles:
import '@skeletonlabs/skeleton/styles/all.css';
import '../../../app.postcss'; import '../../../app.postcss';
import IconMusic from '~icons/mdi/music'; import IconMusic from '~icons/mdi/music';

4
svelte.config.js
View File

@ -1,9 +1,9 @@
import adapter from 'svelte-adapter-deno'; import adapter from 'svelte-adapter-bun';
import { vitePreprocess } from '@sveltejs/kit/vite'; import { vitePreprocess } from '@sveltejs/kit/vite';
/** @type {import('@sveltejs/kit').Config} */ /** @type {import('@sveltejs/kit').Config} */
const config = { const config = {
preprocess: vitePreprocess(), preprocess: [vitePreprocess({})],
kit: { kit: {
adapter: adapter() adapter: adapter()

12
tailwind.config.js
View File

@ -1,12 +0,0 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [
'./src/**/*.{html,js,svelte,ts}',
require('path').join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}')
],
theme: {
extend: {}
},
plugins: [...require('@skeletonlabs/skeleton/tailwind/skeleton.cjs')()],
darkMode: 'class'
};

22
tailwind.config.ts Normal file
View File

@ -0,0 +1,22 @@
import { join } from 'path';
import type { Config } from 'tailwindcss';
import { skeleton } from '@skeletonlabs/tw-plugin';
const config = {
darkMode: 'class',
content: [
'./src/**/*.{html,js,svelte,ts}',
join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}')
],
theme: {
extend: {}
},
plugins: [
skeleton({
themes: { preset: ['crimson'] }
})
]
} satisfies Config;
export default config;

2064
yarn.lock
View File

File diff suppressed because it is too large Load Diff