From 56b04f7bb23fb5c707e2b7ea5ebfc6daaef7d101 Mon Sep 17 00:00:00 2001 From: Mirel Xhafa Date: Fri, 31 Jul 2020 12:06:20 +0200 Subject: [PATCH 1/2] #326: redirect user to welcome and show disclaimer in every page --- src/bootstrap/App.js | 25 ++++++++++----------- src/bootstrap/Initializer.js | 6 ++--- src/components/sections/Status/Advocates.js | 2 ++ src/sagas/User.js | 3 +++ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/bootstrap/App.js b/src/bootstrap/App.js index 0f6492bf..bc41f89c 100755 --- a/src/bootstrap/App.js +++ b/src/bootstrap/App.js @@ -1,8 +1,8 @@ import React, { Component } from "react"; -import Init from './Init' +import Init from "./Init"; -import { Provider } from 'react-redux' +import { Provider } from "react-redux"; import AppProvider from "./AppProvider"; // App Context import ErrorBoundary from "./ErrorBoundary"; // Errors @@ -17,33 +17,31 @@ import Spinner from "../components/common/Spinner"; import UnderAuth from "./UnderAuth"; import Initializer from "./Initializer"; // Initializer import { log, connector, connection } from "../utils/helpers"; +import Disclaimer, { ModalDiscliamer } from "JurCommon/Disclaimer"; -log('App init', process.env); +log("App init", process.env); class App extends Component { constructor(props) { super(props); this.connectorValue = connector(); - } componentDidMount() { - if (this.connectorValue === 'connex') { + if (this.connectorValue === "connex") { const { store } = this.props; - global.store=store; + global.store = store; } } render() { const { store, history, testElement } = this.props; - + // log('connnnnnnnnnection---g---', typeof connection) - - - log('App - connector',this.connectorValue) + log("App - connector", this.connectorValue); - if (this.connectorValue === 'web3') { + if (this.connectorValue === "web3") { return ( @@ -58,7 +56,7 @@ class App extends Component { ); - } else if (this.connectorValue === 'connex') { + } else if (this.connectorValue === "connex") { return ( @@ -67,8 +65,9 @@ class App extends Component { + - + diff --git a/src/bootstrap/Initializer.js b/src/bootstrap/Initializer.js index 25414921..31a10b1e 100644 --- a/src/bootstrap/Initializer.js +++ b/src/bootstrap/Initializer.js @@ -1,7 +1,7 @@ /* eslint-disable no-unused-vars */ import React, { PureComponent } from "react"; import { Route, Switch, Router } from "react-router"; // react-router v4 - +import { ConnectedRouter } from "connected-react-router"; import PropTypes from "prop-types"; // Routes @@ -29,7 +29,7 @@ class Initializer extends PureComponent { render() { const { history } = this.props; return ( - + <> {Routes.map((params, key) => ( @@ -39,7 +39,7 @@ class Initializer extends PureComponent { {this.renderTestReport()} - + ); } } diff --git a/src/components/sections/Status/Advocates.js b/src/components/sections/Status/Advocates.js index b55890fb..b26b6e75 100644 --- a/src/components/sections/Status/Advocates.js +++ b/src/components/sections/Status/Advocates.js @@ -9,6 +9,7 @@ import AdvocatesHeader from "../../app-specific/Advocate/AdvocatesHeader"; import AdvocatesIndex from "../../app-specific/Advocate/AdvocatesIndex"; import AdvocatesFooterBox from "../../app-specific/Advocate/AdvocatesFooterBox"; import { ADVOCATE_RESET_SORTS } from "../../../reducers/types"; +import Disclaimer from "JurCommon/Disclaimer"; const Advocates = ({ resetSorts }) => { useEffect(() => resetSorts, []); @@ -33,6 +34,7 @@ const Advocates = ({ resetSorts }) => { + diff --git a/src/sagas/User.js b/src/sagas/User.js index ac4f8e47..5e546dbc 100644 --- a/src/sagas/User.js +++ b/src/sagas/User.js @@ -1,4 +1,5 @@ import { put, call, select, takeEvery, takeLatest } from "redux-saga/effects"; +import { push } from "connected-react-router"; import { setLoading } from "./App"; import { dateReducer } from "../utils/helpers"; // helpers @@ -79,8 +80,10 @@ export function* checkUserExist(action) { log("checkUserExist - error.response", error.response); if (error.response.status === 404) { log("checkUserExist - error.response.status", error.response.status); + put(push("/")); // create a new user if missing if (action.type === FETCH_USER) { + log("This is fetch_user action type"); yield put({ type: SET_LOADING, payload: false }); // only dismiss loading } else { yield put({ type: NEW_USER }); // create a new user From a593b8fe0c00de9b7f1fad6c62d5c15c9b4872d4 Mon Sep 17 00:00:00 2001 From: Mirel Xhafa Date: Fri, 31 Jul 2020 12:16:54 +0200 Subject: [PATCH 2/2] removed unwanted code --- src/bootstrap/App.js | 2 +- src/components/sections/Status/Advocates.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bootstrap/App.js b/src/bootstrap/App.js index bc41f89c..137fca97 100755 --- a/src/bootstrap/App.js +++ b/src/bootstrap/App.js @@ -17,7 +17,7 @@ import Spinner from "../components/common/Spinner"; import UnderAuth from "./UnderAuth"; import Initializer from "./Initializer"; // Initializer import { log, connector, connection } from "../utils/helpers"; -import Disclaimer, { ModalDiscliamer } from "JurCommon/Disclaimer"; +import Disclaimer from "JurCommon/Disclaimer"; log("App init", process.env); diff --git a/src/components/sections/Status/Advocates.js b/src/components/sections/Status/Advocates.js index b26b6e75..b55890fb 100644 --- a/src/components/sections/Status/Advocates.js +++ b/src/components/sections/Status/Advocates.js @@ -9,7 +9,6 @@ import AdvocatesHeader from "../../app-specific/Advocate/AdvocatesHeader"; import AdvocatesIndex from "../../app-specific/Advocate/AdvocatesIndex"; import AdvocatesFooterBox from "../../app-specific/Advocate/AdvocatesFooterBox"; import { ADVOCATE_RESET_SORTS } from "../../../reducers/types"; -import Disclaimer from "JurCommon/Disclaimer"; const Advocates = ({ resetSorts }) => { useEffect(() => resetSorts, []); @@ -34,7 +33,6 @@ const Advocates = ({ resetSorts }) => { -