From 9cedbeed7e1c23779b833e17d4e50a88a844d1b8 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Fri, 13 Sep 2019 15:10:33 -0300
Subject: [PATCH 1/7] Revert "restore old files"

---
 public/index.html | 23 +++++++++++++++++++-
 src/index.js      | 54 ++++++++++++++++++++++++++---------------------
 2 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/public/index.html b/public/index.html
index 94cbe7e7c..125e481b8 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,8 +3,29 @@
 
 <head>
   <meta charset="utf-8">
+  <script src="cordova.js"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no">
-
+  <meta http-equiv="Content-Security-Policy"
+    content="
+    default-src 'self'
+        'unsafe-inline'
+        'unsafe-eval'
+        http://localhost:10010/ 
+        https://*.app.cboard.io/ 
+        https://*.app.qa.cboard.io/ 
+        https://www.google-analytics.com/
+        https://www.google.com/ads/
+        https://www.google.com.ar/ads/ 
+        https://stats.g.doubleclick.net/ 
+        https://*.blob.core.windows.net/ 
+        https://www.madaportal.org/tawasol/
+        https://api.arasaac.org/api/
+        https://www.googletagmanager.com/
+        https://ssl.gstatic.com 
+        gap: 
+        data:;
+    img-src * data:  filesystem:  blob:  ;
+    ">
 
   <!--
       manifest.json provides metadata used when your web app is added to the
diff --git a/src/index.js b/src/index.js
index 43497680d..047efd5b5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,34 +1,40 @@
-import './polyfills';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import { BrowserRouter, Route } from 'react-router-dom';
+import { BrowserRouter, HashRouter, Route } from 'react-router-dom';
 import { PersistGate } from 'redux-persist/es/integration/react';
-
-import configureStore, { getStore } from './store';
-
-import SpeechProvider from './providers/SpeechProvider';
-import LanguageProvider from './providers/LanguageProvider';
-import ThemeProvider from './providers/ThemeProvider';
 import App from './components/App';
+import { isCordova, onCordovaReady } from './cordova-util';
 import './index.css';
+import './polyfills';
+import LanguageProvider from './providers/LanguageProvider';
+import SpeechProvider from './providers/SpeechProvider';
+import ThemeProvider from './providers/ThemeProvider';
+import configureStore, { getStore } from './store';
 
 const { persistor } = configureStore();
 const store = getStore();
 
-ReactDOM.render(
-  <Provider store={store}>
-    <PersistGate persistor={persistor}>
-      <SpeechProvider>
-        <LanguageProvider>
-          <ThemeProvider>
-            <BrowserRouter>
-              <Route path="/" component={App} />
-            </BrowserRouter>
-          </ThemeProvider>
-        </LanguageProvider>
-      </SpeechProvider>
-    </PersistGate>
-  </Provider>,
-  document.getElementById('root')
-);
+// When running in Cordova, must use the HashRouter
+const PlatformRouter = isCordova() ? HashRouter : BrowserRouter;
+
+const renderApp = () => {
+  ReactDOM.render(
+    <Provider store={store}>
+      <PersistGate persistor={persistor}>
+        <SpeechProvider>
+          <LanguageProvider>
+            <ThemeProvider>
+              <PlatformRouter>
+                <Route path="/" component={App} />
+              </PlatformRouter>
+            </ThemeProvider>
+          </LanguageProvider>
+        </SpeechProvider>
+      </PersistGate>
+    </Provider>,
+    document.getElementById('root')
+  );
+};
+
+isCordova() ? onCordovaReady(renderApp) : renderApp();

From bf745cfc916d2eafac08f315919abdc8a3854530 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Fri, 13 Sep 2019 15:33:03 -0300
Subject: [PATCH 2/7] update package

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9f60531bd..8af1a4971 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "react-loadable": "^5.5.0",
     "react-media-recorder": "^0.7.1",
     "react-redux": "^5.1.1",
-    "react-router-dom": "^4.3.1",
+    "react-router-dom": "5.0.1",
     "react-scannable": "0.0.17",
     "react-share": "^2.3.1",
     "react-sizeme": "^2.5.2",

From c66ccac271987fd4323dc557af072bff7ae3fba6 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Fri, 13 Sep 2019 16:00:09 -0300
Subject: [PATCH 3/7] move to react route

---
 package.json                                  |  2 +-
 .../Account/Activate/Activate.container.js    |  2 +-
 src/components/App/App.component.js           |  2 +-
 src/components/AuthScreen/Auth.helpers.js     |  2 +-
 src/components/Board/Navbar/Navbar.js         | 10 +++---
 .../Settings/People/People.component.js       | 31 ++++++++++---------
 src/components/Settings/Settings.component.js |  2 +-
 src/components/Settings/Settings.wrapper.js   |  2 +-
 .../Settings/SettingsSection.component.js     |  2 +-
 .../UI/UserIcon/UserIcon.component.js         |  5 +--
 src/index.js                                  |  2 +-
 src/store.js                                  |  3 +-
 12 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 8af1a4971..2e762c560 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "react-loadable": "^5.5.0",
     "react-media-recorder": "^0.7.1",
     "react-redux": "^5.1.1",
-    "react-router-dom": "5.0.1",
+    "react-router": "^5.0.1",
     "react-scannable": "0.0.17",
     "react-share": "^2.3.1",
     "react-sizeme": "^2.5.2",
diff --git a/src/components/Account/Activate/Activate.container.js b/src/components/Account/Activate/Activate.container.js
index 601c7bda6..592750269 100644
--- a/src/components/Account/Activate/Activate.container.js
+++ b/src/components/Account/Activate/Activate.container.js
@@ -1,5 +1,5 @@
 import React, { Fragment, PureComponent } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { activate } from './Activate.actions';
 import './Activate.css';
 
diff --git a/src/components/App/App.component.js b/src/components/App/App.component.js
index 69202ccd3..2b2cdfebd 100644
--- a/src/components/App/App.component.js
+++ b/src/components/App/App.component.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Switch } from 'react-router';
 
 import Activate from '../Account/Activate';
 import OAuthLogin from '../Account/OAuthLogin';
diff --git a/src/components/AuthScreen/Auth.helpers.js b/src/components/AuthScreen/Auth.helpers.js
index 16e5cb23a..c76550745 100644
--- a/src/components/AuthScreen/Auth.helpers.js
+++ b/src/components/AuthScreen/Auth.helpers.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Route, Redirect } from 'react-router-dom';
+import { Route, Redirect } from 'react-router';
 
 export const PrivateRoute = ({
   component: Component,
diff --git a/src/components/Board/Navbar/Navbar.js b/src/components/Board/Navbar/Navbar.js
index 71751a75c..ae5d51363 100644
--- a/src/components/Board/Navbar/Navbar.js
+++ b/src/components/Board/Navbar/Navbar.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import classNames from 'classnames';
 import isMobile from 'ismobilejs';
 import copy from 'copy-to-clipboard';
@@ -160,9 +160,11 @@ export class Navbar extends React.Component {
               />
             </React.Fragment>
           )}
-          {(!isLocked && 'name' in userData && 'email' in userData)
-            ? <UserIcon component={Link} to="/settings/people" />
-            : <UserIcon onClick={this.onUserIconClick} />}
+          {!isLocked && 'name' in userData && 'email' in userData ? (
+            <UserIcon component={Link} to="/settings/people" />
+          ) : (
+            <UserIcon onClick={this.onUserIconClick} />
+          )}
           <LockToggle
             locked={isLocked}
             onLockTick={onLockNotify}
diff --git a/src/components/Settings/People/People.component.js b/src/components/Settings/People/People.component.js
index b408416bc..b7b1d4e9e 100644
--- a/src/components/Settings/People/People.component.js
+++ b/src/components/Settings/People/People.component.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import Paper from '@material-ui/core/Paper';
 import Button from '@material-ui/core/Button';
 import List from '@material-ui/core/List';
@@ -21,12 +21,12 @@ const propTypes = {
    */
   onClose: PropTypes.func,
   /**
- * Callback fired when clicking the logout button
- */
+   * Callback fired when clicking the logout button
+   */
   logout: PropTypes.func.isRequired,
   /**
- * flag for user 
- */
+   * flag for user
+   */
   isLogged: PropTypes.bool.isRequired,
   /**
    * Name of user
@@ -71,17 +71,16 @@ const People = ({
           <List>
             <ListItem>
               <UserIcon />
-              <ListItemText
-                primary={name}
-             />
+              <ListItemText primary={name} />
               <ListItemSecondaryAction className="Settings--secondaryAction">
                 <Button
                   disabled={!isLogged}
                   color="secondary"
                   onClick={logout}
                   component={Link}
-                  to="/" >
-                <FormattedMessage {...messages.logout} />
+                  to="/"
+                >
+                  <FormattedMessage {...messages.logout} />
                 </Button>
               </ListItemSecondaryAction>
             </ListItem>
@@ -107,7 +106,8 @@ const People = ({
                 secondary={<FormattedMessage {...messages.emailSecondary} />}
               />
               <ListItemSecondaryAction className="Settings--secondaryAction">
-                <TextField className="Settings--secondaryAction--textField"
+                <TextField
+                  className="Settings--secondaryAction--textField"
                   disabled={!isLogged}
                   id="user-email"
                   label={<FormattedMessage {...messages.email} />}
@@ -120,17 +120,20 @@ const People = ({
             <ListItem>
               <ListItemText
                 primary={<FormattedMessage {...messages.birthdate} />}
-                secondary={<FormattedMessage {...messages.birthdateSecondary} />}
+                secondary={
+                  <FormattedMessage {...messages.birthdateSecondary} />
+                }
               />
               <ListItemSecondaryAction className="Settings--secondaryAction">
-                <TextField className="Settings--secondaryAction--textField"
+                <TextField
+                  className="Settings--secondaryAction--textField"
                   disabled={!isLogged}
                   id="user-birthdate"
                   label={<FormattedMessage {...messages.birthdate} />}
                   type="date"
                   value={birthdate}
                   InputLabelProps={{
-                    shrink: true,
+                    shrink: true
                   }}
                   onChange={onChangePeople('birthdate')}
                 />
diff --git a/src/components/Settings/Settings.component.js b/src/components/Settings/Settings.component.js
index 6c2745ac6..c935e833d 100644
--- a/src/components/Settings/Settings.component.js
+++ b/src/components/Settings/Settings.component.js
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import Button from '@material-ui/core/Button';
 import LanguageIcon from '@material-ui/icons/Language';
 import RecordVoiceOverIcon from '@material-ui/icons/RecordVoiceOver';
diff --git a/src/components/Settings/Settings.wrapper.js b/src/components/Settings/Settings.wrapper.js
index 1358a5bf3..40a16ebdf 100644
--- a/src/components/Settings/Settings.wrapper.js
+++ b/src/components/Settings/Settings.wrapper.js
@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Switch } from 'react-router';
 
 import Settings from './Settings.container';
 import People from './People';
diff --git a/src/components/Settings/SettingsSection.component.js b/src/components/Settings/SettingsSection.component.js
index 77e1e88ed..3f6cc46b6 100644
--- a/src/components/Settings/SettingsSection.component.js
+++ b/src/components/Settings/SettingsSection.component.js
@@ -1,7 +1,7 @@
 import React, { PureComponent, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
diff --git a/src/components/UI/UserIcon/UserIcon.component.js b/src/components/UI/UserIcon/UserIcon.component.js
index c0f978aca..b4b80b540 100644
--- a/src/components/UI/UserIcon/UserIcon.component.js
+++ b/src/components/UI/UserIcon/UserIcon.component.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from 'react-intl';
 import { withStyles } from '@material-ui/core/styles';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import Avatar from '@material-ui/core/Avatar';
 import green from '@material-ui/core/colors/green';
 
@@ -65,7 +65,8 @@ export const UserIcon = ({
 
   return (
     <IconButton
-      label={user ? user.name : intl.formatMessage(messages.login)} {...other}
+      label={user ? user.name : intl.formatMessage(messages.login)}
+      {...other}
     >
       <React.Fragment>
         {!user && link && (
diff --git a/src/index.js b/src/index.js
index 047efd5b5..508d38717 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import { BrowserRouter, HashRouter, Route } from 'react-router-dom';
+import { BrowserRouter, HashRouter, Route } from 'react-router';
 import { PersistGate } from 'redux-persist/es/integration/react';
 import App from './components/App';
 import { isCordova, onCordovaReady } from './cordova-util';
diff --git a/src/store.js b/src/store.js
index 2cd41bf72..dc6729fab 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,5 +1,6 @@
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
+import logger from 'redux-logger';
 import { persistStore } from 'redux-persist';
 import storage from 'redux-persist/lib/storage';
 import { UPDATE_CONNECTIVITY } from './components/App/App.constants';
@@ -10,7 +11,7 @@ import buildVersion from './build-version';
 let store;
 
 export default function configureStore(initialState = {}) {
-  const middlewares = [thunk, googleAnalytics];
+  const middlewares = [thunk, logger, googleAnalytics];
   const enhancers = [applyMiddleware(...middlewares)];
   // If Redux DevTools Extension is installed use it, otherwise use Redux compose
   /* eslint-disable no-underscore-dangle */

From b9741d5b9e8d001890e786b3375eaa46269c2448 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Fri, 13 Sep 2019 16:00:09 -0300
Subject: [PATCH 4/7] Revert "move to react route"

This reverts commit c66ccac271987fd4323dc557af072bff7ae3fba6.
---
 package.json                                  |  2 +-
 .../Account/Activate/Activate.container.js    |  2 +-
 src/components/App/App.component.js           |  2 +-
 src/components/AuthScreen/Auth.helpers.js     |  2 +-
 src/components/Board/Navbar/Navbar.js         | 10 +++---
 .../Settings/People/People.component.js       | 31 +++++++++----------
 src/components/Settings/Settings.component.js |  2 +-
 src/components/Settings/Settings.wrapper.js   |  2 +-
 .../Settings/SettingsSection.component.js     |  2 +-
 .../UI/UserIcon/UserIcon.component.js         |  5 ++-
 src/index.js                                  |  2 +-
 src/store.js                                  |  3 +-
 12 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 2e762c560..8af1a4971 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "react-loadable": "^5.5.0",
     "react-media-recorder": "^0.7.1",
     "react-redux": "^5.1.1",
-    "react-router": "^5.0.1",
+    "react-router-dom": "5.0.1",
     "react-scannable": "0.0.17",
     "react-share": "^2.3.1",
     "react-sizeme": "^2.5.2",
diff --git a/src/components/Account/Activate/Activate.container.js b/src/components/Account/Activate/Activate.container.js
index 592750269..601c7bda6 100644
--- a/src/components/Account/Activate/Activate.container.js
+++ b/src/components/Account/Activate/Activate.container.js
@@ -1,5 +1,5 @@
 import React, { Fragment, PureComponent } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { activate } from './Activate.actions';
 import './Activate.css';
 
diff --git a/src/components/App/App.component.js b/src/components/App/App.component.js
index 2b2cdfebd..69202ccd3 100644
--- a/src/components/App/App.component.js
+++ b/src/components/App/App.component.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import Helmet from 'react-helmet';
-import { Route, Switch } from 'react-router';
+import { Route, Switch } from 'react-router-dom';
 
 import Activate from '../Account/Activate';
 import OAuthLogin from '../Account/OAuthLogin';
diff --git a/src/components/AuthScreen/Auth.helpers.js b/src/components/AuthScreen/Auth.helpers.js
index c76550745..16e5cb23a 100644
--- a/src/components/AuthScreen/Auth.helpers.js
+++ b/src/components/AuthScreen/Auth.helpers.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Route, Redirect } from 'react-router';
+import { Route, Redirect } from 'react-router-dom';
 
 export const PrivateRoute = ({
   component: Component,
diff --git a/src/components/Board/Navbar/Navbar.js b/src/components/Board/Navbar/Navbar.js
index ae5d51363..71751a75c 100644
--- a/src/components/Board/Navbar/Navbar.js
+++ b/src/components/Board/Navbar/Navbar.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import classNames from 'classnames';
 import isMobile from 'ismobilejs';
 import copy from 'copy-to-clipboard';
@@ -160,11 +160,9 @@ export class Navbar extends React.Component {
               />
             </React.Fragment>
           )}
-          {!isLocked && 'name' in userData && 'email' in userData ? (
-            <UserIcon component={Link} to="/settings/people" />
-          ) : (
-            <UserIcon onClick={this.onUserIconClick} />
-          )}
+          {(!isLocked && 'name' in userData && 'email' in userData)
+            ? <UserIcon component={Link} to="/settings/people" />
+            : <UserIcon onClick={this.onUserIconClick} />}
           <LockToggle
             locked={isLocked}
             onLockTick={onLockNotify}
diff --git a/src/components/Settings/People/People.component.js b/src/components/Settings/People/People.component.js
index b7b1d4e9e..b408416bc 100644
--- a/src/components/Settings/People/People.component.js
+++ b/src/components/Settings/People/People.component.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import Paper from '@material-ui/core/Paper';
 import Button from '@material-ui/core/Button';
 import List from '@material-ui/core/List';
@@ -21,12 +21,12 @@ const propTypes = {
    */
   onClose: PropTypes.func,
   /**
-   * Callback fired when clicking the logout button
-   */
+ * Callback fired when clicking the logout button
+ */
   logout: PropTypes.func.isRequired,
   /**
-   * flag for user
-   */
+ * flag for user 
+ */
   isLogged: PropTypes.bool.isRequired,
   /**
    * Name of user
@@ -71,16 +71,17 @@ const People = ({
           <List>
             <ListItem>
               <UserIcon />
-              <ListItemText primary={name} />
+              <ListItemText
+                primary={name}
+             />
               <ListItemSecondaryAction className="Settings--secondaryAction">
                 <Button
                   disabled={!isLogged}
                   color="secondary"
                   onClick={logout}
                   component={Link}
-                  to="/"
-                >
-                  <FormattedMessage {...messages.logout} />
+                  to="/" >
+                <FormattedMessage {...messages.logout} />
                 </Button>
               </ListItemSecondaryAction>
             </ListItem>
@@ -106,8 +107,7 @@ const People = ({
                 secondary={<FormattedMessage {...messages.emailSecondary} />}
               />
               <ListItemSecondaryAction className="Settings--secondaryAction">
-                <TextField
-                  className="Settings--secondaryAction--textField"
+                <TextField className="Settings--secondaryAction--textField"
                   disabled={!isLogged}
                   id="user-email"
                   label={<FormattedMessage {...messages.email} />}
@@ -120,20 +120,17 @@ const People = ({
             <ListItem>
               <ListItemText
                 primary={<FormattedMessage {...messages.birthdate} />}
-                secondary={
-                  <FormattedMessage {...messages.birthdateSecondary} />
-                }
+                secondary={<FormattedMessage {...messages.birthdateSecondary} />}
               />
               <ListItemSecondaryAction className="Settings--secondaryAction">
-                <TextField
-                  className="Settings--secondaryAction--textField"
+                <TextField className="Settings--secondaryAction--textField"
                   disabled={!isLogged}
                   id="user-birthdate"
                   label={<FormattedMessage {...messages.birthdate} />}
                   type="date"
                   value={birthdate}
                   InputLabelProps={{
-                    shrink: true
+                    shrink: true,
                   }}
                   onChange={onChangePeople('birthdate')}
                 />
diff --git a/src/components/Settings/Settings.component.js b/src/components/Settings/Settings.component.js
index c935e833d..6c2745ac6 100644
--- a/src/components/Settings/Settings.component.js
+++ b/src/components/Settings/Settings.component.js
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import Button from '@material-ui/core/Button';
 import LanguageIcon from '@material-ui/icons/Language';
 import RecordVoiceOverIcon from '@material-ui/icons/RecordVoiceOver';
diff --git a/src/components/Settings/Settings.wrapper.js b/src/components/Settings/Settings.wrapper.js
index 40a16ebdf..1358a5bf3 100644
--- a/src/components/Settings/Settings.wrapper.js
+++ b/src/components/Settings/Settings.wrapper.js
@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { Route, Switch } from 'react-router';
+import { Route, Switch } from 'react-router-dom';
 
 import Settings from './Settings.container';
 import People from './People';
diff --git a/src/components/Settings/SettingsSection.component.js b/src/components/Settings/SettingsSection.component.js
index 3f6cc46b6..77e1e88ed 100644
--- a/src/components/Settings/SettingsSection.component.js
+++ b/src/components/Settings/SettingsSection.component.js
@@ -1,7 +1,7 @@
 import React, { PureComponent, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import List from '@material-ui/core/List';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
diff --git a/src/components/UI/UserIcon/UserIcon.component.js b/src/components/UI/UserIcon/UserIcon.component.js
index b4b80b540..c0f978aca 100644
--- a/src/components/UI/UserIcon/UserIcon.component.js
+++ b/src/components/UI/UserIcon/UserIcon.component.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { injectIntl, intlShape } from 'react-intl';
 import { withStyles } from '@material-ui/core/styles';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import Avatar from '@material-ui/core/Avatar';
 import green from '@material-ui/core/colors/green';
 
@@ -65,8 +65,7 @@ export const UserIcon = ({
 
   return (
     <IconButton
-      label={user ? user.name : intl.formatMessage(messages.login)}
-      {...other}
+      label={user ? user.name : intl.formatMessage(messages.login)} {...other}
     >
       <React.Fragment>
         {!user && link && (
diff --git a/src/index.js b/src/index.js
index 508d38717..047efd5b5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Provider } from 'react-redux';
-import { BrowserRouter, HashRouter, Route } from 'react-router';
+import { BrowserRouter, HashRouter, Route } from 'react-router-dom';
 import { PersistGate } from 'redux-persist/es/integration/react';
 import App from './components/App';
 import { isCordova, onCordovaReady } from './cordova-util';
diff --git a/src/store.js b/src/store.js
index dc6729fab..2cd41bf72 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,6 +1,5 @@
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
-import logger from 'redux-logger';
 import { persistStore } from 'redux-persist';
 import storage from 'redux-persist/lib/storage';
 import { UPDATE_CONNECTIVITY } from './components/App/App.constants';
@@ -11,7 +10,7 @@ import buildVersion from './build-version';
 let store;
 
 export default function configureStore(initialState = {}) {
-  const middlewares = [thunk, logger, googleAnalytics];
+  const middlewares = [thunk, googleAnalytics];
   const enhancers = [applyMiddleware(...middlewares)];
   // If Redux DevTools Extension is installed use it, otherwise use Redux compose
   /* eslint-disable no-underscore-dangle */

From 373389fbdc3720f248d9e028ed6eb6c3dafec927 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Fri, 13 Sep 2019 16:26:28 -0300
Subject: [PATCH 5/7] fix

---
 package.json |  2 +-
 yarn.lock    | 98 +++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 67 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index 8af1a4971..cb9b5b0b3 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "react-loadable": "^5.5.0",
     "react-media-recorder": "^0.7.1",
     "react-redux": "^5.1.1",
-    "react-router-dom": "5.0.1",
+    "react-router-dom": "^5.0.1",
     "react-scannable": "0.0.17",
     "react-share": "^2.3.1",
     "react-sizeme": "^2.5.2",
diff --git a/yarn.lock b/yarn.lock
index fded313bc..b47b17a0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -861,6 +861,13 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
+"@babel/runtime@^7.4.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205"
+  integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@babel/template@^7.1.0", "@babel/template@^7.2.2", "@babel/template@^7.4.4":
   version "7.4.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
@@ -3793,6 +3800,11 @@ dotenv@6.0.0:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.0.0.tgz#24e37c041741c5f4b25324958ebbc34bca965935"
   integrity sha512-FlWbnhgjtwD+uNLUGHbMykMOYQaTivdHEmYwAKFjn6GKe/CqY0fNae93ZHTd20snh9ZLr8mTzIL9m0APQ1pjQg==
 
+dotenv@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz#941c0410535d942c8becf28d3f357dbd9d476064"
+  integrity sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==
+
 duplexer2@~0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
@@ -5310,17 +5322,17 @@ hex-color-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-history@^4.7.2:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.9.0.tgz#84587c2068039ead8af769e9d6a6860a14fa1bca"
-  integrity sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==
+history@^4.9.0:
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"
+  integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==
   dependencies:
     "@babel/runtime" "^7.1.2"
     loose-envify "^1.2.0"
-    resolve-pathname "^2.2.0"
+    resolve-pathname "^3.0.0"
     tiny-invariant "^1.0.2"
     tiny-warning "^1.0.0"
-    value-equal "^0.4.0"
+    value-equal "^1.0.1"
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -7625,6 +7637,15 @@ mimic-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mini-create-react-context@^0.3.0:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz#79fc598f283dd623da8e088b05db8cddab250189"
+  integrity sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==
+  dependencies:
+    "@babel/runtime" "^7.4.0"
+    gud "^1.0.0"
+    tiny-warning "^1.0.2"
+
 mini-css-extract-plugin@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
@@ -9705,6 +9726,15 @@ react-app-polyfill@^0.2.2:
     raf "3.4.1"
     whatwg-fetch "3.0.0"
 
+react-app-rewired@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/react-app-rewired/-/react-app-rewired-2.1.3.tgz#5ae8583ecc9f9f968d40b735d2abbe871378a52f"
+  integrity sha512-NXC2EsQrnEMV7xD70rHcBq0B4PSEzjY/K2m/e+GRgit2jZO/uZApnpCZSKvIX2leLRN69Sqf2id0VXZ1F62CDw==
+  dependencies:
+    cross-spawn "^6.0.5"
+    dotenv "^6.2.0"
+    semver "^5.6.0"
+
 react-autosuggest@^9.4.2:
   version "9.4.3"
   resolved "https://registry.yarnpkg.com/react-autosuggest/-/react-autosuggest-9.4.3.tgz#eb46852422a48144ab9f39fb5470319222f26c7c"
@@ -9877,30 +9907,34 @@ react-resizable@1.x:
     prop-types "15.x"
     react-draggable "^3.0.3"
 
-react-router-dom@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6"
-  integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==
+react-router-dom@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.0.1.tgz#ee66f4a5d18b6089c361958e443489d6bab714be"
+  integrity sha512-zaVHSy7NN0G91/Bz9GD4owex5+eop+KvgbxXsP/O+iW1/Ln+BrJ8QiIR5a6xNPtrdTvLkxqlDClx13QO1uB8CA==
   dependencies:
-    history "^4.7.2"
-    invariant "^2.2.4"
+    "@babel/runtime" "^7.1.2"
+    history "^4.9.0"
     loose-envify "^1.3.1"
-    prop-types "^15.6.1"
-    react-router "^4.3.1"
-    warning "^4.0.1"
+    prop-types "^15.6.2"
+    react-router "5.0.1"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
 
-react-router@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
-  integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==
+react-router@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.0.1.tgz#04ee77df1d1ab6cb8939f9f01ad5702dbadb8b0f"
+  integrity sha512-EM7suCPNKb1NxcTZ2LEOWFtQBQRQXecLxVpdsP4DW4PbbqYWeRiLyV/Tt1SdCrvT2jcyXAXmVTmzvSzrPR63Bg==
   dependencies:
-    history "^4.7.2"
-    hoist-non-react-statics "^2.5.0"
-    invariant "^2.2.4"
+    "@babel/runtime" "^7.1.2"
+    history "^4.9.0"
+    hoist-non-react-statics "^3.1.0"
     loose-envify "^1.3.1"
+    mini-create-react-context "^0.3.0"
     path-to-regexp "^1.7.0"
-    prop-types "^15.6.1"
-    warning "^4.0.1"
+    prop-types "^15.6.2"
+    react-is "^16.6.0"
+    tiny-invariant "^1.0.2"
+    tiny-warning "^1.0.0"
 
 react-scannable@0.0.17:
   version "0.0.17"
@@ -10447,10 +10481,10 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-pathname@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"
-  integrity sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==
+resolve-pathname@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
+  integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
 resolve-url@^0.2.1:
   version "0.2.1"
@@ -12096,10 +12130,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-value-equal@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7"
-  integrity sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==
+value-equal@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
+  integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
 vary@~1.1.2:
   version "1.1.2"

From 05bb56a90c71e1f91a2c2d38959f18f1d05d9080 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Mon, 16 Sep 2019 10:36:30 -0300
Subject: [PATCH 6/7] added homepage

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb9b5b0b3..0eabfec53 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "tts",
     "text-to-speech"
   ],
-  "homepage": ".",
+  "homepage": "https://app.cboard.io",
   "private": false,
   "license": "GPL-3.0-only",
   "dependencies": {

From 94e986d8c65f84035f3cbf6b8b2cf7c09ad25947 Mon Sep 17 00:00:00 2001
From: martin bedouret <martinbedouret@gmail.com>
Date: Mon, 16 Sep 2019 10:44:31 -0300
Subject: [PATCH 7/7] removed missed js

---
 public/index.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 125e481b8..55f3b7287 100644
--- a/public/index.html
+++ b/public/index.html
@@ -3,7 +3,6 @@
 
 <head>
   <meta charset="utf-8">
-  <script src="cordova.js"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no, user-scalable=no">
   <meta http-equiv="Content-Security-Policy"
     content="
