Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aa4b81b9a7 | ||
|
|
5c8c0ae318 | ||
|
|
c50654534d | ||
|
|
2a2754379f | ||
|
|
6ca5482b97 | ||
|
|
eb47085e5b | ||
|
|
b1a053a346 | ||
|
|
705f23c78f | ||
|
|
8a76fbb78e | ||
|
|
fc427f1b19 | ||
|
|
b63e30d2f8 | ||
|
|
f1220a688a | ||
|
|
9770580f7f | ||
|
|
f98c47f5ed |
@@ -1,115 +0,0 @@
|
|||||||
name: CI/CD
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: ['**']
|
|
||||||
pull_request:
|
|
||||||
branches: ['**']
|
|
||||||
|
|
||||||
concurrency:
|
|
||||||
group: production-deploy
|
|
||||||
cancel-in-progress: false
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
backend-tests:
|
|
||||||
name: BackEnd
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 20
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
working-directory: backend
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-dotnet@v4
|
|
||||||
with:
|
|
||||||
dotnet-version: '10.0.x'
|
|
||||||
|
|
||||||
- name: Restore
|
|
||||||
run: dotnet restore Musify.slnx
|
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: dotnet build Musify.slnx --no-restore -c Release
|
|
||||||
|
|
||||||
- name: Test
|
|
||||||
run: dotnet test Musify.slnx --no-build -c Release
|
|
||||||
|
|
||||||
web-player-checks:
|
|
||||||
name: WebPlayer
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 15
|
|
||||||
defaults:
|
|
||||||
run:
|
|
||||||
working-directory: web-player
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: '22'
|
|
||||||
cache: npm
|
|
||||||
cache-dependency-path: web-player/package-lock.json
|
|
||||||
|
|
||||||
- run: npm ci
|
|
||||||
|
|
||||||
- name: Type-check
|
|
||||||
run: npm run check
|
|
||||||
|
|
||||||
- name: Lint
|
|
||||||
run: npm run lint
|
|
||||||
|
|
||||||
# Runs on the production host itself, through the existing self-hosted
|
|
||||||
# Gitea Actions runner (act_runner), which also carries a "production"
|
|
||||||
# label registered in native (non-docker) mode so its steps see the host's
|
|
||||||
# real Docker daemon directly (Docker socket + a bind-mounted deploy
|
|
||||||
# directory — see deploy/README.md for how that runner is set up).
|
|
||||||
#
|
|
||||||
# DEPLOY_PATH is the persistent clone already on that host (the one whose
|
|
||||||
# deploy/.env.prod is filled in and matches SharedServices/.env.prod) —
|
|
||||||
# deploy reuses it instead of a fresh checkout, since .env.prod is
|
|
||||||
# untracked and only lives there.
|
|
||||||
deploy:
|
|
||||||
name: Deploy
|
|
||||||
needs: [backend-tests, web-player-checks]
|
|
||||||
if: github.ref == 'refs/heads/master' && github.event_name == 'push'
|
|
||||||
runs-on: [production]
|
|
||||||
timeout-minutes: 20
|
|
||||||
env:
|
|
||||||
DEPLOY_PATH: /home/ubuntu/deploys/musify
|
|
||||||
COMPOSE: docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml
|
|
||||||
steps:
|
|
||||||
- name: Pull latest master
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
git config --global --add safe.directory "$DEPLOY_PATH"
|
|
||||||
cd "$DEPLOY_PATH"
|
|
||||||
git fetch origin master
|
|
||||||
git reset --hard origin/master
|
|
||||||
|
|
||||||
- name: Migrate database, generate keys
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
cd "$DEPLOY_PATH"
|
|
||||||
$COMPOSE up -d wait-for-postgres keys-init migrate
|
|
||||||
|
|
||||||
# Both jobs verify themselves through the public auth./s3. URLs, served
|
|
||||||
# by the shared edge nginx (Infrastructure's edge/), and are idempotent.
|
|
||||||
- name: Create OIDC app and S3 bucket
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
cd "$DEPLOY_PATH"
|
|
||||||
$COMPOSE up -d seaweedfs-init zitadel-init
|
|
||||||
for job in musify-seaweedfs-init musify-zitadel-init; do
|
|
||||||
code=$(docker wait "$job")
|
|
||||||
if [ "$code" != "0" ]; then
|
|
||||||
docker logs "$job"
|
|
||||||
echo "$job exited with $code"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Build and start apps
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
cd "$DEPLOY_PATH"
|
|
||||||
$COMPOSE --profile apps up -d --build api worker gateway web-player
|
|
||||||
@@ -28,4 +28,5 @@ Thumbs.db
|
|||||||
# Deploy secrets and runtime state
|
# Deploy secrets and runtime state
|
||||||
deploy/keys/
|
deploy/keys/
|
||||||
deploy/secrets/
|
deploy/secrets/
|
||||||
|
deploy/nginx/certs/
|
||||||
deploy/zitadel/.output/
|
deploy/zitadel/.output/
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace Musify.Infrastructure.Persistence
|
|||||||
}
|
}
|
||||||
else if (entry.State == EntityState.Modified)
|
else if (entry.State == EntityState.Modified)
|
||||||
{
|
{
|
||||||
entry.Property(nameof(IAuditable.UpdatedAt)).CurrentValue = now;
|
entry.Entity.UpdatedAt = now;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,13 +13,9 @@ namespace Musify.Infrastructure.Persistence
|
|||||||
public class Database(DatabaseConfiguration configuration)
|
public class Database(DatabaseConfiguration configuration)
|
||||||
: DbContext, AppIDatabase
|
: DbContext, AppIDatabase
|
||||||
{
|
{
|
||||||
private static readonly AuditableEntityInterceptor AuditInterceptor = new();
|
|
||||||
|
|
||||||
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
|
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
|
||||||
{
|
{
|
||||||
optionsBuilder
|
optionsBuilder.UseNpgsql(configuration.ConnectionString, o => o.MapEnum<Genre>("genre"));
|
||||||
.UseNpgsql(configuration.ConnectionString, o => o.MapEnum<Genre>("genre"))
|
|
||||||
.AddInterceptors(AuditInterceptor);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||||
|
|||||||
@@ -18,7 +18,10 @@ namespace Musify.Infrastructure.Persistence
|
|||||||
serviceDescriptors.AddSingleton(serviceProvider =>
|
serviceDescriptors.AddSingleton(serviceProvider =>
|
||||||
serviceProvider.GetRequiredService<IOptions<DatabaseConfiguration>>().Value);
|
serviceProvider.GetRequiredService<IOptions<DatabaseConfiguration>>().Value);
|
||||||
|
|
||||||
serviceDescriptors.AddDbContext<Database>();
|
serviceDescriptors.AddSingleton<AuditableEntityInterceptor>();
|
||||||
|
|
||||||
|
serviceDescriptors.AddDbContext<Database>((serviceProvider, options) =>
|
||||||
|
options.AddInterceptors(serviceProvider.GetRequiredService<AuditableEntityInterceptor>()));
|
||||||
|
|
||||||
serviceDescriptors.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
|
serviceDescriptors.AddScoped<IDatabase>(serviceProvider => serviceProvider.GetRequiredService<Database>());
|
||||||
|
|
||||||
|
|||||||
-6
@@ -1,4 +1,3 @@
|
|||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Musify.Domain.Entities;
|
using Musify.Domain.Entities;
|
||||||
using Musify.Infrastructure.Tests.TestSupport;
|
using Musify.Infrastructure.Tests.TestSupport;
|
||||||
using Xunit;
|
using Xunit;
|
||||||
@@ -44,11 +43,6 @@ namespace Musify.Infrastructure.Tests.Persistence
|
|||||||
Assert.Equal(originalCreatedAt, user.CreatedAt);
|
Assert.Equal(originalCreatedAt, user.CreatedAt);
|
||||||
Assert.True(user.UpdatedAt > originalCreatedAt,
|
Assert.True(user.UpdatedAt > originalCreatedAt,
|
||||||
$"original-created-at={originalCreatedAt:O}, final-updated-at={user.UpdatedAt:O}");
|
$"original-created-at={originalCreatedAt:O}, final-updated-at={user.UpdatedAt:O}");
|
||||||
|
|
||||||
await using var reader = fixture.CreateDatabase();
|
|
||||||
var stored = await reader.Users.SingleAsync(u => u.Id == user.Id, TestContext.Current.CancellationToken);
|
|
||||||
Assert.True(stored.UpdatedAt > stored.CreatedAt,
|
|
||||||
$"stored-created-at={stored.CreatedAt:O}, stored-updated-at={stored.UpdatedAt:O}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-13
@@ -1,14 +1,11 @@
|
|||||||
# Production configuration for deploy/compose.yml + compose.prod.yml.
|
# Production configuration for deploy/compose.yml + compose.prod.yml.
|
||||||
# Copy to deploy/.env.prod, then:
|
# Copy to deploy/.env.prod, then:
|
||||||
#
|
#
|
||||||
# 1. replace every `*.example.com` with your actual domains (each service
|
# 1. replace every `example.com` with your domain,
|
||||||
# below has its own, independent domain — they don't need to share a
|
|
||||||
# root, e.g. for DNS providers that don't allow multi-level
|
|
||||||
# subdomains),
|
|
||||||
# 2. replace every CHANGE_ME with a strong random value
|
# 2. replace every CHANGE_ME with a strong random value
|
||||||
# (`openssl rand -hex 24`),
|
# (`openssl rand -hex 24`),
|
||||||
# 3. point each domain below at the server and add its vhost to the shared
|
# 3. point these DNS records at the server, all proxied/TLS-terminated the
|
||||||
# edge (Infrastructure's edge/conf.d).
|
# same way: example.com, www, api, auth, stream, s3.
|
||||||
#
|
#
|
||||||
# Requires ../../../Infrastructure running first, on the same Docker host,
|
# Requires ../../../Infrastructure running first, on the same Docker host,
|
||||||
# with its own `infra-net` network already created. See
|
# with its own `infra-net` network already created. See
|
||||||
@@ -17,13 +14,12 @@
|
|||||||
|
|
||||||
DOTNET_ENVIRONMENT=Production
|
DOTNET_ENVIRONMENT=Production
|
||||||
|
|
||||||
# --- Domains -------------------------------------------------------------
|
# --- Domain ------------------------------------------------------------------
|
||||||
# Public URLs. They must match the vhosts of the shared edge nginx
|
# ROOT_DOMAIN drives the nginx vhosts; the URLs below must agree with it.
|
||||||
# (Infrastructure's edge/conf.d), which is what serves them; the domains are
|
ROOT_DOMAIN=example.com
|
||||||
# independent, they don't need to share a root.
|
PUBLIC_WEB_URL=https://example.com
|
||||||
PUBLIC_WEB_URL=https://musify.example.com
|
PUBLIC_API_URL=https://api.example.com
|
||||||
PUBLIC_API_URL=https://musifyapi.example.com
|
PUBLIC_STREAM_URL=https://stream.example.com
|
||||||
PUBLIC_STREAM_URL=https://musifystream.example.com
|
|
||||||
PUBLIC_AUTH_URL=https://auth.example.com
|
PUBLIC_AUTH_URL=https://auth.example.com
|
||||||
S3_PUBLIC_URL=https://s3.example.com
|
S3_PUBLIC_URL=https://s3.example.com
|
||||||
|
|
||||||
@@ -67,3 +63,5 @@ AUTH_ALLOW_INSECURE_HTTP=false
|
|||||||
|
|
||||||
# --- Misc --------------------------------------------------------------------
|
# --- Misc --------------------------------------------------------------------
|
||||||
AUTH_REQUIRE_HTTPS=true
|
AUTH_REQUIRE_HTTPS=true
|
||||||
|
# Largest request body nginx accepts (audio uploads go through the web player).
|
||||||
|
MAX_UPLOAD_SIZE=1024m
|
||||||
|
|||||||
+26
-53
@@ -13,7 +13,7 @@ wherever you actually cloned it.
|
|||||||
|---|---|
|
|---|---|
|
||||||
| `compose.yml` | Musify's own services, including the one-shot bootstrap jobs. No published ports, no domains, no environment-specific values. |
|
| `compose.yml` | Musify's own services, including the one-shot bootstrap jobs. No published ports, no domains, no environment-specific values. |
|
||||||
| `compose.dev.yml` | Development overlay: publishes Musify's ports to the host. |
|
| `compose.dev.yml` | Development overlay: publishes Musify's ports to the host. |
|
||||||
| `compose.prod.yml` | Production overlay: joins Infrastructure's `infra-net` network. |
|
| `compose.prod.yml` | Production overlay: adds the nginx edge and joins Infrastructure's `infra-net` network. |
|
||||||
| `.env` / `.env.prod` | The values compose interpolates. Not versioned; templates in `.env.example` / `.env.prod.example`. |
|
| `.env` / `.env.prod` | The values compose interpolates. Not versioned; templates in `.env.example` / `.env.prod.example`. |
|
||||||
|
|
||||||
The four applications (`api`, `worker`, `gateway`, `web-player`) sit behind
|
The four applications (`api`, `worker`, `gateway`, `web-player`) sit behind
|
||||||
@@ -113,26 +113,26 @@ SeaweedFS is done from the `Infrastructure` repo instead.
|
|||||||
|
|
||||||
## Production
|
## Production
|
||||||
|
|
||||||
Musify doesn't run its own nginx: the shared edge in Infrastructure
|
On a server with a domain:
|
||||||
(`edge/`) owns host ports 80/443, terminates TLS for every project's domains
|
|
||||||
and proxies to Musify's containers over `infra-net`. On a server with
|
|
||||||
domains:
|
|
||||||
|
|
||||||
1. Bring up the `Infrastructure` repo first, with its own `.env.prod` filled
|
1. Bring up the `Infrastructure` repo first, with its own `.env.prod` filled
|
||||||
in. It creates the `infra-net` network this stack joins.
|
in. It creates the `infra-net` network this stack joins.
|
||||||
2. Bring up its `edge/` (see Infrastructure's README) and add Musify's
|
2. From this repository's root:
|
||||||
vhosts and certificate there (`edge/conf.d/musify.conf`). The five
|
|
||||||
public hostnames (web, api, stream, auth, s3) are independent: they
|
|
||||||
don't need to share a root domain.
|
|
||||||
3. From this repository's root:
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cp deploy/.env.prod.example deploy/.env.prod
|
cp deploy/.env.prod.example deploy/.env.prod
|
||||||
```
|
```
|
||||||
|
|
||||||
Replace every `*.example.com` with your domains (they must match the
|
Fill it in:
|
||||||
edge's vhosts) and every `CHANGE_ME` with a random value
|
|
||||||
(`openssl rand -hex 24`). `chmod 600 deploy/.env.prod`.
|
1. Replace every `example.com` with your domain and every `CHANGE_ME` with a
|
||||||
|
random value (`openssl rand -hex 24`). `chmod 600 deploy/.env.prod`.
|
||||||
|
2. Drop **`deploy/nginx/certs/origin.pem` and `origin.key`**, the origin
|
||||||
|
certificate nginx serves. The stack assumes Cloudflare in *Full (strict)*
|
||||||
|
mode in front of it, so a Cloudflare Origin Certificate is enough; any
|
||||||
|
certificate valid for the five hostnames works.
|
||||||
|
3. Point `example.com`, `www`, `api`, `auth`, `stream` and `s3` at the server,
|
||||||
|
proxied and TLS-terminated the same way.
|
||||||
|
|
||||||
Then:
|
Then:
|
||||||
|
|
||||||
@@ -141,45 +141,14 @@ docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compo
|
|||||||
docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
|
docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
|
||||||
```
|
```
|
||||||
|
|
||||||
The first command starts Musify's bootstrap jobs (`zitadel-init` and
|
The first command starts Musify's bootstrap jobs and the nginx edge; the
|
||||||
`seaweedfs-init` reach Zitadel/SeaweedFS through the public `auth.`/`s3.`
|
second builds and starts the applications, already wired to the OIDC client
|
||||||
URLs, so the edge has to be serving them by then); the second builds and
|
ids the first one produced. Both are idempotent, so running them again
|
||||||
starts the applications, already wired to the OIDC client ids the first one
|
deploys a new version (`... --profile apps up -d --build` alone is enough for
|
||||||
produced. Both are idempotent, so running them again deploys a new version
|
an update once the stack already exists).
|
||||||
(`... --profile apps up -d --build` alone is enough for an update once the
|
|
||||||
stack already exists).
|
|
||||||
|
|
||||||
Nothing in this stack publishes a port; everything is reachable only on the
|
Only nginx publishes ports (80/443). Every other Musify service, and all of
|
||||||
internal `infra-net` network, through the edge.
|
Infrastructure's, is reachable only on the internal `infra-net` network.
|
||||||
|
|
||||||
### Continuous deployment
|
|
||||||
|
|
||||||
`.gitea/workflows/ci-cd.yml` runs the backend and web-player checks on every
|
|
||||||
push/PR, and on a successful push to `master` deploys automatically. The
|
|
||||||
deploy job runs on `gitea-runner`, the self-hosted Gitea Actions runner on
|
|
||||||
the production host (`~/gitea/docker-compose.yml`), configured by
|
|
||||||
`~/gitea/runner-data/config.yaml` (`CONFIG_FILE`): job containers are pinned
|
|
||||||
to the `gitea_gitea` network so `actions/checkout` can resolve `gitea`,
|
|
||||||
`ubuntu-latest` is `node:22` (JS actions need Node inside the job
|
|
||||||
container), and a `production:host` label runs steps natively.
|
|
||||||
|
|
||||||
Native mode means the label's steps execute inside the runner container
|
|
||||||
itself rather than a fresh one. That container has `/var/run/docker.sock`
|
|
||||||
mounted, so `docker`/`docker compose` there still control the host's real
|
|
||||||
Docker daemon (sibling containers, "Docker outside of Docker"). Its compose
|
|
||||||
service also bind-mounts `/home/ubuntu/deploys` into itself at the *same*
|
|
||||||
path, which matters because compose's own relative bind mounts (`./keys`)
|
|
||||||
are resolved by the host daemon against that literal path; mounting it
|
|
||||||
anywhere else would silently bind the wrong (empty) directory.
|
|
||||||
|
|
||||||
`DEPLOY_PATH` (hardcoded in the workflow as `/home/ubuntu/deploys/musify`)
|
|
||||||
is a persistent clone on that host, reused instead of a fresh checkout each
|
|
||||||
run since `deploy/.env.prod` is untracked and only lives there.
|
|
||||||
`/home/ubuntu/deploys/SharedServices` is the sibling clone of the
|
|
||||||
`Infrastructure` repo (shared services + `edge/`), already running; its
|
|
||||||
`.env.prod` shares the Postgres/RabbitMQ/S3 credentials with Musify's own
|
|
||||||
`deploy/.env.prod` by design (see that repo's README). The edge is deployed
|
|
||||||
from that repo, not from this pipeline.
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -190,9 +159,13 @@ deploy/
|
|||||||
├─ compose.yml # Musify's own services: wait-for-postgres, keys-init,
|
├─ compose.yml # Musify's own services: wait-for-postgres, keys-init,
|
||||||
│ # migrate, seaweedfs-init, zitadel-init, api/worker/gateway/web-player
|
│ # migrate, seaweedfs-init, zitadel-init, api/worker/gateway/web-player
|
||||||
├─ compose.dev.yml # dev overlay: host ports
|
├─ compose.dev.yml # dev overlay: host ports
|
||||||
├─ compose.prod.yml # prod overlay: joins infra-net
|
├─ compose.prod.yml # prod overlay: nginx edge, joins infra-net
|
||||||
├─ .env.example / .env.prod.example
|
├─ .env.example / .env.prod.example
|
||||||
└─ keys/ # RS256 stream-ticket key pair (generated)
|
├─ keys/ # RS256 stream-ticket key pair (generated)
|
||||||
|
└─ nginx/
|
||||||
|
├─ templates/default.conf.template # vhosts, rendered with the domain by envsubst
|
||||||
|
├─ snippets/proxy.conf # proxy headers shared by every vhost
|
||||||
|
└─ certs/ # origin.pem + origin.key (not versioned)
|
||||||
```
|
```
|
||||||
|
|
||||||
The application images are built from `backend/Musify.*.Dockerfile` (build
|
The application images are built from `backend/Musify.*.Dockerfile` (build
|
||||||
|
|||||||
+34
-5
@@ -1,10 +1,11 @@
|
|||||||
name: musify-prod
|
name: musify-prod
|
||||||
|
|
||||||
# Production overlay: joins Infrastructure's shared `infra-net` network so
|
# Production overlay: adds the nginx edge and joins Infrastructure's shared
|
||||||
# this project's containers can reach Postgres, Zitadel, SeaweedFS, RabbitMQ
|
# `infra-net` network so this project's containers can reach Postgres,
|
||||||
# and Jaeger by container name, and so the shared edge nginx (Infrastructure's
|
# Zitadel, SeaweedFS, RabbitMQ and Jaeger by container name. None of them
|
||||||
# `edge/`, which owns host ports 80/443 and terminates TLS for every domain)
|
# run as part of this compose project anymore (see
|
||||||
# can reach api, gateway and web-player. Nothing here publishes a port.
|
# ../../../Infrastructure/README.md, which must already be up). Nothing but
|
||||||
|
# nginx publishes a port; every other service is reachable only on infra-net.
|
||||||
#
|
#
|
||||||
# docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml up -d
|
# docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml up -d
|
||||||
# docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
|
# docker compose --env-file deploy/.env.prod -f deploy/compose.yml -f deploy/compose.prod.yml --profile apps up -d --build
|
||||||
@@ -19,3 +20,31 @@ services:
|
|||||||
zitadel-init:
|
zitadel-init:
|
||||||
volumes:
|
volumes:
|
||||||
- ./.env.prod:/workspace/.env
|
- ./.env.prod:/workspace/.env
|
||||||
|
|
||||||
|
# Every vhost proxies through `set $upstream ...; proxy_pass $upstream;`
|
||||||
|
# with the embedded Docker DNS resolver (see nginx/templates), so nginx
|
||||||
|
# does not need api/gateway/web-player to exist at its own startup, only
|
||||||
|
# at request time. That is what lets it start in the FIRST command
|
||||||
|
# (profile-gated services aren't part of that invocation yet) and still be
|
||||||
|
# reachable at the auth domain for zitadel-init to provision through.
|
||||||
|
nginx:
|
||||||
|
image: nginx:1.27-alpine
|
||||||
|
container_name: musify-nginx
|
||||||
|
environment:
|
||||||
|
# The entrypoint renders /etc/nginx/templates/*.template with envsubst.
|
||||||
|
# The filter keeps it from eating nginx's own $host / $remote_addr.
|
||||||
|
MUSIFY_ROOT_DOMAIN: ${ROOT_DOMAIN}
|
||||||
|
MUSIFY_MAX_UPLOAD_SIZE: ${MAX_UPLOAD_SIZE:-1024m}
|
||||||
|
NGINX_ENVSUBST_FILTER: ^MUSIFY_
|
||||||
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
|
volumes:
|
||||||
|
- ./nginx/templates:/etc/nginx/templates:ro
|
||||||
|
- ./nginx/snippets:/etc/nginx/snippets:ro
|
||||||
|
- ./nginx/certs:/etc/nginx/certs:ro
|
||||||
|
- nginx_cache:/var/cache/nginx
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
nginx_cache:
|
||||||
|
|||||||
@@ -381,10 +381,6 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
NODE_ENV: production
|
NODE_ENV: production
|
||||||
PORT: 3000
|
PORT: 3000
|
||||||
# adapter-node rejects request bodies over 512K by default; audio
|
|
||||||
# uploads are posted to /upload. Keep in line with the edge's
|
|
||||||
# client_max_body_size.
|
|
||||||
BODY_SIZE_LIMIT: 1G
|
|
||||||
ORIGIN: ${PUBLIC_WEB_URL}
|
ORIGIN: ${PUBLIC_WEB_URL}
|
||||||
ZITADEL_ISSUER: ${PUBLIC_AUTH_URL}
|
ZITADEL_ISSUER: ${PUBLIC_AUTH_URL}
|
||||||
ZITADEL_CLIENT_ID: ${WEB_CLIENT_ID}
|
ZITADEL_CLIENT_ID: ${WEB_CLIENT_ID}
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
# Shared proxy settings for every Musify vhost.
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
|
proxy_set_header X-Forwarded-Host $host;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
# Musify edge. The nginx entrypoint renders this with envsubst into
|
||||||
|
# /etc/nginx/conf.d/default.conf (replacing the image's stock file) using the
|
||||||
|
# MUSIFY_* variables set in compose.prod.yml.
|
||||||
|
#
|
||||||
|
# Cloudflare (Full strict) terminates the public edge; this box only needs to
|
||||||
|
# serve the Cloudflare Origin Certificate in nginx/certs/. Each vhost proxies to
|
||||||
|
# a compose service by name through the embedded Docker DNS resolver, so nginx
|
||||||
|
# re-resolves it instead of caching the IP of a container that may be recreated.
|
||||||
|
|
||||||
|
resolver 127.0.0.11 valid=10s;
|
||||||
|
|
||||||
|
map $http_upgrade $connection_upgrade {
|
||||||
|
default upgrade;
|
||||||
|
'' close;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen [::]:80;
|
||||||
|
server_name ${MUSIFY_ROOT_DOMAIN} www.${MUSIFY_ROOT_DOMAIN}
|
||||||
|
api.${MUSIFY_ROOT_DOMAIN} auth.${MUSIFY_ROOT_DOMAIN}
|
||||||
|
stream.${MUSIFY_ROOT_DOMAIN} s3.${MUSIFY_ROOT_DOMAIN};
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Web player (SvelteKit, adapter-node). Uploads are posted to its own form
|
||||||
|
# actions, so it needs the large body size too.
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name ${MUSIFY_ROOT_DOMAIN};
|
||||||
|
client_max_body_size ${MUSIFY_MAX_UPLOAD_SIZE};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/origin.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/origin.key;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
set $upstream http://web-player:3000;
|
||||||
|
proxy_pass $upstream;
|
||||||
|
include /etc/nginx/snippets/proxy.conf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name www.${MUSIFY_ROOT_DOMAIN};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/origin.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/origin.key;
|
||||||
|
|
||||||
|
return 301 https://${MUSIFY_ROOT_DOMAIN}$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name api.${MUSIFY_ROOT_DOMAIN};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/origin.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/origin.key;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
set $upstream http://api:5111;
|
||||||
|
proxy_pass $upstream;
|
||||||
|
include /etc/nginx/snippets/proxy.conf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Audio bytes. Buffering off keeps range requests (seeking) responsive.
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name stream.${MUSIFY_ROOT_DOMAIN};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/origin.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/origin.key;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
set $upstream http://gateway:8081;
|
||||||
|
proxy_pass $upstream;
|
||||||
|
include /etc/nginx/snippets/proxy.conf;
|
||||||
|
proxy_buffering off;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name auth.${MUSIFY_ROOT_DOMAIN};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/origin.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/origin.key;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
set $upstream http://zitadel:8080;
|
||||||
|
proxy_pass $upstream;
|
||||||
|
include /etc/nginx/snippets/proxy.conf;
|
||||||
|
grpc_set_header Host $host;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# Presigned S3 PUT/GET straight from the browser.
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name s3.${MUSIFY_ROOT_DOMAIN};
|
||||||
|
client_max_body_size ${MUSIFY_MAX_UPLOAD_SIZE};
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/certs/origin.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/certs/origin.key;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
set $upstream http://seaweedfs:8333;
|
||||||
|
proxy_pass $upstream;
|
||||||
|
include /etc/nginx/snippets/proxy.conf;
|
||||||
|
proxy_request_buffering off;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,5 +9,3 @@ package
|
|||||||
package-lock.json
|
package-lock.json
|
||||||
src/lib/api/schema.d.ts
|
src/lib/api/schema.d.ts
|
||||||
static
|
static
|
||||||
.agents
|
|
||||||
skills-lock.json
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
"singleQuote": true,
|
"singleQuote": true,
|
||||||
"trailingComma": "none",
|
"trailingComma": "none",
|
||||||
"printWidth": 100,
|
"printWidth": 100,
|
||||||
"endOfLine": "auto",
|
|
||||||
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
|
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
|
||||||
"tailwindStylesheet": "./src/routes/layout.css",
|
"tailwindStylesheet": "./src/routes/layout.css",
|
||||||
"overrides": [
|
"overrides": [
|
||||||
|
|||||||
@@ -57,14 +57,6 @@ The design system lives in `src/routes/layout.css` (`@theme` tokens plus `@utili
|
|||||||
- Reach for these base components before creating a new one: `Artwork`, `Avatar`, `ListRow`, `MediaIdentity`, `TrackList`, `MediaCard`, `PageHeader`, `ContextMenu`, `ConfirmDialog`, `PlayButton`, `Slider`, `Logo`, `Chip`, `SegmentedControl`, `CoverForm`.
|
- Reach for these base components before creating a new one: `Artwork`, `Avatar`, `ListRow`, `MediaIdentity`, `TrackList`, `MediaCard`, `PageHeader`, `ContextMenu`, `ConfirmDialog`, `PlayButton`, `Slider`, `Logo`, `Chip`, `SegmentedControl`, `CoverForm`.
|
||||||
- Known and accepted gap (documented in `scripts/check-tokens.mjs`): icon `strokeWidth={n}` isn't unified yet. There are 13 different values spread across almost every component, and migrating them to `stroke-thin/regular/bold` recipes safely would require visually confirming that `lucide-svelte` actually respects `stroke-width` through CSS, so that was left out of the last pass.
|
- Known and accepted gap (documented in `scripts/check-tokens.mjs`): icon `strokeWidth={n}` isn't unified yet. There are 13 different values spread across almost every component, and migrating them to `stroke-thin/regular/bold` recipes safely would require visually confirming that `lucide-svelte` actually respects `stroke-width` through CSS, so that was left out of the last pass.
|
||||||
|
|
||||||
## Motion
|
|
||||||
|
|
||||||
Every animation follows one scale of three durations and one easing curve, all defined in `theme.css`. Fast (`--mf-motion-fast`, 150ms) is for hover, focus and press feedback: color, opacity and small scale changes. Plain `transition` or `transition-colors` already uses it because it is the Tailwind default, so never write `duration-150`. Base (`--mf-motion-base`, 200ms) is for things that appear on top of the page or move inside a control: modals, menus, the queue panel, `animate-pop`, `animate-fade` and the segmented control thumb. Slow (`--mf-motion-slow`, 300ms) is for content entering the page and larger movement: `animate-enter`, cover zoom on hover and the player dock padding.
|
|
||||||
|
|
||||||
Entrances and movement always use `--mf-ease` (`ease-snappy` in Tailwind, `expoOut` in Svelte transitions), which feels immediate because most of the motion happens at the start. Color transitions keep the Tailwind default curve. Overlays must feel instant: the modal backdrop uses `transition:fade={{ duration: 200 }}` and the panel uses a local `pop` transition (opacity + scale + translateY, `expoOut`, 200ms) mirroring `animate-pop`'s keyframes — both directives so the modal fades and pops on close too, not just on open, and the whole thing settles in 200ms. Staggered lists use `--i` with 40ms steps capped at ten items.
|
|
||||||
|
|
||||||
The only exceptions are looping indicators (equalizer bars, pulse, spin, sheen) and the accent hue crossfade in `+layout.svelte` (600ms), which is ambient and meant to be slow. Do not add new durations or curves; if something needs a different feel, pick the closest step of the scale. `prefers-reduced-motion` disables everything globally in `layout.css`.
|
|
||||||
|
|
||||||
## Auth
|
## Auth
|
||||||
|
|
||||||
`hooks.server.ts` validates the encrypted session cookie (`mf_session`), refreshes the `access_token`, and fills `locals.user` and `locals.accessToken`. To protect a route, check `locals.user` in its `load` and redirect to `/auth?returnTo=…`. When talking to the backend, send `locals.accessToken` as a Bearer token to `API_BASE_URL`.
|
`hooks.server.ts` validates the encrypted session cookie (`mf_session`), refreshes the `access_token`, and fills `locals.user` and `locals.accessToken`. To protect a route, check `locals.user` in its `load` and redirect to `/auth?returnTo=…`. When talking to the backend, send `locals.accessToken` as a Bearer token to `API_BASE_URL`.
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ Status legend: ✅ done · 🟡 partial / mockup · ⬜ pending.
|
|||||||
## Home (app) `/` 🟡
|
## Home (app) `/` 🟡
|
||||||
|
|
||||||
- **Hero**: a greeting plus "Your music. No limits." with a color wash taken from the current track's hue.
|
- **Hero**: a greeting plus "Your music. No limits." with a color wash taken from the current track's hue.
|
||||||
- **Quick access, meaning recently played** (`GET /users/{id}/listening-history` merged with `player.recentlyPlayed` via `mergeRecentlyPlayed`). Empty state with an icon and an "Explore" CTA.
|
- **Quick access, meaning recently played** (`player.recentlyPlayed`, client side for now). Empty state with an icon and an "Explore" CTA.
|
||||||
- **Your playlists**: mosaic cards for the user's playlists (sample data for now). Has an empty state.
|
- **Your playlists**: mosaic cards for the user's playlists (sample data for now). Has an empty state.
|
||||||
- **Resume on load**: the root layout fetches `GET /users/{id}/last-listened-track` and hydrates the player (`player.hydrate`) with it, paused, so the player bar isn't empty on a fresh session. Only applies when nothing is already loaded (won't override an in-progress session).
|
|
||||||
|
|
||||||
### Pending backend work (ASP.NET) for Home
|
### Pending backend work (ASP.NET) for Home
|
||||||
|
|
||||||
|
- **Recently played**: track plays per user (a history table with `userId`, `trackId`, `playedAt`) and expose `GET /me/recently-played?limit=` (or `/users/{id}/recently-played`), returning tracks ordered by `playedAt` descending, with no duplicates. The frontend would load this in a `load` function and pass it to the store instead of using `recentlyPlayed`.
|
||||||
- **Playlists by last listen**: add `lastPlayedAt` to the playlist (the schema currently only has `createdAt`/`updatedAt`) and allow sorting `GET /playlists/users/{userId}` by that field (for example `?sort=lastPlayed`), to show "your most recently played" playlists.
|
- **Playlists by last listen**: add `lastPlayedAt` to the playlist (the schema currently only has `createdAt`/`updatedAt`) and allow sorting `GET /playlists/users/{userId}` by that field (for example `?sort=lastPlayed`), to show "your most recently played" playlists.
|
||||||
- Tracks will need an **artist** and a **color/hue** (or a real cover to extract one from) for the artwork and the dynamic accent. Right now `TrackApplicationResponse` carries neither artist nor color.
|
- Tracks will need an **artist** and a **color/hue** (or a real cover to extract one from) for the artwork and the dynamic accent. Right now `TrackApplicationResponse` carries neither artist nor color.
|
||||||
|
|
||||||
@@ -120,7 +120,7 @@ A fixed bottom bar, visible while something is playing. Shows track info, transp
|
|||||||
## Available backend (summary)
|
## Available backend (summary)
|
||||||
|
|
||||||
| Resource | Endpoints |
|
| Resource | Endpoints |
|
||||||
| --------- | ----------------------------------------------------------------- |
|
| --------- | --------------------------------------------------------------------- |
|
||||||
| Tracks | list/search, detail, by user, stream, create, delete, upload-urls |
|
| Tracks | list/search, detail, by user, stream, create, delete, upload-urls |
|
||||||
| Playlists | CRUD, playlist tracks, add/remove track, upload-picture |
|
| Playlists | CRUD, playlist tracks, add/remove track, upload-picture |
|
||||||
| Users | list/search, detail, create |
|
| Users | list/search, detail, create |
|
||||||
|
|||||||
Generated
+14
-55
@@ -39,40 +39,6 @@
|
|||||||
"vite": "^8.0.16"
|
"vite": "^8.0.16"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@emnapi/core": {
|
|
||||||
"version": "1.11.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz",
|
|
||||||
"integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@emnapi/wasi-threads": "1.2.3",
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@emnapi/core/node_modules/@emnapi/wasi-threads": {
|
|
||||||
"version": "1.2.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz",
|
|
||||||
"integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==",
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@emnapi/runtime": {
|
|
||||||
"version": "1.11.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz",
|
|
||||||
"integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"peer": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@emnapi/wasi-threads": {
|
"node_modules/@emnapi/wasi-threads": {
|
||||||
"version": "1.2.2",
|
"version": "1.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz",
|
||||||
@@ -1152,6 +1118,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.69.1.tgz",
|
"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.69.1.tgz",
|
||||||
"integrity": "sha512-+nz8Fx/cElzb2ZPHC+6Ll3y3NEVIe4Na75PeplLlyTmd1dBXAjz2KR14y1ZgNjb2ThfAYzulu+PFy1UE3RCUzA==",
|
"integrity": "sha512-+nz8Fx/cElzb2ZPHC+6Ll3y3NEVIe4Na75PeplLlyTmd1dBXAjz2KR14y1ZgNjb2ThfAYzulu+PFy1UE3RCUzA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@standard-schema/spec": "^1.0.0",
|
"@standard-schema/spec": "^1.0.0",
|
||||||
"@sveltejs/acorn-typescript": "^1.0.9",
|
"@sveltejs/acorn-typescript": "^1.0.9",
|
||||||
@@ -1203,6 +1170,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-7.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-7.1.2.tgz",
|
||||||
"integrity": "sha512-DrUBA2UXRfDmUX/ZTiEopd3X40yavsJF1FX2RygcuIScHL7o5YX1fMvoYnDhjeJQC4weCOklirpNWlcb2NiSeA==",
|
"integrity": "sha512-DrUBA2UXRfDmUX/ZTiEopd3X40yavsJF1FX2RygcuIScHL7o5YX1fMvoYnDhjeJQC4weCOklirpNWlcb2NiSeA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"deepmerge": "^4.3.1",
|
"deepmerge": "^4.3.1",
|
||||||
"magic-string": "^0.30.21",
|
"magic-string": "^0.30.21",
|
||||||
@@ -1440,27 +1408,6 @@
|
|||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
|
|
||||||
"version": "1.11.1",
|
|
||||||
"dev": true,
|
|
||||||
"inBundle": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@emnapi/wasi-threads": "1.2.2",
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
|
|
||||||
"version": "1.11.1",
|
|
||||||
"dev": true,
|
|
||||||
"inBundle": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"dependencies": {
|
|
||||||
"tslib": "^2.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
|
"node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
|
||||||
"version": "1.2.2",
|
"version": "1.2.2",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@@ -1597,6 +1544,7 @@
|
|||||||
"integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==",
|
"integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==",
|
||||||
"devOptional": true,
|
"devOptional": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"undici-types": "~6.21.0"
|
"undici-types": "~6.21.0"
|
||||||
}
|
}
|
||||||
@@ -1658,6 +1606,7 @@
|
|||||||
"integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==",
|
"integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@typescript-eslint/scope-manager": "8.64.0",
|
"@typescript-eslint/scope-manager": "8.64.0",
|
||||||
"@typescript-eslint/types": "8.64.0",
|
"@typescript-eslint/types": "8.64.0",
|
||||||
@@ -1765,6 +1714,7 @@
|
|||||||
"integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==",
|
"integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==",
|
||||||
"devOptional": true,
|
"devOptional": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
"node": "^18.18.0 || ^20.9.0 || >=21.1.0"
|
||||||
},
|
},
|
||||||
@@ -1848,6 +1798,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
|
||||||
"integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
|
"integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"acorn": "bin/acorn"
|
"acorn": "bin/acorn"
|
||||||
},
|
},
|
||||||
@@ -2082,6 +2033,7 @@
|
|||||||
"integrity": "sha512-GVTD7s1vdIl6UYvAfriOPeY1Df8LIZjfofLvHwde+erDHGGuHyuM6xoxRxmHiebhYuD2p1vN4wWh0XzPARSGDQ==",
|
"integrity": "sha512-GVTD7s1vdIl6UYvAfriOPeY1Df8LIZjfofLvHwde+erDHGGuHyuM6xoxRxmHiebhYuD2p1vN4wWh0XzPARSGDQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
],
|
],
|
||||||
@@ -3160,6 +3112,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nanoid": "^3.3.12",
|
"nanoid": "^3.3.12",
|
||||||
"picocolors": "^1.1.1",
|
"picocolors": "^1.1.1",
|
||||||
@@ -3293,6 +3246,7 @@
|
|||||||
"integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==",
|
"integrity": "sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"prettier": "bin/prettier.cjs"
|
"prettier": "bin/prettier.cjs"
|
||||||
},
|
},
|
||||||
@@ -3309,6 +3263,7 @@
|
|||||||
"integrity": "sha512-wXvbXMjSvb4C9ENWTHXyd+ihakKCsJ6rJhLP6/8HFNj4GkZr48jqL9PoKsl2sk7SyCZRTnJ7O2TTowUpOxP/KA==",
|
"integrity": "sha512-wXvbXMjSvb4C9ENWTHXyd+ihakKCsJ6rJhLP6/8HFNj4GkZr48jqL9PoKsl2sk7SyCZRTnJ7O2TTowUpOxP/KA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20"
|
"node": ">=20"
|
||||||
},
|
},
|
||||||
@@ -3479,6 +3434,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
|
"resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
|
||||||
"integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
|
"integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/estree": "1.0.9"
|
"@types/estree": "1.0.9"
|
||||||
},
|
},
|
||||||
@@ -3613,6 +3569,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.4.tgz",
|
"resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.4.tgz",
|
||||||
"integrity": "sha512-/d0QHehmRuJW8gVz395MTkPcPozxzdjBMBE8oEYGz8O3b9KTMzzQ9ZHJQLuFKOHOPQbU6kx/X4iid/EBBzH7iw==",
|
"integrity": "sha512-/d0QHehmRuJW8gVz395MTkPcPozxzdjBMBE8oEYGz8O3b9KTMzzQ9ZHJQLuFKOHOPQbU6kx/X4iid/EBBzH7iw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@jridgewell/remapping": "^2.3.4",
|
"@jridgewell/remapping": "^2.3.4",
|
||||||
"@jridgewell/sourcemap-codec": "^1.5.0",
|
"@jridgewell/sourcemap-codec": "^1.5.0",
|
||||||
@@ -3824,6 +3781,7 @@
|
|||||||
"integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
|
"integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
|
||||||
"devOptional": true,
|
"devOptional": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
"peer": true,
|
||||||
"bin": {
|
"bin": {
|
||||||
"tsc": "bin/tsc",
|
"tsc": "bin/tsc",
|
||||||
"tsserver": "bin/tsserver"
|
"tsserver": "bin/tsserver"
|
||||||
@@ -3885,6 +3843,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/vite/-/vite-8.1.3.tgz",
|
||||||
"integrity": "sha512-Ds+gBRbj0lwRO2Y5hwnUBdxSwlAve9LeRyU4sNnAr0ewW0gWF0n5bgXgUzbgZ49MV9BVUAQUFYVcDUcilUExMA==",
|
"integrity": "sha512-Ds+gBRbj0lwRO2Y5hwnUBdxSwlAve9LeRyU4sNnAr0ewW0gWF0n5bgXgUzbgZ49MV9BVUAQUFYVcDUcilUExMA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lightningcss": "^1.32.0",
|
"lightningcss": "^1.32.0",
|
||||||
"picomatch": "^4.0.4",
|
"picomatch": "^4.0.4",
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
import type { Handle } from '@sveltejs/kit';
|
import type { Handle } from '@sveltejs/kit';
|
||||||
import {
|
import {
|
||||||
clearSessionCookie,
|
|
||||||
decodeSession,
|
decodeSession,
|
||||||
encodeSession,
|
encodeSession,
|
||||||
readSessionCookie,
|
|
||||||
refreshSession,
|
refreshSession,
|
||||||
writeSessionCookie
|
sessionCookieOptions,
|
||||||
|
SESSION_COOKIE
|
||||||
} from '$lib/server/auth';
|
} from '$lib/server/auth';
|
||||||
import { authConfig } from '$lib/server/config';
|
import { authConfig } from '$lib/server/config';
|
||||||
|
|
||||||
export const handle: Handle = async ({ event, resolve }) => {
|
export const handle: Handle = async ({ event, resolve }) => {
|
||||||
let session = await decodeSession(readSessionCookie(event.cookies));
|
let session = await decodeSession(event.cookies.get(SESSION_COOKIE));
|
||||||
|
|
||||||
if (
|
if (
|
||||||
session &&
|
session &&
|
||||||
@@ -18,9 +17,13 @@ export const handle: Handle = async ({ event, resolve }) => {
|
|||||||
) {
|
) {
|
||||||
session = await refreshSession(session);
|
session = await refreshSession(session);
|
||||||
if (session) {
|
if (session) {
|
||||||
writeSessionCookie(event.cookies, await encodeSession(session), event.url);
|
event.cookies.set(
|
||||||
|
SESSION_COOKIE,
|
||||||
|
await encodeSession(session),
|
||||||
|
sessionCookieOptions(event.url)
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
clearSessionCookie(event.cookies);
|
event.cookies.delete(SESSION_COOKIE, { path: '/' });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
-48
@@ -553,23 +553,6 @@ export interface paths {
|
|||||||
patch?: never;
|
patch?: never;
|
||||||
trace?: never;
|
trace?: never;
|
||||||
};
|
};
|
||||||
"/users/{id}/last-listened-track": {
|
|
||||||
parameters: {
|
|
||||||
query?: never;
|
|
||||||
header?: never;
|
|
||||||
path?: never;
|
|
||||||
cookie?: never;
|
|
||||||
};
|
|
||||||
|
|
||||||
get: operations["GetLastTrackListenedByUserId"];
|
|
||||||
put?: never;
|
|
||||||
post?: never;
|
|
||||||
delete?: never;
|
|
||||||
options?: never;
|
|
||||||
head?: never;
|
|
||||||
patch?: never;
|
|
||||||
trace?: never;
|
|
||||||
};
|
|
||||||
"/users/{id}/listening-stats": {
|
"/users/{id}/listening-stats": {
|
||||||
parameters: {
|
parameters: {
|
||||||
query?: never;
|
query?: never;
|
||||||
@@ -714,9 +697,7 @@ export interface components {
|
|||||||
pictureIntentId: string;
|
pictureIntentId: string;
|
||||||
|
|
||||||
audioIntentId: string;
|
audioIntentId: string;
|
||||||
tags: components["schemas"]["Genre"][];
|
|
||||||
};
|
};
|
||||||
Genre: "Pop" | "Rock" | "HipHop" | "RnB" | "Jazz" | "Blues" | "Classical" | "Electronic" | "House" | "Techno" | "Trance" | "Dubstep" | "DrumAndBass" | "Metal" | "Punk" | "Reggae" | "Reggaeton" | "Country" | "Folk" | "Indie" | "KPop" | "Latin" | "Soul" | "Funk" | "Ambient" | "Lofi";
|
|
||||||
CreateUserRequest: {
|
CreateUserRequest: {
|
||||||
|
|
||||||
id: number | string;
|
id: number | string;
|
||||||
@@ -2394,35 +2375,6 @@ export interface operations {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
GetLastTrackListenedByUserId: {
|
|
||||||
parameters: {
|
|
||||||
query?: never;
|
|
||||||
header?: never;
|
|
||||||
path: {
|
|
||||||
id: number | string;
|
|
||||||
};
|
|
||||||
cookie?: never;
|
|
||||||
};
|
|
||||||
requestBody?: never;
|
|
||||||
responses: {
|
|
||||||
|
|
||||||
200: {
|
|
||||||
headers: {
|
|
||||||
[name: string]: unknown;
|
|
||||||
};
|
|
||||||
content: {
|
|
||||||
"application/json": components["schemas"]["TrackApplicationResponse"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
404: {
|
|
||||||
headers: {
|
|
||||||
[name: string]: unknown;
|
|
||||||
};
|
|
||||||
content?: never;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
GetUserProfile: {
|
GetUserProfile: {
|
||||||
parameters: {
|
parameters: {
|
||||||
query?: never;
|
query?: never;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<header
|
<header
|
||||||
class="sticky top-0 z-(--z-sticky) flex h-14 items-center justify-between bg-transparent page-x backdrop-blur-md sm:hidden"
|
class="sticky top-0 z-(--z-sticky) flex h-14 items-center justify-between border-b border-hairline bg-bg/85 page-x backdrop-blur-md sm:hidden"
|
||||||
>
|
>
|
||||||
<a href="/">
|
<a href="/">
|
||||||
<Logo size="sm" />
|
<Logo size="sm" />
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
import type { SessionUser } from '$lib/types';
|
import type { SessionUser } from '$lib/types';
|
||||||
import ListRow from '../ui/media/ListRow.svelte';
|
import ListRow from '../ui/media/ListRow.svelte';
|
||||||
import IconButton from '../ui/primitives/IconButton.svelte';
|
import IconButton from '../ui/primitives/IconButton.svelte';
|
||||||
import Plus from '@lucide/svelte/icons/plus';
|
|
||||||
import Logo from '../ui/primitives/Logo.svelte';
|
import Logo from '../ui/primitives/Logo.svelte';
|
||||||
|
import Plus from '@lucide/svelte/icons/plus';
|
||||||
|
|
||||||
interface SidebarPlaylist {
|
interface SidebarPlaylist {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -31,10 +31,10 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<aside
|
<aside
|
||||||
class="hidden shrink-0 flex-col border-r border-hairline p-5 lg:flex"
|
class="hidden shrink-0 flex-col border-r border-hairline bg-bg p-5 theme-transition lg:flex"
|
||||||
style="width:var(--mf-sidebar-w)"
|
style="width:var(--mf-sidebar-w)"
|
||||||
>
|
>
|
||||||
<a href="/" class="mb-4">
|
<a href="/" class="px-3 pb-3">
|
||||||
<Logo size="sm" />
|
<Logo size="sm" />
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
@@ -44,14 +44,14 @@
|
|||||||
<a
|
<a
|
||||||
href={link.href}
|
href={link.href}
|
||||||
aria-current={active ? 'page' : undefined}
|
aria-current={active ? 'page' : undefined}
|
||||||
class="flex items-center gap-3 rounded-control px-3 py-2 text-sm transition-colors {active
|
class="flex items-center gap-3 rounded-control px-3 py-2 text-sm transition-colors duration-150 {active
|
||||||
? 'bg-surface-2 text-fg'
|
? 'bg-surface-2 text-fg'
|
||||||
: 'text-fg-2 hover:bg-hover hover:text-fg'}"
|
: 'text-fg-2 hover:bg-hover hover:text-fg'}"
|
||||||
>
|
>
|
||||||
<link.icon class="size-icon-md shrink-0" strokeWidth={1.5} />
|
<link.icon class="size-4.5 shrink-0" strokeWidth={1.5} />
|
||||||
<span class="flex-1 truncate">{link.label}</span>
|
<span class="flex-1 truncate">{link.label}</span>
|
||||||
{#if link.count}
|
{#if link.count}
|
||||||
<span class="text-xs text-fg-2 tabular-nums">{link.count}</span>
|
<span class="text-xs text-muted tabular-nums">{link.count}</span>
|
||||||
{/if}
|
{/if}
|
||||||
</a>
|
</a>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
{#if user}
|
{#if user}
|
||||||
<div class="mx-3 mt-6 mb-3.5 h-px bg-line"></div>
|
<div class="mx-3 mt-6 mb-3.5 h-px bg-line"></div>
|
||||||
<div class="flex items-center justify-between px-3 pb-1.5">
|
<div class="flex items-center justify-between px-3 pb-1.5">
|
||||||
<span class="text-eyebrow text-fg-2">Tus playlists</span>
|
<span class="text-eyebrow text-muted">Tus playlists</span>
|
||||||
{#if playlists.length > 0}
|
{#if playlists.length > 0}
|
||||||
<IconButton
|
<IconButton
|
||||||
label="Crear playlist"
|
label="Crear playlist"
|
||||||
@@ -68,12 +68,12 @@
|
|||||||
size="xs"
|
size="xs"
|
||||||
onclick={() => createPlaylistModal.show()}
|
onclick={() => createPlaylistModal.show()}
|
||||||
>
|
>
|
||||||
<Plus class="size-icon-sm text-fg-2" strokeWidth={1.25} />
|
<Plus class="size-icon-sm" strokeWidth={1.25} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex flex-1 flex-col gap-px overflow-y-auto pb-icon-md">
|
<div class="flex flex-1 flex-col gap-px overflow-y-auto pb-4.5">
|
||||||
{#each playlists as playlist (playlist.id)}
|
{#each playlists as playlist (playlist.id)}
|
||||||
{@const active = page.url.pathname === `/playlists/${playlist.id}`}
|
{@const active = page.url.pathname === `/playlists/${playlist.id}`}
|
||||||
<ListRow
|
<ListRow
|
||||||
@@ -91,7 +91,7 @@
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onclick={() => createPlaylistModal.show()}
|
onclick={() => createPlaylistModal.show()}
|
||||||
class="flex items-center gap-2 rounded-control px-3 py-2 text-xs text-fg-2 transition-colors hover:bg-hover hover:text-fg-2"
|
class="flex items-center gap-2 rounded-control px-3 py-2 text-xs text-muted transition-colors hover:bg-hover hover:text-fg-2"
|
||||||
>
|
>
|
||||||
<Plus class="size-3.5" strokeWidth={1.8} />
|
<Plus class="size-3.5" strokeWidth={1.8} />
|
||||||
Crear tu primera lista
|
Crear tu primera lista
|
||||||
|
|||||||
@@ -69,21 +69,21 @@
|
|||||||
<label
|
<label
|
||||||
class="flex h-9.5 w-full items-center gap-2.5 rounded-control bg-surface-2 px-3.5 transition focus-within:bg-surface-hover"
|
class="flex h-9.5 w-full items-center gap-2.5 rounded-control bg-surface-2 px-3.5 transition focus-within:bg-surface-hover"
|
||||||
>
|
>
|
||||||
<Search class="size-4 shrink-0 text-fg-2" strokeWidth={1.8} />
|
<Search class="size-4 shrink-0 text-fg-3" strokeWidth={1.8} />
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
bind:this={searchInput}
|
bind:this={searchInput}
|
||||||
bind:value={query}
|
bind:value={query}
|
||||||
oninput={onInput}
|
oninput={onInput}
|
||||||
placeholder="Canciones, artistas, álbumes o playlists"
|
placeholder="Canciones, artistas, álbumes o playlists"
|
||||||
class="w-full min-w-0 bg-transparent text-sm text-fg placeholder:text-fg-2 focus:outline-none"
|
class="w-full min-w-0 bg-transparent text-sm text-fg placeholder:text-muted focus:outline-none"
|
||||||
/>
|
/>
|
||||||
{#if query}
|
{#if query}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onclick={clearQuery}
|
onclick={clearQuery}
|
||||||
aria-label="Borrar búsqueda"
|
aria-label="Borrar búsqueda"
|
||||||
class="grid size-5 shrink-0 place-items-center rounded-full text-fg-2 transition hover:text-fg"
|
class="grid size-5 shrink-0 place-items-center rounded-full text-muted transition hover:text-fg"
|
||||||
>
|
>
|
||||||
<X class="size-3.5" />
|
<X class="size-3.5" />
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
<div class="flex min-w-0 flex-1 flex-col items-center gap-2">
|
<div class="flex min-w-0 flex-1 flex-col items-center gap-2">
|
||||||
<TransportControls />
|
<TransportControls />
|
||||||
<div class="flex w-full max-w-hero items-center gap-3">
|
<div class="flex w-full max-w-hero items-center gap-3">
|
||||||
<span class="min-w-8 text-right text-xs text-fg-2 tabular-nums">
|
<span class="min-w-8 text-right text-xs text-fg-3 tabular-nums">
|
||||||
{fmtTime(player.progress)}
|
{fmtTime(player.progress)}
|
||||||
</span>
|
</span>
|
||||||
<Slider
|
<Slider
|
||||||
@@ -42,13 +42,13 @@
|
|||||||
oninput={seek}
|
oninput={seek}
|
||||||
variant="seek"
|
variant="seek"
|
||||||
/>
|
/>
|
||||||
<span class="min-w-8 text-xs text-fg-2 tabular-nums">
|
<span class="min-w-8 text-xs text-fg-3 tabular-nums">
|
||||||
{fmtTime(player.current.duration)}
|
{fmtTime(player.current.duration)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="hidden w-(--mf-player-side-w) shrink-0 items-center justify-end gap-3.5 sm:flex">
|
<div class="hidden w-(--mf-player-side-w) shrink-0 items-center justify-end gap-3.5 sm:flex">
|
||||||
<Volume2 class="size-icon-sm shrink-0 text-fg-2" strokeWidth={1.8} />
|
<Volume2 class="size-icon-sm shrink-0 text-fg-3" strokeWidth={1.8} />
|
||||||
<Slider
|
<Slider
|
||||||
value={player.volume}
|
value={player.volume}
|
||||||
max={100}
|
max={100}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import PlayerBar from './PlayerBar.svelte';
|
import PlayerBar from './PlayerBar.svelte';
|
||||||
import TabsBar from '../layout/TabsBar.svelte';
|
import TabsBar from '../layout/TabsBar.svelte';
|
||||||
|
import Alert from '$lib/components/ui/primitives/Alert.svelte';
|
||||||
import { player } from '$lib/player/player.svelte';
|
import { player } from '$lib/player/player.svelte';
|
||||||
import type { SessionUser } from '$lib/types';
|
import type { SessionUser } from '$lib/types';
|
||||||
|
|
||||||
@@ -16,6 +17,11 @@
|
|||||||
<div
|
<div
|
||||||
class="pointer-events-none fixed inset-x-0 bottom-0 z-(--z-sticky) flex flex-col lg:left-(--mf-sidebar-w)"
|
class="pointer-events-none fixed inset-x-0 bottom-0 z-(--z-sticky) flex flex-col lg:left-(--mf-sidebar-w)"
|
||||||
>
|
>
|
||||||
|
{#if player.error}
|
||||||
|
<div class="pointer-events-auto px-4 pb-2.5">
|
||||||
|
<Alert tone="danger">{player.error}</Alert>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
{#if hasTrack}
|
{#if hasTrack}
|
||||||
<PlayerBar />
|
<PlayerBar />
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
import { fmtTime } from '$lib/utils/format';
|
import { fmtTime } from '$lib/utils/format';
|
||||||
import X from '@lucide/svelte/icons/x';
|
import X from '@lucide/svelte/icons/x';
|
||||||
import { fly } from 'svelte/transition';
|
import { fly } from 'svelte/transition';
|
||||||
import { expoOut } from 'svelte/easing';
|
import { cubicOut } from 'svelte/easing';
|
||||||
|
|
||||||
const upcoming = $derived.by(() => {
|
const upcoming = $derived.by(() => {
|
||||||
const idx = player.tracks.findIndex((t) => t.id === player.currentId);
|
const idx = player.tracks.findIndex((t) => t.id === player.currentId);
|
||||||
@@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
{#if queuePanel.open}
|
{#if queuePanel.open}
|
||||||
<aside
|
<aside
|
||||||
transition:fly={{ x: 24, duration: 200, easing: expoOut }}
|
transition:fly={{ x: 24, duration: 220, easing: cubicOut }}
|
||||||
class="hidden shrink-0 flex-col border-l border-hairline px-4 pt-5 sm:flex"
|
class="hidden shrink-0 flex-col border-l border-hairline bg-bg px-4 pt-5 theme-transition sm:flex"
|
||||||
style="width:var(--mf-queue-w); padding-bottom:calc(var(--mf-player-h) + 2rem)"
|
style="width:var(--mf-queue-w); padding-bottom:calc(var(--mf-player-h) + 2rem)"
|
||||||
>
|
>
|
||||||
<div class="mb-5 flex items-center justify-between">
|
<div class="mb-5 flex items-center justify-between">
|
||||||
@@ -29,8 +29,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if player.current.id}
|
{#if player.current.id}
|
||||||
<p class="mb-3 text-eyebrow text-fg-2">Reproduciendo</p>
|
<p class="mb-3 text-eyebrow text-fg-3">Reproduciendo</p>
|
||||||
<div class="mb-6 rounded-control surface-active p-2.5">
|
<div class="mb-6 rounded-control bg-accent-tint p-2.5">
|
||||||
<MediaIdentity
|
<MediaIdentity
|
||||||
trackId={player.current.id}
|
trackId={player.current.id}
|
||||||
title={player.current.title}
|
title={player.current.title}
|
||||||
@@ -42,12 +42,12 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="mb-3 flex items-center justify-between gap-3">
|
<div class="mb-3 flex items-center justify-between gap-3">
|
||||||
<span class="min-w-0 flex-1 truncate text-eyebrow text-fg-2"> A continuación </span>
|
<span class="min-w-0 flex-1 truncate text-eyebrow text-fg-3"> A continuación </span>
|
||||||
{#if upcoming.length > 0}
|
{#if upcoming.length > 0}
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onclick={() => player.clearUpcoming()}
|
onclick={() => player.clearUpcoming()}
|
||||||
class="shrink-0 text-xs text-fg-2 transition-colors hover:text-fg"
|
class="shrink-0 text-xs text-fg-3 transition-colors hover:text-fg"
|
||||||
>
|
>
|
||||||
Vaciar
|
Vaciar
|
||||||
</button>
|
</button>
|
||||||
@@ -68,12 +68,13 @@
|
|||||||
>
|
>
|
||||||
{#snippet trailing()}
|
{#snippet trailing()}
|
||||||
{#if track.duration}
|
{#if track.duration}
|
||||||
<span class="shrink-0 text-xs text-fg-2 tabular-nums">{fmtTime(track.duration)}</span>
|
<span class="shrink-0 text-xs text-muted tabular-nums">{fmtTime(track.duration)}</span
|
||||||
|
>
|
||||||
{/if}
|
{/if}
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</ListRow>
|
</ListRow>
|
||||||
{:else}
|
{:else}
|
||||||
<p class="px-2 py-6 text-center text-xs text-fg-2">No hay más canciones en la cola.</p>
|
<p class="px-2 py-6 text-center text-xs text-fg-3">No hay más canciones en la cola.</p>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
<ArtistLink
|
<ArtistLink
|
||||||
name={player.current.artist || '—'}
|
name={player.current.artist || '—'}
|
||||||
ownerUserId={player.current.ownerUserId}
|
ownerUserId={player.current.ownerUserId}
|
||||||
class="mt-0.5 text-xs text-fg-2"
|
class="mt-0.5 text-xs text-fg-3"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{#if !compact}
|
{#if !compact}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
const sideClass = $derived(
|
const sideClass = $derived(
|
||||||
compact
|
compact
|
||||||
? 'grid size-10 place-items-center text-fg opacity-70 transition active:scale-90'
|
? 'grid size-10 place-items-center text-fg opacity-70 transition active:scale-90'
|
||||||
: 'flex text-fg-2 transition hover:text-fg active:scale-90'
|
: 'flex text-fg-2 transition-colors hover:text-fg active:scale-90'
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
onclick={() => player.toggleShuffle()}
|
onclick={() => player.toggleShuffle()}
|
||||||
aria-pressed={player.shuffle}
|
aria-pressed={player.shuffle}
|
||||||
aria-label="Aleatorio"
|
aria-label="Aleatorio"
|
||||||
class="transition-colors hover:text-fg {player.shuffle ? 'text-accent' : 'text-fg-2'}"
|
class="transition-colors hover:text-fg {player.shuffle ? 'text-accent' : 'text-fg-3'}"
|
||||||
>
|
>
|
||||||
<Shuffle class="size-4" strokeWidth={1.8} />
|
<Shuffle class="size-4" strokeWidth={1.8} />
|
||||||
</button>
|
</button>
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
onclick={() => player.toggleRepeat()}
|
onclick={() => player.toggleRepeat()}
|
||||||
aria-pressed={player.repeat}
|
aria-pressed={player.repeat}
|
||||||
aria-label="Repetir"
|
aria-label="Repetir"
|
||||||
class="transition-colors hover:text-fg {player.repeat ? 'text-accent' : 'text-fg-2'}"
|
class="transition-colors hover:text-fg {player.repeat ? 'text-accent' : 'text-fg-3'}"
|
||||||
>
|
>
|
||||||
<Repeat class="size-4" strokeWidth={1.8} />
|
<Repeat class="size-4" strokeWidth={1.8} />
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -80,7 +80,7 @@
|
|||||||
|
|
||||||
<div class="flex items-center justify-between gap-4">
|
<div class="flex items-center justify-between gap-4">
|
||||||
{#if helperText}
|
{#if helperText}
|
||||||
<p class="text-sm text-fg-2">{helperText}</p>
|
<p class="text-sm text-muted">{helperText}</p>
|
||||||
{:else}
|
{:else}
|
||||||
<span></span>
|
<span></span>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -68,6 +68,6 @@
|
|||||||
class="h-full w-full object-cover"
|
class="h-full w-full object-cover"
|
||||||
/>
|
/>
|
||||||
{:else}
|
{:else}
|
||||||
<Icon class="size-icon-xl {gradient ? 'text-on-art/70' : 'text-fg-2'}" strokeWidth={1.3} />
|
<Icon class="size-icon-xl {gradient ? 'text-on-art/70' : 'text-muted'}" strokeWidth={1.3} />
|
||||||
{/if}
|
{/if}
|
||||||
</label>
|
</label>
|
||||||
|
|||||||
@@ -88,7 +88,7 @@
|
|||||||
<div class="flex items-center justify-between gap-4 rounded-art bg-surface px-4 py-3.5">
|
<div class="flex items-center justify-between gap-4 rounded-art bg-surface px-4 py-3.5">
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
<div class="text-sm font-medium text-fg-2">Visibilidad</div>
|
<div class="text-sm font-medium text-fg-2">Visibilidad</div>
|
||||||
<div class="mt-0.5 text-xs text-fg-2">
|
<div class="mt-0.5 text-xs text-muted">
|
||||||
{visibility === 'private'
|
{visibility === 'private'
|
||||||
? 'Solo tú la ves en tu biblioteca'
|
? 'Solo tú la ves en tu biblioteca'
|
||||||
: 'Cualquiera con el enlace puede verla'}
|
: 'Cualquiera con el enlace puede verla'}
|
||||||
|
|||||||
@@ -30,21 +30,21 @@
|
|||||||
{title}
|
{title}
|
||||||
</h2>
|
</h2>
|
||||||
{#if subtitle}
|
{#if subtitle}
|
||||||
<p class="mt-1 text-xs text-fg-2">{subtitle}</p>
|
<p class="mt-1 text-xs text-fg-3">{subtitle}</p>
|
||||||
{/if}
|
{/if}
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
{#snippet autoActions()}
|
{#snippet autoActions()}
|
||||||
{#if count !== undefined}
|
{#if count !== undefined}
|
||||||
<div class="h-px flex-1 self-center bg-line"></div>
|
<div class="h-px flex-1 self-center bg-line"></div>
|
||||||
<span class="shrink-0 text-xs text-fg-2 tabular-nums">
|
<span class="shrink-0 text-xs text-muted tabular-nums">
|
||||||
{plural(count, 'resultado', 'resultados')}
|
{plural(count, 'resultado', 'resultados')}
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
{#if href}
|
{#if href}
|
||||||
<a
|
<a
|
||||||
{href}
|
{href}
|
||||||
class="shrink-0 text-xs font-medium tracking-wider text-fg-2 uppercase transition-colors hover:text-fg"
|
class="shrink-0 text-xs font-medium tracking-wider text-fg-3 uppercase transition-colors hover:text-fg"
|
||||||
>
|
>
|
||||||
{linkLabel}
|
{linkLabel}
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
/>
|
/>
|
||||||
{:else if fallback === 'music'}
|
{:else if fallback === 'music'}
|
||||||
<div class="grid h-full w-full place-items-center bg-surface">
|
<div class="grid h-full w-full place-items-center bg-surface">
|
||||||
<svg viewBox="0 0 24 24" fill="currentColor" class="h-2/5 w-2/5 text-fg-2">
|
<svg viewBox="0 0 24 24" fill="currentColor" class="h-2/5 w-2/5 text-fg-3">
|
||||||
<path
|
<path
|
||||||
d="M19.952 1.651a.75.75 0 0 1 .298.599V16.303a3 3 0 0 1-2.176 2.884l-1.32.377a2.553 2.553 0 1 1-1.401-4.909l2.311-.66a1.5 1.5 0 0 0 1.088-1.442V6.994l-9 2.572v9.737a3 3 0 0 1-2.176 2.884l-1.32.377a2.553 2.553 0 1 1-1.402-4.909l2.312-.66a1.5 1.5 0 0 0 1.088-1.442V5.25a.75.75 0 0 1 .544-.721l10.5-3a.75.75 0 0 1 .754.122Z"
|
d="M19.952 1.651a.75.75 0 0 1 .298.599V16.303a3 3 0 0 1-2.176 2.884l-1.32.377a2.553 2.553 0 1 1-1.401-4.909l2.311-.66a1.5 1.5 0 0 0 1.088-1.442V6.994l-9 2.572v9.737a3 3 0 0 1-2.176 2.884l-1.32.377a2.553 2.553 0 1 1-1.402-4.909l2.312-.66a1.5 1.5 0 0 0 1.088-1.442V5.25a.75.75 0 0 1 .544-.721l10.5-3a.75.75 0 0 1 .754.122Z"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
class="grid size-4 shrink-0 place-items-center rounded-tag bg-fg-2 text-xs leading-4 font-bold text-bg {klass}"
|
class="grid size-4 shrink-0 place-items-center rounded-tag bg-fg-3 text-xs leading-4 font-bold text-bg {klass}"
|
||||||
title="Contenido explícito"
|
title="Contenido explícito"
|
||||||
aria-label="Contenido explícito">E</span
|
aria-label="Contenido explícito">E</span
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
const classes = $derived(
|
const classes = $derived(
|
||||||
`flex items-center gap-3 text-left transition-colors ${
|
`flex items-center gap-3 text-left transition-colors ${
|
||||||
variant === 'card' ? 'rounded-art p-2 pr-3.5' : 'rounded-control p-2'
|
variant === 'card' ? 'rounded-art p-2 pr-3.5' : 'rounded-control p-2'
|
||||||
} ${active ? 'surface-active' : 'hover:bg-hover'} ${klass}`
|
} ${active ? 'bg-accent-tint' : 'hover:bg-hover'} ${klass}`
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
{trackIds}
|
{trackIds}
|
||||||
size="fill"
|
size="fill"
|
||||||
alt={title}
|
alt={title}
|
||||||
class="rounded-art transition duration-300 ease-snappy group-hover:scale-105"
|
class="rounded-art transition duration-300 group-hover:scale-105"
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
{#if onPlay}
|
{#if onPlay}
|
||||||
@@ -50,12 +50,12 @@
|
|||||||
size="sm"
|
size="sm"
|
||||||
onclick={onPlay}
|
onclick={onPlay}
|
||||||
label="Reproducir {title}"
|
label="Reproducir {title}"
|
||||||
class="absolute right-2.5 bottom-2.5 opacity-0 transition-opacity group-hover:opacity-100"
|
class="absolute right-2.5 bottom-2.5 opacity-0 transition-opacity duration-150 group-hover:opacity-100"
|
||||||
/>
|
/>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-2.5 truncate text-sm text-fg">{title}</div>
|
<div class="mt-2.5 truncate text-sm text-fg">{title}</div>
|
||||||
{#if subtitle}
|
{#if subtitle}
|
||||||
<div class="mt-0.5 truncate text-xs text-fg-2">{subtitle}</div>
|
<div class="mt-0.5 truncate text-xs text-fg-3">{subtitle}</div>
|
||||||
{/if}
|
{/if}
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@@ -63,6 +63,6 @@
|
|||||||
>
|
>
|
||||||
{@render badge?.()}
|
{@render badge?.()}
|
||||||
</div>
|
</div>
|
||||||
<ArtistLink name={artist} {ownerUserId} class="mt-0.5 text-xs text-fg-2" />
|
<ArtistLink name={artist} {ownerUserId} class="mt-0.5 text-xs text-fg-3" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -26,12 +26,12 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const VARIANT: Record<'strong' | 'glass', string> = {
|
const VARIANT: Record<'strong' | 'glass', string> = {
|
||||||
strong: 'bg-cta-strong text-ink hover:bg-cta-strong-hover',
|
strong: 'bg-cta-strong text-ink hover:brightness-95',
|
||||||
glass: 'border border-on-art/12 bg-ink/76 text-fg backdrop-blur'
|
glass: 'border border-on-art/12 bg-ink/76 text-fg backdrop-blur'
|
||||||
};
|
};
|
||||||
|
|
||||||
const classes = $derived(
|
const classes = $derived(
|
||||||
`grid shrink-0 place-items-center rounded-full transition ${SIZE[size]} ${VARIANT[variant]} ${klass}`
|
`grid shrink-0 place-items-center rounded-full transition duration-150 ${SIZE[size]} ${VARIANT[variant]} ${klass}`
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -91,7 +91,7 @@
|
|||||||
|
|
||||||
<div class="overflow-x-auto {klass}">
|
<div class="overflow-x-auto {klass}">
|
||||||
<div
|
<div
|
||||||
class="grid track-grid items-center gap-3 border-b border-line pr-4 pb-3 pl-2 text-sm text-fg-2 sm:gap-8 sm:pr-6 sm:pl-3"
|
class="grid track-grid items-center gap-3 border-b border-line pr-4 pb-3 pl-2 text-sm text-fg-3 sm:gap-8 sm:pr-6 sm:pl-3"
|
||||||
style="--mf-track-cols:{gridColumns}; --mf-track-cols-mobile:{gridColumnsMobile}"
|
style="--mf-track-cols:{gridColumns}; --mf-track-cols-mobile:{gridColumnsMobile}"
|
||||||
>
|
>
|
||||||
{#if index}
|
{#if index}
|
||||||
@@ -106,14 +106,13 @@
|
|||||||
<span></span>
|
<span></span>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-1 flex flex-col gap-0.5" role="list">
|
<div class="mt-1 flex flex-col gap-0.5">
|
||||||
{#each tracks as track, i (track.id)}
|
{#each tracks as track, i (track.id)}
|
||||||
{@const active = player.current.id === track.id}
|
{@const active = player.current.id === track.id}
|
||||||
|
|
||||||
<div
|
<div
|
||||||
role="listitem"
|
|
||||||
class="group grid track-grid items-center gap-3 rounded-control py-3 pr-4 pl-2 transition-colors sm:gap-8 sm:pr-6 sm:pl-3 {active
|
class="group grid track-grid items-center gap-3 rounded-control py-3 pr-4 pl-2 transition-colors sm:gap-8 sm:pr-6 sm:pl-3 {active
|
||||||
? 'surface-active'
|
? 'bg-accent-tint'
|
||||||
: 'hover:bg-hover'}"
|
: 'hover:bg-hover'}"
|
||||||
style="--mf-track-cols:{gridColumns}; --mf-track-cols-mobile:{gridColumnsMobile}"
|
style="--mf-track-cols:{gridColumns}; --mf-track-cols-mobile:{gridColumnsMobile}"
|
||||||
oncontextmenu={oncontextmenu ? (event) => oncontextmenu(event, track, i) : undefined}
|
oncontextmenu={oncontextmenu ? (event) => oncontextmenu(event, track, i) : undefined}
|
||||||
@@ -123,7 +122,7 @@
|
|||||||
type="button"
|
type="button"
|
||||||
onclick={() => onPlay(i)}
|
onclick={() => onPlay(i)}
|
||||||
aria-label={active && player.playing ? 'Pausar' : 'Reproducir'}
|
aria-label={active && player.playing ? 'Pausar' : 'Reproducir'}
|
||||||
class="relative grid size-8 place-items-center rounded-tag text-xs text-fg-2 tabular-nums"
|
class="relative grid size-8 place-items-center rounded-tag text-xs text-muted tabular-nums"
|
||||||
>
|
>
|
||||||
{#if active}
|
{#if active}
|
||||||
<EqBars paused={!player.playing} />
|
<EqBars paused={!player.playing} />
|
||||||
@@ -139,7 +138,6 @@
|
|||||||
tabindex="0"
|
tabindex="0"
|
||||||
use:pressable={() => onPlay(i)}
|
use:pressable={() => onPlay(i)}
|
||||||
onclick={(event) => event.stopPropagation()}
|
onclick={(event) => event.stopPropagation()}
|
||||||
onkeydown={(event) => event.stopPropagation()}
|
|
||||||
class="flex min-w-0 flex-1 text-left"
|
class="flex min-w-0 flex-1 text-left"
|
||||||
>
|
>
|
||||||
<MediaIdentity
|
<MediaIdentity
|
||||||
@@ -158,7 +156,7 @@
|
|||||||
</MediaIdentity>
|
</MediaIdentity>
|
||||||
</div>
|
</div>
|
||||||
{#each columns as column (column)}
|
{#each columns as column (column)}
|
||||||
<span class="hidden truncate text-center text-xs text-fg-2 tabular-nums sm:block">
|
<span class="hidden truncate text-center text-xs text-muted tabular-nums sm:block">
|
||||||
{#if column === 'plays'}
|
{#if column === 'plays'}
|
||||||
{Number(track.listensCount ?? 0)}
|
{Number(track.listensCount ?? 0)}
|
||||||
{:else if column === 'added' && track.addedAt}
|
{:else if column === 'added' && track.addedAt}
|
||||||
@@ -168,7 +166,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</span>
|
</span>
|
||||||
{/each}
|
{/each}
|
||||||
<span class="truncate text-center text-xs text-fg-2 tabular-nums">
|
<span class="truncate text-center text-xs text-muted tabular-nums">
|
||||||
{fmtTime(Number(track.duration))}
|
{fmtTime(Number(track.duration))}
|
||||||
</span>
|
</span>
|
||||||
{#if rowAction}
|
{#if rowAction}
|
||||||
|
|||||||
@@ -44,10 +44,7 @@
|
|||||||
{@render trigger({ toggle, open })}
|
{@render trigger({ toggle, open })}
|
||||||
|
|
||||||
{#if open}
|
{#if open}
|
||||||
<GlassMenu
|
<GlassMenu class="absolute top-full right-0 z-(--z-menu) mt-2 overflow-hidden {WIDTH[width]}">
|
||||||
border={false}
|
|
||||||
class="absolute top-full right-0 z-(--z-menu) mt-2 overflow-hidden {WIDTH[width]}"
|
|
||||||
>
|
|
||||||
<MenuItem icon={User} label="Ver perfil" href="/user/{user.sub}" onclick={close} />
|
<MenuItem icon={User} label="Ver perfil" href="/user/{user.sub}" onclick={close} />
|
||||||
{@render extraItems?.({ close })}
|
{@render extraItems?.({ close })}
|
||||||
{#if accountUrl}
|
{#if accountUrl}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import Dialog from './Dialog.svelte';
|
import Modal from './Modal.svelte';
|
||||||
import Button from '../primitives/Button.svelte';
|
import Button from '../primitives/Button.svelte';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
@@ -14,11 +14,13 @@
|
|||||||
let { open, onClose, title, description, confirmLabel, action }: Props = $props();
|
let { open, onClose, title, description, confirmLabel, action }: Props = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Dialog {open} {onClose} {title} {description}>
|
<Modal {open} {onClose} maxWidth="max-w-sm">
|
||||||
{#snippet actions()}
|
<h2 class="text-display-3 text-fg">{title}</h2>
|
||||||
|
<p class="mt-2.5 text-body text-fg-2">{description}</p>
|
||||||
|
<div class="mt-6 flex items-center justify-end gap-3">
|
||||||
<Button variant="secondary" onclick={onClose}>Cancelar</Button>
|
<Button variant="secondary" onclick={onClose}>Cancelar</Button>
|
||||||
<form method="POST" {action}>
|
<form method="POST" {action}>
|
||||||
<Button type="submit" variant="danger">{confirmLabel}</Button>
|
<Button type="submit" variant="danger">{confirmLabel}</Button>
|
||||||
</form>
|
</form>
|
||||||
{/snippet}
|
</div>
|
||||||
</Dialog>
|
</Modal>
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
class="flex items-center gap-3 rounded-control px-2 py-2.5 text-sm font-medium text-fg-2 transition group-hover/addmenu:bg-hover"
|
class="flex items-center gap-3 rounded-control px-2 py-2.5 text-sm font-medium text-fg-2 transition group-hover/addmenu:bg-hover"
|
||||||
>
|
>
|
||||||
<span class="flex-1 cursor-default">{playlistAction.label}</span>
|
<span class="flex-1 cursor-default">{playlistAction.label}</span>
|
||||||
<ChevronRight class="size-icon-sm shrink-0 text-fg-2" />
|
<ChevronRight class="size-icon-sm shrink-0 text-fg-3" />
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="invisible absolute top-0 z-(--z-submenu) opacity-0 transition group-hover/addmenu:visible group-hover/addmenu:opacity-100 max-sm:top-full max-sm:right-0 max-sm:left-0 max-sm:px-0 max-sm:pt-1.5 {openLeft
|
class="invisible absolute top-0 z-(--z-submenu) opacity-0 transition group-hover/addmenu:visible group-hover/addmenu:opacity-100 max-sm:top-full max-sm:right-0 max-sm:left-0 max-sm:px-0 max-sm:pt-1.5 {openLeft
|
||||||
@@ -75,7 +75,7 @@
|
|||||||
>
|
>
|
||||||
<div class="max-h-80 overflow-y-auto">
|
<div class="max-h-80 overflow-y-auto">
|
||||||
{#if playlists.length === 0}
|
{#if playlists.length === 0}
|
||||||
<p class="px-2 py-2.5 text-sm text-fg-2">Todavía no tienes playlists.</p>
|
<p class="px-2 py-2.5 text-sm text-fg-3">Todavía no tienes playlists.</p>
|
||||||
{/if}
|
{/if}
|
||||||
{#each playlists as playlist (playlist.id)}
|
{#each playlists as playlist (playlist.id)}
|
||||||
<form
|
<form
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import type { Snippet } from 'svelte';
|
|
||||||
import CircleAlert from '@lucide/svelte/icons/circle-alert';
|
|
||||||
import Modal from './Modal.svelte';
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
open: boolean;
|
|
||||||
onClose: () => void;
|
|
||||||
title: string;
|
|
||||||
description?: string;
|
|
||||||
tone?: 'neutral' | 'danger';
|
|
||||||
children?: Snippet;
|
|
||||||
actions?: Snippet;
|
|
||||||
}
|
|
||||||
|
|
||||||
let { open, onClose, title, description, tone = 'neutral', children, actions }: Props = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<Modal
|
|
||||||
{open}
|
|
||||||
{onClose}
|
|
||||||
maxWidth="max-w-sm"
|
|
||||||
panelClass={tone === 'danger' ? 'glass-panel-danger' : ''}
|
|
||||||
>
|
|
||||||
{#if tone === 'danger'}
|
|
||||||
<span class="mb-4 grid size-10 place-items-center rounded-full bg-danger/12 text-danger-fg">
|
|
||||||
<CircleAlert class="size-icon-md" strokeWidth={2} />
|
|
||||||
</span>
|
|
||||||
{/if}
|
|
||||||
<h2 class="text-display-3 text-fg">{title}</h2>
|
|
||||||
{#if description}
|
|
||||||
<p class="mt-2.5 text-body text-fg-2">{description}</p>
|
|
||||||
{/if}
|
|
||||||
{@render children?.()}
|
|
||||||
{#if actions}
|
|
||||||
<div class="mt-6 flex flex-wrap items-center justify-end gap-3">
|
|
||||||
{@render actions()}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</Modal>
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import Dialog from './Dialog.svelte';
|
|
||||||
import Button from '../primitives/Button.svelte';
|
|
||||||
import { dialog, type DialogAction, type DialogOptions } from '$lib/state/dialog.svelte';
|
|
||||||
|
|
||||||
// Keep the last dialog's content so the exit transition doesn't render an empty panel.
|
|
||||||
let last = $state<DialogOptions | null>(null);
|
|
||||||
$effect.pre(() => {
|
|
||||||
if (dialog.current) last = dialog.current;
|
|
||||||
});
|
|
||||||
const current = $derived(dialog.current ?? last);
|
|
||||||
const buttons: DialogAction[] = $derived(
|
|
||||||
current?.actions?.length ? current.actions : [{ label: 'Entendido' }]
|
|
||||||
);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<Dialog
|
|
||||||
open={dialog.current !== null}
|
|
||||||
onClose={() => dialog.close()}
|
|
||||||
title={current?.title ?? ''}
|
|
||||||
description={current?.description}
|
|
||||||
tone={current?.tone}
|
|
||||||
>
|
|
||||||
{#snippet actions()}
|
|
||||||
{#each buttons as action, i (action.label)}
|
|
||||||
<Button
|
|
||||||
variant={action.variant ?? (i === buttons.length - 1 ? 'primary' : 'secondary')}
|
|
||||||
onclick={() => dialog.run(action)}
|
|
||||||
>
|
|
||||||
{action.label}
|
|
||||||
</Button>
|
|
||||||
{/each}
|
|
||||||
{/snippet}
|
|
||||||
</Dialog>
|
|
||||||
@@ -4,18 +4,12 @@
|
|||||||
interface Props {
|
interface Props {
|
||||||
class?: string;
|
class?: string;
|
||||||
style?: string;
|
style?: string;
|
||||||
border?: boolean;
|
|
||||||
children: Snippet;
|
children: Snippet;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { class: klass = '', style = '', border = true, children }: Props = $props();
|
let { class: klass = '', style = '', children }: Props = $props();
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div
|
<div class="glass-panel animate-pop rounded-panel border border-hairline p-1.5 {klass}" {style}>
|
||||||
class="glass-panel animate-pop rounded-panel p-1.5 {border
|
|
||||||
? 'border border-hairline'
|
|
||||||
: ''} {klass}"
|
|
||||||
{style}
|
|
||||||
>
|
|
||||||
{@render children()}
|
{@render children()}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
const classes = $derived(
|
const classes = $derived(
|
||||||
`flex w-full items-center gap-3 rounded-control px-2 py-2.5 text-left text-xs font-medium text-fg-2 transition hover:bg-hover ${klass}`
|
`flex w-full items-center gap-3 rounded-control px-2 py-2.5 text-left text-sm font-medium text-fg-2 transition hover:bg-hover ${klass}`
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
import type { Snippet } from 'svelte';
|
import type { Snippet } from 'svelte';
|
||||||
import X from '@lucide/svelte/icons/x';
|
import X from '@lucide/svelte/icons/x';
|
||||||
import IconButton from '../primitives/IconButton.svelte';
|
import IconButton from '../primitives/IconButton.svelte';
|
||||||
import { fade } from 'svelte/transition';
|
|
||||||
import { expoOut } from 'svelte/easing';
|
|
||||||
import type { TransitionConfig } from 'svelte/transition';
|
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
@@ -48,15 +45,6 @@
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function pop(node: Element, { duration = 200 }: { duration?: number } = {}): TransitionConfig {
|
|
||||||
return {
|
|
||||||
duration,
|
|
||||||
easing: expoOut,
|
|
||||||
css: (t) =>
|
|
||||||
`opacity: ${t}; transform: scale(${0.98 + 0.02 * t}) translateY(${0.25 * (1 - t)}rem);`
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function onWindowKeydown(event: KeyboardEvent) {
|
function onWindowKeydown(event: KeyboardEvent) {
|
||||||
if (!open) return;
|
if (!open) return;
|
||||||
if (event.key === 'Escape') {
|
if (event.key === 'Escape') {
|
||||||
@@ -82,15 +70,13 @@
|
|||||||
|
|
||||||
{#if open}
|
{#if open}
|
||||||
<div
|
<div
|
||||||
transition:fade={{ duration: 200 }}
|
class="animate-fade fixed inset-0 z-(--z-modal) grid place-items-center bg-scrim/70 p-4 backdrop-blur-sm"
|
||||||
class="fixed inset-0 z-(--z-modal) grid place-items-center bg-scrim/70 p-4 backdrop-blur-sm"
|
|
||||||
role="presentation"
|
role="presentation"
|
||||||
onclick={onBackdropClick}
|
onclick={onBackdropClick}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
bind:this={panel}
|
bind:this={panel}
|
||||||
transition:pop={{ duration: 200 }}
|
class="glass-panel animate-pop max-h-[85dvh] w-full overflow-y-auto {maxWidth} rounded-panel p-5 outline-none sm:p-6 {panelClass}"
|
||||||
class="glass-panel max-h-[85dvh] w-full overflow-y-auto {maxWidth} rounded-panel p-5 outline-none sm:p-6 {panelClass}"
|
|
||||||
role="dialog"
|
role="dialog"
|
||||||
aria-modal="true"
|
aria-modal="true"
|
||||||
aria-label={title}
|
aria-label={title}
|
||||||
@@ -100,7 +86,7 @@
|
|||||||
<div class="flex items-center justify-between gap-4">
|
<div class="flex items-center justify-between gap-4">
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
{#if eyebrow}
|
{#if eyebrow}
|
||||||
<p class="mb-2.5 text-eyebrow text-fg-2">
|
<p class="mb-2.5 text-eyebrow text-muted">
|
||||||
{eyebrow}
|
{eyebrow}
|
||||||
</p>
|
</p>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
<a
|
<a
|
||||||
href={target.url}
|
href={target.url}
|
||||||
{onclick}
|
{onclick}
|
||||||
class="inline-flex items-center text-fg-2 transition-colors hover:text-accent-soft"
|
class="inline-flex items-center text-fg-3 transition-colors hover:text-accent-soft"
|
||||||
>
|
>
|
||||||
<span class="grid size-8 place-items-center">
|
<span class="grid size-8 place-items-center">
|
||||||
<ArrowLeft class="size-icon-sm" />
|
<ArrowLeft class="size-icon-sm" />
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import LoaderCircle from '@lucide/svelte/icons/loader-circle';
|
import LoaderCircle from '@lucide/svelte/icons/loader-circle';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
variant?: 'primary' | 'secondary' | 'accent' | 'danger';
|
variant?: 'primary' | 'secondary' | 'glass' | 'accent' | 'strong' | 'danger';
|
||||||
size?: 'sm' | 'md' | 'lg';
|
size?: 'sm' | 'md' | 'lg';
|
||||||
type?: 'button' | 'submit';
|
type?: 'button' | 'submit';
|
||||||
href?: string;
|
href?: string;
|
||||||
@@ -29,20 +29,25 @@
|
|||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
const sizes = {
|
const sizes = {
|
||||||
sm: 'rounded-control px-4 py-2 text-xs',
|
sm: 'px-4 py-2.5 text-xs',
|
||||||
md: 'rounded-btn-sm px-4.5 py-2.5 text-control-sm',
|
md: 'px-5 py-3 text-sm',
|
||||||
lg: 'rounded-btn px-6 py-3.5 text-sm'
|
lg: 'px-6 py-3.5 text-sm'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const subtle = 'bg-btn text-fg-2 hover:bg-btn-hover hover:text-fg';
|
||||||
|
const glass = 'font-normal bg-btn-glass text-fg-2 hover:bg-btn-glass-hover hover:text-fg';
|
||||||
|
|
||||||
const variants = {
|
const variants = {
|
||||||
primary: 'bg-cta-strong text-ink hover:bg-cta-strong-hover',
|
primary: subtle,
|
||||||
secondary: 'bg-btn text-fg hover:bg-btn-hover',
|
secondary: subtle,
|
||||||
accent: 'surface-active text-accent-soft hover:surface-active-hover',
|
glass,
|
||||||
|
accent: 'bg-accent-btn text-accent-soft hover:bg-accent-btn-hover',
|
||||||
|
strong: 'bg-cta-strong text-ink hover:brightness-95',
|
||||||
danger: 'bg-danger text-on-art hover:brightness-110'
|
danger: 'bg-danger text-on-art hover:brightness-110'
|
||||||
};
|
};
|
||||||
|
|
||||||
const classes = $derived(
|
const classes = $derived(
|
||||||
`inline-flex items-center justify-center gap-2 font-medium btn-transition focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-bg focus-visible:outline-none disabled:opacity-40 ${sizes[size]} ${variants[variant]} ${klass}`
|
`inline-flex items-center justify-center gap-2 rounded-control transition focus-visible:ring-2 focus-visible:ring-accent focus-visible:ring-offset-2 focus-visible:ring-offset-bg focus-visible:outline-none disabled:opacity-40 ${sizes[size]} ${variants[variant]} ${klass}`
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -3,33 +3,34 @@
|
|||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
selected?: boolean;
|
selected?: boolean;
|
||||||
disabled?: boolean;
|
|
||||||
count?: number;
|
count?: number;
|
||||||
href?: string;
|
href?: string;
|
||||||
onclick?: () => void;
|
onclick?: () => void;
|
||||||
children: Snippet;
|
children: Snippet;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { selected = false, disabled = false, count, href, onclick, children }: Props = $props();
|
let { selected = false, count, href, onclick, children }: Props = $props();
|
||||||
|
|
||||||
const classes = $derived(
|
const classes = $derived(
|
||||||
href
|
href
|
||||||
? 'rounded-full border border-line-strong px-3.5 py-2 text-xs text-fg-2 transition-colors hover:bg-hover hover:text-fg'
|
? 'rounded-full border border-line-strong px-3.5 py-2 text-xs text-fg-2 transition-colors hover:bg-hover hover:text-fg'
|
||||||
: `flex items-center gap-2 rounded-full px-3.5 py-2 text-xs font-medium transition ${
|
: `flex items-center gap-2 rounded-full px-3.5 py-2 text-xs font-medium transition ${
|
||||||
selected ? 'bg-cta-strong text-ink' : 'bg-btn text-fg-2 hover:bg-btn-hover hover:text-fg'
|
selected
|
||||||
} ${disabled ? 'cursor-not-allowed opacity-40' : ''}`
|
? 'bg-cta-strong text-ink'
|
||||||
|
: 'bg-surface-2 text-fg-2 hover:bg-surface-hover hover:text-fg'
|
||||||
|
}`
|
||||||
);
|
);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#snippet content()}
|
{#snippet content()}
|
||||||
{@render children()}
|
{@render children()}
|
||||||
{#if count !== undefined}
|
{#if count !== undefined}
|
||||||
<span class="tabular-nums {selected ? 'opacity-55' : 'text-fg-2'}">{count}</span>
|
<span class="tabular-nums {selected ? 'opacity-55' : 'text-muted'}">{count}</span>
|
||||||
{/if}
|
{/if}
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|
||||||
{#if href}
|
{#if href}
|
||||||
<a {href} class={classes}>{@render content()}</a>
|
<a {href} class={classes}>{@render content()}</a>
|
||||||
{:else}
|
{:else}
|
||||||
<button type="button" {onclick} {disabled} class={classes}>{@render content()}</button>
|
<button type="button" {onclick} class={classes}>{@render content()}</button>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
{@render children()}
|
{@render children()}
|
||||||
{#if hint}
|
{#if hint}
|
||||||
<div class="mt-2 flex items-center justify-between gap-3 text-xs text-fg-2">
|
<div class="mt-2 flex items-center justify-between gap-3 text-xs text-muted">
|
||||||
{@render hint()}
|
{@render hint()}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
const TEXT: Record<'muted' | 'subtle' | 'plain', string> = {
|
const TEXT: Record<'muted' | 'subtle' | 'plain', string> = {
|
||||||
muted: 'text-fg-2 hover:text-fg',
|
muted: 'text-muted hover:text-fg',
|
||||||
subtle: 'text-fg-2 hover:text-fg',
|
subtle: 'text-fg-2 hover:text-fg',
|
||||||
plain: 'text-fg-2 hover:text-fg'
|
plain: 'text-fg-2 hover:text-fg'
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,6 +34,6 @@
|
|||||||
|
|
||||||
<div bind:this={sentinel} class="flex min-h-12 items-center justify-center py-8">
|
<div bind:this={sentinel} class="flex min-h-12 items-center justify-center py-8">
|
||||||
{#if loading}
|
{#if loading}
|
||||||
<LoaderCircle class="size-5 animate-spin text-fg-2" />
|
<LoaderCircle class="size-5 animate-spin text-muted" />
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
<div class="relative w-full">
|
<div class="relative w-full">
|
||||||
{#if Icon}
|
{#if Icon}
|
||||||
<span class="pointer-events-none absolute inset-y-0 left-4 grid place-items-center text-fg-2">
|
<span class="pointer-events-none absolute inset-y-0 left-4 grid place-items-center text-muted">
|
||||||
<Icon class="size-icon-lg" />
|
<Icon class="size-icon-lg" />
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -5,10 +5,18 @@
|
|||||||
|
|
||||||
let { size = 'sm' }: Props = $props();
|
let { size = 'sm' }: Props = $props();
|
||||||
|
|
||||||
|
const MARK: Record<'sm' | 'lg', string> = {
|
||||||
|
sm: 'size-5.5 rounded-thumb',
|
||||||
|
lg: 'size-8 rounded-control'
|
||||||
|
};
|
||||||
|
|
||||||
const TEXT: Record<'sm' | 'lg', string> = {
|
const TEXT: Record<'sm' | 'lg', string> = {
|
||||||
sm: 'font-display text-lg font-semibold tracking-tight text-fg',
|
sm: 'font-display text-lg font-semibold tracking-tight text-fg',
|
||||||
lg: 'font-display text-[clamp(1.5rem,3vw,2.5rem)] font-semibold tracking-tight'
|
lg: 'font-display text-[clamp(1.5rem,3vw,2.5rem)] font-semibold tracking-tight'
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<span class={TEXT[size]}>Musify</span>
|
<span class="flex items-center gap-3">
|
||||||
|
<span class="{MARK[size]} bg-[image:var(--mf-logo-grad)]"></span>
|
||||||
|
<span class={TEXT[size]}>Musify</span>
|
||||||
|
</span>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
<div class="relative flex shrink-0 rounded-full bg-surface-2 p-1">
|
<div class="relative flex shrink-0 rounded-full bg-surface-2 p-1">
|
||||||
<div
|
<div
|
||||||
class="absolute inset-y-1 left-1 rounded-full bg-fg transition-transform duration-200 ease-snappy"
|
class="absolute inset-y-1 left-1 rounded-full bg-fg transition-transform duration-300 ease-out"
|
||||||
style="width:calc((100% - 0.5rem) / {options.length}); transform:translateX(calc({index} * 100%))"
|
style="width:calc((100% - 0.5rem) / {options.length}); transform:translateX(calc({index} * 100%))"
|
||||||
></div>
|
></div>
|
||||||
{#each options as option (option.value)}
|
{#each options as option (option.value)}
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
class="relative z-(--z-raised) flex-1 px-4 py-1.5 text-center text-xs font-medium transition-colors {value ===
|
class="relative z-(--z-raised) flex-1 px-4 py-1.5 text-center text-xs font-medium transition-colors {value ===
|
||||||
option.value
|
option.value
|
||||||
? 'text-ink'
|
? 'text-ink'
|
||||||
: 'text-fg-2 hover:text-fg-2'}"
|
: 'text-muted hover:text-fg-2'}"
|
||||||
>
|
>
|
||||||
{option.label}
|
{option.label}
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ export function mixItemTrack(item: MixItem): ApiTrackLike {
|
|||||||
id: item.trackId,
|
id: item.trackId,
|
||||||
title: item.title,
|
title: item.title,
|
||||||
artist: item.artist,
|
artist: item.artist,
|
||||||
duration: item.durationSeconds,
|
|
||||||
listensCount: item.listensCount
|
listensCount: item.listensCount
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,56 +0,0 @@
|
|||||||
export const TRACK_GENRES = [
|
|
||||||
{ value: 'Pop', label: 'Pop' },
|
|
||||||
{ value: 'Rock', label: 'Rock' },
|
|
||||||
{ value: 'HipHop', label: 'Hip-hop' },
|
|
||||||
{ value: 'RnB', label: 'R&B' },
|
|
||||||
{ value: 'Jazz', label: 'Jazz' },
|
|
||||||
{ value: 'Blues', label: 'Blues' },
|
|
||||||
{ value: 'Classical', label: 'Clásica' },
|
|
||||||
{ value: 'Electronic', label: 'Electrónica' },
|
|
||||||
{ value: 'House', label: 'House' },
|
|
||||||
{ value: 'Techno', label: 'Techno' },
|
|
||||||
{ value: 'Trance', label: 'Trance' },
|
|
||||||
{ value: 'Dubstep', label: 'Dubstep' },
|
|
||||||
{ value: 'DrumAndBass', label: 'Drum and bass' },
|
|
||||||
{ value: 'Metal', label: 'Metal' },
|
|
||||||
{ value: 'Punk', label: 'Punk' },
|
|
||||||
{ value: 'Reggae', label: 'Reggae' },
|
|
||||||
{ value: 'Reggaeton', label: 'Reggaetón' },
|
|
||||||
{ value: 'Country', label: 'Country' },
|
|
||||||
{ value: 'Folk', label: 'Folk' },
|
|
||||||
{ value: 'Indie', label: 'Indie' },
|
|
||||||
{ value: 'KPop', label: 'K-pop' },
|
|
||||||
{ value: 'Latin', label: 'Latina' },
|
|
||||||
{ value: 'Soul', label: 'Soul' },
|
|
||||||
{ value: 'Funk', label: 'Funk' },
|
|
||||||
{ value: 'Ambient', label: 'Ambient' },
|
|
||||||
{ value: 'Lofi', label: 'Lo-fi' }
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
export type TrackGenre = (typeof TRACK_GENRES)[number]['value'];
|
|
||||||
|
|
||||||
const GENRE_VALUES: ReadonlySet<string> = new Set(TRACK_GENRES.map((genre) => genre.value));
|
|
||||||
|
|
||||||
const INTENSE: ReadonlySet<TrackGenre> = new Set(['Metal', 'Punk', 'Dubstep', 'DrumAndBass']);
|
|
||||||
const MELLOW: ReadonlySet<TrackGenre> = new Set(['Classical', 'Ambient', 'Lofi']);
|
|
||||||
|
|
||||||
export function isTrackGenre(value: string): value is TrackGenre {
|
|
||||||
return GENRE_VALUES.has(value);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function areCompatible(a: TrackGenre, b: TrackGenre): boolean {
|
|
||||||
return !((INTENSE.has(a) && MELLOW.has(b)) || (INTENSE.has(b) && MELLOW.has(a)));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function genreLabel(value: TrackGenre): string {
|
|
||||||
return TRACK_GENRES.find((genre) => genre.value === value)?.label ?? value;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function findConflict(tags: readonly TrackGenre[]): [TrackGenre, TrackGenre] | undefined {
|
|
||||||
for (let i = 0; i < tags.length; i++) {
|
|
||||||
for (let j = i + 1; j < tags.length; j++) {
|
|
||||||
if (!areCompatible(tags[i], tags[j])) return [tags[i], tags[j]];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,6 @@ import { browser } from '$app/environment';
|
|||||||
import { DEFAULT_ACCENT } from '$lib/theme/color';
|
import { DEFAULT_ACCENT } from '$lib/theme/color';
|
||||||
import { extractAccent, type Accent } from '$lib/theme/palette';
|
import { extractAccent, type Accent } from '$lib/theme/palette';
|
||||||
import { shuffle } from '$lib/data/collections';
|
import { shuffle } from '$lib/data/collections';
|
||||||
import { dialog } from '$lib/state/dialog.svelte';
|
|
||||||
|
|
||||||
export interface PlayerTrack {
|
export interface PlayerTrack {
|
||||||
id: string | number;
|
id: string | number;
|
||||||
@@ -24,7 +23,6 @@ export interface QueueItem {
|
|||||||
id: string | number;
|
id: string | number;
|
||||||
title: string;
|
title: string;
|
||||||
artist?: string;
|
artist?: string;
|
||||||
duration?: number | string;
|
|
||||||
explicit?: boolean;
|
explicit?: boolean;
|
||||||
ownerUserId?: string | number | null;
|
ownerUserId?: string | number | null;
|
||||||
listensCount?: number | string;
|
listensCount?: number | string;
|
||||||
@@ -34,7 +32,6 @@ export interface ApiTrackLike {
|
|||||||
id: string | number;
|
id: string | number;
|
||||||
title: string;
|
title: string;
|
||||||
artist?: string | null;
|
artist?: string | null;
|
||||||
duration?: number | string;
|
|
||||||
isExplicit?: boolean;
|
isExplicit?: boolean;
|
||||||
ownerUserId?: string | number | null;
|
ownerUserId?: string | number | null;
|
||||||
listensCount?: number | string;
|
listensCount?: number | string;
|
||||||
@@ -45,7 +42,6 @@ export function toQueueItems(tracks: ApiTrackLike[]): QueueItem[] {
|
|||||||
id: track.id,
|
id: track.id,
|
||||||
title: track.title,
|
title: track.title,
|
||||||
artist: track.artist ?? undefined,
|
artist: track.artist ?? undefined,
|
||||||
duration: track.duration,
|
|
||||||
explicit: track.isExplicit,
|
explicit: track.isExplicit,
|
||||||
ownerUserId: track.ownerUserId,
|
ownerUserId: track.ownerUserId,
|
||||||
listensCount: track.listensCount
|
listensCount: track.listensCount
|
||||||
@@ -61,7 +57,6 @@ export function trackFromQueueItem(item: QueueItem): ApiTrackLike {
|
|||||||
id: item.id,
|
id: item.id,
|
||||||
title: item.title,
|
title: item.title,
|
||||||
artist: item.artist,
|
artist: item.artist,
|
||||||
duration: item.duration,
|
|
||||||
isExplicit: item.explicit,
|
isExplicit: item.explicit,
|
||||||
ownerUserId: item.ownerUserId,
|
ownerUserId: item.ownerUserId,
|
||||||
listensCount: item.listensCount
|
listensCount: item.listensCount
|
||||||
@@ -106,7 +101,7 @@ function toTrack(item: QueueItem): PlayerTrack {
|
|||||||
id: item.id,
|
id: item.id,
|
||||||
title: item.title,
|
title: item.title,
|
||||||
artist: item.artist ?? '',
|
artist: item.artist ?? '',
|
||||||
duration: Number(item.duration) || 0,
|
duration: 0,
|
||||||
explicit: item.explicit,
|
explicit: item.explicit,
|
||||||
ownerUserId: item.ownerUserId,
|
ownerUserId: item.ownerUserId,
|
||||||
listensCount: item.listensCount
|
listensCount: item.listensCount
|
||||||
@@ -120,6 +115,7 @@ class PlayerState {
|
|||||||
progress = $state(0);
|
progress = $state(0);
|
||||||
volume = $state(browser ? Number(localStorage.getItem('player.volume') ?? 100) : 100);
|
volume = $state(browser ? Number(localStorage.getItem('player.volume') ?? 100) : 100);
|
||||||
loading = $state(false);
|
loading = $state(false);
|
||||||
|
error = $state('');
|
||||||
recentlyPlayed = $state<PlayerTrack[]>([]);
|
recentlyPlayed = $state<PlayerTrack[]>([]);
|
||||||
playlists = $state<Playlist[]>([]);
|
playlists = $state<Playlist[]>([]);
|
||||||
shuffle = $state(false);
|
shuffle = $state(false);
|
||||||
@@ -173,7 +169,7 @@ class PlayerState {
|
|||||||
this.#stopProgressLoop();
|
this.#stopProgressLoop();
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.playing = false;
|
this.playing = false;
|
||||||
this.#fail();
|
this.error = 'No se pudo reproducir la pista.';
|
||||||
});
|
});
|
||||||
this.#audio = audio;
|
this.#audio = audio;
|
||||||
this.#setupMediaSession(audio);
|
this.#setupMediaSession(audio);
|
||||||
@@ -268,6 +264,7 @@ class PlayerState {
|
|||||||
if (track) this.#syncMediaSessionMetadata(track);
|
if (track) this.#syncMediaSessionMetadata(track);
|
||||||
const token = ++this.#loadToken;
|
const token = ++this.#loadToken;
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
this.error = '';
|
||||||
this.progress = 0;
|
this.progress = 0;
|
||||||
try {
|
try {
|
||||||
const src = await this.#resolveLocalSrc(String(id));
|
const src = await this.#resolveLocalSrc(String(id));
|
||||||
@@ -282,23 +279,13 @@ class PlayerState {
|
|||||||
if (token !== this.#loadToken) return;
|
if (token !== this.#loadToken) return;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.playing = false;
|
this.playing = false;
|
||||||
if (exception instanceof DOMException && exception.name === 'AbortError') return;
|
this.error =
|
||||||
this.#fail(
|
exception instanceof Error && exception.message
|
||||||
exception instanceof Error && !(exception instanceof DOMException)
|
|
||||||
? exception.message
|
? exception.message
|
||||||
: undefined
|
: 'No se pudo reproducir la pista.';
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#fail(detail?: string) {
|
|
||||||
dialog.error(
|
|
||||||
'No se pudo reproducir la pista',
|
|
||||||
detail || 'El archivo no está disponible o su formato no es compatible.',
|
|
||||||
[{ label: 'Cerrar' }]
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async #resolveLocalSrc(id: string): Promise<string> {
|
async #resolveLocalSrc(id: string): Promise<string> {
|
||||||
const res = await fetch(`/api/tracks/${id}/stream`);
|
const res = await fetch(`/api/tracks/${id}/stream`);
|
||||||
if (!res.ok) throw new Error(await readErrorMessage(res));
|
if (!res.ok) throw new Error(await readErrorMessage(res));
|
||||||
@@ -315,15 +302,6 @@ class PlayerState {
|
|||||||
return `${url}${sep}t=${encodeURIComponent(ticket)}`;
|
return `${url}${sep}t=${encodeURIComponent(ticket)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
hydrate(item: ApiTrackLike) {
|
|
||||||
if (this.currentId !== null || this.tracks.length > 0) return;
|
|
||||||
const track = toTrack(toQueueItem(item));
|
|
||||||
this.tracks = [track];
|
|
||||||
this.currentId = track.id;
|
|
||||||
this.#applyAccent(track.id);
|
|
||||||
this.#syncMediaSessionMetadata(track);
|
|
||||||
}
|
|
||||||
|
|
||||||
playlistTracks(ids: (string | number)[]): PlayerTrack[] {
|
playlistTracks(ids: (string | number)[]): PlayerTrack[] {
|
||||||
return ids
|
return ids
|
||||||
.map((id) => this.tracks.find((t) => t.id === id))
|
.map((id) => this.tracks.find((t) => t.id === id))
|
||||||
@@ -393,10 +371,6 @@ class PlayerState {
|
|||||||
toggle() {
|
toggle() {
|
||||||
const audio = this.#audioEl();
|
const audio = this.#audioEl();
|
||||||
if (!audio || this.currentId === null) return;
|
if (!audio || this.currentId === null) return;
|
||||||
if (!audio.src) {
|
|
||||||
this.#loadCurrent();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (audio.paused) audio.play().catch(() => {});
|
if (audio.paused) audio.play().catch(() => {});
|
||||||
else audio.pause();
|
else audio.pause();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,27 +52,9 @@ export function unwrapOrError<T>(
|
|||||||
return result.data;
|
return result.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function apiErrorDetail(error: unknown): string | undefined {
|
|
||||||
if (typeof error !== 'object' || error === null) return undefined;
|
|
||||||
const { errors, detail, title } = error as {
|
|
||||||
errors?: Record<string, unknown>;
|
|
||||||
detail?: unknown;
|
|
||||||
title?: unknown;
|
|
||||||
};
|
|
||||||
if (errors && typeof errors === 'object') {
|
|
||||||
const messages = Object.values(errors)
|
|
||||||
.flat()
|
|
||||||
.filter((entry): entry is string => typeof entry === 'string');
|
|
||||||
if (messages.length > 0) return messages.join(' ');
|
|
||||||
}
|
|
||||||
if (typeof detail === 'string' && detail !== '') return detail;
|
|
||||||
if (typeof title === 'string' && title !== '') return title;
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function unwrapOrFail(
|
export function unwrapOrFail(
|
||||||
result: { error?: unknown },
|
result: { error?: unknown },
|
||||||
message: string
|
message: string
|
||||||
): ActionFailure<{ message: string; detail?: string }> | undefined {
|
): ActionFailure<{ message: string }> | undefined {
|
||||||
return result.error ? fail(502, { message, detail: apiErrorDetail(result.error) }) : undefined;
|
return result.error ? fail(502, { message }) : undefined;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import type { Cookies } from '@sveltejs/kit';
|
|
||||||
import * as client from 'openid-client';
|
import * as client from 'openid-client';
|
||||||
import { EncryptJWT, jwtDecrypt } from 'jose';
|
import { EncryptJWT, jwtDecrypt } from 'jose';
|
||||||
import { dev } from '$app/environment';
|
import { dev } from '$app/environment';
|
||||||
@@ -18,7 +17,7 @@ export interface Session extends SessionUser {
|
|||||||
expiresAt: number;
|
expiresAt: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
let configPromise: Promise<client.Configuration> | undefined;
|
let configPromise: Promise<client.Configuration>;
|
||||||
export function getOidcConfig(): Promise<client.Configuration> {
|
export function getOidcConfig(): Promise<client.Configuration> {
|
||||||
configPromise ??= (async () => {
|
configPromise ??= (async () => {
|
||||||
const issuer = new URL(authConfig.issuer);
|
const issuer = new URL(authConfig.issuer);
|
||||||
@@ -29,10 +28,7 @@ export function getOidcConfig(): Promise<client.Configuration> {
|
|||||||
return secret
|
return secret
|
||||||
? client.discovery(issuer, authConfig.clientId, secret, undefined, options)
|
? client.discovery(issuer, authConfig.clientId, secret, undefined, options)
|
||||||
: client.discovery(issuer, authConfig.clientId, undefined, client.None(), options);
|
: client.discovery(issuer, authConfig.clientId, undefined, client.None(), options);
|
||||||
})().catch((exception) => {
|
})();
|
||||||
configPromise = undefined;
|
|
||||||
throw exception;
|
|
||||||
});
|
|
||||||
return configPromise;
|
return configPromise;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,44 +50,6 @@ export function sessionCookieOptions(url: URL) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const SESSION_CHUNK_SIZE = 3600;
|
|
||||||
|
|
||||||
function sessionChunkName(index: number): string {
|
|
||||||
return index === 0 ? SESSION_COOKIE : `${SESSION_COOKIE}.${index}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function readSessionCookie(cookies: Cookies): string | undefined {
|
|
||||||
const parts: string[] = [];
|
|
||||||
for (let index = 0; ; index++) {
|
|
||||||
const part = cookies.get(sessionChunkName(index));
|
|
||||||
if (part === undefined) break;
|
|
||||||
parts.push(part);
|
|
||||||
}
|
|
||||||
return parts.length > 0 ? parts.join('') : undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clearSessionCookie(cookies: Cookies, keep = 0): void {
|
|
||||||
for (const { name } of cookies.getAll()) {
|
|
||||||
const match =
|
|
||||||
name === SESSION_COOKIE
|
|
||||||
? 0
|
|
||||||
: name.startsWith(`${SESSION_COOKIE}.`)
|
|
||||||
? Number(name.slice(SESSION_COOKIE.length + 1))
|
|
||||||
: -1;
|
|
||||||
if (Number.isInteger(match) && match >= keep) cookies.delete(name, { path: '/' });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function writeSessionCookie(cookies: Cookies, token: string, url: URL): void {
|
|
||||||
const options = sessionCookieOptions(url);
|
|
||||||
const count = Math.ceil(token.length / SESSION_CHUNK_SIZE);
|
|
||||||
for (let index = 0; index < count; index++) {
|
|
||||||
const chunk = token.slice(index * SESSION_CHUNK_SIZE, (index + 1) * SESSION_CHUNK_SIZE);
|
|
||||||
cookies.set(sessionChunkName(index), chunk, options);
|
|
||||||
}
|
|
||||||
clearSessionCookie(cookies, count);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function encodeSession(session: Session): Promise<string> {
|
export async function encodeSession(session: Session): Promise<string> {
|
||||||
const now = Math.floor(Date.now() / 1000);
|
const now = Math.floor(Date.now() / 1000);
|
||||||
return new EncryptJWT({ ...session })
|
return new EncryptJWT({ ...session })
|
||||||
|
|||||||
@@ -9,17 +9,12 @@ function positiveInt(value: string | undefined, fallback: number): number {
|
|||||||
return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
|
return Number.isInteger(parsed) && parsed > 0 ? parsed : fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
function required(name: string, value: string | undefined): string {
|
|
||||||
if (!value) throw new Error(`Missing required environment variable: ${name}`);
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const authConfig = {
|
export const authConfig = {
|
||||||
get issuer() {
|
get issuer() {
|
||||||
return required('ZITADEL_ISSUER', env.ZITADEL_ISSUER);
|
return env.ZITADEL_ISSUER;
|
||||||
},
|
},
|
||||||
get clientId() {
|
get clientId() {
|
||||||
return required('ZITADEL_CLIENT_ID', env.ZITADEL_CLIENT_ID);
|
return env.ZITADEL_CLIENT_ID;
|
||||||
},
|
},
|
||||||
get clientSecret(): string | undefined {
|
get clientSecret(): string | undefined {
|
||||||
const secret = env.ZITADEL_CLIENT_SECRET;
|
const secret = env.ZITADEL_CLIENT_SECRET;
|
||||||
@@ -29,10 +24,10 @@ export const authConfig = {
|
|||||||
return env.OIDC_SCOPE || DEFAULT_OIDC_SCOPE;
|
return env.OIDC_SCOPE || DEFAULT_OIDC_SCOPE;
|
||||||
},
|
},
|
||||||
get redirectUri() {
|
get redirectUri() {
|
||||||
return required('AUTH_REDIRECT_URI', env.AUTH_REDIRECT_URI);
|
return env.AUTH_REDIRECT_URI;
|
||||||
},
|
},
|
||||||
get postLogoutUri() {
|
get postLogoutUri() {
|
||||||
return required('AUTH_POST_LOGOUT_URI', env.AUTH_POST_LOGOUT_URI);
|
return env.AUTH_POST_LOGOUT_URI;
|
||||||
},
|
},
|
||||||
get sessionSecret() {
|
get sessionSecret() {
|
||||||
return env.SESSION_SECRET;
|
return env.SESSION_SECRET;
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
export interface DialogAction {
|
|
||||||
label: string;
|
|
||||||
variant?: 'primary' | 'secondary' | 'accent' | 'danger';
|
|
||||||
onclick?: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface DialogOptions {
|
|
||||||
title: string;
|
|
||||||
description?: string;
|
|
||||||
tone?: 'neutral' | 'danger';
|
|
||||||
actions?: DialogAction[];
|
|
||||||
}
|
|
||||||
|
|
||||||
class DialogStore {
|
|
||||||
current = $state<DialogOptions | null>(null);
|
|
||||||
|
|
||||||
show(options: DialogOptions) {
|
|
||||||
this.current = options;
|
|
||||||
}
|
|
||||||
|
|
||||||
error(title: string, description?: string, actions?: DialogAction[]) {
|
|
||||||
this.show({ title, description, tone: 'danger', actions });
|
|
||||||
}
|
|
||||||
|
|
||||||
close() {
|
|
||||||
this.current = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
run(action: DialogAction) {
|
|
||||||
this.close();
|
|
||||||
action.onclick?.();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const dialog = new DialogStore();
|
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
import {
|
import { contextMenuPosition, type MenuPosition } from '$lib/components/ui/overlay/ContextMenu.svelte';
|
||||||
contextMenuPosition,
|
|
||||||
type MenuPosition
|
|
||||||
} from '$lib/components/ui/overlay/ContextMenu.svelte';
|
|
||||||
import { player, toQueueItem, type ApiTrackLike } from '../player/player.svelte';
|
import { player, toQueueItem, type ApiTrackLike } from '../player/player.svelte';
|
||||||
|
|
||||||
export type TrackMenuState = { track: ApiTrackLike } & MenuPosition;
|
export type TrackMenuState = { track: ApiTrackLike } & MenuPosition;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export const ACCENT_LIGHTNESS = 74;
|
export const ACCENT_LIGHTNESS = 74;
|
||||||
export const ACCENT_CHROMA = 0.06;
|
export const ACCENT_CHROMA = 0.145;
|
||||||
export const ACCENT_HUE = 30;
|
export const ACCENT_HUE = 145;
|
||||||
|
|
||||||
export const DEFAULT_ACCENT = `oklch(${ACCENT_LIGHTNESS}% ${ACCENT_CHROMA} ${ACCENT_HUE})`;
|
export const DEFAULT_ACCENT = `oklch(${ACCENT_LIGHTNESS}% ${ACCENT_CHROMA} ${ACCENT_HUE})`;
|
||||||
|
|||||||
@@ -7,14 +7,17 @@
|
|||||||
--mf-tile-shade-c: 0.035;
|
--mf-tile-shade-c: 0.035;
|
||||||
|
|
||||||
--mf-text: #d9d8dc;
|
--mf-text: #d9d8dc;
|
||||||
--mf-text-2: #b1b0b5;
|
--mf-text-2: #8a8a8e;
|
||||||
|
--mf-text-3: #7d7d81;
|
||||||
|
--mf-text-4: #646468;
|
||||||
|
|
||||||
--mf-surface: rgba(255, 255, 255, 0.022);
|
--mf-surface: rgba(255, 255, 255, 0.022);
|
||||||
--mf-surface-2: rgba(255, 255, 255, 0.055);
|
--mf-surface-2: rgba(255, 255, 255, 0.045);
|
||||||
--mf-surface-hover: rgba(255, 255, 255, 0.06);
|
--mf-surface-hover: rgba(255, 255, 255, 0.06);
|
||||||
--mf-row-hover: rgba(255, 255, 255, 0.035);
|
--mf-btn-bg: var(--mf-surface-2);
|
||||||
--mf-btn-bg: rgba(255, 255, 255, 0.055);
|
--mf-btn-bg-hover: var(--mf-surface-hover);
|
||||||
--mf-btn-bg-hover: rgba(255, 255, 255, 0.09);
|
--mf-btn-secondary-bg: rgba(255, 255, 255, 0.045);
|
||||||
|
--mf-btn-secondary-bg-hover: rgba(255, 255, 255, 0.07);
|
||||||
|
|
||||||
--mf-border: rgba(255, 255, 255, 0.04);
|
--mf-border: rgba(255, 255, 255, 0.04);
|
||||||
--mf-border-strong: rgba(255, 255, 255, 0.09);
|
--mf-border-strong: rgba(255, 255, 255, 0.09);
|
||||||
@@ -24,14 +27,7 @@
|
|||||||
--mf-on-art: #fefdfb;
|
--mf-on-art: #fefdfb;
|
||||||
--mf-on-art-2: #cac8c3;
|
--mf-on-art-2: #cac8c3;
|
||||||
--mf-ink: #0a0a0d;
|
--mf-ink: #0a0a0d;
|
||||||
--mf-cta-strong-bg: #c6c4cb;
|
--mf-cta-strong-bg: #ffffff;
|
||||||
--mf-cta-strong-hover: #d8d7dc;
|
|
||||||
--mf-danger-fg: oklch(0.885 0.062 18.334);
|
|
||||||
|
|
||||||
--mf-motion-fast: 150ms;
|
|
||||||
--mf-motion-base: 200ms;
|
|
||||||
--mf-motion-slow: 300ms;
|
|
||||||
--mf-ease: cubic-bezier(0.16, 1, 0.3, 1);
|
|
||||||
|
|
||||||
--mf-noise: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='180' height='180'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='2' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E");
|
--mf-noise: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='180' height='180'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='2' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E");
|
||||||
|
|
||||||
@@ -78,15 +74,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
:root[data-theme='light'] {
|
:root[data-theme='light'] {
|
||||||
--mf-text: #17161c;
|
--mf-text: #17171a;
|
||||||
--mf-text-2: #5d5c66;
|
--mf-text-2: #4a4a4e;
|
||||||
|
--mf-text-3: #6b6b6f;
|
||||||
|
--mf-text-4: #8c8c90;
|
||||||
|
|
||||||
--mf-surface: rgba(0, 0, 0, 0.035);
|
--mf-surface: rgba(0, 0, 0, 0.035);
|
||||||
--mf-surface-2: rgba(0, 0, 0, 0.06);
|
--mf-surface-2: rgba(0, 0, 0, 0.06);
|
||||||
--mf-surface-hover: rgba(26, 24, 38, 0.06);
|
--mf-surface-hover: #e8eceb;
|
||||||
--mf-row-hover: rgba(26, 24, 38, 0.04);
|
--mf-btn-bg: var(--mf-surface-2);
|
||||||
--mf-btn-bg: rgba(255, 255, 255, 0.7);
|
--mf-btn-bg-hover: var(--mf-surface-hover);
|
||||||
--mf-btn-bg-hover: #ffffff;
|
--mf-btn-secondary-bg: rgba(0, 0, 0, 0.09);
|
||||||
|
--mf-btn-secondary-bg-hover: rgba(0, 0, 0, 0.14);
|
||||||
|
|
||||||
--mf-scrollbar: rgba(0, 0, 0, 0.18);
|
--mf-scrollbar: rgba(0, 0, 0, 0.18);
|
||||||
--mf-scrollbar-hover: rgba(0, 0, 0, 0.32);
|
--mf-scrollbar-hover: rgba(0, 0, 0, 0.32);
|
||||||
@@ -96,10 +95,8 @@
|
|||||||
--mf-track: rgba(0, 0, 0, 0.12);
|
--mf-track: rgba(0, 0, 0, 0.12);
|
||||||
|
|
||||||
--mf-scrim: #ffffff;
|
--mf-scrim: #ffffff;
|
||||||
--mf-ink: #f7f6f9;
|
--mf-ink: #ffffff;
|
||||||
--mf-cta-strong-bg: #1b1a20;
|
--mf-cta-strong-bg: #17171a;
|
||||||
--mf-cta-strong-hover: #2e2d36;
|
|
||||||
--mf-danger-fg: oklch(0.5 0.16 25);
|
|
||||||
|
|
||||||
--mf-tile-l: 0.58;
|
--mf-tile-l: 0.58;
|
||||||
--mf-tile-c: 0.085;
|
--mf-tile-c: 0.085;
|
||||||
|
|||||||
@@ -1,71 +1,75 @@
|
|||||||
|
import { ACCENT_CHROMA, ACCENT_LIGHTNESS } from './color';
|
||||||
|
|
||||||
|
const L = ACCENT_LIGHTNESS / 100;
|
||||||
|
const C = ACCENT_CHROMA;
|
||||||
|
|
||||||
function r(value: number, digits = 4): string {
|
function r(value: number, digits = 4): string {
|
||||||
return value.toFixed(digits);
|
return value.toFixed(digits);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function tc(alpha: number, l: number, hue: number): string {
|
||||||
|
const lightness = 0.34 - l / 380;
|
||||||
|
const chroma = Math.max(0, 0.11 - l / 1600);
|
||||||
|
return `oklch(${r(lightness)} ${r(chroma)} ${r(hue, 1)} / ${alpha})`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function tcLight(alpha: number, l: number, hue: number): string {
|
||||||
|
const depth = (88 - l) / 58;
|
||||||
|
const lightness = 0.88 - 0.16 * depth;
|
||||||
|
const chroma = 0.03 + 0.11 * depth;
|
||||||
|
return `oklch(${r(lightness)} ${r(chroma)} ${r(hue, 1)} / ${alpha})`;
|
||||||
|
}
|
||||||
|
|
||||||
export interface ThemeTokens {
|
export interface ThemeTokens {
|
||||||
[cssVar: string]: string;
|
[cssVar: string]: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function buildThemeTokens(hue: number, mode: 'dark' | 'light' = 'dark'): ThemeTokens {
|
export function buildThemeTokens(hue: number, mode: 'dark' | 'light' = 'dark'): ThemeTokens {
|
||||||
const h = ((hue % 360) + 360) % 360;
|
const h = ((hue % 360) + 360) % 360;
|
||||||
|
const h2 = (h + 40) % 360;
|
||||||
const H = r(h, 1);
|
const H = r(h, 1);
|
||||||
|
const H2 = r(h2, 1);
|
||||||
const light = mode === 'light';
|
const light = mode === 'light';
|
||||||
|
|
||||||
const accentL = light ? 0.5 : 0.72;
|
const accentL = light ? 0.52 : L;
|
||||||
const accentC = light ? 0.07 : 0.06;
|
const accentC = light ? 0.16 : C;
|
||||||
const titleL = light ? 0.36 : 0.86;
|
const titleL = light ? 0.4 : 0.87;
|
||||||
const titleC = light ? 0.06 : 0.03;
|
const titleC = light ? 0.13 : 0.07;
|
||||||
const mutedL = light ? 0.42 : 0.8;
|
const mutedL = light ? 0.48 : 0.79;
|
||||||
const mutedC = light ? 0.05 : 0.02;
|
const mutedC = light ? 0.06 : 0.035;
|
||||||
const accent = `oklch(${r(accentL)} ${r(accentC)} ${H})`;
|
|
||||||
|
|
||||||
const g = (l1: number, c1: number, a1: number, l2: number, c2: number, a2: number) =>
|
|
||||||
`linear-gradient(90deg, oklch(${l1} ${c1} ${H} / ${a1}), oklch(${l2} ${c2} ${H} / ${a2}))`;
|
|
||||||
const gActive = light
|
|
||||||
? g(0.82, 0.05, 0.55, 0.87, 0.035, 0.36)
|
|
||||||
: g(0.46, 0.06, 0.34, 0.4, 0.045, 0.22);
|
|
||||||
const gHover = light
|
|
||||||
? g(0.86, 0.035, 0.38, 0.9, 0.025, 0.24)
|
|
||||||
: g(0.42, 0.045, 0.26, 0.38, 0.035, 0.17);
|
|
||||||
const glow = (l: number, c: number, a: number) => `oklch(${l} ${c} ${H} / ${a})`;
|
|
||||||
// Fixed danger hue so error dialogs read red whatever the theme hue is.
|
|
||||||
const dangerGlow = (l: number, c: number, a: number) => `oklch(${l} ${c} 25 / ${a})`;
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'--mf-accent': accent,
|
'--mf-accent': `oklch(${r(accentL)} ${r(accentC)} ${H})`,
|
||||||
'--mf-accent-title': `oklch(${r(titleL)} ${r(titleC)} ${H})`,
|
'--mf-accent-title': `oklch(${r(titleL)} ${r(titleC)} ${H})`,
|
||||||
'--mf-accent-muted': `oklch(${r(mutedL)} ${r(mutedC)} ${H})`,
|
'--mf-accent-muted': `oklch(${r(mutedL)} ${r(mutedC)} ${H})`,
|
||||||
'--mf-accent-soft-bg': `color-mix(in srgb, ${accent} 12%, var(--mf-bg))`,
|
'--mf-accent-soft-bg': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.08)`,
|
||||||
'--mf-accent-line': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.2)`,
|
'--mf-accent-line': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.2)`,
|
||||||
'--mf-accent-hair': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.09)`,
|
'--mf-accent-hair': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.09)`,
|
||||||
'--mf-accent-btn-bg': `color-mix(in srgb, ${accent} 18%, var(--mf-bg))`,
|
'--mf-accent-btn-bg': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.15)`,
|
||||||
'--mf-accent-btn-bg-hover': `color-mix(in srgb, ${accent} 26%, var(--mf-bg))`,
|
'--mf-accent-btn-bg-hover': `oklch(${r(accentL)} ${r(accentC)} ${H} / 0.24)`,
|
||||||
'--mf-g-active': gActive,
|
'--mf-bg': light ? `oklch(0.97 0.006 ${H})` : `oklch(0.068 0.008 ${H})`,
|
||||||
'--mf-g-hover': gHover,
|
'--mf-elevated': light ? `oklch(0.99 0.003 ${H})` : `oklch(0.11 0.012 ${H})`,
|
||||||
'--mf-bg': light ? `oklch(0.975 0.012 ${H})` : `oklch(0.068 0.008 ${H})`,
|
'--mf-panel-bg': light ? `oklch(0.97 0.006 ${H} / 0.7)` : `oklch(0.09 0.01 ${H} / 0.28)`,
|
||||||
'--mf-elevated': light ? `oklch(0.99 0.008 ${H})` : `oklch(0.12 0.012 ${H})`,
|
'--mf-bar-bg': light ? `oklch(0.97 0.006 ${H} / 0.9)` : `oklch(0.105 0.012 ${H} / 0.9)`,
|
||||||
'--mf-panel-bg': light ? 'rgba(255, 255, 255, 0.28)' : 'rgba(0, 0, 0, 0.16)',
|
'--mf-hairline': light ? `oklch(0.3 0.02 ${H} / 0.1)` : `oklch(0.62 0.03 ${H} / 0.08)`,
|
||||||
'--mf-bar-bg': light ? `oklch(0.99 0.01 ${H} / 0.86)` : `oklch(0.105 0.012 ${H} / 0.9)`,
|
|
||||||
'--mf-hairline': light ? `oklch(0.3 0.02 ${H} / 0.06)` : `oklch(0.62 0.02 ${H} / 0.05)`,
|
|
||||||
'--mf-ambient': light
|
'--mf-ambient': light
|
||||||
? `radial-gradient(80% 70% at 12% 0%, ${glow(0.9, 0.05, 0.55)}, transparent 75%), radial-gradient(70% 60% at 88% 8%, ${glow(0.92, 0.035, 0.4)}, transparent 75%), radial-gradient(90% 70% at 50% 110%, ${glow(0.93, 0.03, 0.35)}, transparent 80%), linear-gradient(180deg, ${glow(0.96, 0.02, 0.4)}, transparent 60%)`
|
? 'none'
|
||||||
: `radial-gradient(75% 65% at 12% 0%, ${glow(0.3, 0.045, 0.5)}, transparent 75%), radial-gradient(65% 55% at 85% 5%, ${glow(0.24, 0.035, 0.35)}, transparent 75%), radial-gradient(90% 70% at 50% 105%, ${glow(0.18, 0.025, 0.3)}, transparent 80%), linear-gradient(180deg, ${glow(0.14, 0.02, 0.35)}, transparent 55%)`,
|
: `radial-gradient(52% 38% at 14% 0%, ${tc(0.26, 30, h)}, transparent 54%), radial-gradient(46% 34% at 78% 0%, ${tc(0.2, 40, h)}, transparent 56%)`,
|
||||||
'--mf-hero-tint': light ? `oklch(0.8 0.05 ${H})` : `oklch(0.3 0.04 ${H})`,
|
|
||||||
'--mf-hero-bg': light
|
'--mf-hero-bg': light
|
||||||
? `linear-gradient(120deg, ${glow(0.9, 0.04, 0.6)}, ${glow(0.96, 0.02, 0.4)} 60%)`
|
? `linear-gradient(${tcLight(0.16, 55, h)}, ${tcLight(0.16, 55, h)})`
|
||||||
: `linear-gradient(120deg, ${glow(0.24, 0.04, 0.55)}, ${glow(0.14, 0.02, 0.35)} 60%, ${glow(0.12, 0.015, 0.25)})`,
|
: `linear-gradient(105deg, ${tc(0.34, 42, h)} 0%, ${tc(0.11, 70, h)} 37%, ${tc(0.03, 88, h)} 65%, rgba(6,6,9,0) 92%)`,
|
||||||
'--mf-modal-glow': light
|
'--mf-modal-glow': light
|
||||||
? `linear-gradient(135deg, ${glow(0.88, 0.05, 0.5)} 0%, ${glow(0.93, 0.03, 0.2)} 40%, transparent 75%)`
|
? `linear-gradient(135deg, ${tcLight(0.34, 42, h)} 0%, ${tcLight(0.2, 55, h)} 30%, ${tcLight(0.1, 70, h)} 55%, ${tcLight(0.04, 85, h)} 80%, ${tcLight(0.02, 88, h)} 100%)`
|
||||||
: `linear-gradient(135deg, ${glow(0.3, 0.045, 0.4)} 0%, ${glow(0.2, 0.03, 0.15)} 35%, transparent 70%)`,
|
: `linear-gradient(135deg, ${tc(0.34, 42, h)} 0%, ${tc(0.11, 70, h)} 28%, ${tc(0.03, 88, h)} 50%, rgba(6,6,9,0) 70%)`,
|
||||||
'--mf-modal-glow-danger': light
|
|
||||||
? `linear-gradient(135deg, ${dangerGlow(0.86, 0.07, 0.55)} 0%, ${dangerGlow(0.92, 0.04, 0.22)} 40%, transparent 75%)`
|
|
||||||
: `linear-gradient(135deg, ${dangerGlow(0.34, 0.1, 0.45)} 0%, ${dangerGlow(0.22, 0.06, 0.18)} 35%, transparent 70%)`,
|
|
||||||
'--mf-spotlight-bg': light
|
'--mf-spotlight-bg': light
|
||||||
? `linear-gradient(120deg, ${glow(0.9, 0.04, 0.55)}, ${glow(0.96, 0.02, 0.35)} 55%)`
|
? `linear-gradient(${tcLight(0.16, 55, h)}, ${tcLight(0.16, 55, h)})`
|
||||||
: `linear-gradient(120deg, ${glow(0.22, 0.04, 0.5)}, ${glow(0.13, 0.02, 0.3)} 55%, ${glow(0.11, 0.015, 0.2)})`,
|
: `linear-gradient(100deg, ${tc(0.28, 46, h)} 0%, ${tc(0.1, 74, h)} 40%, ${tc(0.03, 88, h)} 69%, rgba(6,6,9,0) 96%)`,
|
||||||
|
'--mf-logo-grad': light
|
||||||
|
? `linear-gradient(140deg, oklch(0.68 0.16 ${H}), oklch(0.5 0.14 ${H2}) 92%)`
|
||||||
|
: `linear-gradient(140deg, oklch(0.78 0.15 ${H}), oklch(0.62 0.13 ${H2}) 92%)`,
|
||||||
'--mf-cover-grad': light
|
'--mf-cover-grad': light
|
||||||
? `linear-gradient(150deg, oklch(0.84 0.03 ${H}), oklch(0.74 0.02 ${H}))`
|
? `linear-gradient(150deg, oklch(0.62 0.14 ${H}), oklch(0.44 0.08 ${H}))`
|
||||||
: `linear-gradient(150deg, oklch(0.34 0.03 ${H}), oklch(0.18 0.015 ${H}))`
|
: `linear-gradient(150deg, oklch(0.5 0.13 ${H}), oklch(0.16 0.035 ${H}))`
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,10 @@
|
|||||||
import { player, toQueueItems, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
|
import { player, toQueueItems, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
|
||||||
import X from '@lucide/svelte/icons/x';
|
import X from '@lucide/svelte/icons/x';
|
||||||
import Plus from '@lucide/svelte/icons/plus';
|
import Plus from '@lucide/svelte/icons/plus';
|
||||||
|
import Play from '@lucide/svelte/icons/play';
|
||||||
|
import Pause from '@lucide/svelte/icons/pause';
|
||||||
|
import SquarePencil from '@lucide/svelte/icons/square-pen';
|
||||||
|
import Trash from '@lucide/svelte/icons/trash';
|
||||||
import Page from '$lib/components/ui/layout/Page.svelte';
|
import Page from '$lib/components/ui/layout/Page.svelte';
|
||||||
import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
|
import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
|
||||||
import Modal from '$lib/components/ui/overlay/Modal.svelte';
|
import Modal from '$lib/components/ui/overlay/Modal.svelte';
|
||||||
@@ -72,14 +76,20 @@
|
|||||||
{#snippet actions()}
|
{#snippet actions()}
|
||||||
<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
|
<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
|
||||||
{#if isCurrentQueue && player.playing}
|
{#if isCurrentQueue && player.playing}
|
||||||
|
<Pause class="size-4" strokeWidth={1.5} />
|
||||||
Pausar
|
Pausar
|
||||||
{:else}
|
{:else}
|
||||||
|
<Play class="size-4" strokeWidth={1.5} />
|
||||||
Reproducir
|
Reproducir
|
||||||
{/if}
|
{/if}
|
||||||
</Button>
|
</Button>
|
||||||
{#if isOwner}
|
{#if isOwner}
|
||||||
<Button size="sm" variant="secondary" onclick={() => (editing = true)}>Editar</Button>
|
<Button size="sm" variant="secondary" onclick={() => (editing = true)}>
|
||||||
|
<SquarePencil class="size-4" strokeWidth={1.5} />
|
||||||
|
Editar
|
||||||
|
</Button>
|
||||||
<Button size="sm" variant="secondary" onclick={() => (confirmingDelete = true)}>
|
<Button size="sm" variant="secondary" onclick={() => (confirmingDelete = true)}>
|
||||||
|
<Trash class="size-4" strokeWidth={1.5} />
|
||||||
Eliminar
|
Eliminar
|
||||||
</Button>
|
</Button>
|
||||||
{/if}
|
{/if}
|
||||||
|
|||||||
@@ -249,7 +249,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="flex h-22 min-w-0 flex-1 flex-col justify-center gap-3">
|
<div class="flex h-22 min-w-0 flex-1 flex-col justify-center gap-3">
|
||||||
<div class="text-eyebrow leading-none font-semibold text-fg-2">
|
<div class="text-eyebrow leading-none font-semibold text-fg-3">
|
||||||
Mejor resultado · {TOP_RESULT_KIND_LABEL[topResult.kind]}
|
Mejor resultado · {TOP_RESULT_KIND_LABEL[topResult.kind]}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
@@ -264,7 +264,7 @@
|
|||||||
: topResult.user.name}
|
: topResult.user.name}
|
||||||
</div>
|
</div>
|
||||||
{#if topResult.kind === 'track' && topResult.track.artist}
|
{#if topResult.kind === 'track' && topResult.track.artist}
|
||||||
<div class="truncate text-sm leading-none text-fg-2">
|
<div class="truncate text-sm leading-none text-fg-3">
|
||||||
{topResult.track.artist}
|
{topResult.track.artist}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
@@ -276,7 +276,6 @@
|
|||||||
<svelte:element
|
<svelte:element
|
||||||
this={topResult.kind === 'track' ? 'button' : 'a'}
|
this={topResult.kind === 'track' ? 'button' : 'a'}
|
||||||
type={topResult.kind === 'track' ? 'button' : undefined}
|
type={topResult.kind === 'track' ? 'button' : undefined}
|
||||||
role={topResult.kind === 'track' ? 'button' : 'link'}
|
|
||||||
href={topResult.kind === 'track' ? undefined : topResultHref}
|
href={topResult.kind === 'track' ? undefined : topResultHref}
|
||||||
onclick={topResult.kind === 'track' ? playTopResult : undefined}
|
onclick={topResult.kind === 'track' ? playTopResult : undefined}
|
||||||
class="group/top animate-pop mt-6.5 flex w-full items-center gap-5 rounded-panel-lg bg-surface p-4.5 text-left transition hover:bg-surface-hover"
|
class="group/top animate-pop mt-6.5 flex w-full items-center gap-5 rounded-panel-lg bg-surface p-4.5 text-left transition hover:bg-surface-hover"
|
||||||
@@ -349,7 +348,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{#snippet trailing()}
|
{#snippet trailing()}
|
||||||
<span class="hidden shrink-0 text-xs text-fg-2 tabular-nums sm:block">
|
<span class="hidden shrink-0 text-xs text-muted tabular-nums sm:block">
|
||||||
{fmtTime(seconds)} · {fmtPlays(track.listensCount)}
|
{fmtTime(seconds)} · {fmtPlays(track.listensCount)}
|
||||||
</span>
|
</span>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
@@ -384,7 +383,7 @@
|
|||||||
oncontextmenu={(e) => openAlbumMenu(e, album.id)}
|
oncontextmenu={(e) => openAlbumMenu(e, album.id)}
|
||||||
>
|
>
|
||||||
{#snippet trailing()}
|
{#snippet trailing()}
|
||||||
<span class="hidden shrink-0 text-xs text-fg-2 tabular-nums sm:block">
|
<span class="hidden shrink-0 text-xs text-muted tabular-nums sm:block">
|
||||||
{Number(album.trackCount)} canciones
|
{Number(album.trackCount)} canciones
|
||||||
</span>
|
</span>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
import Play from '@lucide/svelte/icons/play';
|
||||||
|
import Pause from '@lucide/svelte/icons/pause';
|
||||||
import Shuffle from '@lucide/svelte/icons/shuffle';
|
import Shuffle from '@lucide/svelte/icons/shuffle';
|
||||||
import {
|
import {
|
||||||
player,
|
player,
|
||||||
@@ -73,8 +75,10 @@
|
|||||||
{#snippet actions()}
|
{#snippet actions()}
|
||||||
<Button size="sm" onclick={() => playAllOrToggle(queue)} disabled={queue.length === 0}>
|
<Button size="sm" onclick={() => playAllOrToggle(queue)} disabled={queue.length === 0}>
|
||||||
{#if isCurrentQueue && player.playing}
|
{#if isCurrentQueue && player.playing}
|
||||||
|
<Pause class="size-4" strokeWidth={1.5} />
|
||||||
Pausar
|
Pausar
|
||||||
{:else}
|
{:else}
|
||||||
|
<Play class="size-4" strokeWidth={1.5} />
|
||||||
Reproducir
|
Reproducir
|
||||||
{/if}
|
{/if}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import ListMusic from '@lucide/svelte/icons/list-music';
|
import ListMusic from '@lucide/svelte/icons/list-music';
|
||||||
import X from '@lucide/svelte/icons/x';
|
import X from '@lucide/svelte/icons/x';
|
||||||
|
import Play from '@lucide/svelte/icons/play';
|
||||||
|
import Pause from '@lucide/svelte/icons/pause';
|
||||||
|
import SquarePencil from '@lucide/svelte/icons/square-pen';
|
||||||
|
import Trash from '@lucide/svelte/icons/trash';
|
||||||
import { player, toQueueItems, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
|
import { player, toQueueItems, isQueueCurrent, playAllOrToggle } from '$lib/player/player.svelte';
|
||||||
import Page from '$lib/components/ui/layout/Page.svelte';
|
import Page from '$lib/components/ui/layout/Page.svelte';
|
||||||
import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
|
import PageHeader from '$lib/components/ui/layout/PageHeader.svelte';
|
||||||
@@ -62,13 +66,19 @@
|
|||||||
{#snippet actions()}
|
{#snippet actions()}
|
||||||
<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
|
<Button size="sm" onclick={playAll} disabled={tracks.length === 0}>
|
||||||
{#if isCurrentQueue && player.playing}
|
{#if isCurrentQueue && player.playing}
|
||||||
|
<Pause class="size-4" strokeWidth={1.5} />
|
||||||
Pausar
|
Pausar
|
||||||
{:else}
|
{:else}
|
||||||
|
<Play class="size-4" strokeWidth={1.5} />
|
||||||
Reproducir
|
Reproducir
|
||||||
{/if}
|
{/if}
|
||||||
</Button>
|
</Button>
|
||||||
<Button size="sm" variant="secondary" onclick={() => (editing = true)}>Editar</Button>
|
<Button size="sm" variant="secondary" onclick={() => (editing = true)}>
|
||||||
|
<SquarePencil class="size-4" strokeWidth={1.5} />
|
||||||
|
Editar
|
||||||
|
</Button>
|
||||||
<Button size="sm" variant="secondary" onclick={() => (confirmingDelete = true)}>
|
<Button size="sm" variant="secondary" onclick={() => (confirmingDelete = true)}>
|
||||||
|
<Trash class="size-4" strokeWidth={1.5} />
|
||||||
Eliminar
|
Eliminar
|
||||||
</Button>
|
</Button>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import {
|
|||||||
unwrapOrFail
|
unwrapOrFail
|
||||||
} from '$lib/server/api';
|
} from '$lib/server/api';
|
||||||
import { putPresigned, extOf, contentTypeOf, AUDIO_TYPES, IMAGE_TYPES } from '$lib/server/upload';
|
import { putPresigned, extOf, contentTypeOf, AUDIO_TYPES, IMAGE_TYPES } from '$lib/server/upload';
|
||||||
import { findConflict, genreLabel, isTrackGenre, type TrackGenre } from '$lib/data/trackGenres';
|
|
||||||
|
|
||||||
const MAX_TITLE = 100;
|
const MAX_TITLE = 100;
|
||||||
|
|
||||||
@@ -24,7 +23,6 @@ export const actions: Actions = {
|
|||||||
const title = String(form.get('title') ?? '').trim();
|
const title = String(form.get('title') ?? '').trim();
|
||||||
const audio = form.get('audio');
|
const audio = form.get('audio');
|
||||||
const cover = form.get('cover');
|
const cover = form.get('cover');
|
||||||
const rawTags = form.getAll('tags').map(String);
|
|
||||||
|
|
||||||
if (title === '' || title.length > MAX_TITLE) {
|
if (title === '' || title.length > MAX_TITLE) {
|
||||||
return fail(400, { message: 'El título es obligatorio (máx. 100 caracteres).' });
|
return fail(400, { message: 'El título es obligatorio (máx. 100 caracteres).' });
|
||||||
@@ -36,20 +34,6 @@ export const actions: Actions = {
|
|||||||
return fail(400, { message: 'Selecciona una portada.' });
|
return fail(400, { message: 'Selecciona una portada.' });
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rawTags.length === 0) {
|
|
||||||
return fail(400, { message: 'Elige al menos un género.' });
|
|
||||||
}
|
|
||||||
if (!rawTags.every(isTrackGenre)) {
|
|
||||||
return fail(400, { message: 'Alguno de los géneros no es válido.' });
|
|
||||||
}
|
|
||||||
const tags: TrackGenre[] = [...new Set(rawTags)];
|
|
||||||
const conflict = findConflict(tags);
|
|
||||||
if (conflict) {
|
|
||||||
return fail(400, {
|
|
||||||
message: `Los géneros ${genreLabel(conflict[0])} y ${genreLabel(conflict[1])} no se pueden combinar.`
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const audioContentType = contentTypeOf(audio, AUDIO_TYPES);
|
const audioContentType = contentTypeOf(audio, AUDIO_TYPES);
|
||||||
const pictureContentType = contentTypeOf(cover, IMAGE_TYPES);
|
const pictureContentType = contentTypeOf(cover, IMAGE_TYPES);
|
||||||
const api = createApiClient({ fetch, accessToken });
|
const api = createApiClient({ fetch, accessToken });
|
||||||
@@ -89,8 +73,7 @@ export const actions: Actions = {
|
|||||||
body: {
|
body: {
|
||||||
title,
|
title,
|
||||||
pictureIntentId: urls.pictureIntentId,
|
pictureIntentId: urls.pictureIntentId,
|
||||||
audioIntentId: urls.audioIntentId,
|
audioIntentId: urls.audioIntentId
|
||||||
tags
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -13,8 +13,6 @@
|
|||||||
import Input from '$lib/components/ui/primitives/Input.svelte';
|
import Input from '$lib/components/ui/primitives/Input.svelte';
|
||||||
import Checkbox from '$lib/components/ui/primitives/Checkbox.svelte';
|
import Checkbox from '$lib/components/ui/primitives/Checkbox.svelte';
|
||||||
import Button from '$lib/components/ui/primitives/Button.svelte';
|
import Button from '$lib/components/ui/primitives/Button.svelte';
|
||||||
import Chip from '$lib/components/ui/primitives/Chip.svelte';
|
|
||||||
import { TRACK_GENRES, areCompatible, type TrackGenre } from '$lib/data/trackGenres';
|
|
||||||
|
|
||||||
type Status = 'idle' | 'uploading' | 'done' | 'error';
|
type Status = 'idle' | 'uploading' | 'done' | 'error';
|
||||||
type StepState = 'idle' | 'active' | 'done';
|
type StepState = 'idle' | 'active' | 'done';
|
||||||
@@ -30,8 +28,6 @@
|
|||||||
let status = $state<Status>('idle');
|
let status = $state<Status>('idle');
|
||||||
let acceptedTerms = $state(false);
|
let acceptedTerms = $state(false);
|
||||||
let errorMsg = $state('');
|
let errorMsg = $state('');
|
||||||
let errorDetail = $state('');
|
|
||||||
let tags = $state<TrackGenre[]>([]);
|
|
||||||
let publishedTitle = $state('');
|
let publishedTitle = $state('');
|
||||||
let audioInput = $state<HTMLInputElement>();
|
let audioInput = $state<HTMLInputElement>();
|
||||||
|
|
||||||
@@ -44,7 +40,7 @@
|
|||||||
const busy = $derived(status === 'uploading');
|
const busy = $derived(status === 'uploading');
|
||||||
|
|
||||||
const canPublish = $derived(
|
const canPublish = $derived(
|
||||||
title.trim() !== '' && audioName !== '' && hasCover && tags.length > 0 && acceptedTerms && !busy
|
title.trim() !== '' && audioName !== '' && hasCover && acceptedTerms && !busy
|
||||||
);
|
);
|
||||||
|
|
||||||
const stepStates = $derived.by<StepState[]>(() => {
|
const stepStates = $derived.by<StepState[]>(() => {
|
||||||
@@ -85,14 +81,6 @@
|
|||||||
pickAudio(file);
|
pickAudio(file);
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleTag(tag: TrackGenre) {
|
|
||||||
tags = tags.includes(tag) ? tags.filter((current) => current !== tag) : [...tags, tag];
|
|
||||||
}
|
|
||||||
|
|
||||||
function tagBlocked(tag: TrackGenre) {
|
|
||||||
return !tags.includes(tag) && tags.some((current) => !areCompatible(current, tag));
|
|
||||||
}
|
|
||||||
|
|
||||||
function reset() {
|
function reset() {
|
||||||
title = '';
|
title = '';
|
||||||
audioName = '';
|
audioName = '';
|
||||||
@@ -102,8 +90,6 @@
|
|||||||
status = 'idle';
|
status = 'idle';
|
||||||
acceptedTerms = false;
|
acceptedTerms = false;
|
||||||
errorMsg = '';
|
errorMsg = '';
|
||||||
errorDetail = '';
|
|
||||||
tags = [];
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -137,7 +123,7 @@
|
|||||||
</span>
|
</span>
|
||||||
<span class="text-sm font-medium text-fg">{step.label}</span>
|
<span class="text-sm font-medium text-fg">{step.label}</span>
|
||||||
</div>
|
</div>
|
||||||
<p class="mt-2.5 text-xs text-fg-2">{step.hint}</p>
|
<p class="mt-2.5 text-xs text-muted">{step.hint}</p>
|
||||||
</Surface>
|
</Surface>
|
||||||
</li>
|
</li>
|
||||||
{/each}
|
{/each}
|
||||||
@@ -167,7 +153,6 @@
|
|||||||
use:enhance={() => {
|
use:enhance={() => {
|
||||||
status = 'uploading';
|
status = 'uploading';
|
||||||
errorMsg = '';
|
errorMsg = '';
|
||||||
errorDetail = '';
|
|
||||||
return async ({ result }) => {
|
return async ({ result }) => {
|
||||||
if (result.type === 'success') {
|
if (result.type === 'success') {
|
||||||
publishedTitle = title;
|
publishedTitle = title;
|
||||||
@@ -175,7 +160,6 @@
|
|||||||
} else if (result.type === 'failure') {
|
} else if (result.type === 'failure') {
|
||||||
status = 'error';
|
status = 'error';
|
||||||
errorMsg = (result.data?.message as string) ?? 'No se pudo subir la canción.';
|
errorMsg = (result.data?.message as string) ?? 'No se pudo subir la canción.';
|
||||||
errorDetail = (result.data?.detail as string | undefined) ?? '';
|
|
||||||
} else {
|
} else {
|
||||||
status = 'error';
|
status = 'error';
|
||||||
errorMsg = 'Error inesperado durante la subida.';
|
errorMsg = 'Error inesperado durante la subida.';
|
||||||
@@ -207,7 +191,7 @@
|
|||||||
aria-label="Seleccionar archivo de audio"
|
aria-label="Seleccionar archivo de audio"
|
||||||
/>
|
/>
|
||||||
{#if audioName === ''}
|
{#if audioName === ''}
|
||||||
<Headphones class="size-9 text-fg-2 sm:size-10" strokeWidth={1.4} />
|
<Headphones class="size-9 text-muted sm:size-10" strokeWidth={1.4} />
|
||||||
{:else}
|
{:else}
|
||||||
<Music class="size-9 text-accent-soft sm:size-10" strokeWidth={1.4} />
|
<Music class="size-9 text-accent-soft sm:size-10" strokeWidth={1.4} />
|
||||||
{/if}
|
{/if}
|
||||||
@@ -215,12 +199,12 @@
|
|||||||
<p class="mt-4 text-sm font-medium text-fg">
|
<p class="mt-4 text-sm font-medium text-fg">
|
||||||
Arrastra tu audio aquí o haz clic para elegir
|
Arrastra tu audio aquí o haz clic para elegir
|
||||||
</p>
|
</p>
|
||||||
<p class="mt-1.5 text-xs text-fg-2">MP3, FLAC, WAV…</p>
|
<p class="mt-1.5 text-xs text-muted">MP3, FLAC, WAV…</p>
|
||||||
{:else}
|
{:else}
|
||||||
<p class="mt-4 max-w-full truncate text-sm font-medium text-fg">
|
<p class="mt-4 max-w-full truncate text-sm font-medium text-fg">
|
||||||
{audioName}
|
{audioName}
|
||||||
</p>
|
</p>
|
||||||
<p class="mt-1.5 text-xs text-fg-2">{formatSize(audioSize)} · Listo para subir</p>
|
<p class="mt-1.5 text-xs text-muted">{formatSize(audioSize)} · Listo para subir</p>
|
||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -252,26 +236,6 @@
|
|||||||
</Field>
|
</Field>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Field label="Géneros">
|
|
||||||
<div class="flex flex-wrap gap-2">
|
|
||||||
{#each TRACK_GENRES as genre (genre.value)}
|
|
||||||
<Chip
|
|
||||||
selected={tags.includes(genre.value)}
|
|
||||||
disabled={tagBlocked(genre.value)}
|
|
||||||
onclick={() => toggleTag(genre.value)}
|
|
||||||
>
|
|
||||||
{genre.label}
|
|
||||||
</Chip>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{#each tags as tag (tag)}
|
|
||||||
<input type="hidden" name="tags" value={tag} />
|
|
||||||
{/each}
|
|
||||||
{#snippet hint()}
|
|
||||||
<p>Elige al menos uno. Algunos géneros no se pueden combinar, como Metal con Ambient.</p>
|
|
||||||
{/snippet}
|
|
||||||
</Field>
|
|
||||||
|
|
||||||
<Checkbox bind:checked={acceptedTerms}>
|
<Checkbox bind:checked={acceptedTerms}>
|
||||||
Acepto los
|
Acepto los
|
||||||
<a
|
<a
|
||||||
@@ -287,7 +251,7 @@
|
|||||||
<Surface padding="sm">
|
<Surface padding="sm">
|
||||||
<div class="flex items-center justify-between text-sm">
|
<div class="flex items-center justify-between text-sm">
|
||||||
<span class="font-medium text-fg">Subiendo y creando la pista…</span>
|
<span class="font-medium text-fg">Subiendo y creando la pista…</span>
|
||||||
<span class="text-xs text-fg-2">un momento</span>
|
<span class="text-xs text-muted">un momento</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="mt-3 h-2 overflow-hidden rounded-full bg-surface-2">
|
<div class="mt-3 h-2 overflow-hidden rounded-full bg-surface-2">
|
||||||
<div class="h-full w-full animate-pulse rounded-full bg-accent-soft"></div>
|
<div class="h-full w-full animate-pulse rounded-full bg-accent-soft"></div>
|
||||||
@@ -296,10 +260,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
{#if status === 'error'}
|
{#if status === 'error'}
|
||||||
<Alert tone="danger">
|
<Alert tone="danger">{errorMsg}</Alert>
|
||||||
{errorMsg}
|
|
||||||
{#if errorDetail}<span class="mt-1 block text-xs opacity-80">{errorDetail}</span>{/if}
|
|
||||||
</Alert>
|
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="flex flex-col-reverse gap-3 sm:flex-row sm:items-center sm:justify-end sm:gap-4">
|
<div class="flex flex-col-reverse gap-3 sm:flex-row sm:items-center sm:justify-end sm:gap-4">
|
||||||
|
|||||||
@@ -39,22 +39,6 @@ async function fetchLikedTracks(fetchFn: typeof fetch, accessToken: string | nul
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchLastPlayedTrack(
|
|
||||||
fetchFn: typeof fetch,
|
|
||||||
accessToken: string | null,
|
|
||||||
userId: string
|
|
||||||
) {
|
|
||||||
try {
|
|
||||||
const api = createApiClient({ fetch: fetchFn, accessToken: accessToken ?? undefined });
|
|
||||||
const { data } = await api.GET('/users/{id}/last-listened-track', {
|
|
||||||
params: { path: { id: userId } }
|
|
||||||
});
|
|
||||||
return data ?? null;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
|
export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
|
||||||
const allowAnonymousListening = await getAllowAnonymousListening(fetch);
|
const allowAnonymousListening = await getAllowAnonymousListening(fetch);
|
||||||
|
|
||||||
@@ -72,15 +56,13 @@ export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
|
|||||||
allowAnonymousListening,
|
allowAnonymousListening,
|
||||||
sidebarPlaylists: [],
|
sidebarPlaylists: [],
|
||||||
likedTracks: [],
|
likedTracks: [],
|
||||||
lastPlayedTrack: null,
|
|
||||||
accountUrl
|
accountUrl
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
const [sidebarPlaylists, likedTracks, lastPlayedTrack] = await Promise.all([
|
const [sidebarPlaylists, likedTracks] = await Promise.all([
|
||||||
fetchSidebarPlaylists(fetch, locals.accessToken, locals.user.sub),
|
fetchSidebarPlaylists(fetch, locals.accessToken, locals.user.sub),
|
||||||
fetchLikedTracks(fetch, locals.accessToken),
|
fetchLikedTracks(fetch, locals.accessToken)
|
||||||
fetchLastPlayedTrack(fetch, locals.accessToken, locals.user.sub)
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
@@ -88,7 +70,6 @@ export const load: LayoutServerLoad = async ({ locals, url, fetch }) => {
|
|||||||
allowAnonymousListening,
|
allowAnonymousListening,
|
||||||
sidebarPlaylists,
|
sidebarPlaylists,
|
||||||
likedTracks,
|
likedTracks,
|
||||||
lastPlayedTrack,
|
|
||||||
accountUrl
|
accountUrl
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
import TopBar from '$lib/components/layout/TopBar.svelte';
|
import TopBar from '$lib/components/layout/TopBar.svelte';
|
||||||
import MobileHeader from '$lib/components/layout/MobileHeader.svelte';
|
import MobileHeader from '$lib/components/layout/MobileHeader.svelte';
|
||||||
import Modal from '$lib/components/ui/overlay/Modal.svelte';
|
import Modal from '$lib/components/ui/overlay/Modal.svelte';
|
||||||
import DialogHost from '$lib/components/ui/overlay/DialogHost.svelte';
|
|
||||||
import PlaylistForm from '$lib/components/ui/forms/PlaylistForm.svelte';
|
import PlaylistForm from '$lib/components/ui/forms/PlaylistForm.svelte';
|
||||||
import { player } from '$lib/player/player.svelte';
|
import { player } from '$lib/player/player.svelte';
|
||||||
import { queuePanel } from '$lib/player/queuePanel.svelte';
|
import { queuePanel } from '$lib/player/queuePanel.svelte';
|
||||||
@@ -30,19 +29,15 @@
|
|||||||
if (data.likedTracks?.length) liked.hydrate(data.likedTracks);
|
if (data.likedTracks?.length) liked.hydrate(data.likedTracks);
|
||||||
});
|
});
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (data.lastPlayedTrack) player.hydrate(data.lastPlayedTrack);
|
|
||||||
});
|
|
||||||
|
|
||||||
const isAuthPage = $derived(page.url.pathname === '/auth');
|
const isAuthPage = $derived(page.url.pathname === '/auth');
|
||||||
const hasTrack = $derived(player.currentId !== null);
|
const hasTrack = $derived(player.currentId !== null);
|
||||||
|
|
||||||
const initialThemeCss = `:root{${tokensToCss(buildThemeTokens(ACCENT_HUE, 'dark'))}}:root[data-theme='light']{${tokensToCss(buildThemeTokens(ACCENT_HUE, 'light'))}}`;
|
const initialThemeCss = `:root{${tokensToCss(buildThemeTokens(ACCENT_HUE, 'dark'))}}:root[data-theme='light']{${tokensToCss(buildThemeTokens(ACCENT_HUE, 'light'))}}`;
|
||||||
|
|
||||||
let wasPlaying = false;
|
let hadTrack = false;
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
if (player.playing && !wasPlaying) queuePanel.show();
|
if (hasTrack && !hadTrack) queuePanel.show();
|
||||||
wasPlaying = player.playing;
|
hadTrack = hasTrack;
|
||||||
});
|
});
|
||||||
|
|
||||||
function isTypingTarget(target: EventTarget | null): boolean {
|
function isTypingTarget(target: EventTarget | null): boolean {
|
||||||
@@ -92,7 +87,6 @@
|
|||||||
|
|
||||||
<svelte:head>
|
<svelte:head>
|
||||||
<link rel="icon" href={favicon} />
|
<link rel="icon" href={favicon} />
|
||||||
<!-- eslint-disable-next-line svelte/no-at-html-tags -- CSS generado a partir de números, sin entrada de usuario -->
|
|
||||||
{@html `<style>${initialThemeCss}</style>`}
|
{@html `<style>${initialThemeCss}</style>`}
|
||||||
</svelte:head>
|
</svelte:head>
|
||||||
|
|
||||||
@@ -140,5 +134,3 @@
|
|||||||
</Modal>
|
</Modal>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<DialogHost />
|
|
||||||
|
|||||||
@@ -134,7 +134,9 @@
|
|||||||
</svelte:head>
|
</svelte:head>
|
||||||
|
|
||||||
<Page>
|
<Page>
|
||||||
<div class="relative overflow-hidden rounded-panel-lg hero-surface px-6 py-8 sm:px-9 sm:py-8.5">
|
<div
|
||||||
|
class="relative overflow-hidden rounded-panel-lg hero-surface px-6 py-8 theme-transition sm:px-9 sm:py-8.5"
|
||||||
|
>
|
||||||
<div
|
<div
|
||||||
class="relative flex flex-col items-start gap-7 lg:flex-row lg:flex-wrap lg:items-end lg:justify-between"
|
class="relative flex flex-col items-start gap-7 lg:flex-row lg:flex-wrap lg:items-end lg:justify-between"
|
||||||
>
|
>
|
||||||
@@ -149,12 +151,12 @@
|
|||||||
</p>
|
</p>
|
||||||
<div class="mt-6.5 flex flex-wrap items-center gap-2.5">
|
<div class="mt-6.5 flex flex-wrap items-center gap-2.5">
|
||||||
{#if spotlight}
|
{#if spotlight}
|
||||||
<Button variant="primary" onclick={playSpotlight}>
|
<Button variant="strong" onclick={playSpotlight}>
|
||||||
{heroPlaying ? 'Pausar' : 'Reanudar'}
|
{heroPlaying ? 'Pausar' : 'Reanudar'}
|
||||||
{spotlight.name}
|
{spotlight.name}
|
||||||
</Button>
|
</Button>
|
||||||
{/if}
|
{/if}
|
||||||
<Button href="/explore" variant="secondary">Explorar música</Button>
|
<Button href="/explore" variant="glass">Explorar música</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -171,7 +173,7 @@
|
|||||||
{#each statsList as stat (stat.label)}
|
{#each statsList as stat (stat.label)}
|
||||||
<div>
|
<div>
|
||||||
<div class="text-display-2 text-fg">{stat.value}</div>
|
<div class="text-display-2 text-fg">{stat.value}</div>
|
||||||
<div class="mt-1 text-xs text-fg-2">{stat.label}</div>
|
<div class="mt-1 text-xs text-fg-3">{stat.label}</div>
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
@@ -209,7 +211,7 @@
|
|||||||
{#if spotlight}
|
{#if spotlight}
|
||||||
<section>
|
<section>
|
||||||
<div
|
<div
|
||||||
class="grid grid-cols-1 overflow-hidden rounded-panel-lg spotlight-surface lg:grid-cols-2"
|
class="grid grid-cols-1 overflow-hidden rounded-panel-lg spotlight-surface theme-transition lg:grid-cols-2"
|
||||||
>
|
>
|
||||||
<div class="flex flex-col justify-center p-8 sm:p-9">
|
<div class="flex flex-col justify-center p-8 sm:p-9">
|
||||||
<div
|
<div
|
||||||
@@ -240,10 +242,10 @@
|
|||||||
</p>
|
</p>
|
||||||
<div class="mt-5 flex gap-2.5">
|
<div class="mt-5 flex gap-2.5">
|
||||||
<Button variant="accent" onclick={playSpotlight}>Reproducir</Button>
|
<Button variant="accent" onclick={playSpotlight}>Reproducir</Button>
|
||||||
<Button variant="secondary" onclick={shuffleSpotlight}>Aleatorio</Button>
|
<Button variant="glass" onclick={shuffleSpotlight}>Aleatorio</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col gap-2 p-5.5 sm:p-6">
|
<div class="flex flex-col gap-0.5 p-5.5 sm:p-6">
|
||||||
{#each spotlightRows as { track, seconds }, i (track.id)}
|
{#each spotlightRows as { track, seconds }, i (track.id)}
|
||||||
<ListRow
|
<ListRow
|
||||||
onclick={() => playSpotlightTrack(i)}
|
onclick={() => playSpotlightTrack(i)}
|
||||||
@@ -254,16 +256,16 @@
|
|||||||
subtitleHref={track.ownerUserId}
|
subtitleHref={track.ownerUserId}
|
||||||
>
|
>
|
||||||
{#snippet leading()}
|
{#snippet leading()}
|
||||||
<span class="w-5 shrink-0 text-center text-xs text-fg-2 tabular-nums"
|
<span class="w-5 shrink-0 text-center text-xs text-muted tabular-nums"
|
||||||
>{i + 1}</span
|
>{i + 1}</span
|
||||||
>
|
>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{#snippet trailing()}
|
{#snippet trailing()}
|
||||||
<span class="shrink-0 text-xs text-fg-2 tabular-nums">{fmtTime(seconds)}</span>
|
<span class="shrink-0 text-xs text-muted tabular-nums">{fmtTime(seconds)}</span>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
</ListRow>
|
</ListRow>
|
||||||
{:else}
|
{:else}
|
||||||
<p class="p-2 text-sm text-fg-2">Esta playlist todavía no tiene canciones.</p>
|
<p class="p-2 text-sm text-fg-3">Esta playlist todavía no tiene canciones.</p>
|
||||||
{/each}
|
{/each}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -312,16 +314,16 @@
|
|||||||
trackId={track.id}
|
trackId={track.id}
|
||||||
>
|
>
|
||||||
{#snippet leading()}
|
{#snippet leading()}
|
||||||
<span class="flex h-3.5 w-icon-md shrink-0 items-end justify-center">
|
<span class="flex h-3.5 w-4.5 shrink-0 items-end justify-center">
|
||||||
{#if isCurrent}
|
{#if isCurrent}
|
||||||
<EqBars size={13} paused={!player.playing} />
|
<EqBars size={13} paused={!player.playing} />
|
||||||
{:else}
|
{:else}
|
||||||
<span class="text-xs text-fg-2 tabular-nums">{i + 1}</span>
|
<span class="text-xs text-muted tabular-nums">{i + 1}</span>
|
||||||
{/if}
|
{/if}
|
||||||
</span>
|
</span>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
{#snippet trailing()}
|
{#snippet trailing()}
|
||||||
<span class="hidden shrink-0 text-xs text-fg-2 tabular-nums sm:block">
|
<span class="hidden shrink-0 text-xs text-muted tabular-nums sm:block">
|
||||||
{fmtPlays(track.listensCount)}
|
{fmtPlays(track.listensCount)}
|
||||||
</span>
|
</span>
|
||||||
{/snippet}
|
{/snippet}
|
||||||
|
|||||||
@@ -4,9 +4,10 @@ import type { RequestHandler } from './$types';
|
|||||||
import {
|
import {
|
||||||
getOidcConfig,
|
getOidcConfig,
|
||||||
encodeSession,
|
encodeSession,
|
||||||
|
sessionCookieOptions,
|
||||||
toSessionUser,
|
toSessionUser,
|
||||||
writeSessionCookie,
|
|
||||||
type Session,
|
type Session,
|
||||||
|
SESSION_COOKIE,
|
||||||
STATE_COOKIE,
|
STATE_COOKIE,
|
||||||
VERIFIER_COOKIE,
|
VERIFIER_COOKIE,
|
||||||
NONCE_COOKIE,
|
NONCE_COOKIE,
|
||||||
@@ -54,7 +55,7 @@ export const GET: RequestHandler = async ({ url, cookies }) => {
|
|||||||
expiresAt: Math.floor(Date.now() / 1000) + (tokens.expires_in ?? 3600)
|
expiresAt: Math.floor(Date.now() / 1000) + (tokens.expires_in ?? 3600)
|
||||||
};
|
};
|
||||||
|
|
||||||
writeSessionCookie(cookies, await encodeSession(session), url);
|
cookies.set(SESSION_COOKIE, await encodeSession(session), sessionCookieOptions(url));
|
||||||
|
|
||||||
for (const name of [STATE_COOKIE, VERIFIER_COOKIE, NONCE_COOKIE, RETURN_COOKIE]) {
|
for (const name of [STATE_COOKIE, VERIFIER_COOKIE, NONCE_COOKIE, RETURN_COOKIE]) {
|
||||||
cookies.delete(name, { path: '/' });
|
cookies.delete(name, { path: '/' });
|
||||||
|
|||||||
@@ -1,17 +1,12 @@
|
|||||||
import { redirect } from '@sveltejs/kit';
|
import { redirect } from '@sveltejs/kit';
|
||||||
import * as client from 'openid-client';
|
import * as client from 'openid-client';
|
||||||
import type { RequestHandler } from './$types';
|
import type { RequestHandler } from './$types';
|
||||||
import {
|
import { getOidcConfig, decodeSession, SESSION_COOKIE } from '$lib/server/auth';
|
||||||
clearSessionCookie,
|
|
||||||
decodeSession,
|
|
||||||
getOidcConfig,
|
|
||||||
readSessionCookie
|
|
||||||
} from '$lib/server/auth';
|
|
||||||
import { authConfig } from '$lib/server/config';
|
import { authConfig } from '$lib/server/config';
|
||||||
|
|
||||||
const handleLogout: RequestHandler = async ({ cookies }) => {
|
const handleLogout: RequestHandler = async ({ cookies }) => {
|
||||||
const session = await decodeSession(readSessionCookie(cookies));
|
const session = await decodeSession(cookies.get(SESSION_COOKIE));
|
||||||
clearSessionCookie(cookies);
|
cookies.delete(SESSION_COOKIE, { path: '/' });
|
||||||
|
|
||||||
const config = await getOidcConfig();
|
const config = await getOidcConfig();
|
||||||
const endSessionUrl = client.buildEndSessionUrl(config, {
|
const endSessionUrl = client.buildEndSessionUrl(config, {
|
||||||
|
|||||||
@@ -9,13 +9,15 @@
|
|||||||
--color-surface: var(--mf-surface);
|
--color-surface: var(--mf-surface);
|
||||||
--color-surface-2: var(--mf-surface-2);
|
--color-surface-2: var(--mf-surface-2);
|
||||||
--color-surface-hover: var(--mf-surface-hover);
|
--color-surface-hover: var(--mf-surface-hover);
|
||||||
--color-hover: var(--mf-row-hover);
|
--color-hover: var(--mf-surface-2);
|
||||||
--color-line: var(--mf-border);
|
--color-line: var(--mf-border);
|
||||||
--color-line-strong: var(--mf-border-strong);
|
--color-line-strong: var(--mf-border-strong);
|
||||||
--color-hairline: var(--mf-hairline);
|
--color-hairline: var(--mf-hairline);
|
||||||
--color-track: var(--mf-track);
|
--color-track: var(--mf-track);
|
||||||
--color-fg: var(--mf-text);
|
--color-fg: var(--mf-text);
|
||||||
--color-fg-2: var(--mf-text-2);
|
--color-fg-2: var(--mf-text-2);
|
||||||
|
--color-fg-3: var(--mf-text-3);
|
||||||
|
--color-muted: var(--mf-text-4);
|
||||||
--color-accent: var(--mf-accent);
|
--color-accent: var(--mf-accent);
|
||||||
--color-accent-soft: var(--mf-accent-title);
|
--color-accent-soft: var(--mf-accent-title);
|
||||||
--color-accent-tint: var(--mf-accent-soft-bg);
|
--color-accent-tint: var(--mf-accent-soft-bg);
|
||||||
@@ -27,17 +29,15 @@
|
|||||||
--color-on-art: var(--mf-on-art);
|
--color-on-art: var(--mf-on-art);
|
||||||
--color-on-art-2: var(--mf-on-art-2);
|
--color-on-art-2: var(--mf-on-art-2);
|
||||||
--color-danger: oklch(63.7% 0.15 25.331);
|
--color-danger: oklch(63.7% 0.15 25.331);
|
||||||
--color-danger-fg: var(--mf-danger-fg);
|
--color-danger-fg: oklch(88.5% 0.062 18.334);
|
||||||
--color-btn: var(--mf-btn-bg);
|
--color-btn: var(--mf-btn-bg);
|
||||||
--color-btn-hover: var(--mf-btn-bg-hover);
|
--color-btn-hover: var(--mf-btn-bg-hover);
|
||||||
--color-cta-strong-hover: var(--mf-cta-strong-hover);
|
--color-btn-glass: var(--mf-btn-secondary-bg);
|
||||||
--color-row-hover: var(--mf-row-hover);
|
--color-btn-glass-hover: var(--mf-btn-secondary-bg-hover);
|
||||||
|
|
||||||
--radius-tag: 0.25rem;
|
--radius-tag: 0.25rem;
|
||||||
--radius-thumb: 0.5rem;
|
--radius-thumb: 0.5rem;
|
||||||
--radius-control: 0.625rem;
|
--radius-control: 0.625rem;
|
||||||
--radius-btn-sm: 0.6875rem;
|
|
||||||
--radius-btn: 0.75rem;
|
|
||||||
--radius-art: 0.8125rem;
|
--radius-art: 0.8125rem;
|
||||||
--radius-art-lg: 1.125rem;
|
--radius-art-lg: 1.125rem;
|
||||||
--radius-panel: 1.125rem;
|
--radius-panel: 1.125rem;
|
||||||
@@ -64,11 +64,6 @@
|
|||||||
--container-search: 30rem;
|
--container-search: 30rem;
|
||||||
--container-cta: 20rem;
|
--container-cta: 20rem;
|
||||||
|
|
||||||
--text-control-sm: 0.78125rem;
|
|
||||||
|
|
||||||
--ease-snappy: var(--mf-ease);
|
|
||||||
--default-transition-duration: var(--mf-motion-fast);
|
|
||||||
|
|
||||||
--tracking-display: -0.02em;
|
--tracking-display: -0.02em;
|
||||||
--tracking-eyebrow: 0.1em;
|
--tracking-eyebrow: 0.1em;
|
||||||
--leading-body: 1.65;
|
--leading-body: 1.65;
|
||||||
@@ -124,16 +119,14 @@
|
|||||||
@apply text-xs tabular-nums;
|
@apply text-xs tabular-nums;
|
||||||
}
|
}
|
||||||
|
|
||||||
@utility btn-transition {
|
@utility theme-transition {
|
||||||
transition-property:
|
transition: background 0.5s ease-out;
|
||||||
color, background-color, border-color, outline-color, opacity, box-shadow, filter;
|
|
||||||
transition-timing-function: var(--default-transition-timing-function);
|
|
||||||
transition-duration: var(--default-transition-duration);
|
|
||||||
}
|
}
|
||||||
@utility glass-bar {
|
@utility glass-bar {
|
||||||
background-color: var(--mf-bar-bg);
|
background-image: var(--mf-bar-bg);
|
||||||
border-top: 1px solid var(--mf-hairline);
|
border-top: 1px solid var(--mf-hairline);
|
||||||
backdrop-filter: blur(24px);
|
backdrop-filter: blur(24px);
|
||||||
|
transition: background 0.5s ease-out;
|
||||||
}
|
}
|
||||||
@utility grid-cards {
|
@utility grid-cards {
|
||||||
display: grid;
|
display: grid;
|
||||||
@@ -188,7 +181,7 @@
|
|||||||
@utility app-main {
|
@utility app-main {
|
||||||
--mf-dock-h: 0px;
|
--mf-dock-h: 0px;
|
||||||
padding-bottom: calc(var(--mf-nav-h) + var(--mf-safe-b) + var(--mf-dock-h));
|
padding-bottom: calc(var(--mf-nav-h) + var(--mf-safe-b) + var(--mf-dock-h));
|
||||||
transition: padding var(--mf-motion-slow) var(--mf-ease);
|
transition: padding 0.3s;
|
||||||
|
|
||||||
&[data-has-track] {
|
&[data-has-track] {
|
||||||
--mf-dock-h: var(--mf-player-h);
|
--mf-dock-h: var(--mf-player-h);
|
||||||
@@ -201,12 +194,6 @@
|
|||||||
oklch(var(--mf-tile-shade-l) var(--mf-tile-shade-c) var(--tile-hue))
|
oklch(var(--mf-tile-shade-l) var(--mf-tile-shade-c) var(--tile-hue))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@utility surface-active {
|
|
||||||
background-image: var(--mf-g-active);
|
|
||||||
}
|
|
||||||
@utility surface-active-hover {
|
|
||||||
background-image: var(--mf-g-hover);
|
|
||||||
}
|
|
||||||
@utility hero-surface {
|
@utility hero-surface {
|
||||||
background-image: var(--mf-hero-bg);
|
background-image: var(--mf-hero-bg);
|
||||||
}
|
}
|
||||||
@@ -221,7 +208,7 @@
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
@utility field-control {
|
@utility field-control {
|
||||||
@apply w-full rounded-control bg-surface py-3 text-sm text-fg transition placeholder:text-fg-2 focus:bg-surface-2 focus:outline-none;
|
@apply w-full rounded-control bg-surface py-3 text-sm text-fg transition placeholder:text-muted focus:bg-surface-2 focus:outline-none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@layer base {
|
@layer base {
|
||||||
@@ -268,7 +255,7 @@ button:disabled {
|
|||||||
@keyframes pop-in {
|
@keyframes pop-in {
|
||||||
from {
|
from {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform: scale(0.98) translateY(0.25rem);
|
transform: scale(0.96) translateY(0.5rem);
|
||||||
}
|
}
|
||||||
to {
|
to {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
@@ -317,16 +304,16 @@ button:disabled {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.animate-enter {
|
.animate-enter {
|
||||||
animation: fade-up var(--mf-motion-slow) var(--mf-ease) both;
|
animation: fade-up 0.35s cubic-bezier(0.16, 1, 0.3, 1) both;
|
||||||
animation-delay: calc(min(var(--i, 0), 10) * 40ms);
|
animation-delay: calc(min(var(--i, 0), 10) * 45ms);
|
||||||
}
|
}
|
||||||
|
|
||||||
.animate-pop {
|
.animate-pop {
|
||||||
animation: pop-in var(--mf-motion-base) var(--mf-ease) both;
|
animation: pop-in 0.3s cubic-bezier(0.16, 1, 0.3, 1) both;
|
||||||
}
|
}
|
||||||
|
|
||||||
.animate-fade {
|
.animate-fade {
|
||||||
animation: fade-in var(--mf-motion-base) var(--mf-ease) both;
|
animation: fade-in 0.4s ease both;
|
||||||
}
|
}
|
||||||
|
|
||||||
.glass-panel {
|
.glass-panel {
|
||||||
@@ -334,11 +321,7 @@ button:disabled {
|
|||||||
background-image: var(--mf-modal-glow);
|
background-image: var(--mf-modal-glow);
|
||||||
backdrop-filter: blur(22px);
|
backdrop-filter: blur(22px);
|
||||||
-webkit-backdrop-filter: blur(22px);
|
-webkit-backdrop-filter: blur(22px);
|
||||||
transition: background var(--mf-motion-slow) var(--mf-ease);
|
transition: background 0.6s;
|
||||||
}
|
|
||||||
|
|
||||||
.glass-panel.glass-panel-danger {
|
|
||||||
background-image: var(--mf-modal-glow-danger);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
|||||||
Reference in New Issue
Block a user