Merge pull request 'Refactor/Formattingandstuff' (#60) from refactor/formattingAndStuff into main
This commit is contained in:
commit
80121c9b90
2 changed files with 16 additions and 18 deletions
|
@ -75,10 +75,10 @@ with app.app_context():
|
||||||
db.create_all()
|
db.create_all()
|
||||||
if db.session.query(User).filter_by(username='Yasoob').count() < 1:
|
if db.session.query(User).filter_by(username='Yasoob').count() < 1:
|
||||||
db.session.add(User(
|
db.session.add(User(
|
||||||
username='Yasoob',
|
username='Yasoob',
|
||||||
password=guard.hash_password('strongpassword'),
|
password=guard.hash_password('strongpassword'),
|
||||||
roles='admin'
|
roles='admin'
|
||||||
))
|
))
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
@ -133,6 +133,7 @@ def protected():
|
||||||
"""
|
"""
|
||||||
return {'message': f'protected endpoint (allowed user {flask_praetorian.current_user().username})'}
|
return {'message': f'protected endpoint (allowed user {flask_praetorian.current_user().username})'}
|
||||||
|
|
||||||
|
|
||||||
@app.route('/api/register', methods=['POST'])
|
@app.route('/api/register', methods=['POST'])
|
||||||
def register():
|
def register():
|
||||||
req = flask.request.get_json(force=True)
|
req = flask.request.get_json(force=True)
|
||||||
|
|
|
@ -19,28 +19,25 @@ function Navbar() {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const isLoggedIn = useAuth();
|
||||||
|
|
||||||
/* Shows the button after resizing the screen */
|
/* Shows the button after resizing the screen */
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
showButton();
|
showButton();
|
||||||
}, []);
|
}, []);
|
||||||
window.addEventListener("resize", showButton);
|
window.addEventListener("resize", showButton);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{" "}
|
|
||||||
<nav className="navbar">
|
<nav className="navbar">
|
||||||
{" "}
|
|
||||||
<div className="navbar-container">
|
<div className="navbar-container">
|
||||||
{" "}
|
|
||||||
<Link to="/" className="navbar-logo" onClick={closeMobileMenu}>
|
<Link to="/" className="navbar-logo" onClick={closeMobileMenu}>
|
||||||
{" "}
|
|
||||||
Bachelorarbeit Marco Camenzind{" "}
|
Bachelorarbeit Marco Camenzind{" "}
|
||||||
</Link>{" "}
|
</Link>
|
||||||
<div className="menu-icon" onClick={handleClick}>
|
<div className="menu-icon" onClick={handleClick}>
|
||||||
{" "}
|
<i className={click ? "fas fa-times" : "fas fa-bars"} />
|
||||||
<i className={click ? "fas fa-times" : "fas fa-bars"} />{" "}
|
</div>
|
||||||
</div>{" "}
|
|
||||||
<ul className={click ? "nav-menu active" : "nav-menu"}>
|
<ul className={click ? "nav-menu active" : "nav-menu"}>
|
||||||
{" "}
|
|
||||||
<li className="nav-item">
|
<li className="nav-item">
|
||||||
<Link to="/" className="nav-links" onClick={closeMobileMenu}>
|
<Link to="/" className="nav-links" onClick={closeMobileMenu}>
|
||||||
Startseite
|
Startseite
|
||||||
|
|
Loading…
Reference in a new issue