cleaner imports

react/src/App.tsx

@@ -5,7 +5,7 @@ import { BrowserRouter as Router } from 'react-router-dom'
 
 import Nav from 'Nav/Nav'
 import Routes from 'Routes/Routes'
-import { WithUser } from 'Shared/Context'
+import { WithUser } from 'Shared/UserContainer'
 
 const App = () => (
   <WithUser>

react/src/Nav/Nav.tsx

@@ -4,8 +4,8 @@ import { useLocation } from 'react-router'
 import { NavLink, NavLinkProps } from 'react-router-dom'
 import { Button, Container, Menu } from 'semantic-ui-react'
 
-import { UserContainer } from 'Shared/Context'
 import { Anon, LoggedIn } from 'Shared/Roles'
+import { UserContainer } from 'Shared/UserContainer'
 
 import './responsive.css'
 

react/src/Routes/Helpers.tsx

@@ -4,8 +4,8 @@ import { Redirect, RouteProps } from 'react-router'
 import { Route } from 'react-router-dom'
 import { Loader, Container, Dimmer } from 'semantic-ui-react'
 
-import { UserContainer } from 'Shared/Context'
 import SimplePage from 'Shared/SimplePage'
+import { UserContainer } from 'Shared/UserContainer'
 
 // check the user is logged in, and redirect to login screen if still not auth'd
 

react/src/Routes/LogIn/LogInForm.tsx

@@ -4,9 +4,9 @@ import { Redirect, useLocation } from 'react-router-dom'
 import { Form, Button, Message } from 'semantic-ui-react'
 
 import API from 'Api'
-import { UserContainer } from 'Shared/Context'
 import { useRequest, useFields, InputChangeHandler } from 'Shared/Hooks';
 import { User } from 'Shared/Models'
+import { UserContainer } from 'Shared/UserContainer'
 
 const LogInForm = () => {
   const location = useLocation<{ from: string }>()

react/src/Routes/Posts/Posts.tsx

@@ -1,19 +1,19 @@
-import react from 'react'
+import React, { useContext, useEffect } from 'react'
 
 import { Link } from 'react-router-dom'
 import { Segment, Message, Header, Button, Placeholder } from 'semantic-ui-react'
 
 import API from 'Api'
-import { UserContainer } from 'Shared/Context'
 import { useRequest } from 'Shared/Hooks'
 import { Post } from 'Shared/Models'
 import SimplePage from 'Shared/SimplePage'
+import { UserContainer } from 'Shared/UserContainer'
 
 const Posts = () => {
   const [loading, error, run, posts] = useRequest([])
-  const { user } = react.useContext(UserContainer)
+  const { user } = useContext(UserContainer)
 
-  react.useEffect(() => {
+  useEffect(() => {
     run(API.getPosts())
   }, [run])
 

react/src/Routes/Reset/CheckReset.tsx

@@ -4,10 +4,10 @@ import { useParams } from 'react-router'
 import { Redirect } from 'react-router-dom'
 
 import API from 'Api'
-import { UserContainer } from 'Shared/Context'
 import { useRequest } from 'Shared/Hooks';
 import { User } from 'Shared/Models'
 import SimplePage from 'Shared/SimplePage';
+import { UserContainer } from 'Shared/UserContainer'
 
 const CheckReset = () => {
   const { code } = useParams<{ code: string }>();

react/src/Routes/Verify/Verify.tsx

@@ -5,10 +5,10 @@ import { Redirect } from 'react-router-dom'
 import { Message } from 'semantic-ui-react'
 
 import API from 'Api'
-import { UserContainer } from 'Shared/Context'
 import { useRequest } from 'Shared/Hooks';
 import { User } from 'Shared/Models'
 import SimplePage from 'Shared/SimplePage'
+import { UserContainer } from 'Shared/UserContainer'
 
 const Verify = () => {
   const { code } = useParams<{ code: string }>();

react/src/Shared/Roles.tsx

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react'
 
-import { UserContainer } from 'Shared/Context'
+import { UserContainer } from 'Shared/UserContainer'
 
 export const LoggedIn = ({ children }: { children: React.ReactNode }) => {
   const { user } = useContext(UserContainer)

react/src/Shared/Context.tsx → react/src/Shared/UserContainer.tsx

@@ -12,7 +12,6 @@ export const UserContainer = React.createContext({
   handleLogout: () => { }
 });
 
-
 export const WithUser = ({ children }: { children: React.ReactNode }) => {
   const [user, setUser] = useState({} as User)
   const [userLoading, setLoading] = useState(true)