Skip to content

refactor(templates): introduce base.html and inheritance #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(templates): introduce base.html and inheritance #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}GUDLFT{% endblock %}</title>
{% block head_extra %}{% endblock %}
</head>
<body>
{% block content %}{% endblock %}
</body>
</html>
16 changes: 7 additions & 9 deletions templates/booking.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Booking for {{competition['name']}} || GUDLFT</title>
</head>
<body>
{% extends "base.html" %}
{% block title %}Booking for {{ competition['name'] }} | GUDLFT{% endblock %}
{% block head_extra %}
<meta name="description" content="Book places for {{ competition['name'] }}.">
{% endblock %}
{% block content %}
<h2>{{competition['name']}}</h2>
Places available: {{competition['numberOfPlaces']}}
<form action="/purchasePlaces" method="post">
Expand All @@ -13,5 +12,4 @@ <h2>{{competition['name']}}</h2>
<label for="places">How many places?</label><input type="number" name="places" id=""/>
<button type="submit">Book</button>
</form>
</body>
</html>
{% endblock %}
14 changes: 5 additions & 9 deletions templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>GUDLFT Registration</title>
</head>
<body>
{% extends "base.html" %}

{% block title %}GUDLFT Registration{% endblock %}
{% block content %}
<h1>Welcome to the GUDLFT Registration Portal!</h1>
Please enter your secretary email to continue:
<form action="showSummary" method="post">
<label for="email">Email:</label>
<input type="email" name="email" id=""/>
<button type="submit">Enter</button>
</form>
</body>
</html>
{% endblock %}
25 changes: 10 additions & 15 deletions templates/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Summary | GUDLFT Registration</title>
</head>
<body>
<h2>Welcome, {{club['email']}} </h2><a href="{{url_for('logout')}}">Logout</a>
{% extends "base.html" %}
{% block title %}Summary | GUDLFT Registration{% endblock %}
{% block content %}

{% with messages = get_flashed_messages()%}
<h2>Welcome, {{club['email']}} </h2><a href="{{url_for('logout')}}">Logout</a>

{% with messages = get_flashed_messages() %}
{% if messages %}
<ul>
<ul class=flashes>
{% for message in messages %}
<li>{{message}}</li>
<li>{{ message }}</li>
{% endfor %}
</ul>
{% endif%}
{% endwith %}
Points available: {{club['points']}}
<h3>Competitions:</h3>
<ul>
Expand All @@ -30,7 +28,4 @@ <h3>Competitions:</h3>
<hr />
{% endfor %}
</ul>
{%endwith%}

</body>
</html>
{% endblock %}