-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
50 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; */ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |