Sync profile and apps

.env

@@ -1,5 +1,6 @@
 EXTEND_ESLINT=true
 REACT_APP_SIGNALHUB_URLS='localhost:8080'
 REACT_APP_REMOTE_WEBRTC=false
+REACT_APP_VERSION=0.16
 # REACT_APP_STUN_URLS
 # REACT_APP_TURN_URLS

.eslintrc.js

@@ -7,7 +7,8 @@ module.exports = {
   overrides: [{
     files: '*.test.js',
     rules: {
-      'no-unused-expressions': 'off'
+      'no-unused-expressions': 'off',
+      'import/first': 'off'
     }
   }],
   settings: {

karma.conf.js

@@ -1,3 +1,5 @@
+const webpack = require('webpack')
+
 process.env.CHROME_BIN = require('puppeteer').executablePath()
 
 module.exports = function (config) {
@@ -13,13 +15,18 @@ module.exports = function (config) {
     singleRun: true,
     concurrency: Infinity,
     preprocessors: {
-      'test/**/*.js': [ 'webpack', 'sourcemap' ]
+      'test/**/*.js': ['webpack', 'sourcemap']
     },
     webpack: {
       mode: 'development',
       node: {
         fs: 'empty'
-      }
+      },
+      plugins: [
+        new webpack.EnvironmentPlugin({
+          NODE_ENV: 'test'
+        })
+      ]
     },
     webpackMiddleware: {
       stats: 'errors-only',

package.json

@@ -40,14 +40,15 @@
     "react-dom": "^16.6.0",
     "react-feather": "^1.1.6",
     "react-i18next": "^10.9.0",
+    "react-qr-reader": "^2.2.1",
     "react-redux": "^6.0.0",
-    "react-responsive": "^6.1.1",
-    "react-router": "^4.3.1",
-    "react-router-dom": "^4.3.1",
+    "react-responsive": "^8.0.1",
+    "react-router": "^5.0.1",
+    "react-router-dom": "^5.0.1",
     "react-scripts": "^3.1.1",
     "redux": "^4.0.1",
     "redux-thunk": "^2.3.0",
-    "signalhubws": "git+https://github.com/QwantResearch/signalhubws#masq",
+    "signalhubws": "1.0.12",
     "typeface-asap": "0.0.35",
     "typeface-asap-condensed": "0.0.35",
     "uuid": "^3.3.2",

public/locales/en.json

@@ -9,7 +9,6 @@
   "My applications": "My applications",
   "You do not have a registered application yet": "You do not have a registered application yet",
   "My devices": "My devices",
-  "Add a new devce (coming soon)": "Add a new devce (coming soon)",
   "Create a new profile": "Create a new profile",
   "Respects your privacy": "Respects your privacy",
   "Masq allows you to store all your preferences while guaranteeing your privacy": "Masq allows you to store all your preferences while guaranteeing your privacy",
@@ -102,7 +101,6 @@
   "Copy the following link and paste it in the browser you want to use:": "Copy the following link and paste it in the browser you want to use:",
   "Link Copied !": "Link Copied !",
   "Connection failure, please retry.": "Connection failure, please retry.",
-  "on": "on",
   "This device": "This device",
   "You have refused the access of the application": "You have refused the access of the application",
   "to your Masq storage.": "to your Masq storage.",
@@ -119,5 +117,38 @@
   "Synchronization finished!": "Synchronization finished!",
   "Synchronization failure": "Synchronization failure",
   "You can choose from": "You can choose from",
-  "1 special character ": "1 special character "
+  "1 special character ": "1 special character ",
+  "Add a new device": "Add a new device",
+  "This profile is already synchronized on this device.": "This profile is already synchronized on this device.",
+  "Add a new profile": "Add a new profile",
+  "Sync an existing profile": "Sync an existing profile",
+  "Copy the link displayed on your initial device, then paste it in the field \"link to existing profile\" on this device.": "Copy the link displayed on your initial device, then paste it in the field \"link to existing profile\" on this device.",
+  "Link to existing profile": "Link to existing profile",
+  "Synchronize": "Synchronize",
+  "Already got a profile ? SYNCHRONIZE IT": "Already got a profile ? SYNCHRONIZE IT",
+  "Okay, I get it!": "Okay, I get it!",
+  "How to find the profile link?": "How to find the profile link?",
+  "Log in to Masq from the device on which you already have a profile": "Log in to Masq from the device on which you already have a profile",
+  "In the \"Devices\" section, click the \"Add a device\" button": "In the \"Devices\" section, click the \"Add a device\" button",
+  "Copy the link displayed on your original device, then paste it in the \"existing profile link\" field on this device.": "Copy the link displayed on your original device, then paste it in the \"existing profile link\" field on this device.",
+  "How to display the QR code of my profile?": "How to display the QR code of my profile?",
+  "Using the new device, scan the QR code displayed on the original device": "Using the new device, scan the QR code displayed on the original device",
+  "Synchronization method": "Synchronization method",
+  "Scan the QR code": "Scan the QR code",
+  "How to display the QR code?": "How to display the QR code?",
+  "Copy the link displayed on your original device and paste it into this mobile:": "Copy the link displayed on your original device and paste it into this mobile:",
+  "Paste the profile link": "Paste the profile link",
+  "The sync process has been aborted, please try again.": "The sync process has been aborted, please try again.",
+  "Please enter you secret key to finish the synchronization process": "Please enter you secret key to finish the synchronization process",
+  "Scan QR code": "Scan QR code",
+  "Position this phone in front of your initial device to scan the QR code": "Position this phone in front of your initial device to scan the QR code",
+  "This synchronization link is invalid. Please go back to the profile you want to import and generate a new link or QR code.": "This synchronization link is invalid. Please go back to the profile you want to import and generate a new link or QR code.",
+  "Hold your device over the QR Code so that it is clearly visible within your smartphone's screen:": "Hold your device over the QR Code so that it is clearly visible within your smartphone's screen:",
+  "A profile with the same username already exists in this device, rename it and try again.": "A profile with the same username already exists in this device, rename it and try again.",
+  "Error during the synchronization. Please retry.": "Error during the synchronization. Please retry.",
+  "Paste profile link": "Paste profile link",
+  "The link has expired. Please retry with a fresh link.": "The link has expired. Please retry with a fresh link.",
+  "Scanner failure": "Scanner failure",
+  "To scan the QR code, you must allow this browser to access your camera. You can do this through your mobile settings. Warning: on iOS this is only possible with Safari.": "To scan the QR code, you must allow this browser to access your camera. You can do this through your mobile settings. Warning: on iOS this is only possible with Safari.",
+  "This import link is incorrect or the connection between the devices can not be done . Please, return to the profile you want to import and generate a new link or QR code.": "This import link is incorrect or the connection between the devices can not be done . Please, return to the profile you want to import and generate a new link or QR code."
 }

public/locales/fr.json

@@ -9,7 +9,6 @@
   "My applications": "Mes applications",
   "You do not have a registered application yet": "Vous n'avez pas d'applications pour le moment",
   "My devices": "Mes appareils",
-  "Add a new devce (coming soon)": "Ajouter un appareil (bientôt)",
   "Create a new profile": "Créer un nouveau profil",
   "Respects your privacy": "Respect de la vie privée",
   "Masq allows you to store all your preferences while guaranteeing your privacy": "Masq vous permet de stocker les données personnelles de vos applications tout en garantissant le respect de votre vie privée.",
@@ -102,7 +101,6 @@
   "Copy the following link and paste it in the browser you want to use:": "Copiez le lien ci-dessous et collez le dans le navigateur que vous souhaitez utiliser :",
   "Link Copied !": "Lien Copié !",
   "Connection failure, please retry.": "Connexion interrompue, veuillez réessayer.",
-  "on": "sur",
   "This device": "Cet appareil",
   "You have refused the access of the application": "Vous avez refusé l'accès de l'application",
   "to your Masq storage.": "à votre stockage Masq.",
@@ -119,5 +117,38 @@
   "close": "fermer",
   "go back": "retour",
   "You can choose from": "Vous pouvez choisir parmi ",
-  "1 special character ": "1 caractère spécial "
+  "1 special character ": "1 caractère spécial ",
+  "Add a new device": "Ajouter un appareil",
+  "This profile is already synchronized on this device.": "Ce profil est déjà synchronisé sur cet appareil.",
+  "Add a new profile": "Ajouter un nouveau profil",
+  "Sync an existing profile": "Synchroniser un profil existant",
+  "Copy the link displayed on your initial device, then paste it in the field \"link to existing profile\" on this device.": "Copiez le lien affiché sur votre appareil initial, puis collez le dans le champ \"lien du profil existant\" sur cet appareil",
+  "Link to existing profile": "Lien du profil existant",
+  "Synchronize": "Synchroniser",
+  "Already got a profile ? SYNCHRONIZE IT": "Déjà un profil ? SYNCHRONISEZ-LE",
+  "Okay, I get it!": "Ok, j'ai compris !",
+  "How to find the profile link?": "Comment récupérer le lien du profil ?",
+  "Log in to Masq from the device on which you already have a profile": "Connectez-vous à Masq depuis l'appareil sur lequel vous possédez déjà un profil",
+  "In the \"Devices\" section, click the \"Add a device\" button": "Dans la rubrique \"Appareils\", cliquez sur le bouton \"Ajouter un appareil\"",
+  "Copy the link displayed on your original device, then paste it in the \"existing profile link\" field on this device.": "Copiez le lien affiché sur votre appareil initial, puis collez-le dans le champs \"lien du profil existant\" sur cet appareil",
+  "How to display the QR code of my profile?": "Comment afficher le QR code de mon profil ?",
+  "Using the new device, scan the QR code displayed on the original device": "Avec le nouvel appareil, scannez le QR code qui est affiché sur l'appareil initial",
+  "Synchronization method": "Méthode de synchronisation",
+  "Scan the QR code": "Scannez le QR code",
+  "How to display the QR code?": "Comment afficher le QR code ? ",
+  "Copy the link displayed on your original device and paste it into this mobile:": "Copiez le lien affiché sur l'appareil original et collez le sur ce smartphone",
+  "Paste the profile link": "Collez le lien du profil",
+  "The sync process has been aborted, please try again.": "La synchronisation à été interrompue, merci de réessayer.",
+  "Please enter you secret key to finish the synchronization process": "Saisir votre clé secrète pour finaliser la synchronisation",
+  "Scan QR code": "Scanner un QR code",
+  "Position this phone in front of your initial device to scan the QR code": "Placez ce téléphone face à votre appareil initial pour scanner le QR code",
+  "This synchronization link is invalid. Please go back to the profile you want to import and generate a new link or QR code.": "Ce lien d'importation est incorrect. Veuillez retourner au profil que vous voulez importer et générer un nouveau lien ou code QR.",
+  "Hold your device over the QR Code so that it is clearly visible within your smartphone's screen:": "Placez ce téléphone face à votre appareil initial pour scanner le QR code :",
+  "A profile with the same username already exists in this device, rename it and try again.": "Un profil avec le même nom existe sur cet appareil, merci de le renommer et recommencer la synchronisation.",
+  "Error during the synchronization. Please retry.": "Echec de la synchronisation. Merci de réessayer.",
+  "Paste profile link": "Coller le lien du profil",
+  "The link has expired. Please retry with a fresh link.": "Le lien a expiré, merci de réessayer avec nouveau lien.",
+  "Scanner failure": "Echec du scan",
+  "To scan the QR code, you must allow this browser to access your camera. You can do this through your mobile settings. Warning: on iOS this is only possible with Safari.": "Pour scanner le QR code, vous devez autoriser ce navigateur à accéder à votre appareil photo. Vous pouvez le faire via les paramètres de votre mobile. Attention : sur iOS, cela n'est possible qu'avec Safari.",
+  "This import link is incorrect or the connection between the devices can not be done . Please, return to the profile you want to import and generate a new link or QR code.": "Ce lien est incorrect ou la connexion entre les deux appareils n'a pu être faite. Retournez sur le profil que vous souhaitez importer et générez un nouveau lien ou QR code."
 }