feature: add dashboard redirect

This commit is contained in:
Jordan Knott 2020-04-10 11:31:29 -05:00
parent d51a9c58ab
commit a877cd9414
5 changed files with 56 additions and 11 deletions

View File

@ -2,6 +2,7 @@ import React from 'react';
import { Router, Switch, Route } from 'react-router-dom'; import { Router, Switch, Route } from 'react-router-dom';
import * as H from 'history'; import * as H from 'history';
import Dashboard from 'Dashboard';
import Projects from 'Projects'; import Projects from 'Projects';
import Project from 'Projects/Project'; import Project from 'Projects/Project';
import Login from 'Auth'; import Login from 'Auth';
@ -13,6 +14,7 @@ type RoutesProps = {
const Routes = ({ history }: RoutesProps) => ( const Routes = ({ history }: RoutesProps) => (
<Router history={history}> <Router history={history}>
<Switch> <Switch>
<Route exact path="/" component={Dashboard} />
<Route exact path="/projects" component={Projects} /> <Route exact path="/projects" component={Projects} />
<Route exact path="/projects/:projectId" component={Project} /> <Route exact path="/projects/:projectId" component={Project} />
<Route exact path="/login" component={Login} /> <Route exact path="/login" component={Login} />

View File

@ -4,9 +4,17 @@ import { setAccessToken } from 'shared/utils/accessToken';
import NormalizeStyles from './NormalizeStyles'; import NormalizeStyles from './NormalizeStyles';
import BaseStyles from './BaseStyles'; import BaseStyles from './BaseStyles';
import Routes from './Routes'; import Routes from './Routes';
import Navbar from 'shared/components/Navbar';
import GlobalTopNavbar from 'App/TopNavbar';
import styled from 'styled-components';
const history = createBrowserHistory(); const history = createBrowserHistory();
const MainContent = styled.div`
padding: 0 0 50px 80px;
background: #262c49;
`;
const App = () => { const App = () => {
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
@ -29,7 +37,14 @@ const App = () => {
}, []); }, []);
if (loading) { if (loading) {
return <div>loading...</div>; return (
<>
<Navbar />
<MainContent>
<GlobalTopNavbar />
</MainContent>
</>
);
} }
return ( return (
<> <>

View File

@ -0,0 +1,8 @@
import React from 'react';
import { Redirect } from 'react-router';
const Dashboard: React.FC = () => {
return <Redirect to="/projects" />;
};
export default Dashboard;

View File

@ -37,7 +37,7 @@ interface QuickCardEditorState {
} }
const MainContent = styled.div` const MainContent = styled.div`
padding: 0 0 50px 100px; padding: 0 0 50px 80px;
height: 100%; height: 100%;
background: #262c49; background: #262c49;
`; `;
@ -47,12 +47,21 @@ const Wrapper = styled.div`
background-color: red; background-color: red;
`; `;
const TitleWrapper = styled.div`
margin-left: 38px;
margin-bottom: 15px;
`;
const Title = styled.span` const Title = styled.span`
text-align: center; text-align: center;
font-size: 24px; font-size: 24px;
color: #fff; color: #fff;
`; `;
const Board = styled.div`
margin-left: 36px;
`;
interface ProjectParams { interface ProjectParams {
projectId: string; projectId: string;
} }
@ -187,7 +196,10 @@ const Project = () => {
<Navbar /> <Navbar />
<MainContent> <MainContent>
<TopNavbar /> <TopNavbar />
<TitleWrapper>
<Title>{data.findProject.name}</Title> <Title>{data.findProject.name}</Title>
</TitleWrapper>
<Board>
<Lists <Lists
onQuickEditorOpen={onQuickEditorOpen} onQuickEditorOpen={onQuickEditorOpen}
onCardCreate={onCardCreate} onCardCreate={onCardCreate}
@ -195,6 +207,7 @@ const Project = () => {
onCardDrop={onCardDrop} onCardDrop={onCardDrop}
onListDrop={onListDrop} onListDrop={onListDrop}
/> />
</Board>
</MainContent> </MainContent>
{quickCardEditor.isOpen && ( {quickCardEditor.isOpen && (
<QuickCardEditor <QuickCardEditor

View File

@ -28,7 +28,14 @@ const Projects = () => {
const { loading, data } = useGetProjectsQuery(); const { loading, data } = useGetProjectsQuery();
console.log(loading, data); console.log(loading, data);
if (loading) { if (loading) {
return <Wrapper>Loading</Wrapper>; return (
<>
<Navbar />
<MainContent>
<TopNavbar />
</MainContent>
</>
);
} }
if (data) { if (data) {
const { teams } = data.organizations[0]; const { teams } = data.organizations[0];