Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added menu components #12

Merged
merged 1 commit into from
Jul 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions brainstems-FE/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions brainstems-FE/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-router": "^5.0.1",
"react-router-dom": "^5.0.1",
"react-scripts": "3.0.1"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion brainstems-FE/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import './App.css';
import PicLogin from "./Components/picLogin";
import DashboardComp from './Components/DashboardComp'


function App() {
return (
<div className="App">
<PicLogin />
{/* <PicLogin /> */}
<DashboardComp />

</div>
Expand Down
13 changes: 13 additions & 0 deletions brainstems-FE/src/Components/AddActivityComp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react'

class AddActivityComp extends React.Component {
render() {
return(
<div>
<h1>hi from AddActivity</h1>
</div>
)
}
}

export default AddActivityComp
13 changes: 13 additions & 0 deletions brainstems-FE/src/Components/CompletedActivitiesComp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react'

class CompletedActivitiesComp extends React.Component {
render() {
return(
<div>
<h1>CompletedActivitiesComp</h1>
</div>
)
}
}

export default CompletedActivitiesComp
28 changes: 25 additions & 3 deletions brainstems-FE/src/Components/DashboardComp.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,34 @@
import React from 'react'
import picLogin from './picLogin'
import AddActivityComp from './AddActivityComp'
import ExistingActivitiesComp from './ExistingActivitiesComp'
import CompletedActivitiesComp from './CompletedActivitiesComp'
import FavouriteActivitiesComp from './FavouriteActivitiesComp'

import { NavLink, Switch, Route, Link, BrowserRouter as Router } from 'react-router-dom'

class DashboardComp extends React.Component {
render() {
return (
<div>
<h1>hi from DashboardComp</h1>
</div>
<Router>
<div>
<h1>hi from DashboardComp</h1>
<NavLink to='/studentlogin'>Student Login</NavLink>
<NavLink to='/addactivity'>Add New Activity</NavLink>
<NavLink to='/existingactivities'>Existing Activities</NavLink>
<NavLink to='/completedactivities'>Completed Activities</NavLink>
<NavLink to='/favouriteactivities'>Favourite Activities</NavLink>

<Switch>
<Route path='/studentlogin' component={picLogin} />
<Route path='/addactivity' component={AddActivityComp} />
<Route path='/existingactivities' component={ExistingActivitiesComp} />
<Route path='/completedactivities' component={CompletedActivitiesComp} />
<Route path='/favouriteactivities' component={FavouriteActivitiesComp} />

</Switch>
</div>
</Router>
)
}
}
Expand Down
14 changes: 14 additions & 0 deletions brainstems-FE/src/Components/ExistingActivitiesComp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react'

class ExistingActivitiesComp extends React.Component {
render() {
console.log('from exist')
return(
<div>
<h1>hi from ExistingActivitiesComp</h1>
</div>
)
}
}

export default ExistingActivitiesComp
14 changes: 14 additions & 0 deletions brainstems-FE/src/Components/FavouriteActivitiesComp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import React from 'react'

class FavouriteActivitiesComp extends React.Component {
render() {
console.log('from exist')
return(
<div>
<h1>hi from FavouriteActivitiesComp</h1>
</div>
)
}
}

export default FavouriteActivitiesComp