commit 5758e695b2e8309108df460b16ddd57f63486b79 Author: Lukas Martin Date: Mon Aug 14 02:54:14 2023 +0200 [LM] initial commit diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..69a0f7c --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,19 @@ + + + + + sqlite.xerial + true + org.sqlite.JDBC + jdbc:sqlite:D:\Projects\ArduinoSensorServer\db.sqlite3 + $ProjectFileDir$ + + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://localhost:5432/ArudinoSensorServer + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..aca274e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..2e0b9c2 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/ArduinoSensorServer/__init__.py b/ArduinoSensorServer/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/ArduinoSensorServer/admin.py b/ArduinoSensorServer/admin.py new file mode 100644 index 0000000..e69de29 diff --git a/ArduinoSensorServer/urls.py b/ArduinoSensorServer/urls.py new file mode 100644 index 0000000..ce47fd6 --- /dev/null +++ b/ArduinoSensorServer/urls.py @@ -0,0 +1,33 @@ +""" +URL configuration for ArduinoSensorServer project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.urls import path, include +from . import views +from django.contrib import admin + +urlpatterns = [ + + # Admin Site + path('admin/', admin.site.urls), + + # WebPages of root project, including plant/ to access dynamic webpages of plants + path("", views.home, name="home"), + path("plant/", views.plant_page, name="plant"), + + # includes all dataHandler urls after /data/ Example: data/1/ + path('data/', include("dataHandler.urls")), + +] diff --git a/ArduinoSensorServer/views.py b/ArduinoSensorServer/views.py new file mode 100644 index 0000000..794cabf --- /dev/null +++ b/ArduinoSensorServer/views.py @@ -0,0 +1,19 @@ +from django.shortcuts import render, redirect +from dataHandler.models import BasicPlant +from django.core.exceptions import ObjectDoesNotExist + + +# Renders the request home, opens home.html and passes through all BasicPlants Objects +def home(request): + plant = BasicPlant.objects.all() + return render(request, "home.html", {"plants": plant}) + + +# Renders the request plant_page, plant_id is needed to open the corresponding website of the plant, if a plant_id +# which is unknown is given, return redirects to home. Uses plant.html and passes through one plant (plant_id) +def plant_page(request, plant_id): + try: + plant = BasicPlant.objects.get(id=plant_id) + return render(request, "plant.html", {"plant": plant}) + except ObjectDoesNotExist: + return redirect("/") diff --git a/dataHandler/__init__.py b/dataHandler/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/dataHandler/admin.py b/dataHandler/admin.py new file mode 100644 index 0000000..d6440be --- /dev/null +++ b/dataHandler/admin.py @@ -0,0 +1,8 @@ +from django.contrib import admin +from .models import Temperature, Moisture, BasicPlant +# Register your models here. + +# Registers data models with the admin panel (Testing only) +admin.site.register(Temperature) +admin.site.register(Moisture) +admin.site.register(BasicPlant) diff --git a/dataHandler/apps.py b/dataHandler/apps.py new file mode 100644 index 0000000..54a36be --- /dev/null +++ b/dataHandler/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class DatapagesConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'dataHandler' diff --git a/dataHandler/models.py b/dataHandler/models.py new file mode 100644 index 0000000..2303c07 --- /dev/null +++ b/dataHandler/models.py @@ -0,0 +1,24 @@ +import datetime + +from django.db import models +from django.db.models import PROTECT, CASCADE + + +# Create your models here. + +class BasicPlant(models.Model): + id = models.AutoField(primary_key=True) + name = models.CharField(max_length=64, default="Pflanze") + bought = models.DateTimeField(default=datetime.datetime.now()) + + +class Temperature(models.Model): + temp = models.IntegerField() + dateTime = models.DateTimeField(default=datetime.datetime.now()) + plant_id = models.ForeignKey(BasicPlant, on_delete=CASCADE) + + +class Moisture(models.Model): + moisture = models.IntegerField() + dateTime = models.DateTimeField(default=datetime.datetime.now()) + plant_id = models.ForeignKey(BasicPlant, on_delete=CASCADE) diff --git a/dataHandler/tests.py b/dataHandler/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/dataHandler/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/dataHandler/urls.py b/dataHandler/urls.py new file mode 100644 index 0000000..a8fa48f --- /dev/null +++ b/dataHandler/urls.py @@ -0,0 +1,8 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path("", views.dataPage01, name="dataPage01"), + path("1/", views.data_temp, name="data_temp"), + path("2/", views.data_moist, name="data_moist"), +] diff --git a/dataHandler/views.py b/dataHandler/views.py new file mode 100644 index 0000000..e41f05b --- /dev/null +++ b/dataHandler/views.py @@ -0,0 +1,34 @@ +from django.shortcuts import render, HttpResponse +from django.views.decorators.csrf import csrf_exempt +from .models import BasicPlant, Temperature, Moisture +from django.shortcuts import redirect + + +# Temporary Test page to check moisture, temperature and plant data. +def dataPage01(request): + plant = BasicPlant.objects.get(id=1) + temp = Temperature.objects.filter(plant_id=1).all() + moist = Moisture.objects.filter(plant_id=1).all() + return render(request, "dataPage.html", {"plant": plant, "temps": temp, "moists": moist}) + + +# Post Only, handles temperature data send to data/1/, if accessed with GET, gets redirected to test data page +@csrf_exempt +def data_temp(request): + if request.method == "POST": + p = BasicPlant.objects.get(id=request.POST["plant_id"]) + Temperature.objects.create(temp=request.POST["temp"], plant_id=p) + return HttpResponse("data received") + else: + return redirect("/data/") + + +# Post Only, handles moisture data send to data/2/, if accessed with GET, gets redirected to test data page +@csrf_exempt +def data_moist(request): + if request.method == "POST": + p = BasicPlant.objects.get(id=request.POST["plant_id"]) + Moisture.objects.create(moisture=request.POST["moist"], plant_id=p) + return HttpResponse("data received") + else: + return redirect("/data/") diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..280fe6a --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ArduinoSensorServer.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/static/css/base.css b/static/css/base.css new file mode 100644 index 0000000..03aed35 --- /dev/null +++ b/static/css/base.css @@ -0,0 +1,3 @@ +.bg { + background-color: #add8e6; +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..e4e60d5 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,96 @@ + + + +{% load static %} + + + + + +

+ {% block content %} {% endblock %} +

+ diff --git a/templates/dataPage.html b/templates/dataPage.html new file mode 100644 index 0000000..df2b2b9 --- /dev/null +++ b/templates/dataPage.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} + +{% block content %} +

+
+ +

Temperature

+ {% for temp in temps %} +

+ {{ temp.temp }} +

+ {% endfor %} +
+

Moisture

+ {% for moist in moists %} +

+ {{ moist.moisture }} +

+ {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/templates/home.html b/templates/home.html new file mode 100644 index 0000000..e23e73d --- /dev/null +++ b/templates/home.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} +{% block content %} + {% for plant in plants %} +

+ {{ plant.name }} +

+ {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/templates/plant.html b/templates/plant.html new file mode 100644 index 0000000..f41e1fd --- /dev/null +++ b/templates/plant.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} + +{% block content %} + {{ plant.name }} +