1.0.1 release #15

Merged
williamp merged 35 commits from testing into master 2023-03-21 18:10:14 +00:00
9 changed files with 91 additions and 11 deletions
Showing only changes of commit ec31206127 - Show all commits

View File

@@ -17,7 +17,7 @@
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<ul class="navbar-nav mr-auto mt-3 mt-lg-0">
<li class="nav-item">
<a class="nav-link" href="/events">Events</a>
</li>
@@ -27,14 +27,17 @@
<li class="nav-item">
<a class="nav-link" href="/periods">Periods</a>
</li>
</ul>
</div>
<div class="float-right">
{% if current_user.is_authenticated %}
<a href="{{ url_for('logout') }}" class="nav-link"> Logout {{current_user.userName}} </a>
<li class="nav-item">
<a class="nav-link" href="/settings">Settings</a>
</li>
{% endif %}
</ul>
{% if current_user.is_authenticated %}
<a href="{{ url_for('logout') }}"> Logout {{current_user.userName}} </a>
{% endif %}
{% if not current_user.is_authenticated %}
<a href="{{ url_for('login') }}" class="nav-link"> Login </a>
<a href="{{ url_for('login') }}"> Login </a>
{% endif %}
</div>
</nav>