diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ba4b220..3f44b36 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,19 +4,19 @@ on: [push] jobs: deploy: runs-on: ubuntu-22.04 - needs: test container: volumes: - /var/docker-web:/var/docker-web steps: - uses: actions/checkout@v4 - - name: Deploy with docker-web run: | - APP_DIR=/var/docker-web/apps/${GITHUB_REPOSITORY##*/} - mkdir -p $APP_DIR + REPO_NAME="${GITHUB_REPOSITORY##*/}" + APP_DIR="/var/docker-web/apps/${REPO_NAME}" + bash /var/docker-web/src/cli.sh down "${REPO_NAME}" + rm -rf "$APP_DIR" + mkdir "$APP_DIR" cp -a $(find . -mindepth 1 -maxdepth 1 ! -name '.git' ! -name 'node_modules') "$APP_DIR/" export COMPOSE_BAKE=false - bash /var/docker-web/src/cli.sh down ${GITHUB_REPOSITORY##*/} - docker rmi local/${GITHUB_REPOSITORY##*/} - bash /var/docker-web/src/cli.sh up ${GITHUB_REPOSITORY##*/} + docker rmi "local/${REPO_NAME}" + bash /var/docker-web/src/cli.sh up "${REPO_NAME}" diff --git a/app/components/compilationBox.vue b/app/components/box.vue similarity index 78% rename from app/components/compilationBox.vue rename to app/components/box.vue index 342c549..1aca472 100644 --- a/app/components/compilationBox.vue +++ b/app/components/box.vue @@ -10,44 +10,33 @@
- +
- -
- - - -
- - - -
-
@@ -254,6 +242,7 @@ body { position: relative; transform-style: preserve-3d; transition: transform 120ms linear; + transition: height 120ms linear; /* légère smoothing quand on lâche */ margin: auto; user-select: none; diff --git a/app/components/boxItem.vue b/app/components/boxItem.vue deleted file mode 100644 index ad0e27d..0000000 --- a/app/components/boxItem.vue +++ /dev/null @@ -1,263 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/pages/design.vue b/app/pages/design.vue index 65aad4c..2214098 100644 --- a/app/pages/design.vue +++ b/app/pages/design.vue @@ -4,7 +4,7 @@
- +
diff --git a/app/pages/index.vue b/app/pages/index.vue deleted file mode 100644 index 750df57..0000000 --- a/app/pages/index.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - \ No newline at end of file diff --git a/app/pages/studio.vue b/app/pages/studio.vue new file mode 100644 index 0000000..622e1df --- /dev/null +++ b/app/pages/studio.vue @@ -0,0 +1,65 @@ + + + diff --git a/public/logo.svg b/public/logo.svg index b8fc967..223bd83 100644 --- a/public/logo.svg +++ b/public/logo.svg @@ -1,5 +1,5 @@ - + + fill="currentColor" /> \ No newline at end of file diff --git a/server/api/compilations.ts b/server/api/compilations.ts index d021503..59fb3ec 100644 --- a/server/api/compilations.ts +++ b/server/api/compilations.ts @@ -6,33 +6,37 @@ export default eventHandler(() => { id: 'ES00A', name: 'zero', duration: 2794, - description: 'Zero is for manifesto ... ;)', - colorFrom: '#ffffff', - colorTo: '#48959d', + description: 'Zero is for manifesto', + color1: '#ffffff', + color2: '#48959d', + color3: '#00ff00', }, { id: 'ES00B', name: 'zero b-side', duration: 2470, description: 'Even Zero has a b-side', - colorFrom: '#0d01b9', - colorTo: '#3b7589', + color1: '#0d01b9', + color2: '#3b7589', + color3: '#00ff00', }, { id: 'ES01A', name: 'first', duration: 3487, description: '...', - colorFrom: '#c7b3aa', - colorTo: '#000100', + color1: '#c7b3aa', + color2: '#000100', + color3: '#00ff00', }, { id: 'ES01B', name: 'first b-side', duration: 3773, description: '...', - colorFrom: '#f7dd01', - colorTo: '#010103', + color1: '#f7dd01', + color2: '#010103', + color3: '#00ff00', } ] }) diff --git a/types/types.ts b/types/types.ts index 0c966e0..e3e0a2b 100644 --- a/types/types.ts +++ b/types/types.ts @@ -5,8 +5,9 @@ export interface Compilation { duration: number tracks?: Track[] description: string - colorFrom: string - colorTo: string + color2: string + color1: string + color3: string } export interface Artist { @@ -26,3 +27,15 @@ export interface Track { link: string coverId: string } + +export interface BoxPosition { + x: number + y: number + z: number +} + +export interface BoxSize { + h: number + w: number + d: number +}