Skip to content

Commit ab56e62

Browse files
committed
updated templates
1 parent 41c5a63 commit ab56e62

File tree

5 files changed

+40
-41
lines changed

5 files changed

+40
-41
lines changed
Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
<!-- Navigation -->
2-
<nav class="navbar fixed-top navbar-expand-lg navbar-dark bg-dark">
3-
<!-- Navbar Brand -->
4-
<a class="navbar-brand" href="{{ url_for('main.home') }}">{{ config.APP_NAME }}</a>
5-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
6-
<span class="navbar-toggler-icon"></span>
7-
</button>
8-
<div class="collapse navbar-collapse" id="navbarNav">
9-
<!-- Main Navigation -->
10-
<ul class="navbar-nav">
11-
<li class="nav-item active">
12-
<a class="nav-link" href="{{ url_for('main.about') }}">About <span class="sr-only">(current)</span></a>
13-
</li>
14-
{% if current_user.is_authenticated %}
15-
<li class="nav-item">
16-
<a class="nav-link" href="{{ url_for('user.members') }}">Members</a>
17-
</li>
18-
{% endif %}
19-
</ul>
20-
<!-- Login/Logout -->
21-
<ul class="navbar-nav ml-auto">
22-
<li class="nav-item">
2+
<nav class="navbar fixed-top navbar-expand-sm navbar-dark bg-dark">
3+
<div class="container">
4+
<!-- Navbar Brand -->
5+
<a class="navbar-brand" href="{{ url_for('main.home') }}">{{ config.APP_NAME }}</a>
6+
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
7+
<span class="navbar-toggler-icon"></span>
8+
</button>
9+
<div class="collapse navbar-collapse" id="navbarNav">
10+
<!-- Main Navigation -->
11+
<ul class="navbar-nav">
12+
<li class="nav-item active">
13+
<a class="nav-link" href="{{ url_for('main.about') }}">About<span class="sr-only">(current)</span></a>
14+
</li>
2315
{% if current_user.is_authenticated %}
24-
<a class="nav-link" href="{{ url_for('user.logout') }}">Logout</a>
25-
{% else %}
26-
<a class="nav-link" href="{{ url_for('user.login') }}">Login</a>
16+
<li class="nav-item">
17+
<a class="nav-link" href="{{ url_for('user.members') }}">Members</a>
18+
</li>
2719
{% endif %}
28-
</li>
29-
</ul>
20+
</ul>
21+
<!-- Login/Logout -->
22+
<ul class="navbar-nav ml-auto">
23+
<li class="nav-item">
24+
{% if current_user.is_authenticated %}
25+
<a class="nav-link" href="{{ url_for('user.logout') }}">Logout</a>
26+
{% else %}
27+
<a class="nav-link" href="{{ url_for('user.login') }}">Login</a>
28+
{% endif %}
29+
</li>
30+
</ul>
31+
</div>
3032
</div>
31-
</nav>
33+
</nav>

{{cookiecutter.app_slug}}/project/client/templates/main/about.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
{% block content %}
33

44
<div class="body-content">
5-
<div class="row">
5+
<div>
66
<h1>About</h1>
7+
<hr><br>
8+
<p>Add some content here!</p>
79
</div>
810
</div>
911

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{% extends "_base.html" %}
22
{% block content %}
33

4-
<div class="body-content">
5-
<div class="row">
6-
<h1>Welcome!</h1>
7-
</div>
4+
<div>
5+
<h1>Welcome!</h1>
6+
<hr><br>
7+
<p>Add some content here!</p>
88
</div>
99

1010
{% endblock %}

{{cookiecutter.app_slug}}/project/client/templates/user/login.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,25 @@
33
{% block content %}
44

55
<header class="content-header">
6-
<h1>Please login</h1>
6+
<h1>Login</h1>
7+
<hr><br>
78
</header>
89

910
<br>
1011

1112
<form class="form" role="form" method="post" action="">
12-
1313
{{ form.csrf_token }}
1414
{{ form.hidden_tag() }}
1515
{{ wtf.form_errors(form, hiddens="only") }}
1616

1717
<div class="col-lg-4 col-sm-4">
18-
1918
{{ wtf.form_field(form.email) }}
2019
{{ wtf.form_field(form.password) }}
2120

2221
<button class="btn btn-success" type="submit">Sign In!</button>
2322
<br><br>
2423
<p>Need to <a href="{{ url_for('user.register') }}">Register</a>?</p>
2524
</div>
26-
2725
</form>
2826

2927
{% endblock %}

{{cookiecutter.app_slug}}/project/client/templates/user/register.html

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,26 @@
33
{% block content %}
44

55
<header class="content-header">
6-
<h1>Please Register</h1>
6+
<h1>Register</h1>
7+
<hr><br>
78
</header>
89

910
<br>
1011

1112
<form class="form" role="form" method="post" action="">
12-
1313
{{ form.csrf_token }}
1414
{{ form.hidden_tag() }}
1515
{{ wtf.form_errors(form, hiddens="only") }}
1616

1717
<div class="col-lg-4 col-sm-4">
18-
1918
{{ wtf.form_field(form.email) }}
2019
{{ wtf.form_field(form.password) }}
2120
{{ wtf.form_field(form.confirm) }}
2221

2322
<button class="btn btn-success" type="submit">Register!</button>
2423
<br><br>
2524
<p>Already have an account? <a href="{{ url_for('user.login') }}">Sign in</a>.</p>
26-
2725
</div>
28-
2926
</form>
3027

3128
{% endblock %}

0 commit comments

Comments
 (0)