Skip to content

Commit

Permalink
Header style added and start form flow repaired
Browse files Browse the repository at this point in the history
  • Loading branch information
RafisSomeone committed Oct 13, 2020
1 parent 4517172 commit 924d308
Show file tree
Hide file tree
Showing 15 changed files with 611 additions and 60 deletions.
11 changes: 8 additions & 3 deletions 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"bootstrap": "^4.5.0",
"d3": "^5.16.0",
"formik": "^2.1.4",
"jquery": "^3.5.1",
"material-ui-icons": "^1.0.0-beta.36",
"memoize": "^0.1.1",
"memoize-one": "^5.1.1",
Expand Down
6 changes: 5 additions & 1 deletion src/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,11 @@ class App extends Component {
currentUser={this.state.currentUser}
component={Diary}
/>
<Route path='/oauth2/redirect' component={OAuth2RedirectHandler} />
<Route
path='/oauth2/redirect'
currentUser={this.state.currentUser}
component={OAuth2RedirectHandler}
/>
<Route component={NotFound} />
</Switch>
</div>
Expand Down
98 changes: 51 additions & 47 deletions src/common/AppHeader.js
Original file line number Diff line number Diff line change
@@ -1,60 +1,64 @@
import React, { Component } from 'react'
import { Link, NavLink } from 'react-router-dom'
import './css/styles.css'
import './AppHeader.css'
import { Link, NavLink } from 'react-router-dom'
import $ from 'jquery'

class AppHeader extends Component {
componentDidMount () {
$('.navTrigger').click(function () {
$(this).toggleClass('active')
$('#mainNav').toggleClass('mobileNav')
$('#mainListDiv').toggleClass('show_list')
$('#mainListDiv').fadeIn()
})
$(window).scroll(function () {
if ($(document).scrollTop() > 50) {
$('.nav').addClass('affix')
} else {
$('.nav').removeClass('affix')
}
})
}

render () {
return (
<header className='app-header'>
<nav id='mainNav' className='nav'>
<div className='container'>
<div className='app-branding'>
<Link to='/' className='app-title'>Master Diet</Link>
<div className='logo'>
<Link to='/'>Master Diet</Link>
</div>
<div className='app-options'>
<nav className='app-nav'>
{this.props.authenticated ? ( !window.location.href.includes('startForm') ? (
<ul>
<li>
<NavLink to='/profile'>Profile</NavLink>
</li>
<li>
<NavLink to='/productBrowser'>Product Browser</NavLink>
</li>
<li>
<NavLink to='/activityBrowser'>Activity Browser</NavLink>
</li>
<li>
<NavLink to='/achievements'>Achievements</NavLink>
</li>
<li>
<NavLink to='/bmiCalculator'>BMI Calculator</NavLink>
</li>
<li>
<NavLink to='/diary'>Diary</NavLink>
</li>
<li>
<a onClick={this.props.onLogout}>Logout</a>
</li>
</ul>
) : (
<ul>
</ul>
)
) : (
<ul>
<li>
<NavLink to='/login'>Login</NavLink>
</li>
<li>
<NavLink to='/signup'>Signup</NavLink>
</li>

</ul>
)}
</nav>
<div id='mainListDiv' className='main_list'>
{this.props.authenticated ? (!window.location.href.includes('startForm') ? (
<ul className='navlinks'>
<li><NavLink to='/diary'>Diary</NavLink></li>
<li><NavLink to='/profile'>Profile</NavLink></li>
<li><NavLink to='/achievements'>Achievements</NavLink></li>
<li>
<a onClick={this.props.onLogout}>Logout</a>
</li>
</ul>
) : (
<ul className='navlinks' />
)
) : (
<ul className='navlinks'>
<li>
<NavLink to='/login'>Login</NavLink>
</li>
<li>
<NavLink to='/signup'>Sign Up</NavLink>
</li>
</ul>
)}
</div>
<span className='navTrigger'>
<i />
<i />
<i />
</span>
</div>
</header>
</nav>
)
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/common/bootstrap/css/bootstrap.min.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions src/common/bootstrap/js/bootstrap.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 924d308

Please sign in to comment.