{BUGFIX} On update my account

Reviewed-on: #91
Co-authored-by: dbroqua <contact@darkou.fr>
Co-committed-by: dbroqua <contact@darkou.fr>

.eslintrc.js

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

docker-compose.yml.dev

@@ -3,7 +3,7 @@ version: "2.4"
 services:
   musictopus-www:
     container_name: musictopus-www
-    image: "node:16"
+    image: "node:18"
     restart: always
     user: "node"
     working_dir: /home/node/app

docker-compose.yml.prod

@@ -3,7 +3,7 @@ version: "2.4"
 services:
   musictopus-www:
     container_name: musictopus-www
-    image: "node:16"
+    image: "node:18"
     restart: always
     user: "node"
     working_dir: /home/node/app

javascripts/ajouter-un-album.js

@@ -1,6 +1,8 @@
 Vue.createApp({
     data() {
         return {
+            // eslint-disable-next-line no-undef
+            share: canPublish,
             q: "",
             year: "",
             country: "",
@@ -9,6 +11,7 @@ Vue.createApp({
             items: [],
             details: {},
             modalIsVisible: false,
+            submitting: false,
             formats: [
                 "Vinyl",
                 "Acetate",
@@ -112,6 +115,7 @@ Vue.createApp({
                             format,
                             genre,
                             style,
+                            inCollection,
                         } = results[i];
                         items.push({
                             id,
@@ -122,6 +126,7 @@ Vue.createApp({
                             format,
                             genre,
                             style,
+                            inCollection,
                         });
                     }
 
@@ -160,12 +165,21 @@ Vue.createApp({
                 });
         },
         add() {
-            axios
-                .post("/api/v1/albums", this.details)
+            if (this.submitting) {
+                return true;
+            }
+            this.submitting = true;
+
+            return axios
+                .post("/api/v1/albums", {
+                    album: this.details,
+                    share: this.share,
+                })
                 .then(() => {
                     window.location.href = "/ma-collection";
                 })
                 .catch((err) => {
+                    this.submitting = false;
                     showToastr(
                         err.response?.data?.message ||
                             "Impossible d'ajouter cet album pour le moment…"

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)
@@ -167,10 +175,11 @@ Vue.createApp({
             this.toggleModal();
         },
         deleteItem() {
-            if ( vueType === 'private' ) {
+            // eslint-disable-next-line no-undef
+            if (vueType !== "private") {
                 return false;
             }
-            axios
+            return axios
                 .delete(`/api/v1/albums/${this.itemId}`)
                 .then(() => {
                     this.fetch();
@@ -186,10 +195,11 @@ Vue.createApp({
                 });
         },
         shareCollection() {
-            if ( vueType === 'private' ) {
+            // eslint-disable-next-line no-undef
+            if (vueType !== "private") {
                 return false;
             }
-            axios
+            return axios
                 .patch(`/api/v1/me`, {
                     isPublicCollection: !this.isPublicCollection,
                 })
@@ -219,19 +229,16 @@ Vue.createApp({
                 });
         },
         renderAlbumTitle(item) {
-            let render = '';
+            let render = "";
 
-            for ( let i = 0 ; i < item.artists.length ; i += 1 ) {
-                const {
-                    name,
-                    join,
-                } = item.artists[i];
-                render += `${name} ${join ? `${join} ` : ''}`;
+            for (let i = 0; i < item.artists.length; i += 1) {
+                const { name, join } = item.artists[i];
+                render += `${name} ${join ? `${join} ` : ""}`;
             }
 
             render += `- ${item.title}`;
 
             return render;
-        }
+        },
     },
 }).mount("#collection");

javascripts/main.js

@@ -1,6 +1,8 @@
 /* eslint-disable no-unused-vars */
 const { protocol, host } = window.location;
 
+let timeout = null;
+
 /**
  * Fonction permettant d'afficher un message dans un toastr
  * @param {String} message
@@ -11,12 +13,23 @@ function showToastr(message, success = false) {
         x.getElementsByTagName("SPAN")[0].innerHTML = message;
     }
 
-    x.className = `${x.className} show`.replace("sucess", "");
-    if (success) {
-        x.className = `${x.className} success`;
+    if (timeout) {
+        clearTimeout(timeout);
+        x.classList.remove("show");
     }
-    setTimeout(() => {
-        x.className = x.className.replace("show", "");
+
+    x.classList.remove("success");
+    x.classList.remove("error");
+    if (success) {
+        x.classList.add("success");
+    } else {
+        x.classList.add("error");
+    }
+
+    x.classList.add("show");
+
+    timeout = setTimeout(() => {
+        x.classList.remove("show");
     }, 3000);
 }
 
@@ -30,80 +43,6 @@ function hideToastr() {
     x.getElementsByTagName("SPAN")[0].innerHTML = "";
 }
 
-/**
- * Fonction permettant de récupérer la valeur d'un cookie
- * @param {String} cname
- * @param {String} defaultValue
- *
- * @return {String}
- */
-function getCookie(cname, defaultValue = "false") {
-    const name = `${cname}=`;
-    const decodedCookie = decodeURIComponent(document.cookie);
-    const ca = decodedCookie.split(";");
-    for (let i = 0; i < ca.length; i += 1) {
-        let c = ca[i];
-        while (c.charAt(0) === " ") {
-            c = c.substring(1);
-        }
-        if (c.indexOf(name) === 0) {
-            return c.substring(name.length, c.length);
-        }
-    }
-    return defaultValue;
-}
-
-/**
- * Fonction permettant de créer un cookie
- * @param {String} cname
- * @param {String} cvalue
- * @param {Number} exdays
- */
-function setCookie(cname, cvalue, exdays = 30) {
-    const d = new Date();
-    d.setTime(d.getTime() + exdays * 24 * 60 * 60 * 1000);
-    const expires = `expires=${d.toUTCString()}`;
-    document.cookie = `${cname}=${cvalue};${expires};path=/`;
-}
-
-/**
- * Fonction de (dé)charger le thème accessible
- * @param {String} value
- */
-function setAriaTheme(value) {
-    const { body } = document;
-    if (value === "true") {
-        const classesString = body.className || "";
-        if (classesString.indexOf("is-accessible") === -1) {
-            body.classList.add("is-accessible");
-        }
-    } else {
-        body.classList.remove("is-accessible");
-    }
-}
-
-/**
- * Fonction de (dé)charger  le thème accessible
- */
-function switchAriaTheme() {
-    const { body } = document;
-
-    body.classList.toggle("is-accessible");
-
-    setCookie("ariatheme", body.classList.contains("is-accessible"));
-}
-
-/**
- * Fonction permettant de switcher de thème clair/sombre
- * @param {Object} e
- */
-function switchTheme(e) {
-    const theme = e.target.checked ? "dark" : "light";
-
-    document.documentElement.setAttribute("data-theme", theme);
-    setCookie("theme", theme);
-}
-
 /**
  * Ensemble d'actions effectuées au chargement de la page
  */
@@ -123,29 +62,4 @@ document.addEventListener("DOMContentLoaded", () => {
             });
         });
     }
-
-    const switchAriaThemeBtn = document.querySelector("#switchAriaTheme");
-    if (switchAriaThemeBtn) {
-        switchAriaThemeBtn.addEventListener("click", switchAriaTheme);
-    }
-    setAriaTheme(getCookie("ariatheme"));
-
-    const toggleSwitch = document.querySelector(
-        '.theme-switch input[type="checkbox"]'
-    );
-    if (toggleSwitch) {
-        toggleSwitch.addEventListener("change", switchTheme, false);
-    }
-
-    let currentThemeIsDark = getCookie("theme");
-    if (currentThemeIsDark === "false" && window.matchMedia) {
-        currentThemeIsDark = window.matchMedia("(prefers-color-scheme: dark)")
-            .matches
-            ? "dark"
-            : "light";
-    }
-    switchTheme({ target: { checked: currentThemeIsDark === "dark" } });
-    if (toggleSwitch) {
-        toggleSwitch.checked = currentThemeIsDark === "dark";
-    }
 });

javascripts/mon-compte/index.js

@@ -1,7 +1,9 @@
+
 if (typeof email !== "undefined" && typeof username !== "undefined") {
     Vue.createApp({
         data() {
             return {
+                formData: {
                     // eslint-disable-next-line no-undef
                     email,
                     // eslint-disable-next-line no-undef
@@ -9,20 +11,92 @@ if (typeof email !== "undefined" && typeof username !== "undefined") {
                     oldPassword: "",
                     password: "",
                     passwordConfirm: "",
+                    // eslint-disable-next-line no-undef
+                    mastodon: mastodon || {
+                        publish: false,
+                        url: "",
+                        token: "",
+                        message:
+                            "Je viens d'ajouter {artist} - {album} à ma collection !",
+                    },
+                },
                 loading: false,
+                errors: [],
             };
         },
         methods: {
             // eslint-disable-next-line no-unused-vars
-            async updateProfil(event) {
-                // try {
-                //     if ( this.password !== this.passwordConfirm ) {
-                //         throw "La confirnation du mot de passe ne correspond pas";
-                //     }
-                // } catch(err) {
-                //     event.preventDefault();
-                //     showToastr(err);
-                // }
+            async testMastodon() {
+                const { url, token } = this.formData.mastodon;
+
+                if (!url) {
+                    this.errors.push("emptyUrl");
+                }
+                if (!token) {
+                    this.errors.push("emptyToken");
+                }
+
+                if (this.errors.length > 0) {
+                    return false;
+                }
+
+                try {
+                    await axios.post(`/api/v1/mastodon`, { url, token });
+
+                    showToastr("Configuration valide !", true);
+                } catch (err) {
+                    showToastr(
+                        err.response?.data?.message ||
+                            "Impossible de tester cette configuration",
+                        false
+                    );
+                }
+
+                return true;
+            },
+            // eslint-disable-next-line no-unused-vars
+            async updateProfil() {
+                this.errors = [];
+                const { oldPassword, password, passwordConfirm, mastodon } =
+                    this.formData;
+
+                if (password && !oldPassword) {
+                    this.errors.push("emptyPassword");
+                }
+
+                if (password !== passwordConfirm) {
+                    this.errors.push("passwordsDiffer");
+                }
+
+                if (this.errors.length > 0) {
+                    return false;
+                }
+
+                this.loading = true;
+
+                const data = {
+                    mastodon,
+                };
+
+                if (password) {
+                    data.password = password;
+                    data.oldPassword = oldPassword;
+                }
+
+                try {
+                    await axios.patch(`/api/v1/me`, data);
+
+                    showToastr("Profil mis à jour", true);
+                } catch (err) {
+                    showToastr(
+                        err.response?.data?.message ||
+                            "Impossible de mettre à jour votre profil"
+                    );
+                }
+
+                this.loading = false;
+
+                return true;
             },
         },
     }).mount("#mon-compte");

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

@@ -4,6 +4,8 @@ if (typeof item !== "undefined") {
             return {
                 // eslint-disable-next-line no-undef
                 item,
+                // eslint-disable-next-line no-undef
+                canShareItem,
                 tracklist: [],
                 identifiers: [],
                 modalIsVisible: false,
@@ -12,6 +14,11 @@ if (typeof item !== "undefined") {
                 preview: null,
                 index: null,
                 showModalDelete: false,
+                showModalShare: false,
+                shareMessage: "",
+                shareMessageTransformed: "",
+                shareMessageLength: 0,
+                shareSubmiting: false,
             };
         },
         created() {
@@ -23,6 +30,26 @@ if (typeof item !== "undefined") {
         destroyed() {
             window.removeEventListener("keydown", this.changeImage);
         },
+        watch: {
+            shareMessage(message) {
+                const video =
+                    this.item.videos && this.item.videos.length > 0
+                        ? this.item.videos[0].uri
+                        : "";
+
+                this.shareMessageTransformed = message
+                    .replaceAll("{artist}", this.item.artists[0].name)
+                    .replaceAll("{format}", this.item.formats[0].name)
+                    .replaceAll("{year}", this.item.year)
+                    .replaceAll("{video}", video)
+                    .replaceAll("{album}", this.item.title);
+
+                this.shareMessageLength = this.shareMessageTransformed.replace(
+                    video,
+                    new Array(36).join("#")
+                ).length;
+            },
+        },
         methods: {
             setIdentifiers() {
                 this.identifiers = [];
@@ -189,6 +216,33 @@ if (typeof item !== "undefined") {
             goToArtist() {
                 return "";
             },
+            shareAlbum() {
+                if (this.shareSubmiting) {
+                    return false;
+                }
+                this.shareSubmiting = true;
+                axios
+                    .post(`/api/v1/albums/${this.item._id}/share`, {
+                        message: this.shareMessageTransformed,
+                    })
+                    .then(() => {
+                        showToastr("Album partagé", true);
+                        this.shareMessage = "";
+                        this.showModalShare = false;
+                    })
+                    .catch((err) => {
+                        showToastr(
+                            err.response?.data?.message ||
+                                "Impossible de partager cet album",
+                            false
+                        );
+                    })
+                    .finally(() => {
+                        this.shareSubmiting = false;
+                    });
+
+                return true;
+            },
         },
     }).mount("#ma-collection-details");
 }

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");

javascripts/theme.js

@@ -0,0 +1,71 @@
+/**
+ * Fonction permettant de sauvegarder dans le stockage local le choix du thème
+ * @param {String} scheme
+ */
+function saveColorScheme(scheme) {
+    localStorage.setItem("theme", scheme);
+}
+
+/**
+ * Fonction permettant de changer le thème du site
+ * @param {String} scheme
+ */
+function setColorScheme(scheme) {
+    document.documentElement.setAttribute("data-theme", scheme);
+}
+
+/**
+ * Fonction permettant de récupérer le thème du système
+ * @return {String}
+ */
+function getPreferredColorScheme() {
+    if (window.matchMedia) {
+        if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+            return "dark";
+        }
+        return "light";
+    }
+    return "light";
+}
+
+// INFO: On place un event sur le bouton
+const toggleSwitch = document.querySelector(
+    '.theme-switch input[type="checkbox"]'
+);
+
+/**
+ * Event permettant de détecter les changements de thème du système
+ */
+if (window.matchMedia) {
+    const colorSchemeQuery = window.matchMedia("(prefers-color-scheme: dark)");
+    colorSchemeQuery.addEventListener("change", () => {
+        const selectedColorScheme = localStorage.getItem("theme") || "system";
+
+        if (selectedColorScheme === "system") {
+            const preferedColorScheme = getPreferredColorScheme();
+            setColorScheme(preferedColorScheme);
+
+            toggleSwitch.checked = preferedColorScheme === "dark";
+        }
+    });
+}
+
+const currentTheme = localStorage.getItem("theme") || getPreferredColorScheme();
+
+// INFO: Au chargement de la page on détecte le thème à charger
+setColorScheme(currentTheme);
+
+toggleSwitch.checked = currentTheme === "dark";
+
+toggleSwitch.addEventListener(
+    "change",
+    (e) => {
+        e.preventDefault();
+
+        const scheme = e.target.checked ? "dark" : "light";
+
+        saveColorScheme(scheme);
+        setColorScheme(scheme);
+    },
+    false
+);

package.json

@@ -14,7 +14,7 @@
     "prepare": "npx husky install"
   },
   "engines": {
-    "node": "16.x",
+    "node": "16.x || 18.x",
     "yarn": "1.x"
   },
   "repository": {
@@ -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",
@@ -63,6 +64,7 @@
     "gulp-uglify": "^3.0.2",
     "joi": "^17.6.0",
     "knacss": "^8.0.4",
+    "mastodon": "^1.2.2",
     "mongoose": "^6.2.1",
     "mongoose-unique-validator": "^3.0.0",
     "nodemailer": "^6.7.8",

sass/ajouter-un-album.scss

@@ -7,10 +7,18 @@
     .list {
         margin-top: 2rem;
 
-        .item{
+        .item {
             img {
                 cursor: pointer;
             }
+
+            &.in-collection {
+                opacity: 0.6;
+
+                small {
+                    font-style: italic;
+                }
+            }
         }
     }
 }

sass/colors.scss

@@ -22,10 +22,12 @@ $nord15: #b48ead;
 
 $primary-color: $nord8;
 $danger-color: $nord11;
+$error-color: $nord12;
 $warning-color: $nord13;
 $success-color: $nord14;
 $primary-color-hl: darken($primary-color, $hoverAmount);
 $danger-color-hl: darken($danger-color, $hoverAmount);
+$error-color-hl: darken($error-color, $hoverAmount);
 $warning-color-hl: darken($warning-color, $hoverAmount);
 $success-color-hl: darken($success-color, $hoverAmount);
 
@@ -35,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%)};
@@ -56,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};
@@ -97,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/error.scss

@@ -1,4 +1,6 @@
-.error {
+main {
+    &.error {
         min-height: calc(100vh - 3.25rem - 100px);
         padding-top: 4rem;
+    }
 }

sass/flash.scss

@@ -9,7 +9,7 @@
     margin: 2rem auto;
 
     .header {
-        font-weight: 800;
+        font-weight: 700;
     }
 
     &.info {

sass/forms.scss

@@ -24,9 +24,6 @@
         }
     }
 
-    label {
-        font-weight: 800;
-    }
     input,
     textarea,
     select {
@@ -34,13 +31,12 @@
         max-width: 100%;
         width: 100%;
         background-color: var(--input-color);
-        border: 1px solid transparent !important;
+        border: 1px solid var(--input-active-color) !important;
         color: var(--input-font-color);
         @include transition() {}
 
         &:focus-visible {
             outline: unset;
-            border-color: var(--input-active-color) !important;
         }
     }
 

sass/global.scss

@@ -7,19 +7,10 @@ html {
         display: flex;
         flex-direction: column;
         padding-top: 3.5rem;
-        font-family: 'open_sansregular';
-        font-weight: 400;
+        font-family: 'lucioleregular';
         min-height: 100vh;
         color: var(--font-color);
-        @include transition() {}
-
-        &.is-accessible {
-            font-family: 'lucioleregular';
-
-            .text-justify {
-                text-align: left;
-            }
-        }
+        @include transition();
 
         footer.footer {
             margin-top: auto;

sass/index.scss

@@ -1,28 +1,4 @@
-// @use '../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";
+@import '../node_modules/knacss/sass/knacss.scss';
 
 // SPÉCIFIQUE AU SITE
 @import './fonts';
@@ -42,6 +18,7 @@
 @import './loader';
 
 @import './error';
+@import './messages.scss';
 @import './500';
 @import './home';
 @import './ajouter-un-album';

sass/list.scss

@@ -42,7 +42,6 @@
         }
 
         .title {
-            font-weight: 800;
             font-size: 1.4rem;
         }
 

sass/ma-collection-details.scss

@@ -45,33 +45,44 @@
 
     .modal {
         button.close {
-            height: 36px;
-            max-height: 36px;
-            max-width: 36px;
-            min-height: 36px;
-            min-width: 36px;
-            width: 36px;
+            height: 42px;
+            max-height: 42px;
+            max-width: 42px;
+            min-height: 42px;
+            min-width: 42px;
+            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/messages.scss

@@ -0,0 +1,9 @@
+.message {
+    margin: 8px 0;
+    padding: 0;
+    font-size: 0.8rem;
+
+    &.error {
+        color: $error-color-hl;
+    }
+}

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;
@@ -33,7 +37,6 @@
                 word-break: break-word;
                 color: var(--font-color);
                 font-size: 2rem;
-                font-weight: 600;
                 line-height: 1.125;
                 margin-left: .5rem !important;
                 @include transition() {}
@@ -128,7 +131,6 @@
                     min-width: 100%;
                     position: absolute;
                     top: 100%;
-                    z-index: 20;
                 }
 
                 &:hover {
@@ -279,7 +281,6 @@
             min-width: 100%;
             position: absolute;
             top: 100%;
-            z-index: 20;
 
             .navbar-item {
                 white-space: nowrap;

sass/toast.scss

@@ -3,15 +3,18 @@
     min-width: 250px;
     max-width: 360px;
     position: fixed;
-    z-index: 31;
+    z-index: 10;
     right: 30px;
     top: 30px;
     font-size: 17px;
 
     padding: 1.25rem 2.5rem 1.25rem 1.5rem;
+    border-radius: 6px;
+
+    &.error {
         background-color: $danger-color;
         color: $button-alternate-color;
-    border-radius: 6px;
+    }
 
     &.success {
         background-color: $success-color;

src/app.js

@@ -22,11 +22,13 @@ import importJobsRouter from "./routes/jobs";
 
 import importAlbumRouterApiV1 from "./routes/api/v1/albums";
 import importSearchRouterApiV1 from "./routes/api/v1/search";
+import importMastodonRouterApiV1 from "./routes/api/v1/mastodon";
 import importMeRouterApiV1 from "./routes/api/v1/me";
 import importContactRouterApiV1 from "./routes/api/v1/contact";
 
 passportConfig(passport);
 
+mongoose.set("strictQuery", false);
 mongoose
     .connect(mongoDbUri, { useNewUrlParser: true, useUnifiedTopology: true })
     .catch(() => {
@@ -35,7 +37,7 @@ mongoose
 
 const sess = {
     cookie: {
-        maxAge: 86400000,
+        maxAge: 604800000, // INFO: 7 jours
     },
     secret,
     saveUninitialized: false,
@@ -83,6 +85,7 @@ app.use("/collection", collectionRouter);
 app.use("/jobs", importJobsRouter);
 app.use("/api/v1/albums", importAlbumRouterApiV1);
 app.use("/api/v1/search", importSearchRouterApiV1);
+app.use("/api/v1/mastodon", importMastodonRouterApiV1);
 app.use("/api/v1/me", importMeRouterApiV1);
 app.use("/api/v1/contact", importContactRouterApiV1);
 

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({
-        endpoint: s3Endpoint,
-        signatureVersion: s3Signature,
-    });
-
-    await s3
-        .putObject({
+    const multipartUpload = new Upload({
+        client: new S3Client({
+            region: "fr-par",
+            endpoint: `https://${s3Endpoint}`,
+            credentials: {
+                accessKeyId: awsAccessKeyId,
+                secretAccessKey: awsSecretAccessKey,
+            },
+        }),
+        params: {
             Bucket: s3Bucket,
             Key: dest,
             Body: base64data,
             ACL: "public-read",
-        })
-        .promise();
+            endpoint: s3Endpoint,
+        },
+    });
+
+    await multipartUpload.done();
 
     if (deleteFile) {
         fs.unlinkSync(file);
@@ -62,11 +64,15 @@ export const uploadFromUrl = async (url) => {
     const filename = `${uuid()}.jpg`;
     const file = `/tmp/${filename}`;
 
-    const { data } = await axios.get(url, { responseType: "arraybuffer" });
+    const { data } = await axios.get(url, {
+        headers: {
+            "User-Agent":
+                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0",
+        },
+        responseType: "arraybuffer",
+    });
 
     fs.writeFileSync(file, data);
 
     return uploadFromFile(filename, file, true);
-
-    // return s3Object;
 };

src/middleware/Albums.js

@@ -1,5 +1,9 @@
 import { format as formatDate } from "date-fns";
+import fs from "fs";
 
+import Mastodon from "mastodon";
+import { v4 } from "uuid";
+import axios from "axios";
 import Pages from "./Pages";
 import Export from "./Export";
 
@@ -21,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,
-            discogsId: body.id,
+            ...albumDetails,
+            discogsId: albumDetails.id,
             User: user._id,
         };
         data.released = data.released
@@ -39,11 +55,88 @@ class Albums extends Pages {
             model: "Albums",
             id: album._id,
         };
-
         const job = new JobsModel(jobData);
 
         job.save();
 
+        try {
+            const User = await UsersModel.findOne({ _id: user._id });
+
+            const { mastodon: mastodonConfig } = User;
+
+            const { publish, token, url, message } = mastodonConfig;
+
+            if (share && publish && url && token) {
+                const M = new Mastodon({
+                    access_token: token,
+                    api_url: url,
+                });
+
+                const video =
+                    data.videos && data.videos.length > 0
+                        ? data.videos[0].uri
+                        : "";
+
+                const status = `${(
+                    message ||
+                    "Je viens d'ajouter {artist} - {album} à ma collection !"
+                )
+                    .replaceAll("{artist}", data.artists[0].name)
+                    .replaceAll("{format}", data.formats[0].name)
+                    .replaceAll("{year}", data.year)
+                    .replaceAll("{video}", video)
+                    .replaceAll("{album}", data.title)}
+
+Publié automatiquement via #musictopus`;
+
+                const media_ids = [];
+
+                if (data.images.length > 0) {
+                    for (let i = 0; i < data.images.length; i += 1) {
+                        if (media_ids.length === 4) {
+                            break;
+                        }
+
+                        const filename = `${v4()}.jpg`;
+                        const file = `/tmp/${filename}`;
+
+                        // eslint-disable-next-line no-await-in-loop
+                        const { data: buff } = await axios.get(
+                            data.images[i].uri,
+                            {
+                                headers: {
+                                    "User-Agent":
+                                        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0",
+                                },
+                                responseType: "arraybuffer",
+                            }
+                        );
+
+                        fs.writeFileSync(file, buff);
+
+                        // eslint-disable-next-line no-await-in-loop
+                        const { data: media } = await M.post("media", {
+                            file: fs.createReadStream(file),
+                        });
+
+                        const { id } = media;
+
+                        media_ids.push(id);
+
+                        fs.unlinkSync(file);
+                    }
+                }
+
+                await M.post("statuses", { status, media_ids });
+            }
+        } catch (err) {
+            throw new ErrorEvent(
+                500,
+                "Mastodon",
+                "Album ajouté à votre collection mais impossible de publier sur Mastodon"
+            );
+        }
+
         return album;
     }
 
@@ -86,6 +179,8 @@ class Albums extends Pages {
             genre,
             style,
             userId: collectionUserId,
+            discogsIds,
+            discogsId,
         } = this.req.query;
 
         let userId = this.req.user?._id;
@@ -135,6 +230,13 @@ class Albums extends Pages {
             userId = userIsSharingCollection._id;
         }
 
+        if (discogsIds) {
+            where.discogsId = { $in: discogsIds };
+        }
+        if (discogsId) {
+            where.discogsId = Number(discogsId);
+        }
+
         const count = await AlbumsModel.count({
             User: userId,
             ...where,
@@ -183,6 +285,27 @@ class Albums extends Pages {
         }
     }
 
+    /**
+     * 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
      *
@@ -207,7 +330,9 @@ class Albums extends Pages {
 
         const values = await getAlbumDetails(album.discogsId);
 
-        return AlbumsModel.findOneAndUpdate(query, values, { new: true });
+        await AlbumsModel.findOneAndUpdate(query, values, { new: true });
+
+        return this.getOne();
     }
 
     /**
@@ -216,7 +341,7 @@ class Albums extends Pages {
      */
     async deleteOne() {
         const res = await AlbumsModel.findOneAndDelete({
-            user: this.req.user._id,
+            User: this.req.user._id,
             _id: this.req.params.itemId,
         });
 
@@ -231,6 +356,83 @@ class Albums extends Pages {
         );
     }
 
+    async shareOne() {
+        const { message: status } = this.req.body;
+        const { itemId: _id } = this.req.params;
+        const { _id: User } = this.req.user;
+        const query = {
+            _id,
+            User,
+        };
+
+        const album = await AlbumsModel.findOne(query);
+
+        if (!album) {
+            throw new ErrorEvent(
+                404,
+                "Mise à jour",
+                "Impossible de trouver cet album"
+            );
+        }
+
+        const { mastodon: mastodonConfig } = this.req.user;
+        const { publish, token, url } = mastodonConfig;
+
+        if (publish && url && token) {
+            const M = new Mastodon({
+                access_token: token,
+                api_url: url,
+            });
+
+            const media_ids = [];
+
+            if (album.images.length > 0) {
+                for (let i = 0; i < album.images.length; i += 1) {
+                    if (media_ids.length === 4) {
+                        break;
+                    }
+
+                    const filename = `${v4()}.jpg`;
+                    const file = `/tmp/${filename}`;
+
+                    // eslint-disable-next-line no-await-in-loop
+                    const { data: buff } = await axios.get(
+                        album.images[i].uri,
+                        {
+                            headers: {
+                                "User-Agent":
+                                    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0",
+                            },
+                            responseType: "arraybuffer",
+                        }
+                    );
+
+                    fs.writeFileSync(file, buff);
+
+                    // eslint-disable-next-line no-await-in-loop
+                    const { data: media } = await M.post("media", {
+                        file: fs.createReadStream(file),
+                    });
+
+                    const { id } = media;
+
+                    media_ids.push(id);
+
+                    fs.unlinkSync(file);
+                }
+            }
+
+            await M.post("statuses", { status, media_ids });
+        } else {
+            throw new ErrorEvent(
+                406,
+                `Vous n'avez pas configuré vos options de partage sur votre compte`
+            );
+        }
+
+        return true;
+    }
+
     /**
      * Méthode permettant de créer la page "ma-collection"
      */
@@ -265,19 +467,7 @@ class Albums extends Pages {
      * Méthode permettant d'afficher le détails d'un album
      */
     async loadItem() {
-        const { itemId: _id } = this.req.params;
-        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,
-        };
+        const item = await this.getOne();
 
         this.setPageContent("item", item);
         this.setPageTitle(
@@ -285,6 +475,31 @@ class Albums extends Pages {
         );
     }
 
+    /**
+     * 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

@@ -12,21 +12,47 @@ class Me extends Pages {
      * @return {Object}
      */
     async patchMe() {
-        const { body, user } = this.req;
+        const { body } = this.req;
+        const { _id } = this.req.user;
 
         const schema = Joi.object({
             isPublicCollection: Joi.boolean(),
+            oldPassword: Joi.string(),
+            password: Joi.string(),
+            passwordConfirm: Joi.ref("password"),
+            mastodon: {
+                publish: Joi.boolean(),
+                url: Joi.string().uri().allow(null, ""),
+                token: Joi.string().allow(null, ""),
+                message: Joi.string().allow(null, ""),
+            },
         });
 
         const value = await schema.validateAsync(body);
-        const update = await UsersModel.findByIdAndUpdate(
-            user._id,
-            { $set: value },
-            { new: true }
-        );
+        const user = await UsersModel.findById(_id);
+
+        if (value.oldPassword) {
+            if (!user.validPassword(value.oldPassword)) {
+                throw new Error("Votre ancien mot de passe n'est pas valide");
+            }
+        }
+
+        if (value.mastodon !== undefined) {
+            user.mastodon = value.mastodon;
+        }
+
+        if (value.password) {
+            user.salt = value.password;
+        }
+
+        if (value.isPublicCollection !== undefined) {
+            user.isPublicCollection = value.isPublicCollection;
+        }
+
+        user.save();
 
         await new Promise((resolve, reject) => {
-            this.req.login(update, (err) => {
+            this.req.login(user, (err) => {
                 if (err) {
                     return reject(err);
                 }
@@ -35,34 +61,7 @@ class Me extends Pages {
             });
         });
 
-        return update;
-    }
-
-    /**
-     * Méthode permettant de modifier le mot de passe d'un utilisateur
-     */
-    async updatePassword() {
-        const { body } = this.req;
-        const { _id } = this.req.user;
-
-        const schema = Joi.object({
-            oldPassword: Joi.string().required(),
-            password: Joi.string().required(),
-            passwordConfirm: Joi.ref("password"),
-        });
-
-        const value = await schema.validateAsync(body);
-        const user = await UsersModel.findById(_id);
-
-        if (!user.validPassword(value.oldPassword)) {
-            throw new Error("Votre ancien mot de passe n'est pas valide");
-        }
-
-        user.salt = value.password;
-
-        await user.save();
-
-        this.req.flash("success", "Profil correctement mis à jour");
+        return user;
     }
 }
 

src/models/users.js

@@ -29,6 +29,12 @@ const UserSchema = new mongoose.Schema(
             type: Boolean,
             default: false,
         },
+        mastodon: {
+            publish: Boolean,
+            token: String,
+            url: String,
+            message: String,
+        },
     },
     {
         timestamps: true,

src/routes/api/v1/albums.js

@@ -68,4 +68,17 @@ router
         }
     });
 
+router
+    .route("/:itemId/share")
+    .post(ensureLoggedIn("/connexion"), async (req, res, next) => {
+        try {
+            const albums = new Albums(req);
+            const data = await albums.shareOne();
+
+            sendResponse(req, res, data);
+        } catch (err) {
+            next(err);
+        }
+    });
+
 export default router;

src/routes/api/v1/mastodon.js

@@ -0,0 +1,28 @@
+import express from "express";
+import { ensureLoggedIn } from "connect-ensure-login";
+
+import Mastodon from "mastodon";
+import { sendResponse } from "../../../libs/format";
+
+// eslint-disable-next-line new-cap
+const router = express.Router();
+
+router.route("/").post(ensureLoggedIn("/connexion"), async (req, res, next) => {
+    try {
+        const { url, token } = req.body;
+
+        const M = new Mastodon({
+            access_token: token,
+            api_url: url,
+        });
+
+        const data = await M.post("statuses", {
+            status: "Test d'intégration de Mastodon sur mon compte #musictopus 👌",
+        });
+        return sendResponse(req, res, data);
+    } catch (err) {
+        return next(err);
+    }
+});
+
+export default router;

src/routes/api/v1/search.js

@@ -3,6 +3,7 @@ import { ensureLoggedIn } from "connect-ensure-login";
 
 import { sendResponse } from "../../../libs/format";
 import { searchSong, getAlbumDetails } from "../../../helpers";
+import Albums from "../../../middleware/Albums";
 
 // eslint-disable-next-line new-cap
 const router = express.Router();
@@ -16,6 +17,30 @@ router.route("/").get(ensureLoggedIn("/connexion"), async (req, res, next) => {
             req.query.country || null
         );
 
+        const discogsIds = [];
+        const foundIds = [];
+
+        for (let i = 0; i < data.results.length; i += 1) {
+            discogsIds.push(data.results[i].id);
+        }
+
+        req.query.discogsIds = discogsIds;
+
+        const albums = new Albums(req);
+        const myAlbums = await albums.getAll();
+
+        if (myAlbums.rows) {
+            for (let i = 0; i < myAlbums.rows.length; i += 1) {
+                foundIds.push(myAlbums.rows[i].discogsId);
+            }
+        }
+
+        for (let i = 0; i < data.results.length; i += 1) {
+            data.results[i].inCollection = foundIds.includes(
+                data.results[i].id
+            );
+        }
+
         sendResponse(req, res, data);
     } catch (err) {
         next(err);

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);

src/routes/mon-compte.js

@@ -8,9 +8,7 @@ import render from "../libs/format";
 // eslint-disable-next-line new-cap
 const router = express.Router();
 
-router
-    .route("/")
-    .get(ensureLoggedIn("/connexion"), async (req, res, next) => {
+router.route("/").get(ensureLoggedIn("/connexion"), async (req, res, next) => {
     try {
         const page = new Me(req, "mon-compte/index");
 
@@ -20,16 +18,6 @@ router
     } catch (err) {
         next(err);
     }
-    })
-    .post(ensureLoggedIn("/connexion"), async (req, res) => {
-        try {
-            const page = new Me(req, "mon-compte/index");
-
-            await page.updatePassword();
-        } catch (err) {
-            req.flash("error", err.toString());
-        }
-        res.redirect("/mon-compte");
-    });
+});
 
 export default router;

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

@@ -16,9 +16,6 @@
 
         <link href="/css/main.css" rel="stylesheet" />
 
-        <script defer src="/js/libs.js"></script>
-        <script defer src="/js/main.js"></script>
-
         <% if ( config.matomoUrl ) { %>
         <!-- Matomo -->
         <script>
@@ -38,7 +35,8 @@
         <% } %>
     </head>
     <body>
-        <nav class="navbar" aria-label="Navigation principale">
+        <nav class="navbar">
+            <nav class="navbar container" aria-label="Navigation principale">
                 <div class="navbar-brand">
                     <a class="navbar-item" href="/">
                         <img src="/img/logo.png" alt="Logo MusicTopus">
@@ -89,9 +87,19 @@
                                 <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>
                         <% } %>
@@ -103,24 +111,18 @@
                             </label>
                             </div>
                         </div>
+                        <% if ( !user ) { %>
                         <div class="navbar-item">
                             <div class="buttons">
-                            <button type="button" class="button is-primary" id="switchAriaTheme" aria-label="Renforcer la visibilité de ce site" title="Renforcer la visibilité de ce site">
-                                <i class="icon-eye"></i>
-                            </button>
-                            <% if ( !user ) { %>
                                 <a class="button is-primary" href="/connexion">
                                     <strong>Connexion</strong>
                                 </a>
-                            <% } else { %>
-                            <a class="button is-danger" href="/se-deconnecter">
-                                Déconnexion
-                            </a>
+                            </div>
+                        </div>
                         <% } %>
                     </div>
                 </div>
-                </div>
-            </div>
+            </nav>
         </nav>
 
         <div id="toastr">
@@ -177,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>.
@@ -185,5 +187,8 @@
                 Fait avec ❤️ à Bordeaux.
             </p>
         </footer>
+
+        <script defer src="/js/libs.js"></script>
+        <script defer src="/js/main.js"></script>
     </body>
 </html>

views/pages/ajouter-un-album.ejs

@@ -34,8 +34,9 @@
 
 
     <div class="grid grid-cols-1 md:grid-cols-2 list hover">
-        <div class="item" v-if="!loading" v-for="item in items">
+        <div v-if="!loading" v-for="item in items" class="item" :class="{'in-collection': item.inCollection}">
             <a @click="loadDetails(item.id)" class="title">{{ item.artists_sort }} {{ item.title }}</a>
+            <small v-if="item.inCollection"> (Dans ma collection)</small>
             <div class="grid grid-cols-2 md:grid-cols-4">
                 <div>
                     <img :src="item.thumb" :alt="item.title" @click="loadDetails(item.id)"/>
@@ -78,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}`" />
@@ -86,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">
-                            <li v-for="track in details.tracklist">
-                                {{ track.title }} ({{track.duration}})
+                        <ul class="is-unstyled">
+                            <li v-for="track in details.tracklist" :class="{'ml-4': track.type_ === 'track'}">
+                                <strong v-if="track.type_ === 'heading'">
+                                    {{track.title}}
+                                </strong>
+                                <template v-else>
+                                    {{ track.position }}
+                                    {{ 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="grid grid-cols-2 gap-10">
-                            <div>
+                    <div class="md:col-span-2">
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-10">
+                            <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>
+                        <div class="grid grid-cols-1 md:grid-cols-3 gap-10">
+                            <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}}
@@ -152,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>
-                                <ol>
+                                <strong>Code<template v-if="details?.identifiers?.length > 1">s</template> barre<template v-if="details?.identifiers?.length > 1">s</template></strong>
+                                <ol class="ml-4">
                                     <li v-for="identifier in details.identifiers">
                                         {{identifier.value}} ({{identifier.type}})
                                     </li>
                                 </ol>
                             </div>
                             <div>
-                                <strong>Label</strong>
-                                <ol>
+                                <strong>Label<template v-if="details?.labels?.length > 1">s</template></strong>
+                                <ol class="ml-4">
                                     <li v-for="label in details.labels">
                                         {{label.name}}
                                     </li>
                                 </ol>
-                                <strong>Société</strong>
-                                <ol>
-                                    <li v-for="company in details.companie">
+                                <strong>Société<template v-if="details?.companies?.length > 1">s</template></strong>
+                                <ol class="ml-4">
+                                    <li v-for="company in details.companies">
+                                        <strong>{{company.entity_type_name}}</strong>
                                         {{company.name}}
                                     </li>
                                 </ol>
@@ -180,9 +183,21 @@
                 </div>
             </section>
             <footer>
-                <button class="button is-primary" @click="add">Ajouter</button>
+                <% 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>
+
+<script>
+    const canPublish = <%- (user.mastodon && user.mastodon.publish) || false %>;
+</script>

views/pages/composants.ejs

@@ -497,9 +497,6 @@
             </div>
             <div class="navbar-item">
                 <div class="buttons">
-                    <button type="button" class="button is-primary" id="switchAriaTheme" aria-label="Renforcer la visibilité de ce site" title="Renforcer la visibilité de ce site">
-                        <i class="icon-eye"></i>
-                    </button>
                     <a class="button is-danger" href="/se-deconnecter">
                         Déconnexion
                     </a>

views/pages/mon-compte/index.ejs

@@ -3,9 +3,11 @@
         Mon compte
     </h1>
 
+    <form method="POST" @submit.prevent="updateProfil">
         <div class="grid grid-cols-1 md:grid-cols-2 gap-10">
-        <form method="POST" action="/mon-compte" @submit="updateProfil">
-
+            <div>
+                <h2>Mes données personnelles</h2>
+                <div>
                     <div class="field">
                         <label for="email">Adresse e-mail</label>
                         <input
@@ -14,7 +16,7 @@
                             disabled
                             name="email"
                             id="email"
-                    v-model="email"
+                            v-model="formData.email"
                         />
                     </div>
                     <div class="field">
@@ -25,7 +27,7 @@
                             disabled
                             name="username"
                             id="username"
-                    v-model="username"
+                            v-model="formData.username"
                         />
                     </div>
                     <div class="field">
@@ -34,21 +36,21 @@
                             type="password"
                             name="oldPassword"
                             id="oldPassword"
-                    required
                             placeholder="Saisisssez votre mot de passe actuel"
-                    v-model="oldPassword"
+                            v-model="formData.oldPassword"
                         />
+                        <div class="message error" v-if="errors.includes('emptyPassword')">
+                            Pour changer votre mot de passe vous devez saisir votre mot de passe actuel
+                        </div>
                     </div>
-            <div></div>
                     <div class="field">
                         <label for="password">Nouveau mot de passe</label>
                         <input
                             type="password"
                             name="password"
                             id="password"
-                    required
                             placeholder="Saisisssez votre nouveau mot de passe"
-                    v-model="password"
+                            v-model="formData.password"
                         />
                     </div>
                     <div class="field">
@@ -57,21 +59,85 @@
                             type="password"
                             name="passwordConfirm"
                             id="passwordConfirm"
-                    required
                             placeholder="Confirmez votre nouveau mot de passe"
-                    v-model="passwordConfirm"
+                            v-model="formData.passwordConfirm"
                         />
+                        <div class="message error" v-if="errors.includes('passwordsDiffer')">
+                            La confirmation ne correspond pas avec votre nouveau mot de passe
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <h2>Mon activité</h2>
+                <div>
+                    <div class="field">
+                        <label for="mastodon.publish">Publier sur le fédiverse lorsque j'ajoute un album</label>
+                        <select id="format" v-model="formData.mastodon.publish">
+                            <option value="true">Oui</option>
+                            <option value="false">Non</option>
+                        </select>
+                        <!-- <input
+                            type="checkbox"
+                            name="mastodon.publish"
+                            id="mastodon.publish"
+                            v-model="mastodon.publish"
+                        /> -->
+                    </div>
+                    <div class="field">
+                        <label for="mastodon.url">Url de l'API de votre instance</label>
+                        <input
+                            type="text"
+                            name="mastodon.url"
+                            id="mastodon.url"
+                            v-model="formData.mastodon.url"
+                            placeholder="https://mastodon.social/api/v1/"
+                        />
+                    </div>
+                    <div class="field">
+                        <label for="mastodon.token">Jeton d'accès (droits nécessaires : write:media et write:statuses)</label>
+                        <input
+                            type="text"
+                            name="mastodon.token"
+                            id="mastodon.token"
+                            v-model="formData.mastodon.token"
+                        />
+                    </div>
+                    <div class="field">
+                        <label for="mastodon.message">Message</label>
+                        <textarea
+                            name="mastodon.message"
+                            id="mastodon.message"
+                            v-model="formData.mastodon.message"
+                        ></textarea>
+                        <small>
+                            Variables possibles :
+                            <ul>
+                                <li>{artist}, exemple : Iron Maiden</li>
+                                <li>{album}, exemple : Powerslave</li>
+                                <li>{format}, exemple : Cassette</li>
+                                <li>{year}, exemple: 1984</li>
+                                <li>{video}, exemple : https://www.youtube.com/watch?v=Qx0s8OqgBIw</li>
+                            </ul>
+                        </small>
+                    </div>
+                    <button type="button" class="button is-secondary mt-10" :disabled="loading" @click="testMastodon">
+                        <span>Tester</span>
+                    </button>
+                </div>
             </div>
 
             <button type="submit" class="button is-primary mt-10" :disabled="loading">
                 <span v-if="!loading">Mettre à jour</span>
                 <i class="icon-spin animate-spin" v-if="loading"></i>
             </button>
-        </form>
+
         </div>
+    </form>
 </main>
 
 <script>
     const email = '<%= user.email %>';
     const username = '<%= user.username %>';
-  </script>
+    const mastodon = <%- JSON.stringify(user.mastodon || {publish: false, url: '', token: '', message: ''}) %>;
+</script>

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

@@ -8,6 +8,7 @@
         - {{item.title}}
         <i class="icon-trash" title="Supprimer cette fiche" @click="showConfirmDelete()"></i>
         <i class="icon-refresh" title="Mettre à jour les données de cette fiche" @click="updateItem()"></i>
+        <i class="icon-share" title="Partager cet album sur le fédiverse" @click="showModalShare = true" v-if="canShareItem"></i>
     </h1>
     <div class="grid sm:grid-cols-3 gap-16">
         <div class="text-center">
@@ -20,152 +21,22 @@
         </div>
     </div>
     <hr />
-    <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</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>
+    <%- include('../../../components/album.ejs') %>
 
     <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">
+            <button type="button" aria-label="Image précédente" class="navigation previous" @click="previous">
                 <i class="icon-left-open"></i>
             </button>
-        <button type="button" aria-label="Image suivante" class="navigation next" @click="next" v-if="index + 1 < item.images.length">
+            <div class="text-center">
+                <img :src="preview" />
+            </div>
+            <button type="button" aria-label="Image suivante" class="navigation next" @click="next">
                 <i class="icon-right-open"></i>
             </button>
-        <div class="modal-card">
-            <img :src="preview" />
+
         </div>
     </div>
 
@@ -182,8 +53,46 @@
             </footer>
         </div>
     </div>
+
+    <div class="modal" :class="{'is-visible': showModalShare}">
+        <div class="modal-background"></div>
+        <div class="modal-card">
+            <header>Partager un album sur le fédiverse</header>
+            <section>
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-10">
+                    <div class="field">
+                        <label for="shareMessage">Message</label>
+                        <textarea
+                            name="shareMessage"
+                            id="shareMessage"
+                            v-model="shareMessage"
+                            rows="6"
+                        ></textarea>
+                        Caractères utilisés : {{ shareMessageLength }}
+                    </div>
+                    <div>
+                        <small>
+                            Variables possibles :
+                            <ul>
+                                <li>{artist}, exemple : Iron Maiden</li>
+                                <li>{album}, exemple : Powerslave</li>
+                                <li>{format}, exemple : Cassette</li>
+                                <li>{year}, exemple: 1984</li>
+                                <li>{video}, exemple : https://www.youtube.com/watch?v=Qx0s8OqgBIw</li>
+                            </ul>
+                        </small>
+                    </div>
+                </div>
+            </section>
+            <footer>
+                <button :class="['button is-primary', shareSubmiting ? 'is-disabled' : '']" @click="shareAlbum">Partager</button>
+                <button class="button" @click="showModalShare=!showModalShare">Annuler</button>
+            </footer>
+        </div>
+    </div>
 </main>
 
 <script>
     const item = <%- JSON.stringify(page.item) %>;
+    const canShareItem = <%= user.mastodon?.publish || false %>;
 </script>

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>