Merge pull request #2 from Cornul11/frontend

Initial location collection
Cornul11 · Oct 26, 2019 · cdf0033 · cdf0033
2 parents d77422d + b7f97a8
commit cdf0033
Show file tree

Hide file tree

Showing 30 changed files with 91 additions and 5 deletions.
diff --git a/ShopAssistant/ShopAssistant/settings.py b/ShopAssistant/ShopAssistant/settings.py
@@ -13,6 +13,8 @@
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import posixpath
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 
@@ -25,7 +27,9 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['a06eef97.ngrok.io',
+                 'localhost',
+                 '127.0.0.1']
 
 
 # Application definition
@@ -37,6 +41,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'frontend',
     'database',
 ]
 
@@ -123,3 +128,5 @@
 # https://docs.djangoproject.com/en/2.1/howto/static-files/
 
 STATIC_URL = '/static/'
+
+STATIC_ROOT = posixpath.join(*(BASE_DIR.split(os.path.sep) + ['static']))
diff --git a/ShopAssistant/ShopAssistant/urls.py b/ShopAssistant/ShopAssistant/urls.py
@@ -14,8 +14,10 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
+
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('', include('frontend.urls')),
 ]
diff --git a/ShopAssistant/frontend/.idea/vcs.xml b/ShopAssistant/frontend/.idea/vcs.xml
diff --git a/ShopAssistant/frontend/__pycache__/urls.cpython-36.pyc b/ShopAssistant/frontend/__pycache__/urls.cpython-36.pyc
diff --git a/ShopAssistant/frontend/__pycache__/views.cpython-36.pyc b/ShopAssistant/frontend/__pycache__/views.cpython-36.pyc
diff --git a/...Assistant/frontend/css/bootstrap-grid.css → ...nt/frontend/static/css/bootstrap-grid.css b/...Assistant/frontend/css/bootstrap-grid.css → ...nt/frontend/static/css/bootstrap-grid.css
diff --git a/...stant/frontend/css/bootstrap-grid.css.map → ...rontend/static/css/bootstrap-grid.css.map b/...stant/frontend/css/bootstrap-grid.css.map → ...rontend/static/css/bootstrap-grid.css.map
diff --git a/...stant/frontend/css/bootstrap-grid.min.css → ...rontend/static/css/bootstrap-grid.min.css b/...stant/frontend/css/bootstrap-grid.min.css → ...rontend/static/css/bootstrap-grid.min.css
diff --git a/...t/frontend/css/bootstrap-grid.min.css.map → ...end/static/css/bootstrap-grid.min.css.map b/...t/frontend/css/bootstrap-grid.min.css.map → ...end/static/css/bootstrap-grid.min.css.map
diff --git a/...sistant/frontend/css/bootstrap-reboot.css → .../frontend/static/css/bootstrap-reboot.css b/...sistant/frontend/css/bootstrap-reboot.css → .../frontend/static/css/bootstrap-reboot.css
diff --git a/...ant/frontend/css/bootstrap-reboot.css.map → ...ntend/static/css/bootstrap-reboot.css.map b/...ant/frontend/css/bootstrap-reboot.css.map → ...ntend/static/css/bootstrap-reboot.css.map
diff --git a/...ant/frontend/css/bootstrap-reboot.min.css → ...ntend/static/css/bootstrap-reboot.min.css b/...ant/frontend/css/bootstrap-reboot.min.css → ...ntend/static/css/bootstrap-reboot.min.css
diff --git a/...frontend/css/bootstrap-reboot.min.css.map → ...d/static/css/bootstrap-reboot.min.css.map b/...frontend/css/bootstrap-reboot.min.css.map → ...d/static/css/bootstrap-reboot.min.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap.css → ...sistant/frontend/static/css/bootstrap.css b/ShopAssistant/frontend/css/bootstrap.css → ...sistant/frontend/static/css/bootstrap.css
diff --git a/ShopAssistant/frontend/css/bootstrap.css.map → ...ant/frontend/static/css/bootstrap.css.map b/ShopAssistant/frontend/css/bootstrap.css.map → ...ant/frontend/static/css/bootstrap.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap.min.css → ...ant/frontend/static/css/bootstrap.min.css b/ShopAssistant/frontend/css/bootstrap.min.css → ...ant/frontend/static/css/bootstrap.min.css
diff --git a/...istant/frontend/css/bootstrap.min.css.map → ...frontend/static/css/bootstrap.min.css.map b/...istant/frontend/css/bootstrap.min.css.map → ...frontend/static/css/bootstrap.min.css.map
diff --git a/...Assistant/frontend/js/bootstrap.bundle.js → ...nt/frontend/static/js/bootstrap.bundle.js b/...Assistant/frontend/js/bootstrap.bundle.js → ...nt/frontend/static/js/bootstrap.bundle.js
diff --git a/...stant/frontend/js/bootstrap.bundle.js.map → ...rontend/static/js/bootstrap.bundle.js.map b/...stant/frontend/js/bootstrap.bundle.js.map → ...rontend/static/js/bootstrap.bundle.js.map
diff --git a/...stant/frontend/js/bootstrap.bundle.min.js → ...rontend/static/js/bootstrap.bundle.min.js b/...stant/frontend/js/bootstrap.bundle.min.js → ...rontend/static/js/bootstrap.bundle.min.js
diff --git a/...t/frontend/js/bootstrap.bundle.min.js.map → ...end/static/js/bootstrap.bundle.min.js.map b/...t/frontend/js/bootstrap.bundle.min.js.map → ...end/static/js/bootstrap.bundle.min.js.map
diff --git a/ShopAssistant/frontend/js/bootstrap.js → ...Assistant/frontend/static/js/bootstrap.js b/ShopAssistant/frontend/js/bootstrap.js → ...Assistant/frontend/static/js/bootstrap.js
diff --git a/ShopAssistant/frontend/js/bootstrap.js.map → ...stant/frontend/static/js/bootstrap.js.map b/ShopAssistant/frontend/js/bootstrap.js.map → ...stant/frontend/static/js/bootstrap.js.map
diff --git a/ShopAssistant/frontend/js/bootstrap.min.js → ...stant/frontend/static/js/bootstrap.min.js b/ShopAssistant/frontend/js/bootstrap.min.js → ...stant/frontend/static/js/bootstrap.min.js
diff --git a/...ssistant/frontend/js/bootstrap.min.js.map → ...t/frontend/static/js/bootstrap.min.js.map b/...ssistant/frontend/js/bootstrap.min.js.map → ...t/frontend/static/js/bootstrap.min.js.map
diff --git a/ShopAssistant/frontend/static/js/location.js b/ShopAssistant/frontend/static/js/location.js
@@ -0,0 +1,47 @@
+/*
+
+button.onclick = function () {
+    let startPos;
+
+    let geoSuccess = function (position) {
+        // Do magic with location
+        startPos = position;
+        document.getElementById('startLat').innerHTML = startPos.coords.latitude;
+        document.getElementById('startLon').innerHTML = startPos.coords.longitude;
+    };
+    let geoError = function (error) {
+        switch (error.code) {
+            case error.TIMEOUT:
+                // The user didn't accept the callout
+                console.log('DENIED!');
+                break;
+        }
+    };
+
+    navigator.geolocation.getCurrentPosition(geoSuccess, geoError);
+};
+*/
+button = document.getElementById("mainButton");
+
+let startPos;
+let geoOptions = {
+    enableHighAccuracy: true,
+    maximumAge: 60 * 1000, // get new position data every minute
+};
+
+let geoSuccess = function (position) {
+    startPos = position;
+    console.log('updated pos');
+    document.getElementById('startLat').innerHTML = startPos.coords.latitude;
+    document.getElementById('startLon').innerHTML = startPos.coords.longitude;
+};
+let geoError = function (error) {
+    console.log('Error occurred. Error code: ' + error.code);
+    // error.code can be:
+    //   0: unknown error
+    //   1: permission denied
+    //   2: position unavailable (error response from location provider)
+    //   3: timed out
+};
+
+let watchId = navigator.geolocation.watchPosition(geoSuccess, geoError, geoOptions);
diff --git a/ShopAssistant/frontend/templates/collector.html b/ShopAssistant/frontend/templates/collector.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Location</title>
+    {% load static %}
+    <link href="{% static "css/bootstrap.min.css" %}" rel="stylesheet">
+</head>
+<body>
+<button id="mainButton" type="button" class="btn btn-primary">Primary</button>
+
+<p id="startLat">0</p><br>
+<p id="startLon">0</p>
+<!-- script at the end to load the page faster -->
+{% load static %}
+<script src="{% static "js/location.js" %}"></script>
+
+</body>
+</html>
diff --git a/ShopAssistant/frontend/urls.py b/ShopAssistant/frontend/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+
+from . import views
+
+urlpatterns = [
+    path('', views.index),
+]
diff --git a/ShopAssistant/frontend/views.py b/ShopAssistant/frontend/views.py
@@ -0,0 +1,5 @@
+from django.shortcuts import render_to_response
+
+
+def index(request):
+    return render_to_response('collector.html')
diff --git a/ShopAssistant/requirements.txt b/ShopAssistant/requirements.txt
@@ -1,5 +1,4 @@
 Django==2.2.6
 psycopg2-binary==2.8.4
 pytz==2019.3
-sqlparse==0.3.0
-
+sqlparse==0.3.0