Burathar
/
The-Hunt
1
0
Fork 0
Code Issues 24 Pull Requests Releases Wiki Activity

Compare commits

base: Burathar:3bd6bda6e1e5f45a93be3c8cd9199838b7708d1f
Branches Tags
Burathar:QR-seachgame
Burathar:feature_tests
Burathar:master
Burathar:testing
..
compare: Burathar:81bd506e1cb78788fe00511fbdfa22407a8dc635
Branches Tags
Burathar:QR-seachgame
Burathar:feature_tests
Burathar:master
Burathar:testing

No commits in common. '3bd6bda6e1e5f45a93be3c8cd9199838b7708d1f' and '81bd506e1cb78788fe00511fbdfa22407a8dc635' have entirely different histories.
3bd6bda6e1 ... 81bd506e1c

9 changed files with 69 additions and 128 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 0
      app/static/css/default.css
  2. 44
      app/templates/_game_player_info.html
  3. 14
      app/templates/auth/login.html
  4. 18
      app/templates/auth/register.html
  5. 18
      app/templates/auth/user_hash_login.html
  6. 6
      app/templates/base.html
  7. 25
      app/templates/game_bunny_dashboard.html
  8. 48
      app/templates/game_hunter_dashboard.html
  9. 24
      app/templates/index.html

0
app/static/css/default.css
Unescape View File

44
app/templates/_game_player_info.html
Unescape View File

@ -1,29 +1,21 @@ @@ -1,29 +1,21 @@
<h2>Game Info</h2>
<div class="table">
<div class="table-responsive">
<table class="table">
<tr>
<th>My Game</th>
<td>{{ game.name.title() }}</td>
</tr>
<tr>
<th>My Name</th>
<td>{{ current_user.name.title() }}</td>
</tr>
<tr>
<th>My Role</th>
<td>{{ current_user.role_in_game(game).name.title() }}</td>
</tr>
<tr>
<th>Game State</th>
<td>{{ game.state.name.title() }}</td>
</tr>
<tr>
<th>Start Time</th>
<td>{% if game.start_time %}{{ moment(game.start_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}</td>
</tr>
<tr>
<th>End Time</th>
<td>{% if game.end_time %}{{ moment(game.end_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}</td>
</tr>
<tr>
<th>My Role</th>
<td>{{ current_user.role_in_game(game).name }}</td>
</tr>
<tr>
<th>Game State</th>
<td>{{ game.state.name }}</td>
</tr>
<tr>
<th>Start Time</th>
<td>{% if game.start_time %}{{ moment(game.start_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}</td>
</tr>
<tr>
<th>End Time</th>
<td>{% if game.end_time %}{{ moment(game.end_time).format('DD-MM-YYYY, hh:mm')}}{% else %}-{% endif %}</td>
</tr>
</table>
</div>
</div>

14
app/templates/auth/login.html
Unescape View File

@ -2,14 +2,12 @@ @@ -2,14 +2,12 @@
{% import 'bootstrap/wtf.html' as wtf %}
{% block app_content %}
<h1>Sign In</h1>
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-8 col-md-4">
<h1>Sign In</h1>
{{ wtf.quick_form(form, button_map={'submit': 'primary'}) }}
<br>
<p>New User? <a href="{{ url_for('auth.register') }}">Click to Register!</a></p>
<div class="col-md-4">
{{ wtf.quick_form(form, button_map={'submit': 'primary'}) }}
</div>
<div class="col-xs-0 col-md-7"></div>
</div>
{% endblock %}
<br>
<p>New User? <a href="{{ url_for('auth.register') }}">Click to Register!</a></p>
{% endblock %}

18
app/templates/auth/register.html
Unescape View File

@ -2,14 +2,12 @@ @@ -2,14 +2,12 @@
{% import 'bootstrap/wtf.html' as wtf %}
{% block app_content %}
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-8 col-md-4">
<h1>Register</h1>
{{ wtf.quick_form(form, button_map={'submit': 'primary'}) }}
<br>
<p>Already have an account? <a href="{{ url_for('auth.login') }}">Click to Sign In!</a></p>
<h1>Register</h1>
<div class="row">
<div class="col-md-4">
{{ wtf.quick_form(form, button_map={'submit': 'primary'}) }}
</div>
</div>
<div class="col-xs-0 col-md-7"></div>
</div>
{% endblock %}
<br>
<p>Already have an account? <a href="{{ url_for('auth.login') }}">Click to Sign In!</a></p>
{% endblock %}

18
app/templates/auth/user_hash_login.html
Unescape View File

@ -2,19 +2,13 @@ @@ -2,19 +2,13 @@
{% import 'bootstrap/wtf.html' as wtf %}
{% block app_content %}
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-12 col-md-10">
<h1>Welcome, {{ user.name }}!</h1>
<p>
<h1>Welcome, {{ user.name }}!</h1>
<p>
If you found this page, it probably means someone who is organising a hunt invited you by
sending a link or QR-code to this page. You can start playing right away, if and if you get
logged out just visit this page again. However, if you want to be sure other people can't
steal this account, please set a password.
</p>
<a href="{{ url_for('main.index') }}"><button class="btn btn-primary">Set Password</button></a>
<a href="{{ url_for('auth.user_hash_login', auth_hash=user.auth_hash, login='true') }}"><button class="btn btn-primary">Start Playing!</button></a>
</div>
<div class="col-xs-0 col-md-1"></div>
</div>
{% endblock %}
</p>
<a href="{{ url_for('main.index') }}"><button class="btn btn-primary">Set Password</button></a>
<a href="{{ url_for('auth.user_hash_login', auth_hash=user.auth_hash, login='true') }}"><button class="btn btn-primary">Start Playing!</button></a>
{% endblock %}

6
app/templates/base.html
Unescape View File

@ -1,10 +1,5 @@ @@ -1,10 +1,5 @@
{% extends 'bootstrap/base.html' %}
{% block styles %}
{{ super() }}
<link rel="stylesheet" href="{{ url_for('static', filename='css/default.css') }}">
{% endblock %}
{% block title %}
{% if title %}{{ title }} - The Hunt{% else %}Welcome to The Hunt{% endif %}
{% endblock %}
@ -32,7 +27,6 @@ @@ -32,7 +27,6 @@
{% if current_user.is_anonymous %}
<li><a href="{{ url_for('auth.login') }}">Login</a></li>
{% else %}
<li><a href="#"><div class="hidden-xs hidden-sm">{{ current_user.name }}{% if game is defined %}/{{ game.name }}{% endif %}</div></a></li>
<li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
{% endif %}
</ul>

25
app/templates/game_bunny_dashboard.html
Unescape View File

@ -8,14 +8,11 @@ @@ -8,14 +8,11 @@
{% endblock %}
{% block player_app_content %}
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-12 col-md-7">
<h1>{{ game.name }}: {{ current_user.name }}</h1>
{% include '_game_player_info.html' %}
<h2>Objective Locations:</h2>
{% if game.objectives %}
<div class="table">
<div class="table-responsive">
<table class="table">
<thead>
<tr>
@ -37,21 +34,9 @@ @@ -37,21 +34,9 @@
</tbody>
</table>
</div>
<div id="map" style=" height: 500px; border-radius: 10px; " class="col-md-6 col-xs-12"></div>
{% endif %}
</div>
<div class="col-xs-12 col-md-3">
{% include '_game_player_info.html' %}
</div>
</div>
{% if game.objectives %}
<div class="row">
<div class="col-xs-1 col-md-1"></div>
<div id="map" style=" height: 500px; border-radius: 10px; " class="col-xs-10 col-md-10"></div>
<div class="col-xs-1 col-md-1"></div>
</div>
{% endif %}
{% endblock %}
@ -85,4 +70,4 @@ @@ -85,4 +70,4 @@
}
</script>
{% endblock %}
{% endblock %}

48
app/templates/game_hunter_dashboard.html
Unescape View File

@ -8,17 +8,22 @@ @@ -8,17 +8,22 @@
{% endblock %}
{% block player_app_content %}
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-12 col-md-7">
<h2>Bunnies</h2>
<div class="table">
<table class="table">
<h1>{{ game.name }}: {{ current_user.name }}</h1>
{% include '_game_player_info.html' %}
<h2>Bunnies:</h2>
<a href="{{ url_for('main.catch_bunny', game_name=game.name) }}">
<button class="btn btn-success">Catch Bunny</button>
</a>
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th scope="col">Player Name</th>
<th scope="col">Times Caught</th>
<th scope="col">Times Caught
<span style="font-size: smaller;">
(<span style="color:green;">Accepted</span>/<span style="color:red;">Denied</span>/<span style="color:gray;">Not reviewed</span>)
</span>
</th>
<th scope="col">Last location</th>
<th scope="col"></th>
</tr>
@ -28,7 +33,7 @@ @@ -28,7 +33,7 @@
{% for bunny in game.bunnies() %}
<tr>
<td>{{ bunny.user.name }}</td>
<td><span style="color:green;">{{ bunny.player_caught_by_players | selectattr('catching_player', '==', player) | selectattr('review.name', '==', 'accepted') |list|length}}</span> /
<td><span style="color:green;">{{ bunny.player_caught_by_players | selectattr('catching_player', '==', player) | selectattr('review.name', '==', 'accepted') |list|length}}</span> /
<span style="color:red;">{{ bunny.player_caught_by_players | selectattr('catching_player', '==', player) | selectattr('review.name', '==', 'denied') |list|length}}</span> /
<span style="color:gray;">{{ bunny.player_caught_by_players | selectattr('catching_player', '==', player) | selectattr('review.name', '==', 'none') |list|length}}</span>
</td>
@ -38,28 +43,15 @@ @@ -38,28 +43,15 @@
{% endwith %}</td>
<td>
<a href="{{ url_for('main.catch_bunny', game_name=game.name, bunny_name=bunny.user.name) }}">
<button class="btn btn-success btn-sm">Catch</button>
<button class="btn btn-success">Catch</button>
</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<span style="font-size: smaller;">
(<span style="color:green;">Accepted</span>/<span style="color:red;">Denied</span>/<span style="color:gray;">Not reviewed</span>)
</span>
</div>
</div>
<div class="col-xs-12 col-md-3">
{% include '_game_player_info.html' %}
</div>
</div>
<div class="row">
<div class="col-xs-1 col-md-1"></div>
<div id="map" style=" height: 500px; border-radius: 10px; " class="col-xs-10 col-md-10"></div>
<div class="col-xs-1 col-md-1"></div>
</table>
</div>
<div id="map" style=" height: 500px; border-radius: 10px; " class="col-md-6 col-xs-12"></div>
{% endblock %}
@ -80,8 +72,8 @@ @@ -80,8 +72,8 @@
L.tileLayer( 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/brtachtergrondkaartpastel/EPSG:3857/{z}/{x}/{y}.png', {
attribution: 'Kaartgegevens &copy; <a href="https://kadaster.nl">Kadaster</a>'
}).addTo( map );
var bunnies = JSON.parse('{{ json.dumps(game.last_locations(game.bunnies()), cls=location_encoder)|safe }}')
var bunnies = JSON.parse('{{ json.dumps(game.last_locations(game.bunnies()), cls=location_encoder)|safe }}')
for (var i = 0; i < bunnies.length; i++){
addPlayerMarker(map, bunnies[i])
}
@ -92,4 +84,4 @@ @@ -92,4 +84,4 @@
}
</script>
{% endblock %}
{% endblock %}

24
app/templates/index.html
Unescape View File

@ -1,19 +1,11 @@ @@ -1,19 +1,11 @@
{% extends 'player_base.html' %}
{% block player_app_content %}
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-12 col-md-10">
<h2>My games:</h2>
</div>
<div class="col-xs-0 col-md-1"></div>
</div>
<h1>Hi, {{ current_user.name }}!</h1>
<h2>My games:</h2>
{% if current_user.games %}
<div class="row">
<div class="col-xs-0 col-md-1"></div>
<div class="col-xs-12 col-md-10">
<div class="table">
<div class="table-responsive">
<table class="table">
<thead>
<tr>
@ -28,12 +20,12 @@ @@ -28,12 +20,12 @@
{% for game in current_user.games %}
<tr>
<td><a href="{{ url_for('main.game_dashboard', game_name = game.name) }}">{{ game.name }}</a></td>
<td>{{ game.state.name.title() }}</td>
<td>{{ game.state.name}}</td>
<td>{{ game.start_time }}</td>
<td>{{ game.end_time }}</td>
<td>
{% for gameplayer in current_user.user_games if gameplayer.game == game %}
{{ gameplayer.role.name.title() }}
{{ gameplayer.role.name }}
{% endfor %}
</td>
</tr>
@ -41,13 +33,9 @@ @@ -41,13 +33,9 @@
</tbody>
</table>
</div>
</div>
<div class="col-xs-0 col-md-1"></div>
</div>
{% else %}
<div class="alert alert-info" role="alert">
You don't participate in any game yet 😢
</div>
{% endif %}
{% endblock %}
{% endblock %}
Write Preview
Loading…
Cancel
Save