Dev

LICENCE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Dewilde Alexandre, Dubois Brieuc and Fischer Nicolas
+Copyright (c) 2020 Dewilde Alexandre, Dubois Brieuc and Technicguy Theo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -27,6 +27,7 @@
     "mongodb": "^3.6.3",
     "morgan": "^1.10.0",
     "mysql": "^2.18.1",
+    "nanoid": "^3.1.18",
     "nunjucks": "^3.2.2",
     "prom-client": "^12.0.0",
     "prometheus-api-metrics": "^3.1.0",

src/app.js

@@ -16,10 +16,22 @@ const index = require('./routes/index');
 const editor = require('./routes/editor');
 const legal = require('./routes/legal');
 const config = require('./config/config');
+const ssl = config.SSL;
 
 const app = express();
 app.disable("x-powered-by");
 
+if (ssl) {
+    app.use('*', function (req, res, next) {
+        if (req.secure) {
+            next();
+        } else {
+            const target = (req.headers.host.includes(':') ? req.headers.host.split(':')[0] : req.headers.host) + ':' + config.PORT;
+            res.redirect('https://' + target + req.url);
+        }
+    });
+}
+
 // Configure views folder
 nunjucks.configure(path.join(__dirname, 'views'), {
     autoescape: true,
@@ -51,13 +63,6 @@ app.use('/', index);
 app.use('/editor', editor);
 app.use('/legal', legal);
 
-// redirect to https when ssl is active
-if (config.SSL) {
-    app.get('*', function(req, res) {  
-        res.redirect('https://' + req.headers.host + req.url);
-    });
-}
-
 // 404 error
 app.all('*', (req, res) => {
     res.status(404).render('404.html', {production: config.PRODUCTION, client_versobe: config.CLIENT_VERBOSE});

src/config/config dist.json

@@ -10,6 +10,7 @@
     "SSL": false,
     "KEY_FILE_SSL": null,
     "CERT_FILE_SSL" : null,
+    "REDIRECT_PORT": null,
     "METRICS": false,
     "METRICS_PORT": 8000
 }

src/config/langages.js

@@ -0,0 +1,25 @@
+module.exports = [
+    "python",
+    "c",
+    "c++",
+    "c#",
+    "javascript",
+    "java",
+    "haskell",
+    "smalltalk",
+    "coffescript",
+    "css",
+    "d",
+    "go",
+    "haskell",
+    "html",
+    "json",
+    "lua",
+    "php",
+    "r",
+    "ruby",
+    "scheme",
+    "shell",
+    "sql",
+    'oz',
+];

src/db/MongoDB.js

@@ -1,7 +1,10 @@
 const { MongoClient, ObjectID } = require("mongodb");
 var crypto = require('crypto');
+const { nanoid } = require('nanoid');
+const languages = require('../config/langages');
 const configs = require('../config/config');
 const utils = require('../utils');
+const prom = require('../socket/prom')
 
 const baseCode = [
     {uuid: utils.uuid(Math.random().toString(), 10), content: 'def main(text: str) -> None:'},
@@ -11,7 +14,6 @@ const baseCode = [
     {uuid: utils.uuid(Math.random().toString(), 10), content: '    main(\'Hello World !\')'}
 ];
 
-
 class MongoDB {
     constructor (url) {
         this.client = new MongoClient(url, {
@@ -34,7 +36,7 @@ class MongoDB {
         }
     }
 
-    async createDocument (language) {
+    async createDocument (documentLanguage) {
         let doc = {
             content: baseCode,
             creationDate: Date.now(),
@@ -44,13 +46,13 @@ class MongoDB {
             editors: [],
             documentLink: '',
             linkView: '',
-            language: language,
+            language: documentLanguage,
             tab: 4
         };
         try {
             let results = (await this.documentsCollection.insertOne(doc));
             const documentLink = utils.uuid(results.insertedId.toString());
-            const linkView = utils.uuid(documentLink);
+            const linkView = nanoid(5);
             this.documentsCollection.updateOne({_id: results.insertedId}, {$set: {documentLink: documentLink, linkView: linkView}});
             return documentLink;
         } catch (err) {
@@ -117,7 +119,7 @@ class MongoDB {
             let index = doc.content.findIndex(line => {
                 return line.uuid == previousUuid;
             });
-            if (index) {
+            if (index || index === 0) {
                 this.documentsCollection.updateOne({documentLink: documentLink}, {
                     $push: {
                         content: {
@@ -172,7 +174,7 @@ class MongoDB {
     }
 
     async changeLanguage(documentLink, newLanguage) {
-        if (["python"].includes(newLanguage)) {
+        if (languages.includes(newLanguage)) {
             return this.changeParam(documentLink, 'language', newLanguage);
         }
     }
@@ -215,6 +217,7 @@ class MongoDB {
                     case 'new-line':
                         results = await this.newLine(documentLink, data.previous, data.id, data.content);
                         if (!results) success = false;
+                        prom.total_new_lines.inc();
                         break;
                     case 'delete-line':
                         results = await this.deleteLine(documentLink, data.id);

src/publics/css/base.less

@@ -2,7 +2,7 @@
 |      Generic      |
 \*******************/
 
-@background-color: #222;
+@background-color: #222222;
 @color: #fff;
 @font: sans-serif;
 @absolute-color: #d5e6ed;

src/publics/css/editor.less

@@ -1,3 +1,7 @@
+@background-color: #222222;
+@color: #fff;
+@header-height: 60px;
+
 /******************\
 |      Header      |
 \******************/
@@ -57,3 +61,70 @@ section#editor{
     background-color: red;
     border-radius: 10px;
 }
+
+/*******************\
+|  Navigation Bar   |
+\*******************/
+
+#customise{
+    position: fixed;
+    top: 1.1 * @header-height;
+    right: 0;
+    width: 20%;
+    height: 100%;
+    max-width: 300px;
+    min-width: 200px;
+    padding: 20px;
+    background-color: darken(@background-color, 2%);
+    border-left: 1px solid #111111;
+    z-index: 5;
+
+    ul{
+        list-style: none;
+
+        li{
+            padding-bottom: 20px;
+
+            h3{
+                padding: 5px 0;
+                color: darken(@color, 50%);
+                letter-spacing: 3px;
+                border-bottom: 1px solid lighten(@background-color, 10%);
+                display: inline;
+            }
+
+            > :not(h3){
+                padding: 7px;
+                margin-top: 20px;
+                border-radius: 10px;
+            }
+
+            select,
+            input{
+                color: @color;
+                background-color: lighten(@background-color, 5%);
+                border-color: @background-color;
+                width: 90%;
+            }
+
+            #qrcode{
+                background-color: white;
+                display: inline-block;
+
+                canvas{
+                    width: 128px;
+                    height: 128px;
+                    margin: 10px;
+                    background-color: white;
+                    image-rendering: optimizeSpeed;             /*                     */
+                    image-rendering: -moz-crisp-edges;          /* Firefox             */
+                    image-rendering: -o-crisp-edges;            /* Opera               */
+                    image-rendering: -webkit-optimize-contrast; /* Chrome (and Safari) */
+                    image-rendering: pixelated;                 /* Chrome as of 2019   */
+                    image-rendering: optimize-contrast;         /* CSS3 Proposed       */
+                    -ms-interpolation-mode: nearest-neighbor;   /* IE8+                */
+                }
+            }
+        }
+    }
+}

src/publics/css/legal.less

@@ -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;
 }