From ee60b137d35d9816c18326ea6cee9dd0d263591a Mon Sep 17 00:00:00 2001
From: Clement G <clement@garrot.org>
Date: Tue, 21 Apr 2020 22:45:47 +0200
Subject: [PATCH 1/4] feat(static-pages) : add privacy policy and legal notices
 pages

---
 public/locale/i18n/fr/resource.json    |  4 +-
 src/Routes.jsx                         |  5 +-
 src/components/layouts/Footer.jsx      | 10 ++-
 src/components/views/LegalNotices.jsx  | 92 ++++++++++++++++++++++++++
 src/components/views/PrivacyPolicy.jsx | 78 ++++++++++++++++++++++
 5 files changed, 186 insertions(+), 3 deletions(-)
 create mode 100644 src/components/views/LegalNotices.jsx
 create mode 100644 src/components/views/PrivacyPolicy.jsx

diff --git a/public/locale/i18n/fr/resource.json b/public/locale/i18n/fr/resource.json
index ca527e0..f3e98e4 100644
--- a/public/locale/i18n/fr/resource.json
+++ b/public/locale/i18n/fr/resource.json
@@ -80,5 +80,7 @@
   "The parameters of the election are incorrect.": "Les paramètres de l'élection sont incorrects.",
   "Support us !": "Soutenez-nous !",
   "PayPal - The safer, easier way to pay online!": "PayPal -  Le moyen le plus sûr et le plus simple de payer en ligne !",
-  "Number of votes:": "Nombre de votes :"
+  "Number of votes:": "Nombre de votes :",
+  "Privacy policy": "Politique de confidentialité",
+  "Legal notices": "Mentions légales"
 }
diff --git a/src/Routes.jsx b/src/Routes.jsx
index 60ca18e..ae15b7d 100644
--- a/src/Routes.jsx
+++ b/src/Routes.jsx
@@ -9,7 +9,8 @@ import UnknownView from "./components/views/UnknownView";
 import UnknownElection from "./components/views/UnknownElection";
 import CreateSuccess from "./components/views/CreateSuccess";
 import VoteSuccess from "./components/views/VoteSuccess";
-
+import LegalNotices from "./components/views/LegalNotices";
+import PrivacyPolicy from "./components/views/PrivacyPolicy";
 
 function Routes() {
   return (
@@ -23,6 +24,8 @@ function Routes() {
         <Route path="/links/:slug" component={props => <CreateSuccess invitationOnly={false} {...props} />} />
         <Route path="/vote-success/:slug" component={VoteSuccess} />
         <Route path="/unknown-election/:slug" component={UnknownElection} />
+        <Route path="/legal-notices" component={LegalNotices} />
+        <Route path="/privacy-policy" component={PrivacyPolicy} />
         <Route component={UnknownView} />
       </Switch>
     </main>
diff --git a/src/components/layouts/Footer.jsx b/src/components/layouts/Footer.jsx
index 82098fb..42cae74 100644
--- a/src/components/layouts/Footer.jsx
+++ b/src/components/layouts/Footer.jsx
@@ -13,7 +13,7 @@ class Footer extends Component {
     const linkStyle = {whiteSpace: 'nowrap'};
     const {t} = this.props;
     return (
-      <footer className="text-center">
+      <footer className="text-center small">
         <Link to="/" style={linkStyle}>
           {t('Homepage')}
         </Link>
@@ -33,6 +33,14 @@ class Footer extends Component {
           style={linkStyle}>
           {t('Who are we?')}
         </a>
+          <span className="m-2">-</span>
+          <Link to="/legal-notices" style={linkStyle}>
+              {t('Legal notices')}
+          </Link>
+          <span className="m-2">-</span>
+          <Link to="/privacy-policy" style={linkStyle}>
+              {t('Privacy policy')}
+          </Link>
         <div className="mt-3">
           <Paypal btnColor="btn-primary" />
         </div>
diff --git a/src/components/views/LegalNotices.jsx b/src/components/views/LegalNotices.jsx
new file mode 100644
index 0000000..f77f881
--- /dev/null
+++ b/src/components/views/LegalNotices.jsx
@@ -0,0 +1,92 @@
+import React, { Component } from "react";
+import { Col, Container, Row } from "reactstrap";
+import logoLine from "../../logos/logo-line-white.svg";
+import { Link } from "react-router-dom";
+import { AppContext } from "../../AppContext";
+import { withTranslation } from "react-i18next";
+
+class LegalNotices extends Component {
+  static contextType = AppContext;
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    const { t } = this.props;
+    return (
+      <Container>
+        <Row>
+          <Link to="/" className="d-block ml-auto mr-auto mb-4">
+            <img src={logoLine} alt="logo" height="128" />
+          </Link>
+        </Row>
+        <Row className="mt-4">
+          <Col className="text-center">
+            <h1>{t("Legal notices")}</h1>
+          </Col>
+        </Row>
+        <Row className="mt-4">
+          <Col>
+            <h3 className="bold">Editeur du Site</h3>
+            <p>
+              Association MIEUX VOTER
+              <br />
+              59 Rue Saint-André des Arts, 75006 Paris
+            </p>
+            <p>
+              <a
+                href="https://mieuxvoter.fr/"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-white"
+              >
+                https://mieuxvoter.fr/
+              </a>
+            </p>
+            <h3 className="mt-2 bold">Hébergement</h3>
+            <p>
+              Association MIEUX VOTER
+              <br />
+              59 Rue Saint-André des Arts, 75006 Paris
+            </p>
+            <p>
+              <a
+                href="https://mieuxvoter.fr/"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-white"
+              >
+                https://mieuxvoter.fr/
+              </a>
+            </p>
+            <h3 className="mt-2 bold">Développement</h3>
+            <p>
+              Association MIEUX VOTER
+              <br />
+              59 Rue Saint-André des Arts, 75006 Paris
+            </p>
+            <p>
+              <a
+                href="https://mieuxvoter.fr/"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="text-white"
+              >
+                https://mieuxvoter.fr/
+              </a>
+            </p>
+          </Col>
+        </Row>
+        <Row className="mt-4">
+          <Col className="text-center">
+            <Link to="/" className="btn btn-secondary">
+              {t("Go back to homepage")}
+            </Link>
+          </Col>
+        </Row>
+      </Container>
+    );
+  }
+}
+export default withTranslation()(LegalNotices);
diff --git a/src/components/views/PrivacyPolicy.jsx b/src/components/views/PrivacyPolicy.jsx
new file mode 100644
index 0000000..bb4cc16
--- /dev/null
+++ b/src/components/views/PrivacyPolicy.jsx
@@ -0,0 +1,78 @@
+import React, { Component } from "react";
+import { Col, Container, Row } from "reactstrap";
+import logoLine from "../../logos/logo-line-white.svg";
+import { Link } from "react-router-dom";
+import { AppContext } from "../../AppContext";
+import { withTranslation } from "react-i18next";
+
+class PrivacyPolicy extends Component {
+  static contextType = AppContext;
+
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    const { t } = this.props;
+    return (
+      <Container>
+        <Row>
+          <Link to="/" className="d-block ml-auto mr-auto mb-4">
+            <img src={logoLine} alt="logo" height="128" />
+          </Link>
+        </Row>
+        <Row className="mt-4">
+          <Col className="text-center">
+            <h1>{t("Privacy policy")}</h1>
+          </Col>
+        </Row>
+        <Row className="mt-4">
+          <Col>
+            <p>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
+              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
+              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
+              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
+              risus commodo blandit.
+            </p>
+            <p>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
+              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
+              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
+              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
+              risus commodo blandit.
+            </p>
+            <p>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
+              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
+              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
+              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
+              risus commodo blandit.
+            </p>
+            <p>
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
+              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
+              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
+              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
+              risus commodo blandit.
+            </p>
+          </Col>
+        </Row>
+        <Row className="mt-4">
+          <Col className="text-center">
+            <Link to="/" className="btn btn-secondary">
+              {t("Go back to homepage")}
+            </Link>
+          </Col>
+        </Row>
+      </Container>
+    );
+  }
+}
+
+export default withTranslation()(PrivacyPolicy);

From 20b76cbfc8a1a2a1bba36a55f7002c77692ea3b1 Mon Sep 17 00:00:00 2001
From: Clement G <clement@garrot.org>
Date: Sat, 25 Apr 2020 14:22:37 +0200
Subject: [PATCH 2/4] fix(footer) : footer is too big on page with small
 content

---
 src/scss/_app.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scss/_app.scss b/src/scss/_app.scss
index ff7820a..f26bc48 100644
--- a/src/scss/_app.scss
+++ b/src/scss/_app.scss
@@ -47,7 +47,7 @@ main {
   background-attachment: fixed;
   background-repeat: no-repeat;
   background-color: $mv-blue-color;
-  min-height: calc(100% - 170px);
+  min-height: calc(100% - 128px);
   overflow: auto;
   padding-top: 72px;
   padding-bottom: 100px;

From 2e27e0723044e70266d6a4850843cfb809e055b8 Mon Sep 17 00:00:00 2001
From: Clement G <clement@garrot.org>
Date: Sat, 25 Apr 2020 14:23:16 +0200
Subject: [PATCH 3/4] fix(footer) : fix break-word problem on small devices

---
 src/components/layouts/Footer.jsx | 56 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/components/layouts/Footer.jsx b/src/components/layouts/Footer.jsx
index 82098fb..30dfee7 100644
--- a/src/components/layouts/Footer.jsx
+++ b/src/components/layouts/Footer.jsx
@@ -1,7 +1,7 @@
-import React, {Component} from 'react';
-import {withTranslation} from 'react-i18next';
-import {Link} from 'react-router-dom';
-import Paypal from '../banner/Paypal';
+import React, { Component } from "react";
+import { withTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import Paypal from "../banner/Paypal";
 
 class Footer extends Component {
   constructor(props) {
@@ -10,29 +10,33 @@ class Footer extends Component {
   }
 
   render() {
-    const linkStyle = {whiteSpace: 'nowrap'};
-    const {t} = this.props;
+    const linkStyle = { whiteSpace: "nowrap" };
+    const { t } = this.props;
     return (
-      <footer className="text-center">
-        <Link to="/" style={linkStyle}>
-          {t('Homepage')}
-        </Link>
-        <span className="m-2">-</span>
-        <a
-          href="https://github.com/MieuxVoter"
-          target="_blank"
-          rel="noopener noreferrer"
-          style={linkStyle}>
-          {t('Source code')}
-        </a>
-        <span className="m-2">-</span>
-        <a
-          href="https://mieuxvoter.fr/"
-          target="_blank"
-          rel="noopener noreferrer"
-          style={linkStyle}>
-          {t('Who are we?')}
-        </a>
+      <footer className="text-center" >
+        <div>
+          <Link to="/" style={linkStyle}>
+            {t("Homepage")}
+          </Link>
+            {" "}<span>-</span>{" "}
+          <a
+            href="https://github.com/MieuxVoter"
+            target="_blank"
+            rel="noopener noreferrer"
+            style={linkStyle}
+          >
+            {t("Source code")}
+          </a>
+            {" "}<span>-</span>{" "}
+          <a
+            href="https://mieuxvoter.fr/"
+            target="_blank"
+            rel="noopener noreferrer"
+            style={linkStyle}
+          >
+            {t("Who are we?")}
+          </a>
+        </div>
         <div className="mt-3">
           <Paypal btnColor="btn-primary" />
         </div>

From b659c82641a9d714ea174a8c8c1dff1549ceb4f0 Mon Sep 17 00:00:00 2001
From: guhur <12297742+guhur@users.noreply.github.com>
Date: Sat, 25 Apr 2020 17:58:04 +0200
Subject: [PATCH 4/4] Revert "feat(static-pages) : add privacy policy and legal
 notices pages"

---
 public/locale/i18n/fr/resource.json    |  4 +-
 src/Routes.jsx                         |  5 +-
 src/components/layouts/Footer.jsx      | 10 +--
 src/components/views/LegalNotices.jsx  | 92 --------------------------
 src/components/views/PrivacyPolicy.jsx | 78 ----------------------
 5 files changed, 3 insertions(+), 186 deletions(-)
 delete mode 100644 src/components/views/LegalNotices.jsx
 delete mode 100644 src/components/views/PrivacyPolicy.jsx

diff --git a/public/locale/i18n/fr/resource.json b/public/locale/i18n/fr/resource.json
index f3e98e4..ca527e0 100644
--- a/public/locale/i18n/fr/resource.json
+++ b/public/locale/i18n/fr/resource.json
@@ -80,7 +80,5 @@
   "The parameters of the election are incorrect.": "Les paramètres de l'élection sont incorrects.",
   "Support us !": "Soutenez-nous !",
   "PayPal - The safer, easier way to pay online!": "PayPal -  Le moyen le plus sûr et le plus simple de payer en ligne !",
-  "Number of votes:": "Nombre de votes :",
-  "Privacy policy": "Politique de confidentialité",
-  "Legal notices": "Mentions légales"
+  "Number of votes:": "Nombre de votes :"
 }
diff --git a/src/Routes.jsx b/src/Routes.jsx
index ae15b7d..60ca18e 100644
--- a/src/Routes.jsx
+++ b/src/Routes.jsx
@@ -9,8 +9,7 @@ import UnknownView from "./components/views/UnknownView";
 import UnknownElection from "./components/views/UnknownElection";
 import CreateSuccess from "./components/views/CreateSuccess";
 import VoteSuccess from "./components/views/VoteSuccess";
-import LegalNotices from "./components/views/LegalNotices";
-import PrivacyPolicy from "./components/views/PrivacyPolicy";
+
 
 function Routes() {
   return (
@@ -24,8 +23,6 @@ function Routes() {
         <Route path="/links/:slug" component={props => <CreateSuccess invitationOnly={false} {...props} />} />
         <Route path="/vote-success/:slug" component={VoteSuccess} />
         <Route path="/unknown-election/:slug" component={UnknownElection} />
-        <Route path="/legal-notices" component={LegalNotices} />
-        <Route path="/privacy-policy" component={PrivacyPolicy} />
         <Route component={UnknownView} />
       </Switch>
     </main>
diff --git a/src/components/layouts/Footer.jsx b/src/components/layouts/Footer.jsx
index 42cae74..82098fb 100644
--- a/src/components/layouts/Footer.jsx
+++ b/src/components/layouts/Footer.jsx
@@ -13,7 +13,7 @@ class Footer extends Component {
     const linkStyle = {whiteSpace: 'nowrap'};
     const {t} = this.props;
     return (
-      <footer className="text-center small">
+      <footer className="text-center">
         <Link to="/" style={linkStyle}>
           {t('Homepage')}
         </Link>
@@ -33,14 +33,6 @@ class Footer extends Component {
           style={linkStyle}>
           {t('Who are we?')}
         </a>
-          <span className="m-2">-</span>
-          <Link to="/legal-notices" style={linkStyle}>
-              {t('Legal notices')}
-          </Link>
-          <span className="m-2">-</span>
-          <Link to="/privacy-policy" style={linkStyle}>
-              {t('Privacy policy')}
-          </Link>
         <div className="mt-3">
           <Paypal btnColor="btn-primary" />
         </div>
diff --git a/src/components/views/LegalNotices.jsx b/src/components/views/LegalNotices.jsx
deleted file mode 100644
index f77f881..0000000
--- a/src/components/views/LegalNotices.jsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import React, { Component } from "react";
-import { Col, Container, Row } from "reactstrap";
-import logoLine from "../../logos/logo-line-white.svg";
-import { Link } from "react-router-dom";
-import { AppContext } from "../../AppContext";
-import { withTranslation } from "react-i18next";
-
-class LegalNotices extends Component {
-  static contextType = AppContext;
-  constructor(props) {
-    super(props);
-    this.state = {};
-  }
-
-  render() {
-    const { t } = this.props;
-    return (
-      <Container>
-        <Row>
-          <Link to="/" className="d-block ml-auto mr-auto mb-4">
-            <img src={logoLine} alt="logo" height="128" />
-          </Link>
-        </Row>
-        <Row className="mt-4">
-          <Col className="text-center">
-            <h1>{t("Legal notices")}</h1>
-          </Col>
-        </Row>
-        <Row className="mt-4">
-          <Col>
-            <h3 className="bold">Editeur du Site</h3>
-            <p>
-              Association MIEUX VOTER
-              <br />
-              59 Rue Saint-André des Arts, 75006 Paris
-            </p>
-            <p>
-              <a
-                href="https://mieuxvoter.fr/"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-white"
-              >
-                https://mieuxvoter.fr/
-              </a>
-            </p>
-            <h3 className="mt-2 bold">Hébergement</h3>
-            <p>
-              Association MIEUX VOTER
-              <br />
-              59 Rue Saint-André des Arts, 75006 Paris
-            </p>
-            <p>
-              <a
-                href="https://mieuxvoter.fr/"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-white"
-              >
-                https://mieuxvoter.fr/
-              </a>
-            </p>
-            <h3 className="mt-2 bold">Développement</h3>
-            <p>
-              Association MIEUX VOTER
-              <br />
-              59 Rue Saint-André des Arts, 75006 Paris
-            </p>
-            <p>
-              <a
-                href="https://mieuxvoter.fr/"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-white"
-              >
-                https://mieuxvoter.fr/
-              </a>
-            </p>
-          </Col>
-        </Row>
-        <Row className="mt-4">
-          <Col className="text-center">
-            <Link to="/" className="btn btn-secondary">
-              {t("Go back to homepage")}
-            </Link>
-          </Col>
-        </Row>
-      </Container>
-    );
-  }
-}
-export default withTranslation()(LegalNotices);
diff --git a/src/components/views/PrivacyPolicy.jsx b/src/components/views/PrivacyPolicy.jsx
deleted file mode 100644
index bb4cc16..0000000
--- a/src/components/views/PrivacyPolicy.jsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React, { Component } from "react";
-import { Col, Container, Row } from "reactstrap";
-import logoLine from "../../logos/logo-line-white.svg";
-import { Link } from "react-router-dom";
-import { AppContext } from "../../AppContext";
-import { withTranslation } from "react-i18next";
-
-class PrivacyPolicy extends Component {
-  static contextType = AppContext;
-
-  constructor(props) {
-    super(props);
-    this.state = {};
-  }
-
-  render() {
-    const { t } = this.props;
-    return (
-      <Container>
-        <Row>
-          <Link to="/" className="d-block ml-auto mr-auto mb-4">
-            <img src={logoLine} alt="logo" height="128" />
-          </Link>
-        </Row>
-        <Row className="mt-4">
-          <Col className="text-center">
-            <h1>{t("Privacy policy")}</h1>
-          </Col>
-        </Row>
-        <Row className="mt-4">
-          <Col>
-            <p>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
-              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
-              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
-              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
-              risus commodo blandit.
-            </p>
-            <p>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
-              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
-              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
-              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
-              risus commodo blandit.
-            </p>
-            <p>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
-              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
-              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
-              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
-              risus commodo blandit.
-            </p>
-            <p>
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-              Suspendisse tristique eros dictum, tempor libero quis, tincidunt
-              velit. Vestibulum non diam rutrum nisl consequat pulvinar.
-              Phasellus fermentum, massa at pulvinar eleifend, tellus nibh
-              dictum nulla, et gravida lectus lacus a mauris. Nunc a augue eget
-              risus commodo blandit.
-            </p>
-          </Col>
-        </Row>
-        <Row className="mt-4">
-          <Col className="text-center">
-            <Link to="/" className="btn btn-secondary">
-              {t("Go back to homepage")}
-            </Link>
-          </Col>
-        </Row>
-      </Container>
-    );
-  }
-}
-
-export default withTranslation()(PrivacyPolicy);