From 133e9fd4e4248de394c3a846fe15b271dbf7ac55 Mon Sep 17 00:00:00 2001 From: "user@node5.net" Date: Tue, 9 Dec 2025 21:45:39 +0100 Subject: Navbar --- web_interface/drinks/templates/base.html | 41 ++++++++++++++++ .../drinks/templates/drinks_overview.html | 54 ++++++++++++++++++---- web_interface/drinks_machine/settings.py | 3 +- web_interface/drinks_machine/urls.py | 1 + web_interface/motor_controls/__init__.py | 0 web_interface/motor_controls/apps.py | 5 ++ .../motor_controls/templates/motor-controls.html | 10 ++++ web_interface/motor_controls/urls.py | 8 ++++ web_interface/motor_controls/views.py | 6 +++ 9 files changed, 119 insertions(+), 9 deletions(-) create mode 100644 web_interface/motor_controls/__init__.py create mode 100644 web_interface/motor_controls/apps.py create mode 100644 web_interface/motor_controls/templates/motor-controls.html create mode 100644 web_interface/motor_controls/urls.py create mode 100644 web_interface/motor_controls/views.py (limited to 'web_interface') diff --git a/web_interface/drinks/templates/base.html b/web_interface/drinks/templates/base.html index a9d792b..1702a0b 100644 --- a/web_interface/drinks/templates/base.html +++ b/web_interface/drinks/templates/base.html @@ -16,6 +16,47 @@
+ +
+ +
+ + + + + {% block content %} {% endblock %}
diff --git a/web_interface/drinks/templates/drinks_overview.html b/web_interface/drinks/templates/drinks_overview.html index 13c8e9d..1c4f631 100644 --- a/web_interface/drinks/templates/drinks_overview.html +++ b/web_interface/drinks/templates/drinks_overview.html @@ -1,14 +1,21 @@ {% extends 'base.html' %} - -{% block content %} - -
+{% block header %} +
search
+ +{% endblock %} + +{% block content %} + + + +
@@ -60,7 +68,7 @@ {% if drink.author %}
-
- {% endfor %} - + + +
+ +
Add drink
+
+ Fill all fields +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + + + {% endblock %} diff --git a/web_interface/drinks_machine/settings.py b/web_interface/drinks_machine/settings.py index aae7e99..3dd92fc 100644 --- a/web_interface/drinks_machine/settings.py +++ b/web_interface/drinks_machine/settings.py @@ -66,7 +66,8 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'drinks', - 'colorfield' + 'colorfield', + 'motor_controls', ] MIDDLEWARE = [ diff --git a/web_interface/drinks_machine/urls.py b/web_interface/drinks_machine/urls.py index 3d5f05b..aaafc65 100644 --- a/web_interface/drinks_machine/urls.py +++ b/web_interface/drinks_machine/urls.py @@ -24,6 +24,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path("drinks/", include("drinks.urls")), path('', RedirectView.as_view(url='/drinks/', permanent=False), name='redirect'), + path("motor-controls/", include("motor_controls.urls")), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + \ static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/web_interface/motor_controls/__init__.py b/web_interface/motor_controls/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/web_interface/motor_controls/apps.py b/web_interface/motor_controls/apps.py new file mode 100644 index 0000000..d6fd8de --- /dev/null +++ b/web_interface/motor_controls/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class MotorControls(AppConfig): + name = 'motor_controls' diff --git a/web_interface/motor_controls/templates/motor-controls.html b/web_interface/motor_controls/templates/motor-controls.html new file mode 100644 index 0000000..f1c29ab --- /dev/null +++ b/web_interface/motor_controls/templates/motor-controls.html @@ -0,0 +1,10 @@ +{% extends 'base.html' %} +{% block header %} +
+{% endblock %} + +{% block content %} + +🦗 + +{% endblock %} diff --git a/web_interface/motor_controls/urls.py b/web_interface/motor_controls/urls.py new file mode 100644 index 0000000..acdb237 --- /dev/null +++ b/web_interface/motor_controls/urls.py @@ -0,0 +1,8 @@ +from django.urls import path + +from . import views + +urlpatterns = [ + path("", views.index, name="index"), +] + diff --git a/web_interface/motor_controls/views.py b/web_interface/motor_controls/views.py new file mode 100644 index 0000000..ddb80db --- /dev/null +++ b/web_interface/motor_controls/views.py @@ -0,0 +1,6 @@ +from django.shortcuts import render +from django.http import HttpRequest, HttpResponse + +def index(request: HttpRequest) -> HttpResponse: + return render(request=request, template_name="motor-controls.html") + -- cgit v1.2.3