diff --git a/ShopAssistant/ShopAssistant/settings.py b/ShopAssistant/ShopAssistant/settings.py
index aab310b..873300c 100644
--- 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']))
\ No newline at end of file
diff --git a/ShopAssistant/ShopAssistant/urls.py b/ShopAssistant/ShopAssistant/urls.py
index 766b972..57ccf3d 100644
--- 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
index 6c0b863..b2bdec2 100644
--- a/ShopAssistant/frontend/.idea/vcs.xml
+++ b/ShopAssistant/frontend/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/ShopAssistant/frontend/__pycache__/urls.cpython-36.pyc b/ShopAssistant/frontend/__pycache__/urls.cpython-36.pyc
new file mode 100644
index 0000000..2241217
Binary files /dev/null and b/ShopAssistant/frontend/__pycache__/urls.cpython-36.pyc differ
diff --git a/ShopAssistant/frontend/__pycache__/views.cpython-36.pyc b/ShopAssistant/frontend/__pycache__/views.cpython-36.pyc
new file mode 100644
index 0000000..88e87b6
Binary files /dev/null and b/ShopAssistant/frontend/__pycache__/views.cpython-36.pyc differ
diff --git a/ShopAssistant/frontend/css/bootstrap-grid.css b/ShopAssistant/frontend/static/css/bootstrap-grid.css
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-grid.css
rename to ShopAssistant/frontend/static/css/bootstrap-grid.css
diff --git a/ShopAssistant/frontend/css/bootstrap-grid.css.map b/ShopAssistant/frontend/static/css/bootstrap-grid.css.map
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-grid.css.map
rename to ShopAssistant/frontend/static/css/bootstrap-grid.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap-grid.min.css b/ShopAssistant/frontend/static/css/bootstrap-grid.min.css
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-grid.min.css
rename to ShopAssistant/frontend/static/css/bootstrap-grid.min.css
diff --git a/ShopAssistant/frontend/css/bootstrap-grid.min.css.map b/ShopAssistant/frontend/static/css/bootstrap-grid.min.css.map
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-grid.min.css.map
rename to ShopAssistant/frontend/static/css/bootstrap-grid.min.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap-reboot.css b/ShopAssistant/frontend/static/css/bootstrap-reboot.css
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-reboot.css
rename to ShopAssistant/frontend/static/css/bootstrap-reboot.css
diff --git a/ShopAssistant/frontend/css/bootstrap-reboot.css.map b/ShopAssistant/frontend/static/css/bootstrap-reboot.css.map
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-reboot.css.map
rename to ShopAssistant/frontend/static/css/bootstrap-reboot.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap-reboot.min.css b/ShopAssistant/frontend/static/css/bootstrap-reboot.min.css
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-reboot.min.css
rename to ShopAssistant/frontend/static/css/bootstrap-reboot.min.css
diff --git a/ShopAssistant/frontend/css/bootstrap-reboot.min.css.map b/ShopAssistant/frontend/static/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap-reboot.min.css.map
rename to ShopAssistant/frontend/static/css/bootstrap-reboot.min.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap.css b/ShopAssistant/frontend/static/css/bootstrap.css
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap.css
rename to ShopAssistant/frontend/static/css/bootstrap.css
diff --git a/ShopAssistant/frontend/css/bootstrap.css.map b/ShopAssistant/frontend/static/css/bootstrap.css.map
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap.css.map
rename to ShopAssistant/frontend/static/css/bootstrap.css.map
diff --git a/ShopAssistant/frontend/css/bootstrap.min.css b/ShopAssistant/frontend/static/css/bootstrap.min.css
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap.min.css
rename to ShopAssistant/frontend/static/css/bootstrap.min.css
diff --git a/ShopAssistant/frontend/css/bootstrap.min.css.map b/ShopAssistant/frontend/static/css/bootstrap.min.css.map
similarity index 100%
rename from ShopAssistant/frontend/css/bootstrap.min.css.map
rename to ShopAssistant/frontend/static/css/bootstrap.min.css.map
diff --git a/ShopAssistant/frontend/js/bootstrap.bundle.js b/ShopAssistant/frontend/static/js/bootstrap.bundle.js
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.bundle.js
rename to ShopAssistant/frontend/static/js/bootstrap.bundle.js
diff --git a/ShopAssistant/frontend/js/bootstrap.bundle.js.map b/ShopAssistant/frontend/static/js/bootstrap.bundle.js.map
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.bundle.js.map
rename to ShopAssistant/frontend/static/js/bootstrap.bundle.js.map
diff --git a/ShopAssistant/frontend/js/bootstrap.bundle.min.js b/ShopAssistant/frontend/static/js/bootstrap.bundle.min.js
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.bundle.min.js
rename to ShopAssistant/frontend/static/js/bootstrap.bundle.min.js
diff --git a/ShopAssistant/frontend/js/bootstrap.bundle.min.js.map b/ShopAssistant/frontend/static/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.bundle.min.js.map
rename to ShopAssistant/frontend/static/js/bootstrap.bundle.min.js.map
diff --git a/ShopAssistant/frontend/js/bootstrap.js b/ShopAssistant/frontend/static/js/bootstrap.js
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.js
rename to ShopAssistant/frontend/static/js/bootstrap.js
diff --git a/ShopAssistant/frontend/js/bootstrap.js.map b/ShopAssistant/frontend/static/js/bootstrap.js.map
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.js.map
rename to ShopAssistant/frontend/static/js/bootstrap.js.map
diff --git a/ShopAssistant/frontend/js/bootstrap.min.js b/ShopAssistant/frontend/static/js/bootstrap.min.js
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.min.js
rename to ShopAssistant/frontend/static/js/bootstrap.min.js
diff --git a/ShopAssistant/frontend/js/bootstrap.min.js.map b/ShopAssistant/frontend/static/js/bootstrap.min.js.map
similarity index 100%
rename from ShopAssistant/frontend/js/bootstrap.min.js.map
rename to ShopAssistant/frontend/static/js/bootstrap.min.js.map
diff --git a/ShopAssistant/frontend/static/js/location.js b/ShopAssistant/frontend/static/js/location.js
new file mode 100644
index 0000000..e423f9d
--- /dev/null
+++ 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);
\ No newline at end of file
diff --git a/ShopAssistant/frontend/templates/collector.html b/ShopAssistant/frontend/templates/collector.html
new file mode 100644
index 0000000..217942b
--- /dev/null
+++ b/ShopAssistant/frontend/templates/collector.html
@@ -0,0 +1,19 @@
+
+
+
+
+ Location
+ {% load static %}
+
+
+
+
+
+0
+0
+
+{% load static %}
+
+
+
+
\ No newline at end of file
diff --git a/ShopAssistant/frontend/urls.py b/ShopAssistant/frontend/urls.py
new file mode 100644
index 0000000..c7eec32
--- /dev/null
+++ 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
new file mode 100644
index 0000000..db98bd6
--- /dev/null
+++ 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
index af5b79b..54a265e 100644
--- 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
\ No newline at end of file