bton/matekasse
2
1
Fork 2
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'könnte so klappen' (#32) from 31_templates_vereinfachen into master

Browse source 
Reviewed-on: https://hannover.ccc.de/gitlab/anton/matekasse/pulls/32
This commit is contained in:
anton 2024-02-21 22:30:36 +00:00
commit 42b8a774ea
14 changed files with 204 additions and 187 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -11,3 +11,4 @@ flask_session/
/test/flask_session/ /test/flask_session/
/Website/__pycache__/ /Website/__pycache__/
/Website/.pytest_cache/ /Website/.pytest_cache/
/.idea

11
Website/templates/addtag.html
View file

@ -1,7 +1,6 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en"> {% block customscript %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script> <script type="text/javascript" charset="utf-8">
<script type="text/javascript" charset="utf-8">
var socket = io(); var socket = io();
var user = {{ user }} var user = {{ user }}
socket.on('connect', function() { socket.on('connect', function() {
@ -22,5 +21,5 @@
alert(data) alert(data)
window.location="http://matekasse.server.c3h/" window.location="http://matekasse.server.c3h/"
}); });
</script> </script>
</html> {% endblock %}

18
Website/templates/adduser.html
View file

@ -1,8 +1,10 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en"> {% block title %}
<title>add user</title> add user
<p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p> {% endblock %}
<p> {% block content %}
<form action="/adduser/user" method="post"><input name="username" type="search" placeholder="Username"><button>Add user</button></form> <form action="/adduser/user" method="post"><input name="username" type="search" placeholder="Username">
</p> <button>Add user</button>
</html> </form>
</p>
{% endblock %}

33
Website/templates/base.html
View file

@ -1,17 +1,24 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title> <title>{% block title %}{% endblock %}</title>
{% block title %} {% endblock %} - FlaskApp <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js"
</title> integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA=="
</head> crossorigin="anonymous"
<body> ></script>
<nav> <link rel="shortcut icon" type="Logo/png" href="ccc_logo.png"/>
<p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p> {% block customscript %}{% endblock %}
</nav> </head>
<hr> <body>
<div class="conntent"> <nav>
<p><a href="/">index page</a>
| <a href="/list">user and tag list</a>
| <a href="/documentation">Documentation</a>
</p>
</nav>
<hr>
<div class="conntent">
{% block content %} {% endblock %} {% block content %} {% endblock %}
</div> </div>
</body> </body>
</html> </html>

7
Website/templates/change.html
View file

@ -1,6 +1,5 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en"> {% block customscript %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script>
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
var socket = io(); var socket = io();
var change = {{change}} var change = {{change}}
@ -23,4 +22,4 @@
window.location="http://matekasse.server.c3h/" window.location="http://matekasse.server.c3h/"
}); });
</script> </script>
</html> {% endblock %}

15
Website/templates/confirmation.html
View file

@ -1,6 +1,6 @@
<html> {% extends "base.html" %}
<script src="/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script> {% block customscript %}
<script type="text/javascript" charset="utf-8"> <script type="text/javascript" charset="utf-8">
if (confirm("{message}") == true) { if (confirm("{message}") == true) {
fetch("{{destination}}", { fetch("{{destination}}", {
method: "POST", method: "POST",
@ -9,9 +9,8 @@
"Content-type": "application/json; charset=UTF-8" "Content-type": "application/json; charset=UTF-8"
} }
}) })
} else {
window.location = "/list"
} }
else { </script>
window.location="/list" {% endblock %}
}
</script>
</html>

25
Website/templates/documentation.html
View file

@ -1,16 +1,11 @@
<html> {% extends "base.html" %}
{% block title %}
<head> Documentation
<title>Documentation</title> {% endblock %}
<link rel="stylesheet" type="text/css" href="documentation.css"> {% block customscript %}
<link rel="shortcut icon" type="Logo/png" href="ccc_logo.png"/> <link rel="stylesheet" type="text/css" href="documentation.css">
</head> {% endblock %}
{% block content %}
<body>
<div id="Infos">
<p> <a href="/">index page</a> | <a href="/list">user and tag list</a></p>
<p><a href="https://hannover.ccc.de/gitlab/anton/matekasse">https://hannover.ccc.de/gitlab/anton/matekasse</a></p>
</div>
<h1 class="header"> <u>Documentation</u> </h1> <h1 class="header"> <u>Documentation</u> </h1>
<p>&nbsp;</p> <p>&nbsp;</p>
@ -46,6 +41,4 @@
<p>638: Wrong Input</p> <p>638: Wrong Input</p>
<P>418: I'm a teapot</P> <P>418: I'm a teapot</P>
</div> </div>
</body> {% endblock %}
</html>

14
Website/templates/error.html
View file

@ -1,8 +1,8 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en"> {% block title %}Error{% endblock %}
<title>Error</title> {% block customscript %}
<p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p> <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
<p> <p>
Error: {{error_code}} Error: {{error_code}}
</p> </p>
</html> {% endblock %}

17
Website/templates/index.html
View file

@ -1,11 +1,12 @@
<html> {% extends "base.html" %}
<a href="/list">user and tag list</a> {% block customscript %}
<script type="text/javascript" charset="utf-8">
window.location="/list"
</script>
{% endblock %}
{% block content %}
<a href="/list">user and tag list</a>
<p>The creator of this website accepts no liability for any linguistic or technical errors!</p> <p>The creator of this website accepts no liability for any linguistic or technical errors!</p>
<br style="line-height: 500%;"></br> <br style="line-height: 500%;"></br>
<a href="/documentation">Doumentation</a> <a href="/documentation">Doumentation</a>
<script src="/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"> {% endblock %}
</script>
<script type="text/javascript" charset="utf-8">
window.location="/list"
</script>
</html>

46
Website/templates/list.html
View file

@ -1,29 +1,35 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en-150"> {% block title %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script> Strichliste
<script type="text/javascript" charset="utf-8"> {% endblock %}
{% block customscript %}
<script type="text/javascript" charset="utf-8">
var socket = io(); var socket = io();
socket.on("update", function(){ socket.on("update", function () {
window.location="http://matekasse.server.c3h/list" window.location = "http://matekasse.server.c3h/list"
}); });
</script> </script>
<title>Strichliste</title> {% endblock %}
<p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p> {% block content %}
<form action="/list/user" method="get"><input name="user" type="search" placeholder="Search for user"><button>Search</button></form> <form action="/list/user" method="get"><input name="user" type="search" placeholder="Search for user">
<form action="/adduser" method="post"><button type="submit">Add User</button></form> <button>Search</button>
<br></br> </form>
{% for i in users %} <form action="/adduser" method="post">
<form action="/change" method="post" style="display: inline;"> <button type="submit">Add User</button>
</form>
<br></br>
{% for i in users %}
<form action="/change" method="post" style="display: inline;">
<p style="display: inline;"> <p style="display: inline;">
<a href="list/user?id={{i[0]}}">{{i[1]|safe}}</a>: {{i[2]/100}}€ <a href="list/user?id={{i[0]}}">{{i[1]|safe}}</a>: {{i[2]/100}}€
</p> </p>
<input name="id" type="hidden" value="{{i[0]}}"> <input name="id" type="hidden" value="{{i[0]}}">
<input name="change" type="number" lang="nb" step="0.01" placeholder="add to balance"> <input name="change" type="number" lang="nb" step="0.01" placeholder="add to balance">
</form> </form>
<form action="/change" method="post" style="display: inline"> <form action="/change" method="post" style="display: inline">
<input name="id" type="hidden" value="{{i[0]}}"> <input name="id" type="hidden" value="{{i[0]}}">
<button type="submit" name="change" value=-{{preis}}>-{{preis}}€</button> <button type="submit" name="change" value=-{{preis}}>-{{preis}}€</button>
</form> </form>
<br style="line-height: 50%;"></br> <br style="line-height: 50%;"></br>
{% endfor %} {% endfor %}
</html> {% endblock %}

20
Website/templates/redirect.html
View file

@ -1,8 +1,12 @@
<html> {% extends "base.html" %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script> {% block title %}
<script type="text/javascript" charset="utf-8"> {% endblock %}
window.location="/list"; {% block content %}
</script> <p>redirekting</p>
<p>redirekting</p> <a href="/list">destination</a>
<a href="/list">destination</a> {% endblock %}
</html> {% block customscript %}
<script type="text/javascript" charset="utf-8">
window.location = "/list";
</script>
{% endblock %}

9
Website/templates/removetag.html
View file

@ -1,7 +1,6 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en"> {% block customscript %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script> <script type="text/javascript" charset="utf-8">
<script type="text/javascript" charset="utf-8">
var socket = io(); var socket = io();
var user = {{ user }} var user = {{ user }}
socket.on('connect', function() { socket.on('connect', function() {
@ -23,4 +22,4 @@
window.location="http://matekasse.server.c3h/" window.location="http://matekasse.server.c3h/"
}); });
</script> </script>
</html> {% endblock %}

11
Website/templates/removeuser.html
View file

@ -1,9 +1,10 @@
<html> {% extends "base.html" %}
<title>remove user</title> {% block title %}
remove user
{% endblock %}
{% block content %}
<p> <p>
<p>
<a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a>
</p>
<p>Deleted user {{user_name|safe}}</p> <p>Deleted user {{user_name|safe}}</p>
<a href="/list">return to the tags and user list</a> <a href="/list">return to the tags and user list</a>
</p> </p>
{% endblock %}

58
Website/templates/user.html
View file

@ -1,39 +1,45 @@
<!DOCTYPE html> {% extends "base.html" %}
<html lang="en-150"> {% block customscript %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.0.1/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous"></script> <script type="text/javascript" charset="utf-8">
<script type="text/javascript" charset="utf-8">
var socket = io(); var socket = io();
socket.on("update", function(){ window.location="/list/user?id={{user[0]}}"}); socket.on("update", function () {
</script> window.location = "/list/user?id={{user[0]}}"
<title>{{user[1]|safe}}</title> });
<p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p> </script>
<p> {{user[1]|safe}} : {{user[2]/100}}€ <p> {% endblock %}
<form action="/addtag" method="post"> {% block title %}
{{user[1]|safe}}
{% endblock %}
{% block content %}
<p> {{user[1]|safe}} : {{user[2]/100}}€ <p>
<form action="/addtag" method="post">
<input name="id" type="hidden" value="{{user[0]}}"> <input name="id" type="hidden" value="{{user[0]}}">
<button type="submit">Add Tag</button> <button type="submit">Add Tag</button>
</form> </form>
<form action="/removetag" method="post"> <form action="/removetag" method="post">
<input name="id" type="hidden" value="{{user[0]}}"> <input name="id" type="hidden" value="{{user[0]}}">
<button type="submit">Remove Tag</button> <button type="submit">Remove Tag</button>
</form> </form>
</p> </p>
<form action="/change" method="post"> <form action="/change" method="post">
<input name="id" type="hidden" value="{{user[0]}}"> <input name="id" type="hidden" value="{{user[0]}}">
<input name="change" type="number" lang="nb" step="0.01" placeholder="change balance"> <input name="change" type="number" lang="nb" step="0.01" placeholder="change balance">
</form> </form>
</p> </p>
<br></br> <br></br>
<p>Tags:</p> <p>Tags:</p>
{% for tag in tags %} {% for tag in tags %}
<p> <p>
<form action="/removetag" method="post"> <form action="/removetag" method="post">
<label for="removetag">{{tag[0]}} </label> <label for="removetag">{{tag[0]}} </label>
<input name="id" type="hidden" value="{{user[0]}}"> <input name="id" type="hidden" value="{{user[0]}}">
<input name="tagid" type="hidden" value="{{tag[0]}}"> <input name="tagid" type="hidden" value="{{tag[0]}}">
<button id="removetag" type="submit">Remove Tag</button> <button id="removetag" type="submit">Remove Tag</button>
</form> </form>
</p> </p>
{% endfor %} {% endfor %}
<br></br> <br></br>
<form action="/removeuser" method="post"><input name="id" type="hidden" value="{{user[0]}}"><button type="submit">Remove User</button></form> <form action="/removeuser" method="post"><input name="id" type="hidden" value="{{user[0]}}">
</html> <button type="submit">Remove User</button>
</form>
{% endblock %}