Skip to content

Commit

Permalink
fix files places
Browse files Browse the repository at this point in the history
  • Loading branch information
ishak52 committed Aug 2, 2018
1 parent cad3434 commit 57bc86d
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 16 deletions.
16 changes: 16 additions & 0 deletions frontend/src/AppRoutes.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.AppRoutes {
text-align: center;
position: relative;
min-height: 667px;

}

#root {
font-family: arial;
/* margin: 0 auto; */
max-width: 375px;
min-height: 600px;
background-color:#EEEEEE;

/* padding-bottom: 0px; */
}
50 changes: 34 additions & 16 deletions frontend/src/AppRoutes.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,45 @@
/* eslint-disable react/jsx-filename-extension */
import React from 'react';
import { BrowserRouter, Route, Switch } from 'react-router-dom';
import {BrowserRouter, Route, Switch} from 'react-router-dom'

import './AppRoutes.css';
import './style/style.css';

import Login from './components/Login/Login';
import Header from './components/Header';
import Chats from './components/Chats/Chats';
import Carers from './components/Carers/Carers';
import signUp from './components/singup/singup';
import Profile from './components/Profile/Profile';
import Diaries from './components/MyDiary/MyDiary';
import Discussion from './components/Discussions/Discussions';
import Connection from './components/Connections/Connections';
import './style/style.css';

import MyBook from './components/MyCarePlan/MyCarePlan';

const AppRoutes = () => (
import Error from "./components/Error";

<BrowserRouter>
import NavElements from './components/Navbar/NavElement'

<Switch>
<Route path="/" component={Carers} exact />
<Route path="/login" component={Login} />
<Route path="/carers" component={Carers} />
<Route path="/signUp" component={signUp} />
<Route path="/MyFriends" component={Connection} />
</Switch>

</BrowserRouter>
const AppRoutes = () => (
<div className="AppRoutes">
<BrowserRouter>
<div>
<Header connectReq={['adsfa','sdfg']}/>
<Switch>
<Route path="/" component={Carers} exact />
<Route path="/login" component={Login} />
<Route path="/carers" component={Carers} />
<Route path="/profile" component={Profile} />
<Route path="/diaries" component={Diaries} />
<Route path="/discussion" component={Discussion} />
<Route path="/connection" component={Connection} />
<Route path="/mybook" component={MyBook} />
<Route path="/chats" component={Chats} />
<Route component={Error} />
</Switch>
<NavElements />
</div>
</BrowserRouter>
</div>
);


export default AppRoutes;

0 comments on commit 57bc86d

Please sign in to comment.