diff --git a/.gitignore b/.gitignore index bae90c5..df9e2d6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ SQLHandler/config.json .vscode/arduino.json .gitignore .vscode/c_cpp_properties.json +venv/ +**/__pycache__/ \ No newline at end of file diff --git a/Server/api/__init__.py b/Server/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Server/api/admin.py b/Server/api/admin.py new file mode 100644 index 0000000..7384f36 --- /dev/null +++ b/Server/api/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin +from api.models import * + +admin.site.register(Client) +admin.site.register(Temperature) +admin.site.register(Moisture) +admin.site.register(WaterLevel) diff --git a/Server/api/apps.py b/Server/api/apps.py new file mode 100644 index 0000000..66656fd --- /dev/null +++ b/Server/api/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ApiConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'api' diff --git a/Server/api/migrations/0001_initial.py b/Server/api/migrations/0001_initial.py new file mode 100644 index 0000000..52151f3 --- /dev/null +++ b/Server/api/migrations/0001_initial.py @@ -0,0 +1,51 @@ +# Generated by Django 5.0.3 on 2024-03-28 20:45 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Clients', + fields=[ + ('id', models.AutoField(auto_created=True, editable=False, primary_key=True, serialize=False)), + ('hostname', models.CharField(max_length=100, unique=True)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ], + ), + migrations.CreateModel( + name='Moisture', + fields=[ + ('id', models.AutoField(auto_created=True, editable=False, primary_key=True, serialize=False)), + ('moisture', models.IntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.clients')), + ], + ), + migrations.CreateModel( + name='Temperature', + fields=[ + ('id', models.AutoField(auto_created=True, editable=False, primary_key=True, serialize=False)), + ('temperature', models.FloatField()), + ('humidity', models.FloatField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.clients')), + ], + ), + migrations.CreateModel( + name='WaterLevel', + fields=[ + ('id', models.AutoField(auto_created=True, editable=False, primary_key=True, serialize=False)), + ('waterlevel', models.IntegerField()), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.clients')), + ], + ), + ] diff --git a/Server/api/migrations/__init__.py b/Server/api/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Server/api/migrations/__pycache__/0001_initial.cpython-312.pyc b/Server/api/migrations/__pycache__/0001_initial.cpython-312.pyc new file mode 100644 index 0000000..18ea629 Binary files /dev/null and b/Server/api/migrations/__pycache__/0001_initial.cpython-312.pyc differ diff --git a/Server/api/migrations/__pycache__/__init__.cpython-312.pyc b/Server/api/migrations/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..4e1b34f Binary files /dev/null and b/Server/api/migrations/__pycache__/__init__.cpython-312.pyc differ diff --git a/Server/api/models.py b/Server/api/models.py new file mode 100644 index 0000000..baee685 --- /dev/null +++ b/Server/api/models.py @@ -0,0 +1,49 @@ +from django.db import models + +class Client(models.Model): + id = models.AutoField(primary_key=True, auto_created=True, editable=False) + hostname = models.CharField(unique=True, max_length=100) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + ordering = ['id'] + + def __str__(self): + return f'{self.id}: {self.hostname} - {self.created_at}' + +class Temperature(models.Model): + id = models.AutoField(primary_key=True, auto_created=True, editable=False) + temperature = models.FloatField() + humidity = models.FloatField() + created_by = models.ForeignKey(Client, on_delete=models.CASCADE) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + ordering = ['id'] + + def __str__(self): + return f'{self.id}: {self.temperature}°C and {self.humidity}% - {self.created_at}' + +class Moisture(models.Model): + id = models.AutoField(primary_key=True, auto_created=True, editable=False) + moisture = models.IntegerField() + created_by = models.ForeignKey(Client, on_delete=models.CASCADE) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + ordering = ['id'] + + def __str__(self): + return f'{self.id}: {self.moisture} - {self.created_at}' + +class WaterLevel(models.Model): + id = models.AutoField(primary_key=True, auto_created=True, editable=False) + waterlevel = models.IntegerField() + created_by = models.ForeignKey(Client, on_delete=models.CASCADE) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + ordering = ['id'] + + def __str__(self): + return f'{self.id}: {self.waterlevel} - {self.created_at}' diff --git a/Server/api/tests.py b/Server/api/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/Server/api/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/Server/api/urls.py b/Server/api/urls.py new file mode 100644 index 0000000..4d0f0f2 --- /dev/null +++ b/Server/api/urls.py @@ -0,0 +1,9 @@ +from django.urls import path +from api import views + +urlpatterns = [ + path('client/', views.client, name='api-client'), + path('temperature/', views.temperature, name='api-temperature'), + path('moisture/', views.moisture, name='api-moisture'), + path('waterlevel/', views.waterlevel, name='api-waterlevel'), +] \ No newline at end of file diff --git a/Server/api/views.py b/Server/api/views.py new file mode 100644 index 0000000..874b1f5 --- /dev/null +++ b/Server/api/views.py @@ -0,0 +1,52 @@ +from django.shortcuts import render +from rest_framework import status +from rest_framework.response import Response +from rest_framework.decorators import api_view +from api.models import * + +# ----------------------------------------------------------------------------------------------- # +@api_view(['POST']) +def client(request): + try: + Client.objects.get(hostname=request.data['hostname']) + except Client.DoesNotExist: + temp = Client( + hostname=request.data['hostname'] + ) + temp.save() + return Response(status=status.HTTP_201_CREATED) + return Response(status=status.HTTP_200_OK) + +# ----------------------------------------------------------------------------------------------- # +@api_view(['POST']) +def temperature(request): + client = Client.objects.get(hostname=request.data['hostname']) + temp = Temperature( + temperature=request.data["temperature"], + humidity=request.data["humidity"], + created_by=client + ) + temp.save() + return Response(status=status.HTTP_201_CREATED) + +# ----------------------------------------------------------------------------------------------- # +@api_view(['POST']) +def moisture(request): + client = Client.objects.get(hostname=request.data['hostname']) + temp = Moisture( + moisture=request.data['moistrue'], + created_by=client + ) + temp.save() + return Response(status=status.HTTP_201_CREATED) + +# ----------------------------------------------------------------------------------------------- # +@api_view(['POST']) +def waterlevel(request): + client = Client.objects.get(hostname=request.data['hostname']) + temp = WaterLevel( + waterlevel=request.data['waterlevel'], + created_by=client + ) + temp.save() + return Response(status=status.HTTP_201_CREATED) diff --git a/Server/core/__init__.py b/Server/core/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Server/core/asgi.py b/Server/core/asgi.py new file mode 100644 index 0000000..b0f9e57 --- /dev/null +++ b/Server/core/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for core project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings') + +application = get_asgi_application() diff --git a/Server/core/settings.py b/Server/core/settings.py new file mode 100644 index 0000000..5ff8c66 --- /dev/null +++ b/Server/core/settings.py @@ -0,0 +1,130 @@ +""" +Django settings for core project. + +Generated by 'django-admin startproject' using Django 5.0.3. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/5.0/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-(6h_gl6)e$xf3^^ds6-iyjxa^kbgr51%tu79urm1lrl31ov%65' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [ + '*' +] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + + 'rest_framework', + + 'api', + 'userinterface', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'core.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'core.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/5.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/5.0/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/5.0/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/Server/core/urls.py b/Server/core/urls.py new file mode 100644 index 0000000..036aaa0 --- /dev/null +++ b/Server/core/urls.py @@ -0,0 +1,24 @@ +""" +URL configuration for core project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/5.0/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.contrib import admin +from django.urls import path, include + +urlpatterns = [ + path('admin/', admin.site.urls), + path('api/', include('api.urls')), + path('', include('userinterface.urls')), +] diff --git a/Server/core/wsgi.py b/Server/core/wsgi.py new file mode 100644 index 0000000..53399e0 --- /dev/null +++ b/Server/core/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for core project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/5.0/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings') + +application = get_wsgi_application() diff --git a/Server/db.sqlite3 b/Server/db.sqlite3 new file mode 100644 index 0000000..7f7ef37 Binary files /dev/null and b/Server/db.sqlite3 differ diff --git a/Server/manage.py b/Server/manage.py new file mode 100644 index 0000000..f2a662c --- /dev/null +++ b/Server/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', 'core.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/Server/userinterface/__init__.py b/Server/userinterface/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Server/userinterface/admin.py b/Server/userinterface/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/Server/userinterface/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/Server/userinterface/apps.py b/Server/userinterface/apps.py new file mode 100644 index 0000000..aa3c1fc --- /dev/null +++ b/Server/userinterface/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class UserinterfaceConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'userinterface' diff --git a/Server/userinterface/migrations/__init__.py b/Server/userinterface/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Server/userinterface/migrations/__pycache__/__init__.cpython-312.pyc b/Server/userinterface/migrations/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..d39f003 Binary files /dev/null and b/Server/userinterface/migrations/__pycache__/__init__.cpython-312.pyc differ diff --git a/Server/userinterface/models.py b/Server/userinterface/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/Server/userinterface/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/Server/userinterface/tests.py b/Server/userinterface/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/Server/userinterface/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/Server/userinterface/urls.py b/Server/userinterface/urls.py new file mode 100644 index 0000000..feb2fa4 --- /dev/null +++ b/Server/userinterface/urls.py @@ -0,0 +1,6 @@ +from django.urls import path +from userinterface import views + +urlpatterns = [ + path('', views.home, name='home'), +] \ No newline at end of file diff --git a/Server/userinterface/views.py b/Server/userinterface/views.py new file mode 100644 index 0000000..2c2cd32 --- /dev/null +++ b/Server/userinterface/views.py @@ -0,0 +1,5 @@ +from django.shortcuts import render +from django.http import HttpResponse + +def home(request): + return HttpResponse('Hello World!') diff --git a/requirements.txt b/requirements.txt index 7f31ac1..6393eee 100644 Binary files a/requirements.txt and b/requirements.txt differ