Merge branch 'master' of git.darkou.fr:dbroqua/MusicTopus into develop

.eslintrc.js

@@ -22,7 +22,13 @@ module.exports = {
         camelcase: [
             "error",
             {
-                allow: ["artists_sort", "access_token", "api_url", "media_ids"],
+                allow: [
+                    "artists_sort",
+                    "access_token",
+                    "api_url",
+                    "media_ids",
+                    "release_id",
+                ],
             },
         ],
     },

javascripts/ajouter-un-album.js

@@ -1,6 +1,8 @@
 Vue.createApp({
     data() {
         return {
+            // eslint-disable-next-line no-undef
+            share: canPublish,
             q: "",
             year: "",
             country: "",
@@ -169,7 +171,10 @@ Vue.createApp({
             this.submitting = true;
 
             return axios
-                .post("/api/v1/albums", this.details)
+                .post("/api/v1/albums", {
+                    album: this.details,
+                    share: this.share,
+                })
                 .then(() => {
                     window.location.href = "/ma-collection";
                 })

javascripts/collection.js

@@ -25,6 +25,10 @@ Vue.createApp({
             // eslint-disable-next-line no-undef
             isPublicCollection,
             // eslint-disable-next-line no-undef
+            userId,
+            // eslint-disable-next-line no-undef
+            vueType,
+            // eslint-disable-next-line no-undef
             query,
         };
     },
@@ -81,6 +85,10 @@ Vue.createApp({
             if (this.style) {
                 url += `&style=${this.formatParams(this.style)}`;
             }
+            // INFO: Cas d'une collection partagée
+            if (this.vueType === "public" && this.userId) {
+                url += `&userId=${this.userId}`;
+            }
 
             axios
                 .get(url)

javascripts/mon-compte/ma-collection/importer.js

@@ -0,0 +1,106 @@
+Vue.createApp({
+    data() {
+        return {
+            file: "",
+            content: [],
+            parsed: false,
+            imported: 0,
+            disabled: true,
+            state: "default",
+        };
+    },
+    created() {},
+    destroyed() {},
+    methods: {
+        handleFileUpload(event) {
+            const { files } = event.target;
+            const [csv] = files;
+
+            this.file = csv;
+
+            this.file = csv;
+            // this.parseFile();
+
+            const reader = new FileReader();
+            reader.onload = (content) => {
+                this.content = [];
+                this.state = "parse";
+                const lines = content.target.result.split(/\r\n|\n/);
+                for (let line = 1; line < lines.length - 1; line += 1) {
+                    this.parseLine(lines[0], lines[line]);
+                }
+
+                this.state = "default";
+                this.disabled = false;
+            };
+
+            reader.readAsText(csv);
+        },
+        parseLine(header, line) {
+            const row = {};
+            let currentHeaderIndex = 0;
+
+            let separant = ",";
+            let value = "";
+            for (let i = 0; i < line.length; i += 1) {
+                const char = line[i];
+
+                if (char !== separant) {
+                    if (char === '"') {
+                        separant = '"';
+                    } else {
+                        value += char;
+                    }
+                } else if (char === '"') {
+                    separant = ",";
+                } else {
+                    row[header.split(",")[currentHeaderIndex]] = value;
+                    currentHeaderIndex += 1;
+                    value = "";
+                }
+            }
+            this.content.push(row);
+        },
+        async addOne(index) {
+            const { Artist, Title, release_id } = this.content[index];
+
+            try {
+                const res = await axios.get(
+                    `/api/v1/albums?discogsId=${release_id}`
+                );
+
+                if (res.status === 204) {
+                    await axios.post("/api/v1/albums", {
+                        discogsId: release_id,
+                        share: false,
+                    });
+                }
+
+                this.imported += 1;
+                if (this.content.length > index + 1) {
+                    await this.addOne(index + 1);
+                }
+            } catch (err) {
+                showToastr(
+                    `Impossible d'ajouter l'album ${Title} de ${Artist}`
+                );
+
+                return false;
+            }
+
+            return true;
+        },
+        async importCollection(event) {
+            event.preventDefault();
+
+            this.disabled = true;
+            this.state = "submit";
+            this.imported = 0;
+
+            const imported = await this.addOne(0);
+
+            this.disabled = false;
+            this.state = imported ? "done" : "default";
+        },
+    },
+}).mount("#importer");

package.json

@@ -24,7 +24,7 @@
   "author": {
     "name": "Damien Broqua",
     "email": "contact@darkou.fr",
-    "url": "https://www.darkou.fr"
+    "url": "https://www.darkou.link"
   },
   "license": "GPL-3.0-or-later",
   "devDependencies": {
@@ -39,10 +39,11 @@
     "prettier": "^2.5.1"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.490.0",
+    "@aws-sdk/lib-storage": "^3.490.0",
     "@babel/cli": "^7.17.0",
     "@babel/core": "^7.17.2",
     "@babel/preset-env": "^7.16.11",
-    "aws-sdk": "^2.1110.0",
     "axios": "^0.26.0",
     "connect-ensure-login": "^0.1.1",
     "connect-flash": "^0.1.1",

sass/colors.scss

@@ -37,6 +37,9 @@ $button-alternate-color: #01103C;
 $pagination-border-color: $nord3;
 $pagination-hover-color: rgb(115, 151, 186);
 
+$close-background: rgba(10,10,10,.6);
+$close-background-dark: rgba(240,240,240,.6);
+
 :root {
     --default-color: #{$white};
     --bg-color: #{darken($white, 5%)};
@@ -58,6 +61,8 @@ $pagination-hover-color: rgb(115, 151, 186);
 
     --button-link-text-color: #2C364A;
 
+    --close-background: #{$close-background};
+
     --loader-img: url('/img/loading-light.gif');
 
     --nord0: #{$nord0};
@@ -99,5 +104,7 @@ $pagination-hover-color: rgb(115, 151, 186);
 
     --button-link-text-color: #{$white};
 
+    --close-background: #{$nord3};
+
     --loader-img: url('/img/loading-dark.gif');
 }

sass/flash.scss

@@ -8,6 +8,10 @@
     width: calc(100% - 6rem);
     margin: 2rem auto;
 
+    .header {
+        font-weight: 700;
+    }
+
     &.info {
         background-color: $warning-color;
     }

sass/index.scss

@@ -1,28 +1,4 @@
-// @use '../node_modules/knacss/sass/knacss.scss';
+@import '../node_modules/knacss/sass/knacss.scss';
-
-// NOYAU
-@import "../node_modules/knacss/sass/abstracts/variables-sass";
-@import "../node_modules/knacss/sass/abstracts/mixins-sass";
-
-@import "../node_modules/knacss/sass/base/reset-base";
-@import "../node_modules/knacss/sass/base/reset-accessibility";
-@import "../node_modules/knacss/sass/base/reset-forms";
-@import "../node_modules/knacss/sass/base/reset-print";
-@import "../node_modules/knacss/sass/base/layout";
-
-// UTILITAIRES
-@import "../node_modules/knacss/sass/utils/utils-global";
-@import "../node_modules/knacss/sass/utils/utils-font-sizes";
-@import "../node_modules/knacss/sass/utils/utils-spacers";
-@import "../node_modules/knacss/sass/utils/grillade";
-
-// COMPOSANTS (à ajouter au besoin)
-// @import "../node_modules/knacss/sass/components/button";
-// @import "components/burger";
-// @import "../node_modules/knacss/sass/components/checkbox";
-@import "../node_modules/knacss/sass/components/radio";
-// @import "../node_modules/knacss/sass/components/select";
-// @import "components/quote";
 
 // SPÉCIFIQUE AU SITE
 @import './fonts';

sass/ma-collection-details.scss

@@ -45,33 +45,44 @@
 
     .modal {
         button.close {
-            height: 36px;
+            height: 42px;
-            max-height: 36px;
+            max-height: 42px;
-            max-width: 36px;
+            max-width: 42px;
-            min-height: 36px;
+            min-height: 42px;
-            min-width: 36px;
+            min-width: 42px;
-            width: 36px;
+            width: 42px;
             position: absolute;
-            background-color: rgba(10,10,10,.6);
+            background-color: var(--close-background);
             right: 12px;
             top: 12px;
+
+            &::before,
+            &::after {
+                background-color: $white;
+            }
+        }
+
+        .carousel {
+            display: grid;
+            grid-template-columns: auto 80vw auto;
+            z-index: 1;
+            text-align: center;
+
+            img {
+                max-width: 100%;
+                max-height: 80vh;
+            }
         }
 
         .navigation {
-            position: absolute;
-            top: 50%;
             cursor: pointer;
-            z-index: 10;
-
-            &.previous {
-                left: 12px;
-            }
-            &.next {
-                right: 12px;
-            }
             i {
-                font-size: 2rem;
+                font-size: 1rem;
                 color: $nord4;
+
+                @include respond-to("small-up") {
+                    font-size: 2rem;
+                }
             }
         }
     }

sass/modal.scss

@@ -9,7 +9,7 @@
     justify-content: center;
     overflow: hidden;
     position: fixed;
-    z-index: 40;
+    z-index: 2;
 
     &.is-visible {
         display: flex;
@@ -84,6 +84,11 @@
             width: 1200;
         }
 
+        &.for-image {
+            display: initial;
+            text-align: center;
+        }
+
         header,
         footer {
             align-items: center;
@@ -116,10 +121,25 @@
             border-bottom-left-radius: 6px;
             border-bottom-right-radius: 6px;
             border-top: 1px solid var(--border-color);
+            justify-content: end;
+            align-items: baseline;
+
+            .field {
+                flex-direction: row;
+
+                padding: 6px;
+                span {
+                    padding-left: 6px;
+                }
+            }
 
             .button:not(:last-child) {
                 margin-right: .5em;
             }
         }
+        img {
+            max-width: 100%;
+            max-height: 80vh;
+        }
     }
 }

sass/navbar.scss

@@ -1,21 +1,25 @@
 .navbar {
-    min-height: 3.25rem;
+    min-height: 3.5rem;
     background-color: var(--navbar-color);
     box-shadow: rgba(216, 222, 233, 0.15) 0px 5px 10px 0px;
     color: rgba(0,0,0,.7);
     position: fixed;
-    z-index: 30;
+    z-index: 1;
     top: 0;
     right: 0;
     left: 0;
     @include transition() {}
 
     @include respond-to("medium-up") {
-        min-height: 3.25rem;
         align-items: stretch;
         display: flex;
     }
 
+    &.container {
+        max-width: 1330px;
+        margin: 0 auto;
+    }
+
     .navbar-brand {
         align-items: stretch;
         display: flex;
@@ -127,7 +131,6 @@
                     min-width: 100%;
                     position: absolute;
                     top: 100%;
-                    z-index: 20;
                 }
 
                 &:hover {
@@ -278,7 +281,6 @@
             min-width: 100%;
             position: absolute;
             top: 100%;
-            z-index: 20;
 
             .navbar-item {
                 white-space: nowrap;

sass/toast.scss

@@ -3,7 +3,7 @@
     min-width: 250px;
     max-width: 360px;
     position: fixed;
-    z-index: 66;
+    z-index: 10;
     right: 30px;
     top: 30px;
     font-size: 17px;

src/app.js

@@ -37,7 +37,7 @@ mongoose
 
 const sess = {
     cookie: {
-        maxAge: 86400000,
+        maxAge: 604800000, // INFO: 7 jours
     },
     secret,
     saveUninitialized: false,

src/helpers/index.js

@@ -33,6 +33,11 @@ export const getAlbumDetails = async (id) => {
 
     const res = await dis.getRelease(id);
 
+    if (res.released && res.released.includes("-00")) {
+        const [year, month] = res.released.split("-");
+        res.released = new Date(year, parseInt(month, 10) - 1);
+    }
+
     return res;
 };
 

src/libs/aws.js

@@ -1,4 +1,5 @@
-import AWS from "aws-sdk";
+import { S3Client } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
 import fs from "fs";
 import path from "path";
 import axios from "axios";
@@ -10,13 +11,9 @@ import {
     s3BaseFolder,
     s3Endpoint,
     s3Bucket,
-    s3Signature,
+    // s3Signature,
 } from "../config";
 
-AWS.config.update({
-    accessKeyId: awsAccessKeyId,
-    secretAccessKey: awsSecretAccessKey,
-});
 /**
  * Fonction permettant de stocker un fichier local sur S3
  * @param {String} filename
@@ -27,23 +24,28 @@ AWS.config.update({
  */
 export const uploadFromFile = async (filename, file, deleteFile = false) => {
     const data = await fs.readFileSync(file);
-
     const base64data = Buffer.from(data, "binary");
     const dest = path.join(s3BaseFolder, filename);
 
-    const s3 = new AWS.S3({
+    const multipartUpload = new Upload({
-        endpoint: s3Endpoint,
+        client: new S3Client({
-        signatureVersion: s3Signature,
+            region: "fr-par",
-    });
+            endpoint: `https://${s3Endpoint}`,
-
+            credentials: {
-    await s3
+                accessKeyId: awsAccessKeyId,
-        .putObject({
+                secretAccessKey: awsSecretAccessKey,
+            },
+        }),
+        params: {
             Bucket: s3Bucket,
             Key: dest,
             Body: base64data,
             ACL: "public-read",
-        })
+            endpoint: s3Endpoint,
-        .promise();
+        },
+    });
+
+    await multipartUpload.done();
 
     if (deleteFile) {
         fs.unlinkSync(file);

src/middleware/Albums.js

@@ -25,9 +25,21 @@ class Albums extends Pages {
      */
     static async postAddOne(req) {
         const { body, user } = req;
+        const { share, discogsId } = body;
+
+        let albumDetails = body.album;
+        if (discogsId) {
+            albumDetails = await getAlbumDetails(discogsId);
+            body.id = discogsId;
+        }
+
+        if (!albumDetails) {
+            throw new ErrorEvent(406, "Aucun album à ajouter");
+        }
+
         const data = {
-            ...body,
+            ...albumDetails,
-            discogsId: body.id,
+            discogsId: albumDetails.id,
             User: user._id,
         };
         data.released = data.released
@@ -54,7 +66,7 @@ class Albums extends Pages {
 
             const { publish, token, url, message } = mastodonConfig;
 
-            if (publish && url && token) {
+            if (share && publish && url && token) {
                 const M = new Mastodon({
                     access_token: token,
                     api_url: url,
@@ -168,6 +180,7 @@ Publié automatiquement via #musictopus`;
             style,
             userId: collectionUserId,
             discogsIds,
+            discogsId,
         } = this.req.query;
 
         let userId = this.req.user?._id;
@@ -220,6 +233,9 @@ Publié automatiquement via #musictopus`;
         if (discogsIds) {
             where.discogsId = { $in: discogsIds };
         }
+        if (discogsId) {
+            where.discogsId = Number(discogsId);
+        }
 
         const count = await AlbumsModel.count({
             User: userId,
@@ -269,6 +285,27 @@ Publié automatiquement via #musictopus`;
         }
     }
 
+    /**
+     * Méthode permettant de récupérer le détails d'un album
+     *
+     * @return {Object}
+     */
+    async getOne() {
+        const { itemId: _id } = this.req.params;
+        const { _id: User } = this.req.user;
+        const album = await AlbumsModel.findOne({
+            _id,
+            User,
+        });
+
+        return {
+            ...album.toJSON(),
+            released: album.released
+                ? formatDate(album.released, "MM/dd/yyyy")
+                : null,
+        };
+    }
+
     /**
      * Méthode permettant de mettre à jour un album
      *
@@ -293,7 +330,9 @@ Publié automatiquement via #musictopus`;
 
         const values = await getAlbumDetails(album.discogsId);
 
-        return AlbumsModel.findOneAndUpdate(query, values, { new: true });
+        await AlbumsModel.findOneAndUpdate(query, values, { new: true });
+
+        return this.getOne();
     }
 
     /**
@@ -428,19 +467,7 @@ Publié automatiquement via #musictopus`;
      * Méthode permettant d'afficher le détails d'un album
      */
     async loadItem() {
-        const { itemId: _id } = this.req.params;
+        const item = await this.getOne();
-        const { _id: User } = this.req.user;
-        const album = await AlbumsModel.findOne({
-            _id,
-            User,
-        });
-
-        const item = {
-            ...album.toJSON(),
-            released: album.released
-                ? formatDate(album.released, "MM/dd/yyyy")
-                : null,
-        };
 
         this.setPageContent("item", item);
         this.setPageTitle(
@@ -448,6 +475,31 @@ Publié automatiquement via #musictopus`;
         );
     }
 
+    /**
+     * Méthode permettant de choisir un album de manière aléatoire dans la collection d'un utilisateur
+     */
+    async onAir() {
+        const { _id: User } = this.req.user;
+        const count = await AlbumsModel.count({
+            User,
+        });
+
+        const items = await AlbumsModel.find(
+            {
+                User,
+            },
+            [],
+            {
+                skip: Math.floor(Math.random() * (count + 1)),
+                limit: 1,
+            }
+        );
+
+        this.req.params.itemId = items[0]._id;
+
+        await this.loadItem();
+    }
+
     /**
      * Méthode permettant de créer la page "collection/:userId"
      */

src/middleware/Me.js

@@ -43,6 +43,10 @@ class Me extends Pages {
             user.salt = value.password;
         }
 
+        if (value.isPublicCollection !== undefined) {
+            user.isPublicCollection = value.isPublicCollection;
+        }
+
         user.save();
 
         await new Promise((resolve, reject) => {

src/routes/ma-collection.js

@@ -24,6 +24,20 @@ router.route("/").get(ensureLoggedIn("/connexion"), async (req, res, next) => {
     }
 });
 
+router
+    .route("/on-air")
+    .get(ensureLoggedIn("/connexion"), async (req, res, next) => {
+        try {
+            const page = new Albums(req, "mon-compte/ma-collection/details");
+
+            await page.onAir();
+
+            render(res, page);
+        } catch (err) {
+            next(err);
+        }
+    });
+
 router
     .route("/exporter")
     .get(ensureLoggedIn("/connexion"), async (req, res, next) => {
@@ -32,6 +46,19 @@ router
 
             page.setPageTitle("Exporter ma collection");
 
+            render(res, page);
+        } catch (err) {
+            next(err);
+        }
+    });
+router
+    .route("/importer")
+    .get(ensureLoggedIn("/connexion"), async (req, res, next) => {
+        try {
+            const page = new Albums(req, "mon-compte/ma-collection/importer");
+
+            page.setPageTitle("Importer une collection");
+
             render(res, page);
         } catch (err) {
             next(err);

views/components/album.ejs

@@ -0,0 +1,133 @@
+<div class="grid md:grid-cols-3 gap-16">
+  <div>
+      <template v-for="album in tracklist">
+          <strong v-if="album.title">{{album.title}}</strong>
+          <ul>
+              <li v-for="(track, index) in album.tracks" class="ml-4">
+                  {{track.position || (index+1)}} - {{ track.title }} <template v-if="track.duration">({{track.duration}})</template>
+                  <ul v-if="track.artists && track.artists.length > 0" class="sm-hidden">
+                      <li v-for="extra in track.artists" class=" ml-4">
+                          <small>{{extra.name}}</small>
+                      </li>
+                  </ul>
+                  <ul v-if="track.extraartists && track.extraartists.length > 0" class="sm-hidden">
+                      <li v-for="extra in track.extraartists" class=" ml-4">
+                          <small>{{extra.role}} : {{extra.name}}</small>
+                      </li>
+                  </ul>
+              </li>
+          </ul>
+      </template>
+  </div>
+  <div class="md:col-span-2">
+      <div class="grid grid-cols-2 gap-10">
+          <div>
+              <strong>Genres</strong>
+              <br />
+              <template v-for="(genre, index) in item.genres">
+                  {{genre}}<template v-if="index < item.genres.length - 1">, </template>
+              </template>
+          </div>
+          <div>
+              <strong>Styles</strong>
+              <br />
+              <span v-for="(style, index) in item.styles">
+                  {{style}}<template v-if="index < item.styles.length - 1">, </template>
+              </span>
+          </div>
+      </div>
+      <hr />
+      <div class="grid grid-cols-3 gap-10">
+          <div>
+              <strong>Pays</strong>
+              <br />
+              <span>{{item.country}}</span>
+          </div>
+          <div>
+              <strong>Année</strong>
+              <br />
+              <span>{{item.year}}</span>
+          </div>
+          <div>
+              <strong>Date de sortie</strong>
+              <br />
+              <span>{{item.released}}</span>
+          </div>
+      </div>
+      <hr />
+      <div class="grid gap-10">
+          <div>
+              <strong>Format<template v-if="item.formats.length > 1">s</template></strong>
+              <ul class="ml-4">
+                  <li v-for="(format) in item.formats">
+                      {{format.name}}
+                      <template v-if="format.text">
+                          - <i>{{format.text}}</i>
+                      </template>
+                      <template v-if="format.descriptions && format.descriptions.length > 0">
+                      (<span v-for="(description, index) in format.descriptions">
+                          {{description}}<template v-if="index < format.descriptions.length - 1">, </template>
+                      </span>)
+                      </template>
+                  </li>
+              </ul>
+          </div>
+      </div>
+      <hr />
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-10">
+          <div>
+              <strong id="identifiers">Code<template v-if="item.identifiers.length > 1">s</template> barre<template v-if="item.identifiers.length > 1">s</template></strong>
+              <ol class="ml-4">
+                  <li v-for="identifier in identifiers">
+                      {{identifier.value}} ({{identifier.type}})
+                  </li>
+              </ol>
+              <template v-if="item.identifiers.length > identifiersPreviewLength">
+                  <button type="button" class="button is-link" v-if="identifiersMode === 'preview'" @click="showAllIdentifiers">
+                      Voir la suite
+                  </button>
+                  <button type="button" class="button is-link" v-if="identifiersMode === 'all'" @click="showLessIdentifiers">
+                      Voir moins
+                  </button>
+              </template>
+          </div>
+          <div>
+              <strong>Label<template v-if="item.labels.length > 1">s</template></strong>
+              <ol class="ml-4">
+                  <li v-for="label in item.labels">
+                      {{label.name}} {{label.catno}}
+                  </li>
+              </ol>
+              <strong>Société<template v-if="item.companies.length > 1">s</template></strong>
+              <ol class="ml-4">
+                  <li v-for="company in item.companies">
+                      <strong>{{company.entity_type_name}}</strong> {{company.name}}
+                  </li>
+              </ol>
+          </div>
+      </div>
+      <hr />
+      <div class="grid gap-10">
+          <div>
+              <strong>Note</strong>
+              <div v-html="(item.notes || '').replaceAll('\n', '<br />')"></div>
+          </div>
+      </div>
+      <hr />
+      <div class="grid gap-10">
+          <div>
+              <strong>Vidéos</strong>
+              <dl>
+                  <template v-for="video in item.videos">
+                      <dt>
+                          <a :href="video.uri" target="_blank" rel="noopener noreferrer">{{video.title}}</a>
+                      </dt>
+                      <dd>
+                          {{video.description}}
+                      </dd>
+                  </template>
+              </dl>
+          </div>
+      </div>
+  </div>
+</div>

views/index.ejs

@@ -35,86 +35,94 @@
         <% } %>
     </head>
     <body>
-        <nav class="navbar" aria-label="Navigation principale">
+        <nav class="navbar">
-            <div class="navbar-brand">
+            <nav class="navbar container" aria-label="Navigation principale">
-                <a class="navbar-item" href="/">
+                <div class="navbar-brand">
-                    <img src="/img/logo.png" alt="Logo MusicTopus">
+                    <a class="navbar-item" href="/">
-                    <span>MusicTopus</span>
+                        <img src="/img/logo.png" alt="Logo MusicTopus">
-                </a>
+                        <span>MusicTopus</span>
-
-                <a role="button" class="navbar-burger" aria-label="Afficher le menu" aria-expanded="false" data-target="navbar">
-                    <span aria-hidden="true"></span>
-                    <span aria-hidden="true"></span>
-                    <span aria-hidden="true"></span>
-                </a>
-            </div>
-
-            <div id="navbar" class="navbar-menu">
-                <% if ( user ) { %>
-                <div class="navbar-start">
-                    <div class="navbar-item">
-                        <div class="buttons">
-                            <a class="button is-primary" href="/ajouter-un-album">
-                                <i class="icon-plus"></i>
-                                <span>
-                                    Ajouter un album
-                                </span>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-                <% } %>
-
-                <div class="navbar-end">
-                    <a class="navbar-item" href="/nous-contacter">
-                        Nous contacter
                     </a>
-                    <% if ( user ) { %>
-                    <div class="navbar-item has-dropdown">
-                        <a class="navbar-link">
-                            <i class="icon-user"></i>
-                            <span>
-                                <%= user.username %>
-                            </span>
-                        </a>
 
-                        <div class="navbar-dropdown">
+                    <a role="button" class="navbar-burger" aria-label="Afficher le menu" aria-expanded="false" data-target="navbar">
-                            <a class="navbar-item" href="/mon-compte">
+                        <span aria-hidden="true"></span>
-                                Mon compte
+                        <span aria-hidden="true"></span>
-                            </a>
+                        <span aria-hidden="true"></span>
-                            <hr />
+                    </a>
-                            <a class="navbar-item" href="/ma-collection">
+                </div>
-                                Ma collection
+
-                            </a>
+                <div id="navbar" class="navbar-menu">
-                            <a class="navbar-item" href="/ma-collection/exporter">
+                    <% if ( user ) { %>
-                                Exporter ma collection
+                    <div class="navbar-start">
-                            </a>
+                        <div class="navbar-item">
+                            <div class="buttons">
+                                <a class="button is-primary" href="/ajouter-un-album">
+                                    <i class="icon-plus"></i>
+                                    <span>
+                                        Ajouter un album
+                                    </span>
+                                </a>
+                            </div>
                         </div>
                     </div>
                     <% } %>
-                    <div class="navbar-item apparence">
+
-                        <div class="theme-switch-wrapper">
+                    <div class="navbar-end">
-                            <label class="theme-switch" for="checkbox" aria-label="Passer du thème clair au thème sombre et inversement">
+                        <a class="navbar-item" href="/nous-contacter">
-                                <input type="checkbox" id="checkbox" />
+                            Nous contacter
-                                <div class="slider round"></div>
+                        </a>
-                          </label>
+                        <% if ( user ) { %>
-                        </div>
+                        <div class="navbar-item has-dropdown">
-                    </div>
+                            <a class="navbar-link">
-                    <div class="navbar-item">
+                                <i class="icon-user"></i>
-                        <div class="buttons">
+                                <span>
-                            <% if ( !user ) { %>
+                                    <%= user.username %>
-                            <a class="button is-primary" href="/connexion">
+                                </span>
-                                <strong>Connexion</strong>
                             </a>
-                            <% } else { %>
+
-                            <a class="button is-danger" href="/se-deconnecter">
+                            <div class="navbar-dropdown">
-                                Déconnexion
+                                <a class="navbar-item" href="/mon-compte">
-                            </a>
+                                    Mon compte
-                            <% } %>
+                                </a>
+                                <hr />
+                                <a class="navbar-item" href="/ma-collection">
+                                    Ma collection
+                                </a>
+                                <a class="navbar-item" href="/ma-collection/on-air">
+                                    On air
+                                </a>
+                                <a class="navbar-item" href="/ma-collection/exporter">
+                                    Exporter ma collection
+                                </a>
+                                <a class="navbar-item" href="/ma-collection/importer">
+                                    Importer une collection
+                                </a>
+                                <hr />
+                                <a class="navbar-item is-danger" href="/se-deconnecter">
+                                    Déconnexion
+                                </a>
+                            </div>
                         </div>
+                        <% } %>
+                        <div class="navbar-item apparence">
+                            <div class="theme-switch-wrapper">
+                                <label class="theme-switch" for="checkbox" aria-label="Passer du thème clair au thème sombre et inversement">
+                                    <input type="checkbox" id="checkbox" />
+                                    <div class="slider round"></div>
+                            </label>
+                            </div>
+                        </div>
+                        <% if ( !user ) { %>
+                        <div class="navbar-item">
+                            <div class="buttons">
+                                <a class="button is-primary" href="/connexion">
+                                    <strong>Connexion</strong>
+                                </a>
+                            </div>
+                        </div>
+                        <% } %>
                     </div>
                 </div>
-            </div>
+            </nav>
         </nav>
 
         <div id="toastr">
@@ -171,7 +179,7 @@
 
         <footer class="footer layout-hero">
             <p>
-                <strong title="Merci Brunus ! 😜">MusicTopus</strong> par <a href="https://www.darkou.fr" target="_blank" rel="noopener noreferrer">Damien Broqua <i class="icon-link"></i></a>.
+                <strong title="Merci Brunus ! 😜">MusicTopus</strong> par <a href="https://www.darkou.link" target="_blank" rel="noopener noreferrer">Damien Broqua <i class="icon-link"></i></a>.
                 Logo réalisé par Brunus avec <a href="https://inkscape.org/fr/" target="_blank" rel="noopener noreferrer">Inkscape <i class="icon-link"></i></a>.
                 <br />
                 Le code source est sous licence <a href="https://www.gnu.org/licenses/gpl-3.0-standalone.html" target="_blank" rel="noopener noreferrer">GNU GPL-3.0-or-later <i class="icon-link"></i></a> et disponible sur <a href="https://git.darkou.fr/dbroqua/MusicTopus" target="_blank">git.darkou.fr <i class="icon-link"></i></a>.

views/pages/ajouter-un-album.ejs

@@ -79,7 +79,7 @@
                 <button aria-label="Fermer" class="close" @click="toggleModal"></button>
             </header>
             <section>
-                <div class="grid grid-cols-2 gap-16">
+                <div class="grid grid-cols-1 md:grid-cols-3 gap-16">
                     <div>
                         <div class="text-center">
                             <img :src="details.thumb %>" :alt="`Miniature pour l'album ${details.title}`" />
@@ -87,56 +87,57 @@
                             <img v-for="image in details.images" :src="image.uri150" :alt="`Miniature de type ${image.type}`" style="max-width: 60px;" />
                             <hr />
                         </div>
-                        <ol class="ml-4">
+                        <ul class="is-unstyled">
-                            <li v-for="track in details.tracklist">
+                            <li v-for="track in details.tracklist" :class="{'ml-4': track.type_ === 'track'}">
-                                {{ track.title }} ({{track.duration}})
+                                <strong v-if="track.type_ === 'heading'">
-                                <ul v-if="track.artists && track.artists.length > 0" class="sm-hidden">
+                                    {{track.title}}
-                                    <li v-for="extra in track.artists" class=" ml-4">
+                                </strong>
-                                        <small>{{extra.role}} : {{extra.name}}</small>
+                                <template v-else>
-                                    </li>
+                                    {{ track.position }}
-                                </ul>
+                                    {{ track.title }} <span v-if="track.duration">({{track.duration}})</span>
+                                    <ul v-if="track.artists && track.artists.length > 0" class="sm-hidden">
+                                        <li v-for="extra in track.artists" class=" ml-4">
+                                            <small>{{extra.role}} : {{extra.name}}</small>
+                                        </li>
+                                    </ul>
+                                </template>
                             </li>
-                        </ol>
+                        </ul>
                     </div>
-                    <div>
+                    <div class="md:col-span-2">
-                        <div class="grid grid-cols-2 gap-10">
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-10">
-                            <div>
+                            <div class="grid grid-cols-1">
                                 <strong>Genres</strong>
-                                <br />
                                 <template v-for="(genre, index) in details.genres">
                                     {{genre}}<template v-if="index < details.genres.length - 1">, </template>
                                 </template>
                             </div>
-                            <div>
+                            <div class="grid grid-cols-1">
                                 <strong>Styles</strong>
-                                <br />
                                 <span v-for="(style, index) in details.styles">
                                     {{style}}<template v-if="index < details.styles.length - 1">, </template>
                                 </span>
                             </div>
                         </div>
                         <hr />
-                        <div class="grid grid-cols-3 gap-10">
+                        <div class="grid grid-cols-1 md:grid-cols-3 gap-10">
-                            <div>
+                            <div class="grid grid-cols-2 md:grid-cols-1">
                                 <strong>Pays</strong>
-                                <br />
                                 <span>{{details.country}}</span>
                             </div>
-                            <div>
+                            <div class="grid grid-cols-2 md:grid-cols-1">
                                 <strong>Année</strong>
-                                <br />
                                 <span>{{details.year}}</span>
                             </div>
-                            <div>
+                            <div class="grid grid-cols-2 md:grid-cols-1">
                                 <strong>Date de sortie</strong>
-                                <br />
                                 <span>{{details.released}}</span>
                             </div>
                         </div>
                         <hr />
-                        <div class="grid grid-cols-2 gap-10">
+                        <div class="grid grid-cols-1 gap-10">
                             <div>
-                                <strong>Format</strong>
+                                <strong>Format<template v-if="details?.formats?.length > 1">s</template></strong>
                                 <ul class="ml-4">
                                     <li v-for="(format) in details.formats">
                                         {{format.name}}
@@ -153,25 +154,26 @@
                             </div>
                         </div>
                         <hr />
-                        <div class="grid grid-cols-2 gap-10">
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-10">
                             <div>
-                                <strong>Codes barres</strong>
+                                <strong>Code<template v-if="details?.identifiers?.length > 1">s</template> barre<template v-if="details?.identifiers?.length > 1">s</template></strong>
-                                <ol>
+                                <ol class="ml-4">
                                     <li v-for="identifier in details.identifiers">
                                         {{identifier.value}} ({{identifier.type}})
                                     </li>
                                 </ol>
                             </div>
                             <div>
-                                <strong>Label</strong>
+                                <strong>Label<template v-if="details?.labels?.length > 1">s</template></strong>
-                                <ol>
+                                <ol class="ml-4">
                                     <li v-for="label in details.labels">
                                         {{label.name}}
                                     </li>
                                 </ol>
-                                <strong>Société</strong>
+                                <strong>Société<template v-if="details?.companies?.length > 1">s</template></strong>
-                                <ol>
+                                <ol class="ml-4">
-                                    <li v-for="company in details.companie">
+                                    <li v-for="company in details.companies">
+                                        <strong>{{company.entity_type_name}}</strong>
                                         {{company.name}}
                                     </li>
                                 </ol>
@@ -181,9 +183,21 @@
                 </div>
             </section>
             <footer>
+                <% if ( user.mastodon && user.mastodon.publish ) { %>
+                    <div class="field">
+                        <label for="share">Partager sur le fédiverse</label>
+                        <span>
+                            <input type="checkbox" id="share" name="share" v-model="share">
+                        </span>
+                    </div>
+                <% } %>
                 <button :class="['button is-primary', submitting ? 'is-disabled' : '']" @click="add">Ajouter</button>
                 <button class="button" @click="toggleModal">Annuler</button>
             </footer>
         </div>
     </div>
-</main>
+</main>
+
+<script>
+    const canPublish = <%- (user.mastodon && user.mastodon.publish) || false %>;
+</script>

views/pages/mon-compte/ma-collection/details.ejs

@@ -21,152 +21,22 @@
         </div>
     </div>
     <hr />
-    <div class="grid md:grid-cols-3 gap-16">
+    <%- include('../../../components/album.ejs') %>
-        <div>
-            <template v-for="album in tracklist">
-                <strong v-if="album.title">{{album.title}}</strong>
-                <ul>
-                    <li v-for="(track, index) in album.tracks" class="ml-4">
-                        {{track.position || (index+1)}} - {{ track.title }} <template v-if="track.duration">({{track.duration}})</template>
-                        <ul v-if="track.artists && track.artists.length > 0" class="sm-hidden">
-                            <li v-for="extra in track.artists" class=" ml-4">
-                                <small>{{extra.name}}</small>
-                            </li>
-                        </ul>
-                        <ul v-if="track.extraartists && track.extraartists.length > 0" class="sm-hidden">
-                            <li v-for="extra in track.extraartists" class=" ml-4">
-                                <small>{{extra.role}} : {{extra.name}}</small>
-                            </li>
-                        </ul>
-                    </li>
-                </ul>
-            </template>
-        </div>
-        <div class="md:col-span-2">
-            <div class="grid grid-cols-2 gap-10">
-                <div>
-                    <strong>Genres</strong>
-                    <br />
-                    <template v-for="(genre, index) in item.genres">
-                        {{genre}}<template v-if="index < item.genres.length - 1">, </template>
-                    </template>
-                </div>
-                <div>
-                    <strong>Styles</strong>
-                    <br />
-                    <span v-for="(style, index) in item.styles">
-                        {{style}}<template v-if="index < item.styles.length - 1">, </template>
-                    </span>
-                </div>
-            </div>
-            <hr />
-            <div class="grid grid-cols-3 gap-10">
-                <div>
-                    <strong>Pays</strong>
-                    <br />
-                    <span>{{item.country}}</span>
-                </div>
-                <div>
-                    <strong>Année</strong>
-                    <br />
-                    <span>{{item.year}}</span>
-                </div>
-                <div>
-                    <strong>Date de sortie</strong>
-                    <br />
-                    <span>{{item.released}}</span>
-                </div>
-            </div>
-            <hr />
-            <div class="grid gap-10">
-                <div>
-                    <strong>Format</strong>
-                    <ul class="ml-4">
-                        <li v-for="(format) in item.formats">
-                            {{format.name}}
-                            <template v-if="format.text">
-                                - <i>{{format.text}}</i>
-                            </template>
-                            <template v-if="format.descriptions && format.descriptions.length > 0">
-                            (<span v-for="(description, index) in format.descriptions">
-                                {{description}}<template v-if="index < format.descriptions.length - 1">, </template>
-                            </span>)
-                            </template>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <hr />
-            <div class="grid grid-cols-2 gap-10">
-                <div>
-                    <strong id="identifiers">Codes barres</strong>
-                    <ol class="ml-4">
-                        <li v-for="identifier in identifiers">
-                            {{identifier.value}} ({{identifier.type}})
-                        </li>
-                    </ol>
-                    <template v-if="item.identifiers.length > identifiersPreviewLength">
-                        <button type="button" class="button is-link" v-if="identifiersMode === 'preview'" @click="showAllIdentifiers">
-                            Voir la suite
-                        </button>
-                        <button type="button" class="button is-link" v-if="identifiersMode === 'all'" @click="showLessIdentifiers">
-                            Voir moins
-                        </button>
-                    </template>
-                </div>
-                <div>
-                    <strong>Label</strong>
-                    <br />
-                    <template v-for="label in item.labels">
-                        {{label.name}} {{label.catno}}
-                        <br />
-                    </template>
-                    <hr />
-                    <strong>Sociétés</strong>
-                    <br />
-                    <template v-for="company in item.companies">
-                        <strong>{{company.entity_type_name}}</strong> : {{company.name}}
-                        <br />
-                    </template>
-                </div>
-            </div>
-            <hr />
-            <div class="grid gap-10">
-                <div>
-                    <strong>Note</strong>
-                    <div v-html="(item.notes || '').replaceAll('\n', '<br />')"></div>
-                </div>
-            </div>
-            <hr />
-            <div class="grid gap-10">
-                <div>
-                    <strong>Vidéos</strong>
-                    <dl>
-                        <template v-for="video in item.videos">
-                            <dt>
-                                <a :href="video.uri" target="_blank" rel="noopener noreferrer">{{video.title}}</a>
-                            </dt>
-                            <dd>
-                                {{video.description}}
-                            </dd>
-                        </template>
-                    </dl>
-                </div>
-            </div>
-        </div>
-    </div>
 
     <div class="modal" :class="{'is-visible': modalIsVisible}">
         <div class="modal-background"></div>
         <button type="button" aria-label="Fermer" class="close" @click="toggleModal"></button>
-        <button type="button" aria-label="Image précédente" class="navigation previous" @click="previous" v-if="index > 0">
+        <div class="carousel">
-            <i class="icon-left-open"></i>
+            <button type="button" aria-label="Image précédente" class="navigation previous" @click="previous">
-        </button>
+                <i class="icon-left-open"></i>
-        <button type="button" aria-label="Image suivante" class="navigation next" @click="next" v-if="index + 1 < item.images.length">
+            </button>
-            <i class="icon-right-open"></i>
+            <div class="text-center">
-        </button>
+                <img :src="preview" />
-        <div class="modal-card">
+            </div>
-            <img :src="preview" />
+            <button type="button" aria-label="Image suivante" class="navigation next" @click="next">
+                <i class="icon-right-open"></i>
+            </button>
+
         </div>
     </div>
 

views/pages/mon-compte/ma-collection/importer.ejs

@@ -0,0 +1,43 @@
+<main class="layout-maxed" id="importer">
+    <h1>Importer une collection</h1>
+    <p>
+        Il est actuellement possible d'importer une collection provenant de discogs.
+        <br />
+        Vous devez dans un premier temps vous rendre sur la page <a href="https://www.discogs.com/fr/users/export" target="_blank" rel="noopener noreferrer">Exporter</a> de discogs.
+        <br />
+        Une fois exporter vous recevrez un mail de Discogs avec un lien de téléchargement. Une fois le fichier .zip téléchargé vous devez en extraire le fichier .csv afin de l'importer dans MusicTopus.
+    </p>
+    <p>
+        D'autres formats d'imports seront ajoutés par la suite, comme l'import entre 2 instances MusicTopus.
+    </p>
+    <div class="flash info">
+        <div class="header">
+            Information
+        </div>
+        <div class="body">
+            Si un album est déjà présent en base celui-ci sera ignoré.
+        </div>
+    </div>
+
+    <form @submit="importCollection">
+
+        <div class="field">
+            <label for="file">Fichier .csv</label>
+            <input type="file" name="file" id="file" @change="handleFileUpload( $event )" accept=".csv">
+        </div>
+
+        <div class="field">
+            <span>
+                Albums à impoter : <strong>{{content.length}}</strong>
+            </span>
+        </div>
+
+        <button type="submit" class="button is-primary my-16" :disabled="disabled">
+            <i v-if="['parse', 'submit'].includes(state)" class="icon-spin animate-spin"></i>
+            <span v-if="state === 'default'">Importer</span>
+            <span v-if="state === 'parse'">Analyse en cours...</span>
+            <span v-if="state === 'submit'">Importation en cours... ({{imported}}/{{content.length}})</span>
+            <span v-if="state === 'done'">Importatation terminée</span>
+        </button>
+    </form>
+</main>