From 2dd631ad9192bf09ca6e4be17d1b61a8021e5b8f Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 22 Feb 2022 14:47:06 +0100 Subject: [PATCH 001/136] #issue/17 --- docker-compose.yml.dev | 4 ++++ docker-compose.yml.prod | 4 ++++ sass/error.scss | 10 ++++++++++ sass/forms.scss | 1 + sass/index.scss | 4 +++- sass/nous-contacter.scss | 15 +++++++++++++++ src/config/index.js | 3 +++ src/routes/index.js | 12 ++++++++++++ views/error.ejs | 22 +++++++++++----------- views/index.ejs | 3 +++ views/pages/nous-contacter.ejs | 22 ++++++++++++++++++++++ 11 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 sass/error.scss create mode 100644 sass/nous-contacter.scss create mode 100644 views/pages/nous-contacter.ejs diff --git a/docker-compose.yml.dev b/docker-compose.yml.dev index 6c18da7..c58795e 100644 --- a/docker-compose.yml.dev +++ b/docker-compose.yml.dev @@ -20,7 +20,11 @@ services: - mymusiclibrary-db environment: NODE_ENV: ${NODE_ENV} + PORT: ${PORT} + MONGODB_URI: ${MONGODB_URI} + SECRET: ${SECRET} DISCOGS_TOKEN: ${DISCOGS_TOKEN} + FORMSPREE_ID: ${FORMSPREE_ID} networks: - mymusiclibrary mymusiclibrary-db: diff --git a/docker-compose.yml.prod b/docker-compose.yml.prod index 6e79d23..f5041f7 100644 --- a/docker-compose.yml.prod +++ b/docker-compose.yml.prod @@ -20,7 +20,11 @@ services: - mymusiclibrary-db environment: NODE_ENV: ${NODE_ENV} + PORT: ${PORT} + MONGODB_URI: ${MONGODB_URI} + SECRET: ${SECRET} DISCOGS_TOKEN: ${DISCOGS_TOKEN} + FORMSPREE_ID: ${FORMSPREE_ID} networks: - mymusiclibrary mymusiclibrary-db: diff --git a/sass/error.scss b/sass/error.scss new file mode 100644 index 0000000..325f38b --- /dev/null +++ b/sass/error.scss @@ -0,0 +1,10 @@ +.error { + min-height: calc(100vh - 3.25rem - 100px); + padding-top: 4rem; + + pre { + padding: 0.75rem; + border: 1px dotted #cecccc; + background: #f9f9f9; + } +} \ No newline at end of file diff --git a/sass/forms.scss b/sass/forms.scss index 69e8bbc..d6b036d 100644 --- a/sass/forms.scss +++ b/sass/forms.scss @@ -24,6 +24,7 @@ font-weight: 800; } input, + textarea, select { border-radius: 0.375rem; box-shadow: inset 0 .0625em .125em rgba(10,10,10,.05); diff --git a/sass/index.scss b/sass/index.scss index 1a2463d..ffcb442 100644 --- a/sass/index.scss +++ b/sass/index.scss @@ -36,7 +36,9 @@ @import './pagination'; @import './icons'; +@import './error'; @import './home'; @import './connexion'; @import './ajouter-un-album'; -@import './ma-collection'; \ No newline at end of file +@import './ma-collection'; +@import './nous-contacter'; \ No newline at end of file diff --git a/sass/nous-contacter.scss b/sass/nous-contacter.scss new file mode 100644 index 0000000..1021eb0 --- /dev/null +++ b/sass/nous-contacter.scss @@ -0,0 +1,15 @@ +.nous-contacter { + width: calc(100% - 2rem); + margin: 2rem auto; + + @include respond-to("small-up") { + width: 55%; + } + @include respond-to("medium-up") { + width: 35%; + } + + button { + margin-top: 2rem; + } +} \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js index c241bcc..5de24b6 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,3 +1,5 @@ +console.log("formspreeId: process.env.FORMSPREE_ID:", process.env.FORMSPREE_ID); + module.exports = { nodeEnv: process.env.NODE_ENV || "development", port: parseInt(process.env.PORT || "3001", 10), @@ -5,4 +7,5 @@ module.exports = { process.env.MONGODB_URI || "mongodb://mymusiclibrary-db/mymusiclibrary", secret: process.env.SECRET || "waemaeMe5ahc6ce1chaeKohKa6Io8Eik", discogsToken: process.env.DISCOGS_TOKEN, + formspreeId: process.env.FORMSPREE_ID, }; diff --git a/src/routes/index.js b/src/routes/index.js index ed2c1f1..fc68872 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -107,6 +107,18 @@ router } }); +router.route("/nous-contacter").get(async (req, res, next) => { + try { + const page = new Albums(req, "nous-contacter"); + + await page.loadMyCollection(); + + render(res, page); + } catch (err) { + next(err); + } +}); + router.route("/se-deconnecter").get((req, res) => { req.logout(); req.session.destroy(() => { diff --git a/views/error.ejs b/views/error.ejs index ae8b58c..b0e5112 100644 --- a/views/error.ejs +++ b/views/error.ejs @@ -1,11 +1,11 @@ -
-
-

<%= page.title %>

- <% if ( errorCode && errorCode === 404 ) { %> - Erreur 404 - <% } %> - 
-            <%= page.error %>
-
-
-
\ No newline at end of file +
+

<%= page.title %>

+ <% if ( errorCode && errorCode === 404 ) { %> +

+ Erreur 404 +

+ <% } %> +
+ 
<%= page.error %>
+
+
\ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs index fb060fa..3a526bc 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -86,6 +86,9 @@ <% } %>
+ + Nous contacter + <% if ( user ) { %>
diff --git a/views/pages/nous-contacter.ejs b/views/pages/nous-contacter.ejs new file mode 100644 index 0000000..fed1985 --- /dev/null +++ b/views/pages/nous-contacter.ejs @@ -0,0 +1,22 @@ +
+

Nous contacter

+
+
+
+ + +
+
+ + +
+
+ +
+ + +
+ + +
+
\ No newline at end of file -- 2.39.5 From 60f96d75efa1e9dc10d78b9d69d9667028901b00 Mon Sep 17 00:00:00 2001 From: Damien Broqua Date: Tue, 22 Feb 2022 14:50:07 +0100 Subject: [PATCH 002/136] #issue/17 (#18) #issue-17 Co-authored-by: dbroqua Reviewed-on: https://git.darkou.fr/dbroqua/MyMusicLibrary/pulls/18 Co-authored-by: Damien Broqua Co-committed-by: Damien Broqua --- docker-compose.yml.dev | 4 ++++ docker-compose.yml.prod | 4 ++++ sass/error.scss | 10 ++++++++++ sass/forms.scss | 1 + sass/index.scss | 4 +++- sass/nous-contacter.scss | 15 +++++++++++++++ src/config/index.js | 3 +++ src/routes/index.js | 12 ++++++++++++ views/error.ejs | 22 +++++++++++----------- views/index.ejs | 3 +++ views/pages/nous-contacter.ejs | 22 ++++++++++++++++++++++ 11 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 sass/error.scss create mode 100644 sass/nous-contacter.scss create mode 100644 views/pages/nous-contacter.ejs diff --git a/docker-compose.yml.dev b/docker-compose.yml.dev index 6c18da7..c58795e 100644 --- a/docker-compose.yml.dev +++ b/docker-compose.yml.dev @@ -20,7 +20,11 @@ services: - mymusiclibrary-db environment: NODE_ENV: ${NODE_ENV} + PORT: ${PORT} + MONGODB_URI: ${MONGODB_URI} + SECRET: ${SECRET} DISCOGS_TOKEN: ${DISCOGS_TOKEN} + FORMSPREE_ID: ${FORMSPREE_ID} networks: - mymusiclibrary mymusiclibrary-db: diff --git a/docker-compose.yml.prod b/docker-compose.yml.prod index 6e79d23..f5041f7 100644 --- a/docker-compose.yml.prod +++ b/docker-compose.yml.prod @@ -20,7 +20,11 @@ services: - mymusiclibrary-db environment: NODE_ENV: ${NODE_ENV} + PORT: ${PORT} + MONGODB_URI: ${MONGODB_URI} + SECRET: ${SECRET} DISCOGS_TOKEN: ${DISCOGS_TOKEN} + FORMSPREE_ID: ${FORMSPREE_ID} networks: - mymusiclibrary mymusiclibrary-db: diff --git a/sass/error.scss b/sass/error.scss new file mode 100644 index 0000000..325f38b --- /dev/null +++ b/sass/error.scss @@ -0,0 +1,10 @@ +.error { + min-height: calc(100vh - 3.25rem - 100px); + padding-top: 4rem; + + pre { + padding: 0.75rem; + border: 1px dotted #cecccc; + background: #f9f9f9; + } +} \ No newline at end of file diff --git a/sass/forms.scss b/sass/forms.scss index 69e8bbc..d6b036d 100644 --- a/sass/forms.scss +++ b/sass/forms.scss @@ -24,6 +24,7 @@ font-weight: 800; } input, + textarea, select { border-radius: 0.375rem; box-shadow: inset 0 .0625em .125em rgba(10,10,10,.05); diff --git a/sass/index.scss b/sass/index.scss index 1a2463d..ffcb442 100644 --- a/sass/index.scss +++ b/sass/index.scss @@ -36,7 +36,9 @@ @import './pagination'; @import './icons'; +@import './error'; @import './home'; @import './connexion'; @import './ajouter-un-album'; -@import './ma-collection'; \ No newline at end of file +@import './ma-collection'; +@import './nous-contacter'; \ No newline at end of file diff --git a/sass/nous-contacter.scss b/sass/nous-contacter.scss new file mode 100644 index 0000000..1021eb0 --- /dev/null +++ b/sass/nous-contacter.scss @@ -0,0 +1,15 @@ +.nous-contacter { + width: calc(100% - 2rem); + margin: 2rem auto; + + @include respond-to("small-up") { + width: 55%; + } + @include respond-to("medium-up") { + width: 35%; + } + + button { + margin-top: 2rem; + } +} \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js index c241bcc..5de24b6 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,3 +1,5 @@ +console.log("formspreeId: process.env.FORMSPREE_ID:", process.env.FORMSPREE_ID); + module.exports = { nodeEnv: process.env.NODE_ENV || "development", port: parseInt(process.env.PORT || "3001", 10), @@ -5,4 +7,5 @@ module.exports = { process.env.MONGODB_URI || "mongodb://mymusiclibrary-db/mymusiclibrary", secret: process.env.SECRET || "waemaeMe5ahc6ce1chaeKohKa6Io8Eik", discogsToken: process.env.DISCOGS_TOKEN, + formspreeId: process.env.FORMSPREE_ID, }; diff --git a/src/routes/index.js b/src/routes/index.js index ed2c1f1..fc68872 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -107,6 +107,18 @@ router } }); +router.route("/nous-contacter").get(async (req, res, next) => { + try { + const page = new Albums(req, "nous-contacter"); + + await page.loadMyCollection(); + + render(res, page); + } catch (err) { + next(err); + } +}); + router.route("/se-deconnecter").get((req, res) => { req.logout(); req.session.destroy(() => { diff --git a/views/error.ejs b/views/error.ejs index ae8b58c..b0e5112 100644 --- a/views/error.ejs +++ b/views/error.ejs @@ -1,11 +1,11 @@ -
-
-

<%= page.title %>

- <% if ( errorCode && errorCode === 404 ) { %> - Erreur 404 - <% } %> - 
-            <%= page.error %>
-
-
-
\ No newline at end of file +
+

<%= page.title %>

+ <% if ( errorCode && errorCode === 404 ) { %> +

+ Erreur 404 +

+ <% } %> +
+ 
<%= page.error %>
+
+
\ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs index fb060fa..3a526bc 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -86,6 +86,9 @@ <% } %>
+ + Nous contacter + <% if ( user ) { %>
diff --git a/views/pages/nous-contacter.ejs b/views/pages/nous-contacter.ejs new file mode 100644 index 0000000..fed1985 --- /dev/null +++ b/views/pages/nous-contacter.ejs @@ -0,0 +1,22 @@ +
+

Nous contacter

+
+
+
+ + +
+
+ + +
+
+ +
+ + +
+ + +
+
\ No newline at end of file -- 2.39.5 From e2f4ddeb5a30edbd2e33cabfb41ab355957eb93b Mon Sep 17 00:00:00 2001 From: dbroqua Date: Tue, 22 Feb 2022 14:56:11 +0100 Subject: [PATCH 003/136] Removed useless console.log() --- src/config/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/config/index.js b/src/config/index.js index 5de24b6..311b826 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,5 +1,3 @@ -console.log("formspreeId: process.env.FORMSPREE_ID:", process.env.FORMSPREE_ID); - module.exports = { nodeEnv: process.env.NODE_ENV || "development", port: parseInt(process.env.PORT || "3001", 10), -- 2.39.5 From c6686f6e356b5a64b8a8c961271b7c8f5646a646 Mon Sep 17 00:00:00 2001 From: Damien Broqua Date: Wed, 23 Feb 2022 07:51:17 +0100 Subject: [PATCH 004/136] Ajout de formspree --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a01ba34..ace3c9d 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ Vous pouvez, si vous le souhaitez héberger l'application sur votre propre serve ### Prérequis -Il existe 2 méthodes d'installation, soit via docker soit en mode standalone. +Il existe 2 méthodes d'installation, soit via docker soit en mode standalone. Peu importe la méthode il vous faudra un compte sur [https://formspree.io/](https://formspree.io/) afin d'avoir une page nous-contacter fonctionnelle. -Pour la méthode docker il vous faut simplement Docker sur votre serveur. +Pour la méthode docker il ne vous faudra rien de plus que `docker` et `docker-compose`. En mode standalone il vous faudra : @@ -177,6 +177,7 @@ PORT # Port sur lequel éxécuter le serveur (par défaut 3001) MONGODB_URI # Url du serveur mongo (par défaut mongodb://mymusiclibrary-db/mymusiclibrary) SECRET # Hash utilisé pour pour sauvegardé les dessions (par défaut waemaeMe5ahc6ce1chaeKohKa6Io8Eik) DISCOGS_TOKEN # Token Discogs (vous devez créer un compte sur discogs afin d'en obtenir un gratuitement) +FORMSPREE_ID # Id du formulaire formspree pour la page "nous-contacter" ``` ## Contributeurs -- 2.39.5 From c02d5e9ebd526827e8bfe060989aa32ce4bdf65f Mon Sep 17 00:00:00 2001 From: dbroqua Date: Wed, 23 Feb 2022 08:41:30 +0100 Subject: [PATCH 005/136] Some fixes on css --- package.json | 2 +- sass/ajouter-un-album.scss | 33 ------------ sass/global.scss | 15 ++---- sass/home.scss | 1 - sass/icons.scss | 60 +++++++++++++++++++-- sass/index.scss | 1 + sass/list.scss | 42 +++++++++++++++ sass/ma-collection.scss | 20 +------ views/index.ejs | 12 ++--- views/pages/ajouter-un-album.ejs | 11 ++-- views/pages/home.ejs | 8 +-- views/pages/mon-compte/ma-collection.ejs | 67 ++++++++++++------------ 12 files changed, 152 insertions(+), 120 deletions(-) create mode 100644 sass/list.scss diff --git a/package.json b/package.json index f248398..7c38831 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "start": "node ./dist/bin/www", "run:all": "npm-run-all build sass start", "watch": "nodemon -e js,scss", - "sass": "npx sass sass/index.scss public/css/main.css -s compressed", + "sass": "npx sass sass/index.scss public/css/main.css -s compressed --color", "prebuild": "rimraf dist", "build": "babel ./src --out-dir dist --copy-files", "test": "jest", diff --git a/sass/ajouter-un-album.scss b/sass/ajouter-un-album.scss index d0a173e..d822e30 100644 --- a/sass/ajouter-un-album.scss +++ b/sass/ajouter-un-album.scss @@ -8,40 +8,7 @@ margin-top: 2rem; .item{ - padding: 0.5rem 0.75rem; - border-bottom: 1px solid #dbdbdb; - - @include respond-to("large") { - &:nth-child(2n) { - background-color: #fafafa; - } - } - @include respond-to("large-up") { - border-left: 1px solid #dbdbdb; - - &:first-child, - &:nth-child(2) { - border-top: 1px solid #dbdbdb; - } - - &:nth-child(2n), - &:last-child { - border-right: 1px solid #dbdbdb; - margin-right: -1px; - } - } - - .title { - font-weight: 800; - font-size: 1.4rem; - } - - .grid { - margin-top: 0.75rem; - } - img { - border: 2px solid #4a4a4a; cursor: pointer; } } diff --git a/sass/global.scss b/sass/global.scss index 8409e52..5130647 100644 --- a/sass/global.scss +++ b/sass/global.scss @@ -13,17 +13,6 @@ font-style: normal; } -@font-face { - font-family: 'icon'; - src: url('/font/icon.eot?52730206'); - src: url('/font/icon.eot?52730206#iefix') format('embedded-opentype'), - url('/font/icon.woff?52730206') format('woff'), - url('/font/icon.ttf?52730206') format('truetype'), - url('/font/icon.svg?52730206#icon') format('svg'); - font-weight: normal; - font-style: normal; - } - html { min-height: 100vh; @@ -45,6 +34,10 @@ html { color: #485fc7; cursor: pointer; } + + h1 { + margin-top: 2rem; + } } } diff --git a/sass/home.scss b/sass/home.scss index b7b2534..d99023a 100644 --- a/sass/home.scss +++ b/sass/home.scss @@ -1,6 +1,5 @@ .home { .header { - margin-bottom: 3.25rem; @include respond-to("small-up") { height: 30vh; background-image: url('/header.jpg'); diff --git a/sass/icons.scss b/sass/icons.scss index 61568bc..ab3cd5f 100644 --- a/sass/icons.scss +++ b/sass/icons.scss @@ -1,6 +1,56 @@ -.icon { - font-family: "icon"; - font-style: normal; - font-weight: normal; - text-decoration: inherit; +@font-face { + font-family: 'icon'; + src: url('/font/icon.eot?80770511'); + src: url('/font/icon.eot?80770511#iefix') format('embedded-opentype'), + url('/font/icon.woff2?80770511') format('woff2'), + url('/font/icon.woff?80770511') format('woff'), + url('/font/icon.ttf?80770511') format('truetype'), + url('/font/icon.svg?80770511#icon') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="icon-"]:before, [class*=" icon-"]:before { + font-family: "icon"; + font-style: normal; + font-weight: normal; + + display: inline-block; + text-decoration: inherit; + width: 1em; + margin-right: .2em; + text-align: center; + + font-variant: normal; + text-transform: none; + + line-height: 1em; + + margin-left: .2em; + + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-plus:before { content: '\e800'; } /* '' */ +.icon-user:before { content: '\e801'; } /* '' */ +.icon-search:before { content: '\e802'; } /* '' */ +.icon-mail:before { content: '\e803'; } /* '' */ +.icon-link:before { content: '\e804'; } /* '' */ +.icon-spin:before { content: '\e839'; } /* '' */ +.icon-link-ext:before { content: '\f08e'; } /* '' */ +.icon-trash:before { content: '\f1f8'; } /* '' */ + +.animate-spin { + animation: spin 2s infinite linear; + display: inline-block; +} +@keyframes spin { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(359deg); + } } \ No newline at end of file diff --git a/sass/index.scss b/sass/index.scss index ffcb442..99a65af 100644 --- a/sass/index.scss +++ b/sass/index.scss @@ -35,6 +35,7 @@ @import './flash'; @import './pagination'; @import './icons'; +@import './list'; @import './error'; @import './home'; diff --git a/sass/list.scss b/sass/list.scss new file mode 100644 index 0000000..7301e7c --- /dev/null +++ b/sass/list.scss @@ -0,0 +1,42 @@ +.list { + margin-top: 2rem; + + .item{ + padding: 0.5rem 0.75rem; + border-bottom: 1px solid #dbdbdb; + + @include respond-to("medium") { + &:nth-child(2n) { + background-color: #fafafa; + } + } + @include respond-to("medium-up") { + border-left: 1px solid #dbdbdb; + + &:first-child, + &:nth-child(2) { + border-top: 1px solid #dbdbdb; + } + + &:nth-child(2n), + &:last-child { + border-right: 1px solid #dbdbdb; + margin-right: -1px; + } + } + + .title { + font-weight: 800; + font-size: 1.4rem; + } + + .grid { + margin-top: 0.75rem; + } + + img { + border: 2px solid #4a4a4a; + max-width: 90%; + } + } +} \ No newline at end of file diff --git a/sass/ma-collection.scss b/sass/ma-collection.scss index 85c0c0a..69eb680 100644 --- a/sass/ma-collection.scss +++ b/sass/ma-collection.scss @@ -24,18 +24,8 @@ } .list{ - padding: 0.5rem 0.75rem; - border-bottom: 1px solid #dbdbdb; - - &:nth-child(2n) { - background-color: #fafafa; - } - .title { - font-weight: 800; - font-size: 1.4rem; - - .icon { + .icon-trash { cursor: pointer; color: #f14668; @@ -44,14 +34,6 @@ } } } - - .grid { - margin-top: 0.75rem; - } - - img { - border: 2px solid #4a4a4a; - } } .total { diff --git a/views/index.ejs b/views/index.ejs index 3a526bc..8472832 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -73,9 +73,7 @@
- -  - + Ajouter un album @@ -92,9 +90,7 @@ <% if ( user ) { %>
- -  - + <%= user.username %> @@ -160,9 +156,9 @@ diff --git a/views/pages/ajouter-un-album.ejs b/views/pages/ajouter-un-album.ejs index 3051172..6ae0700 100644 --- a/views/pages/ajouter-un-album.ejs +++ b/views/pages/ajouter-un-album.ejs @@ -1,18 +1,19 @@ -
+
+

Ajouter un album

+
{{ item.artists_sort }} {{ item.title }} @@ -149,7 +150,7 @@
-
+ -