@@ -258,7 +257,7 @@ const UserForm = ({ isEditing, isProfile, userData, action }) => {
Submit
- { !isProfile && (
+ {!isProfile && (
Go Back
diff --git a/src/pages/Home/Home.test.js b/src/pages/Home/Home.test.js
index 810385fa..13240ea3 100644
--- a/src/pages/Home/Home.test.js
+++ b/src/pages/Home/Home.test.js
@@ -1,7 +1,7 @@
import React from 'react';
import * as reactRedux from 'react-redux';
-import * as actions from '../../state/actions/auth';
+import * as actions from 'state/actions/auth';
import Home from '.';
describe('
rendering', () => {
diff --git a/src/pages/Login/index.jsx b/src/pages/Login/index.jsx
index eaaad2e0..b717ed35 100644
--- a/src/pages/Login/index.jsx
+++ b/src/pages/Login/index.jsx
@@ -2,11 +2,11 @@ import React, { useEffect, useState } from 'react';
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import { Redirect, Link } from 'react-router-dom';
-import firebase from '../../firebase';
-import { auth, setPassword, authCleanUp } from '../../state/actions/auth';
+import firebase from 'firebase';
+import { auth, setPassword, authCleanUp } from 'state/actions/auth';
+import { useChangeHandler } from 'utils/hooks';
+import { inputValidations } from 'utils';
import paths from '../Router/paths';
-import { useChangeHandler } from '../../utils/hooks';
-import { inputValidations } from '../../utils';
import classes from './Login.module.scss';
const Login = () => {
diff --git a/src/pages/NotFound/index.jsx b/src/pages/NotFound/index.jsx
index 07d93886..f595f5ab 100644
--- a/src/pages/NotFound/index.jsx
+++ b/src/pages/NotFound/index.jsx
@@ -2,8 +2,8 @@ import React from 'react';
import { Link, useLocation } from 'react-router-dom';
import { useSelector, shallowEqual } from 'react-redux';
-import path from '../Router/paths';
-import NotFoudImage from '../../assets/404.gif';
+import path from 'pages/Router/paths';
+import NotFoudImage from 'assets/404.gif';
import classes from './NotFound.module.scss';
const NotFound = () => {
diff --git a/src/pages/Profile/ChangePassword/ChangePassword.test.js b/src/pages/Profile/ChangePassword/ChangePassword.test.js
index c3b34524..c054625b 100644
--- a/src/pages/Profile/ChangePassword/ChangePassword.test.js
+++ b/src/pages/Profile/ChangePassword/ChangePassword.test.js
@@ -1,7 +1,7 @@
import React from 'react';
import * as reactRedux from 'react-redux';
-import * as actions from '../../../state/actions/auth';
+import * as actions from 'state/actions/auth';
import ChangePassword from '.';
describe('
rendering', () => {
diff --git a/src/pages/Profile/ChangePassword/index.jsx b/src/pages/Profile/ChangePassword/index.jsx
index 0e99df37..babc0983 100644
--- a/src/pages/Profile/ChangePassword/index.jsx
+++ b/src/pages/Profile/ChangePassword/index.jsx
@@ -2,8 +2,8 @@
import React, { useState, useEffect } from 'react';
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
-import { changeUserPassword, authCleanUp } from '../../../state/actions/auth';
-import { useChangeHandler } from '../../../utils/hooks';
+import { changeUserPassword, authCleanUp } from 'state/actions/auth';
+import { useChangeHandler } from 'utils/hooks';
const ChangePasswordCard = () => {
const [passwords, setPasswords] = useState({
diff --git a/src/pages/Profile/index.jsx b/src/pages/Profile/index.jsx
index 2d727f61..4bd55293 100644
--- a/src/pages/Profile/index.jsx
+++ b/src/pages/Profile/index.jsx
@@ -1,9 +1,9 @@
import React from 'react';
import { useSelector, shallowEqual } from 'react-redux';
+import UserForm from 'components/UserForm';
+import { modifyUser } from 'state/actions/users';
import ChangePassword from './ChangePassword';
-import UserForm from '../../components/UserForm';
-import { modifyUser } from '../../state/actions/users';
const Profile = () => {
const { userData } = useSelector(
diff --git a/src/pages/ResetPassword/ResetPassword.test.js b/src/pages/ResetPassword/ResetPassword.test.js
index ac10c2a9..4d2d242f 100644
--- a/src/pages/ResetPassword/ResetPassword.test.js
+++ b/src/pages/ResetPassword/ResetPassword.test.js
@@ -1,7 +1,7 @@
import React from 'react';
import * as reactRedux from 'react-redux';
-import * as actions from '../../state/actions/auth';
+import * as actions from 'state/actions/auth';
import ResetPassword from '.';
describe('
rendering', () => {
diff --git a/src/pages/ResetPassword/index.jsx b/src/pages/ResetPassword/index.jsx
index b80d2f45..7187b40f 100644
--- a/src/pages/ResetPassword/index.jsx
+++ b/src/pages/ResetPassword/index.jsx
@@ -3,9 +3,9 @@ import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import { Redirect, Link } from 'react-router-dom';
import classes from './ResetPassword.module.scss';
-import { useChangeHandler } from '../../utils/hooks';
-import { resetPassword, authCleanUp } from '../../state/actions/auth';
-import paths from '../Router/paths';
+import { useChangeHandler } from 'utils/hooks';
+import { resetPassword, authCleanUp } from 'state/actions/auth';
+import paths from 'pages/Router/paths';
const ResetPassword = () => {
const { loading, error, restoredPassword, isAuth } = useSelector(
diff --git a/src/pages/Router/PrivateRoute/PrivateRoute.test.js b/src/pages/Router/PrivateRoute/PrivateRoute.test.js
index c43a6012..7fb4aac5 100644
--- a/src/pages/Router/PrivateRoute/PrivateRoute.test.js
+++ b/src/pages/Router/PrivateRoute/PrivateRoute.test.js
@@ -2,7 +2,7 @@ import React from 'react';
import * as reactRedux from 'react-redux';
import { Redirect } from 'react-router-dom';
-import * as actions from '../../../state/actions/auth';
+import * as actions from 'state/actions/auth';
import PrivateRoute from '.';
import paths from '../paths';
diff --git a/src/pages/Router/PrivateRoute/index.js b/src/pages/Router/PrivateRoute/index.js
index 06ecec5c..b7783e6b 100644
--- a/src/pages/Router/PrivateRoute/index.js
+++ b/src/pages/Router/PrivateRoute/index.js
@@ -3,8 +3,8 @@ import { Route, Redirect } from 'react-router-dom';
import { useSelector, shallowEqual } from 'react-redux';
import PropTypes from 'prop-types';
+import Layout from 'components/Layout';
import paths from '../paths';
-import Layout from '../../../components/Layout';
const PrivateRoute = ({ path, component: Component }) => {
const { id } = useSelector(
@@ -19,7 +19,7 @@ const PrivateRoute = ({ path, component: Component }) => {
id ? : }
+ render={() => (id ? : )}
/>
);
diff --git a/src/pages/Router/Router.test.js b/src/pages/Router/Router.test.js
index af850665..db5b4735 100644
--- a/src/pages/Router/Router.test.js
+++ b/src/pages/Router/Router.test.js
@@ -1,7 +1,7 @@
import React from 'react';
import * as reactRedux from 'react-redux';
-import * as actions from '../../state/actions/auth';
+import * as actions from 'state/actions/auth';
import Router from '.';
describe(' rendering', () => {
diff --git a/src/pages/User/User.test.js b/src/pages/User/User.test.js
index 32d07641..3817335a 100644
--- a/src/pages/User/User.test.js
+++ b/src/pages/User/User.test.js
@@ -1,8 +1,8 @@
import React from 'react';
import ClipLoader from 'react-spinners/ClipLoader';
+import UserForm from 'components/UserForm';
import User from '.';
-import UserForm from '../../components/UserForm';
describe(' rendering', () => {
it('should render without crashing', () => {
diff --git a/src/pages/User/index.jsx b/src/pages/User/index.jsx
index 3100d8ab..190d9e90 100644
--- a/src/pages/User/index.jsx
+++ b/src/pages/User/index.jsx
@@ -1,12 +1,12 @@
import React, { useState, useEffect } from 'react';
import { useParams, Redirect } from 'react-router-dom';
import { useSelector, shallowEqual } from 'react-redux';
-
import ClipLoader from 'react-spinners/ClipLoader';
-import UserForm from '../../components/UserForm';
-import firebase from '../../firebase';
-import { createUser, modifyUser } from '../../state/actions/users';
-import paths from '../Router/paths';
+
+import UserForm from 'components/UserForm';
+import { createUser, modifyUser } from 'state/actions/users';
+import paths from 'pages/Router/paths';
+import firebase from 'firebase.js';
const User = () => {
const { id } = useParams();
diff --git a/src/pages/Users/index.jsx b/src/pages/Users/index.jsx
index d0905615..fd80ed19 100644
--- a/src/pages/Users/index.jsx
+++ b/src/pages/Users/index.jsx
@@ -1,18 +1,14 @@
-import React, { useEffect, useState, Fragment } from 'react';
+import React, { useEffect, useState } from 'react';
import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import { Redirect, Link } from 'react-router-dom';
import classNames from 'classnames';
import ClipLoader from 'react-spinners/ClipLoader';
-import Table from '../../components/Table';
-import {
- fetchUsers,
- deleteUser,
- clearUsersData
-} from '../../state/actions/users';
+import Table from 'components/Table';
+import { fetchUsers, deleteUser, clearUsersData } from 'state/actions/users';
+import paths from 'pages/Router/paths';
+import ConfirmationModal from 'components/ConfirmationModal';
import classes from './Users.module.scss';
-import paths from '../Router/paths';
-import ConfirmationModal from '../../components/ConfirmationModal';
const Users = () => {
const { usersList, isAdmin, error, loading, deleted } = useSelector(
diff --git a/src/state/actions/auth.js b/src/state/actions/auth.js
index 6acf71ad..9d9b5fcb 100644
--- a/src/state/actions/auth.js
+++ b/src/state/actions/auth.js
@@ -1,9 +1,9 @@
import { createAction } from 'redux-act';
import { toastr } from 'react-redux-toastr';
-import { firebaseError, FIREBASE_RESPONSE } from '../../utils';
+import { firebaseError, FIREBASE_RESPONSE } from 'utils';
+import firebase from 'firebase.js';
import { clearUsersData } from './users';
-import firebase from '../../firebase';
export const AUTH_SIGN_IN_INIT = createAction('AUTH_SIGN_IN_INIT');
export const AUTH_SIGN_IN_FAIL = createAction('AUTH_SIGN_IN_FAIL');
@@ -74,6 +74,7 @@ export const logout = () => {
export const verifyAuth = () => {
return dispatch => {
+ debugger;
firebase.auth().onAuthStateChanged(user => {
dispatch(AUTH_RESTORE_SESSION_INIT());
diff --git a/src/state/actions/users.js b/src/state/actions/users.js
index 8c5bad30..0151f7df 100644
--- a/src/state/actions/users.js
+++ b/src/state/actions/users.js
@@ -2,9 +2,9 @@ import { createAction } from 'redux-act';
import uuid from 'uuid/v4';
import { toastr } from 'react-redux-toastr';
-import axios from '../../utils/axios';
-import firebase from '../../firebase';
-import { firebaseError } from '../../utils';
+import axios from 'utils/axios';
+import { firebaseError } from 'utils';
+import firebase from 'firebase';
import { checkUserData, AUTH_UPDATE_USER_DATA } from './auth';
export const USERS_FETCH_DATA_INIT = createAction('USERS_FETCH_DATA_INIT');