Auth complete
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import ReactDOM from "react-dom";
|
import ReactDOM from "react-dom";
|
||||||
|
|
||||||
import App from "./App.routing.protected.auth";
|
import App from "./App.routing.auth";
|
||||||
import registerServiceWorker from "./registerServiceWorker";
|
import registerServiceWorker from "./registerServiceWorker";
|
||||||
|
|
||||||
ReactDOM.render(<App />, document.getElementById("root"));
|
ReactDOM.render(<App />, document.getElementById("root"));
|
||||||
|
|||||||
@@ -1,10 +1,20 @@
|
|||||||
/* eslint-disable */
|
/* @flow */
|
||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import { Route, Redirect } from "react-router-dom";
|
import { Route, Redirect } from "react-router-dom";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
export class Auth extends React.Component {
|
export class Auth extends React.Component<{
|
||||||
|
loginRoute: string,
|
||||||
|
token: string,
|
||||||
|
location: object
|
||||||
|
}> {
|
||||||
|
static propTypes = {
|
||||||
|
loginRoute: PropTypes.string.isRequired,
|
||||||
|
token: PropTypes.string.isRequired,
|
||||||
|
location: PropTypes.object
|
||||||
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const myProps = { ...this.props };
|
const myProps = { ...this.props };
|
||||||
if (!myProps.token) {
|
if (!myProps.token) {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
/* eslint-disable */
|
/* @flow */
|
||||||
|
|
||||||
import React from "react";
|
|
||||||
import { connect } from "react-redux";
|
import { connect } from "react-redux";
|
||||||
|
|
||||||
import { Auth } from "./authRoute.component";
|
import { Auth } from "./authRoute.component";
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
import { ConnectedLogin } from "./login.connected.js";
|
import { ConnectedLogin } from "./login.connected.js";
|
||||||
import { ConnectedProtectedRoutes } from "./protectedRoutes.connected.js";
|
import { ConnectedProtectedRoutes } from "./protectedRoutes.connected.js";
|
||||||
import { AuthRoute } from "./authroute.connected.js";
|
import { AuthRoute } from "./authRoute.connected.js";
|
||||||
|
|
||||||
export { ConnectedLogin, ConnectedProtectedRoutes, AuthRoute };
|
export { ConnectedLogin, ConnectedProtectedRoutes, AuthRoute };
|
||||||
|
|||||||
@@ -5,7 +5,10 @@ import PropTypes from "prop-types";
|
|||||||
import { Redirect } from "react-router-dom";
|
import { Redirect } from "react-router-dom";
|
||||||
|
|
||||||
export class Login extends React.PureComponent<{
|
export class Login extends React.PureComponent<{
|
||||||
logging: boolean
|
onLogin: func,
|
||||||
|
logging: boolean,
|
||||||
|
token: string,
|
||||||
|
location: object
|
||||||
}> {
|
}> {
|
||||||
static propTypes = {
|
static propTypes = {
|
||||||
onLogin: PropTypes.func.isRequired,
|
onLogin: PropTypes.func.isRequired,
|
||||||
|
|||||||
Reference in New Issue
Block a user