From e786fbf988aac36e288f349aa0d8e810a2b9bb0b Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sun, 10 Feb 2019 13:34:09 +0300 Subject: [PATCH] fix user not being redirected from auth screen --- frontend/package-lock.json | 28 +++++++++++++++++++++------- frontend/src/App.tsx | 12 +++--------- tslint.json | 3 ++- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 2139130..9094339 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3315,12 +3315,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3335,17 +3337,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3462,7 +3467,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3474,6 +3480,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3488,6 +3495,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3495,12 +3503,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3519,6 +3529,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3599,7 +3610,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3611,6 +3623,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3732,6 +3745,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 4c917ce..1f811d6 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,12 +1,6 @@ import * as React from "react"; import { connect } from "react-redux"; -import { - Redirect, - Route, - RouteComponentProps, - Switch, - withRouter, -} from "react-router"; +import { Route, RouteComponentProps, Switch, withRouter } from "react-router"; import { AuthScreen } from "~Auth/AuthScreen"; import { Home } from "~Home/Home"; import { Landing } from "~Landing/Landing"; @@ -21,10 +15,10 @@ export function AppComponent(props: IAppComponentProps) { const { location } = props.history; return loggedIn ? ( - , - , , , + , + , ) : ( diff --git a/tslint.json b/tslint.json index fb256e4..6aba075 100644 --- a/tslint.json +++ b/tslint.json @@ -12,6 +12,7 @@ "no-submodule-imports": false, "no-this-assignment": false, "max-classes-per-file": false, - "jsx-no-lambda": false + "jsx-no-lambda": false, + "linebreak-style": false } } \ No newline at end of file