From 60f96d75efa1e9dc10d78b9d69d9667028901b00 Mon Sep 17 00:00:00 2001 From: Damien Broqua Date: Tue, 22 Feb 2022 14:50:07 +0100 Subject: [PATCH] #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