Merge branch 'master' of https://bitbucket.org/sco44/tecnologiabanana

src/TopBar.js

@@ -3,14 +3,13 @@ import {
 	Navbar,
 	Nav,
 	NavDropdown,
-	//Form,
 	FormControl,
 	Button
 } from 'react-bootstrap'; //eslint-disable-next-line
 import { Link, withRouter } from 'react-router-dom';
 import './css/TopBar.css';
-import './reccomenders/fvitali'
+
-// import PropTypes from "prop-types";
+
 
 class TopBar extends Component {
 	state = {
@@ -77,29 +76,8 @@ class TopBar extends Component {
 									</Link>
 							
 							</NavDropdown>}
-							{<NavDropdown title="Progetti" id="basic-nav-dropdown" >
+
-								
+							<Link to={{ pathname: `/video/${localStorage['lastId']}/progetti` }} className="text-light nav-link">Progetti</Link>
-									<Link to={{ pathname: `/video/${localStorage['lastId']}/...` }} className="text-dark nav-link">
-										Action
-								</Link>
-							
-							
-									<Link to={{ pathname: `/video/${localStorage['lastId']}/...` }} className="text-dark nav-link">
-										Another action
-									</Link>
-							
-								
-									<Link to={{ pathname: `/video/${localStorage['lastId']}/...` }} className="text-dark nav-link">
-										Something
-									</Link>
-								
-								<NavDropdown.Divider />
-								
-									<Link to={{ pathname: `/video/${localStorage['lastId']}/...` }} className="text-dark nav-link">
-										Separated link
-									</Link>
-								
-							</NavDropdown>}
 
 						</Nav>
 						<form className="form-inline" onSubmit={this.handleSubmit}>