Compare commits

..

No commits in common. "42b8a774eacac84ea8c42dc5d0b59e34e6231c14" and "727617e2be1a39231631914322e16ba3097ced3a" have entirely different histories.

14 changed files with 187 additions and 204 deletions

1
.gitignore vendored
View file

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

View file

@ -1,6 +1,7 @@
{% extends "base.html" %} <!DOCTYPE html>
{% block customscript %} <html lang="en">
<script type="text/javascript" charset="utf-8"> <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">
var socket = io(); var socket = io();
var user = {{ user }} var user = {{ user }}
socket.on('connect', function() { socket.on('connect', function() {
@ -21,5 +22,5 @@
alert(data) alert(data)
window.location="http://matekasse.server.c3h/" window.location="http://matekasse.server.c3h/"
}); });
</script> </script>
{% endblock %} </html>

View file

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

View file

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

View file

@ -1,5 +1,6 @@
{% extends "base.html" %} <!DOCTYPE html>
{% block customscript %} <html lang="en">
<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}}
@ -22,4 +23,4 @@
window.location="http://matekasse.server.c3h/" window.location="http://matekasse.server.c3h/"
}); });
</script> </script>
{% endblock %} </html>

View file

@ -1,6 +1,6 @@
{% extends "base.html" %} <html>
{% block customscript %} <script src="/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">
if (confirm("{message}") == true) { if (confirm("{message}") == true) {
fetch("{{destination}}", { fetch("{{destination}}", {
method: "POST", method: "POST",
@ -9,8 +9,9 @@
"Content-type": "application/json; charset=UTF-8" "Content-type": "application/json; charset=UTF-8"
} }
}) })
} else {
window.location = "/list"
} }
</script> else {
{% endblock %} window.location="/list"
}
</script>
</html>

View file

@ -1,11 +1,16 @@
{% extends "base.html" %} <html>
{% block title %}
Documentation <head>
{% endblock %} <title>Documentation</title>
{% block customscript %} <link rel="stylesheet" type="text/css" href="documentation.css">
<link rel="stylesheet" type="text/css" href="documentation.css"> <link rel="shortcut icon" type="Logo/png" href="ccc_logo.png"/>
{% endblock %} </head>
{% 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>
@ -41,4 +46,6 @@ Documentation
<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>
{% endblock %} </body>
</html>

View file

@ -1,8 +1,8 @@
{% extends "base.html" %} <!DOCTYPE html>
{% block title %}Error{% endblock %} <html lang="en">
{% block customscript %} <title>Error</title>
<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>
{% endblock %} </html>

View file

@ -1,12 +1,11 @@
{% extends "base.html" %} <html>
{% block customscript %} <a href="/list">user and tag list</a>
<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>
{% endblock %} <script src="/socket.io.js" integrity="sha512-q/dWJ3kcmjBLU4Qc47E4A9kTB4m3wuTY7vkFJDTZKjTs8jhyGQnaUrxa0Ytd0ssMZhbNua9hE+E7Qv1j+DyZwA==" crossorigin="anonymous">
</script>
<script type="text/javascript" charset="utf-8">
window.location="/list"
</script>
</html>

View file

@ -1,35 +1,29 @@
{% extends "base.html" %} <!DOCTYPE html>
{% block title %} <html lang="en-150">
Strichliste <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>
{% endblock %} <script type="text/javascript" charset="utf-8">
{% 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>
{% endblock %} <title>Strichliste</title>
{% block content %} <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
<form action="/list/user" method="get"><input name="user" type="search" placeholder="Search for user"> <form action="/list/user" method="get"><input name="user" type="search" placeholder="Search for user"><button>Search</button></form>
<button>Search</button> <form action="/adduser" method="post"><button type="submit">Add User</button></form>
</form> <br></br>
<form action="/adduser" method="post"> {% for i in users %}
<button type="submit">Add User</button> <form action="/change" method="post" style="display: inline;">
</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 %}
{% endblock %} </html>

View file

@ -1,12 +1,8 @@
{% extends "base.html" %} <html>
{% 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>
{% endblock %} <script type="text/javascript" charset="utf-8">
{% block content %} window.location="/list";
<p>redirekting</p> </script>
<a href="/list">destination</a> <p>redirekting</p>
{% endblock %} <a href="/list">destination</a>
{% block customscript %} </html>
<script type="text/javascript" charset="utf-8">
window.location = "/list";
</script>
{% endblock %}

View file

@ -1,6 +1,7 @@
{% extends "base.html" %} <!DOCTYPE html>
{% block customscript %} <html lang="en">
<script type="text/javascript" charset="utf-8"> <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">
var socket = io(); var socket = io();
var user = {{ user }} var user = {{ user }}
socket.on('connect', function() { socket.on('connect', function() {
@ -22,4 +23,4 @@
window.location="http://matekasse.server.c3h/" window.location="http://matekasse.server.c3h/"
}); });
</script> </script>
{% endblock %} </html>

View file

@ -1,10 +1,9 @@
{% extends "base.html" %} <html>
{% block title %} <title>remove user</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 %}

View file

@ -1,45 +1,39 @@
{% extends "base.html" %} <!DOCTYPE html>
{% block customscript %} <html lang="en-150">
<script type="text/javascript" charset="utf-8"> <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">
var socket = io(); var socket = io();
socket.on("update", function () { socket.on("update", function(){ window.location="/list/user?id={{user[0]}}"});
window.location = "/list/user?id={{user[0]}}" </script>
}); <title>{{user[1]|safe}}</title>
</script> <p><a href="/list">user and tag list</a> | <a href="/documentation">Documentation</a></p>
{% endblock %} <p> {{user[1]|safe}} : {{user[2]/100}}€ <p>
{% block title %} <form action="/addtag" method="post">
{{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]}}"> <form action="/removeuser" method="post"><input name="id" type="hidden" value="{{user[0]}}"><button type="submit">Remove User</button></form>
<button type="submit">Remove User</button> </html>
</form>
{% endblock %}