webclient finish, socket io finish, some changes in main

This commit is contained in:
derlole
2025-05-12 10:36:25 +00:00
parent 41b276c734
commit f7d9c3e8c7
11 changed files with 92 additions and 46 deletions

View File

@@ -8,16 +8,23 @@
<link rel="icon" href="{{ url_for('static', filename='gimmiCoffee_Logo.png') }}" type="image/png">
</head>
<body>
<header>
<div class="site-title" onclick="window.location.href = '/unsecure'">gimmiCoffee</div>
<div class="user-actions">
<span class="username">Max Mustermann</span>
<a href="/logout" class="logout">Logout</a>
</div>
</header>
<div class="container">
<h1>Bohnenstatus</h1>
<div class="status">
<p><strong>Zuletzt gefüllt:</strong> {{ last_filled }}</p><!-- refactor the variable names-->
<p><strong>Aktueller Füllstand:</strong> {{ current_level }}%</p><!-- refactor the variable names-->
<p><strong>Kaffees seit letzter Füllung:</strong> {{ coffees_made }}</p><!-- refactor the variable names-->
<p><strong>Gesamtanzahl der Füllungen:</strong> {{ total_refills }}</p><!-- refactor the variable names-->
<p><strong>Zuletzt gefüllt:</strong> {{ last_filled.strftime('%d-%m-%Y %H:%M:%S') }}</p>
<p><strong>Aktueller Füllstand:</strong> {{ current_level }}%</p>
<p><strong>Kaffees seit letzter Füllung:</strong> {{ coffees_made }}</p>
<p><strong>Gesamtanzahl der Füllungen:</strong> {{ total_refills }}</p>
</div>
</div>
<button class="homeBut" onclick="window.location.href = '/unsecure'">Get Me Home</button>
<!-- <button class="homeBut" onclick="window.location.href = '/unsecure'">Get Me Home</button> -->
</body>
</html>

View File

@@ -9,8 +9,15 @@
</head>
<body>
<header>
<div class="site-title" onclick="window.location.href = '/unsecure'">gimmiCoffee</div>
<div class="user-actions">
<span class="username">Max Mustermann</span>
<a href="/logout" class="logout">Logout</a>
</div>
</header>
<h1>Coffee History</h1>
<button class="homeBut" onclick="window.location.href = '/unsecure'">get me home</button>
<!-- <button class="homeBut" onclick="window.location.href = '/unsecure'">get me home</button> --> <!-- the redirection is available over the gimmiCoffee writing-->
<table>
<thead>
<tr>
@@ -24,11 +31,11 @@
<tr>
<td>{{ coffee.user }}</td>
<td>{{ coffee.status }}</td>
<td>{{ coffee.tstamp }}</td>
<td>{{ coffee.tstamp}}</td>
</tr>
{% endfor %}
</tbody>
</table>
<script src="{{ url_for('static', filename='coffeesmade.js') }}"></script>
<!-- <script src="{{ url_for('static', filename='coffeesmade.js') }}"></script> -->
</body>
</html>

View File

@@ -8,16 +8,23 @@
<link rel="icon" href="{{ url_for('static', filename='gimmiCoffee_Logo.png') }}" type="image/png">
</head>
<body>
<header>
<div class="site-title" onclick="window.location.href = '/unsecure'">gimmiCoffee</div>
<div class="user-actions">
<span class="username">Max Mustermann</span>
<a href="/logout" class="logout">Logout</a>
</div>
</header>
<div class="container">
<h1>Wasserstatus</h1>
<div class="status">
<p><strong>Zuletzt gefüllt:</strong> {{ last_filled }}</p><!-- refactor the variable names-->
<p><strong>Aktueller Füllstand:</strong> {{ current_level }}%</p><!-- refactor the variable names-->
<p><strong>Kaffees seit letzter Füllung:</strong> {{ coffees_made }}</p><!-- refactor the variable names-->
<p><strong>Gesamtanzahl der Füllungen:</strong> {{ total_refills }}</p><!-- refactor the variable names-->
<p><strong>Zuletzt gefüllt:</strong> {{ last_filled.strftime('%d-%m-%Y %H:%M:%S') }}</p>
<p><strong>Aktueller Füllstand:</strong> {{ current_level }}%</p>
<p><strong>Kaffees seit letzter Füllung:</strong> {{ coffees_made }}</p>
<p><strong>Gesamtanzahl der Füllungen:</strong> {{ total_refills }}</p>
</div>
</div>
<button class="homeBut" onclick="window.location.href = '/unsecure'">Get Me Home</button>
<!-- <button class="homeBut" onclick="window.location.href = '/unsecure'">Get Me Home</button> -->
</body>
</html>