From ebf46e61e940c751d5f4ef1ab79b943ea871eaf7 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Sun, 10 Feb 2019 17:04:04 -0300 Subject: [PATCH 1/3] Issue #153 Fixinfg issue https://github.com/Superalgos/MasterApp/issues/153 --- client/src/views/layout/footer/index.js | 4 ++-- client/src/views/layout/header/LoggedIn.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/views/layout/footer/index.js b/client/src/views/layout/footer/index.js index d16903359..2c9138222 100644 --- a/client/src/views/layout/footer/index.js +++ b/client/src/views/layout/footer/index.js @@ -34,9 +34,9 @@ class Footer extends Component { className={classes.footerContainer} > - + - + Superalgos Ltd. Ground Floor, Palace Court, Church Street,
St. Julians STJ3049, Malta
diff --git a/client/src/views/layout/header/LoggedIn.js b/client/src/views/layout/header/LoggedIn.js index 8ce3c4e74..6dd118d06 100644 --- a/client/src/views/layout/header/LoggedIn.js +++ b/client/src/views/layout/header/LoggedIn.js @@ -35,7 +35,7 @@ export const LoggedIn = props => { ) From 9238b992133c8ceb06c72849ab1f954731f0fc0f Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Sun, 10 Feb 2019 17:04:42 -0300 Subject: [PATCH 2/3] Issue #139 https://github.com/Superalgos/MasterApp/issues/139 --- client/src/auth/index.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/src/auth/index.js b/client/src/auth/index.js index e5f420d40..1cb418d5a 100644 --- a/client/src/auth/index.js +++ b/client/src/auth/index.js @@ -48,7 +48,8 @@ export const defaultOptions = { }, languageDictionary: { title: 'Platform Dev' - } + }, + avatar:null } export const inviteOptions = { @@ -180,9 +181,6 @@ class Auth { alias: authResult.idTokenPayload.nickname } setItem('user', JSON.stringify(user)) - if (window.location.href.includes(`callback`)) { - // window.location.href = '/dashboard' - } return true } } @@ -200,9 +198,7 @@ class Auth { alias: response.data.users_Authenticate.alias } setItem('user', JSON.stringify(user)) - if (window.location.href.includes(`callback`)) { - window.location.href = '/' - } + window.location.href = '/' return response.data } catch (err) { return console.log('Sign in or create account error: ', err) From 92eed43c6650750dd9b6b5e8e3372990ee205f05 Mon Sep 17 00:00:00 2001 From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com> Date: Sun, 10 Feb 2019 17:31:44 -0300 Subject: [PATCH 3/3] Adding environment variables --- client/html/index.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/client/html/index.html b/client/html/index.html index 9eb3cc38a..38c86ca4f 100644 --- a/client/html/index.html +++ b/client/html/index.html @@ -2,10 +2,10 @@ - Superalgos + Superalgos Platform + - @@ -18,18 +18,17 @@