Merge pull request #22 from CodeWe-projet/Legal

[Legal] - Welcome, ToS and PP updates.

Author: BhasherBEL

Privacy Policy - CodeWe.docx

@@ -1,36 +1,70 @@
 section{
-    width: 50%;
-    min-width: 700px;
-    margin: auto;
-    color: rgb(193, 187, 177);
-    line-height: 1.7;
-    word-wrap: break-word;
-    text-align: justify;
-    font-family: helvetica neue,Helvetica,Arial,sans-serif;
-    font-size: 1.125rem;
-
-    h1{
-        font-size: 2.125rem;
-        margin-top: 25px;
-        line-height: 1.4;
-    }
-
-    p{
-        font-size: 1rem;
-        margin-bottom: 10px;
-    }
-
-    a{
-        color: inherit;
-        text-decoration: none;
-        transition: color ease-in-out 0.2s;
-    }
-
-    a:hover{
-        color: #ddd;
-    }
-
-    ul{
-        margin-left: 20px;
-    }
+  width: 50%;
+  min-width: 700px;
+  margin: auto;
+  color: rgb(193, 187, 177);
+  line-height: 1.7;
+  word-wrap: break-word;
+  text-align: justify;
+  font-family: helvetica neue, Helvetica, Arial, sans-serif;
+  font-size: 1.125rem;
+
+  h1{
+    font-size: 2.125rem;
+    margin-top: 25px;
+    line-height: 1.4;
+  }
+
+  p{
+    font-size: 1rem;
+    margin-bottom: 10px;
+  }
+
+  a{
+    color: inherit;
+    text-decoration: none;
+    transition: color ease-in-out 0.2s;
+  }
+
+  a:hover{
+    color: #ddd;
+  }
+
+  ul{
+    margin-left: 20px;
+  }
+}
+
+
+table {
+  width: 100%
+}
+
+td.align-right {
+  text-align: right;
+}
+
+#not-valid {
+  width: 100%;
+  background-color: red;
+  text-align: center;
+  font-size: 38px;
+  color: white;
+}
+#redirect {
+  width: 100%;
+  background-color: darkred;
+  text-align: center;
+  font-size: 18px;
+  color: white;
+}
+
+#redirect:hover {
+  background-color: maroon;
+  transition: 0.2s ease-in-out;
+}
+
+div.revision {
+  border: 1px darkcyan solid;
+  padding: 5px;
 }

Terms and Conditions - CodeWe.docx

@@ -5,10 +5,10 @@
  * @date 16/11/2020
  * @version 1.0.0
  * @requires express
- * 
+ *
  */
 
- /**
+/**
  * express module
  * @const
  */
@@ -29,7 +29,40 @@ const router = express.Router();
  * @inner
  */
 router.get(['/tos', '/tac', '/termsofservice', '/terms-of-service'], (req, res) => {
-    res.render('legal/tos.html', {production: config.PRODUCTION, client_versobe: config.CLIENT_VERBOSE});
+  res.render('legal/tos.html', {
+    production: config.PRODUCTION,
+    client_versobe: config.CLIENT_VERBOSE
+  });
+});
+
+/**
+ * Route serving termsofservice PDF
+ * @name get/termsofservice
+ * @function
+ * @memberof modules:routes/legal
+ * @inner
+ */
+router.get(['/tos-pdf', '/tac-pdf', '/termsofservice-pdf', '/terms-of-service-pdf'], (req, res) => {
+  res.download("./views/legal/tos-pdf.pdf")
+});
+
+/**
+ * Route serving termsofservice archive
+ * @name get/termsofservice
+ * @function
+ * @memberof modules:routes/legal
+ * @inner
+ */
+router.get([
+  '/tos/archive/:date',
+  '/tac/archive/:date',
+  '/termsofservice/archive/:date',
+  '/terms-of-service/archive/:date'
+], (req, res) => {
+  res.render(`legal/archive/tos-${req.params.date}.html`, {
+    production: config.PRODUCTION,
+    client_versobe: config.CLIENT_VERBOSE
+  });
 });
 
 /**
@@ -40,7 +73,35 @@ router.get(['/tos', '/tac', '/termsofservice', '/terms-of-service'], (req, res)
  * @inner
  */
 router.get(['/privacy', '/privacy-policy', '/privacypolicy'], (req, res) => {
-    res.render('legal/privacy.html', {production: config.PRODUCTION, client_versobe: config.CLIENT_VERBOSE});
+  res.render('legal/privacy.html', {
+    production: config.PRODUCTION,
+    client_versobe: config.CLIENT_VERBOSE
+  });
+});
+
+/**
+ * Route serving privacy policy PDF
+ * @name get/privacy
+ * @function
+ * @memberof modules:routes/legal
+ * @inner
+ */
+router.get(['/privacy-pdf', '/privacy-policy-pdf', '/privacypolicy-pdf'], (req, res) => {
+  res.download("./views/legal/privacy-pdf.pdf")
+});
+
+/**
+ * Route serving privacy policy archive
+ * @name get/privacy
+ * @function
+ * @memberof modules:routes/legal
+ * @inner
+ */
+router.get(['/privacy/archive/:date', '/privacy-policy/archive/:date', '/privacypolicy/archive/:date'], (req, res) => {
+  res.render(`legal/archive/privacy-${req.params.date}.html`, {
+    production: config.PRODUCTION,
+    client_versobe: config.CLIENT_VERBOSE
+  });
 });
 
 /**
@@ -50,8 +111,11 @@ router.get(['/privacy', '/privacy-policy', '/privacypolicy'], (req, res) => {
  * @memberof modules:routes/legal
  * @inner
  */
-router.get('/license', (req, res) => {
-    res.render('legal/licence.html', {production: config.PRODUCTION, client_versobe: config.CLIENT_VERBOSE});
+router.get('/licence', (req, res) => {
+  res.render('legal/licence.html', {
+    production: config.PRODUCTION,
+    client_versobe: config.CLIENT_VERBOSE
+  });
 });
 
-module.exports = router;
+module.exports = router;

src/publics/css/legal.less

@@ -8,7 +8,7 @@
         <a href="#">Support</a>
         <a href="#report" id="link-report" onclick="l()">Report&#8239issue</a>
     </div>
-    Copyright © 2020 Dewilde Alexandre, Dubois Brieuc and Fischer Nicolas
+    Copyright © 2020 Dewilde Alexandre, Dubois Brieuc and Technicguy Theo
 </div>
 <script type="application/javascript">
     const l=()=>{document.getElementById('report-issue').style.display="block";document.getElementById('main').classList.add("blur-background");};

src/routes/legal.js

@@ -2,21 +2,25 @@
     <div id="welcome-text">
         <h2>Welcome on CodeWe !</h2>
           <p class="welcome-content">
-            CodeWe is a free and <a href="https://github.com/allEyezOnCode/CodeWe">open source</a> project, and
-            we commit ourselves keeping it that way. That's why no advertising and no advertising cookies are present on the site.
+            CodeWe is a free and <a href="https://github.com/allEyezOnCode/CodeWe">open-source</a> project, and
+            we are committed to keeping it this way. There also are no advertisements or advertising cookies on the site.
+          </p>
+          <p class="welcome-content">
+            We are students of Louvain University, Belgium, who decided to create this project because we lacked such a tool in our classes.
+            As we maintain this project during our free time, we have limited resources and may not be able to keep this project always up-to-date, but do our best to keep a certain quality.
+            Should any problem arise, don't hesitate to report it and try again later.
+            To keep CodeWe alive, we kindly ask, for the good of all, to avoid unnecessarily overloading it. We, of course, encourage the use of CodeWe whenever it can help you in any way, but do not abuse it.
+          </p>
+          <p class="welcome-content">
+            By clicking Got it!, you agree to our <a href="/legal/tos">Terms</a>. You can learn how we (don't) collect, use and share your data in our <a href="/legal/privacy">Policy Privacy</a>. Keep in mind that we do not require any personal information!
           </p>
           <p class="welcome-content">
-            We are students of the UCLouvain University. We decided to create this project because we lacked such a tool during our classes.
-            We maintain this project during our free time and do our best to maintain a certain quality, but we have limited resources.
-            So, should any problem arise, don't hesitate to try again later and report it. Keeping this objective in mind, we kindly ask,
-            for the good of all, to avoid unnecessarily overloading this tool. Of course, we encourage the use of our platform if it can help
-            you in any way, but do not abuse it.
             <span class="bold">
-              Please note that a code not having been viewed for more than 48 hours will be automatically deleted.
+              Please be aware that documents not having been viewed for more than 48 hours will be deleted.
             </span>
           </p>
           <p class="welcome-content welcome-enjoy">
-            Enjoy our tools !
+            Enjoy CodeWe!
           </p>
         <button id="welcome-button">Got it!</button>
     </div>

src/views/component/footer.html

@@ -3,18 +3,14 @@
 {% block title %}CodeWe{% endblock %}
 
 {% block head %}
-<<<<<<< HEAD:src/views/legal/privacy.html
     <link rel="stylesheet" type="text/css" href="/css/legal.less">
-=======
-    <link rel="stylesheet" type="text/css"  href="/css/legal.less">
->>>>>>> Legal:src/views/legal/archive/privacy-20201117.html
 {% endblock %}
 
 {% block corps %}
 <section>
 <h1>Privacy Policy for CodeWe</h1>
 <p id="not-valid">THESE POLICIES ARE NO LONGER VALID!</p>
-<a href="/privacy"><p id="redirect">The current and valid version can be found here.</p></a>
+<a href="/legal/privacy"><p id="redirect">The current and valid version can be found here.</p></a>
 <p>At CodeWe, accessible from https://codewe.bhasher.com, one of our main priorities is the privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded by CodeWe and how we use it.</p>
 
 <p>If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact us.</p>

src/views/component/welcome.html

@@ -23,7 +23,7 @@ <h1>Privacy Policy</h1>
   </table>
 
   <p id="not-valid">THESE POLICIES ARE NO LONGER VALID!</p>
-  <a href="/privacy"><p id="redirect">The current and valid version can be found here.</p></a>
+  <a href="/legal/privacy"><p id="redirect">The current and valid version can be found here.</p></a>
 
   <p>
     <i>