diff --git a/requirements/base.txt b/requirements/base.txt index 9a63842..d3e4ba5 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,2 +1 @@ -peewee -flask +django diff --git a/sensors/__main__.py b/sensors/__main__.py deleted file mode 100644 index e647105..0000000 --- a/sensors/__main__.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python - -import sys - -def main(): - pass - -if __name__ == "__main__": - main() diff --git a/sensors/__init__.py b/sensors/collector/__init__.py similarity index 100% rename from sensors/__init__.py rename to sensors/collector/__init__.py diff --git a/sensors/collector/admin.py b/sensors/collector/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/sensors/collector/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/sensors/collector/apps.py b/sensors/collector/apps.py new file mode 100644 index 0000000..6522bc5 --- /dev/null +++ b/sensors/collector/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CollectorConfig(AppConfig): + name = 'collector' diff --git a/sensors/collector/migrations/__init__.py b/sensors/collector/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sensors/collector/models.py b/sensors/collector/models.py new file mode 100644 index 0000000..b471c2f --- /dev/null +++ b/sensors/collector/models.py @@ -0,0 +1,21 @@ +from django.db import models + +# Create your models here. +class Time(models.Model): + value = DateTimeField() + + +class Temperatur(models.Model): + time = ForeignKeyField(Time, backref='temperatures') + value = FloatField() + + +class Humidity(models.Model): + time = ForeignKeyField(Time, backref='humidities') + value = FloatField() + + +class Pressure(models.Model): + time = ForeignKeyField(Time, backref='pressures') + value = FloatField() + diff --git a/sensors/collector/tests.py b/sensors/collector/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/sensors/collector/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/sensors/collector/views.py b/sensors/collector/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/sensors/collector/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/sensors/manage.py b/sensors/manage.py new file mode 100755 index 0000000..e42feb0 --- /dev/null +++ b/sensors/manage.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sensors.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/sensors/sensors/__init__.py b/sensors/sensors/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sensors/sensors/settings/__init__.py b/sensors/sensors/settings/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sensors/sensors/settings/base.py b/sensors/sensors/settings/base.py new file mode 100644 index 0000000..157c97c --- /dev/null +++ b/sensors/sensors/settings/base.py @@ -0,0 +1,103 @@ +""" +Django settings for sensors project. + +Generated by 'django-admin startproject' using Django 2.2.6. + +For more information on this file, see +https://docs.djangoproject.com/en/2.2/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/2.2/ref/settings/ +""" + +import os + +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = False + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +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 = 'sensors.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 = 'sensors.wsgi.application' + + +# Password validation +# https://docs.djangoproject.com/en/2.2/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/2.2/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'Europe/Zurich' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/2.2/howto/static-files/ + +STATIC_URL = '/static/' diff --git a/sensors/sensors/settings/development.py b/sensors/sensors/settings/development.py new file mode 100644 index 0000000..9d767fc --- /dev/null +++ b/sensors/sensors/settings/development.py @@ -0,0 +1,19 @@ +from .base import * + +ALLOWED_HOSTS = [ + 'localhost', + '127.0.0.1', +] + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'development_key' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:', + } +} diff --git a/sensors/sensors/settings/production.py b/sensors/sensors/settings/production.py new file mode 100644 index 0000000..4899ef8 --- /dev/null +++ b/sensors/sensors/settings/production.py @@ -0,0 +1,16 @@ +from .base import * + +ALLOWED_HOSTS = [ + 'sensors.2li.ch', + '10.7.89.122', +] + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'development_key' + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} diff --git a/sensors/sensors/urls.py b/sensors/sensors/urls.py new file mode 100644 index 0000000..3b94ca1 --- /dev/null +++ b/sensors/sensors/urls.py @@ -0,0 +1,21 @@ +"""sensors URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/2.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.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/sensors/sensors/wsgi.py b/sensors/sensors/wsgi.py new file mode 100644 index 0000000..a00dffc --- /dev/null +++ b/sensors/sensors/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for sensors 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/2.2/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sensors.settings') + +application = get_wsgi_application() diff --git a/setup.py b/setup.py deleted file mode 100644 index 41e0506..0000000 --- a/setup.py +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Note: To use the 'upload' functionality of this file, you must: -# $ pip install twine - -import io -import os - -from setuptools import find_packages, setup - -# Package meta-data. -NAME = 'sensors' -DESCRIPTION = 'A application to record the Sense Hat values to a SQLite DB and show graphs from the values in a web interface.' -URL = 'https://github.com/Nebucatnetzer/environment_sensors.git' -EMAIL = '' -AUTHOR = 'Andreas Zweili' -REQUIRES_PYTHON = '>=3.6.0' -VERSION = '2019.10.13' - -# What packages are required for this module to be executed? -REQUIRED = [ - 'Flask', - 'PeeWee', -] - -# What packages are optional? -EXTRAS = { - # 'fancy feature': ['django'], -} - -# The rest you shouldn't have to touch too much :) -# ------------------------------------------------ -# Except, perhaps the License and Trove Classifiers! -# If you do change the License, remember to change the Trove Classifier for that! - -here = os.path.abspath(os.path.dirname(__file__)) - -# Import the README and use it as the long-description. -# Note: this will only work if 'README.md' is present in your MANIFEST.in file! -try: - with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f: - long_description = '\n' + f.read() -except FileNotFoundError: - long_description = DESCRIPTION - -# Load the package's __version__.py module as a dictionary. -about = {} -if not VERSION: - project_slug = NAME.lower().replace("-", "_").replace(" ", "_") - with open(os.path.join(here, project_slug, '__version__.py')) as f: - exec(f.read(), about) -else: - about['__version__'] = VERSION - - -# Where the magic happens: -setup( - name=NAME, - version=about['__version__'], - description=DESCRIPTION, - long_description=long_description, - long_description_content_type='text/markdown', - author=AUTHOR, - author_email=EMAIL, - python_requires=REQUIRES_PYTHON, - url=URL, - packages=find_packages(exclude=["tests", "*.tests", "*.tests.*", "tests.*"]), - # If your package is a single module, use this instead of 'packages': - # py_modules=['mypackage'], - - # entry_points={ - # 'console_scripts': ['mycli=mymodule:cli'], - # }, - install_requires=REQUIRED, - extras_require=EXTRAS, - include_package_data=True, - license='GPLv3', - classifiers=[ - # Trove classifiers - # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers - 'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: Implementation :: CPython', - 'Programming Language :: Python :: Implementation :: PyPy' - ], - entry_points={ - 'gui_scripts': [ - 'sensors=sensors.__main__:main', - ], - }, -)