From a0e48a4b6cf4a51fa7603f0bdbb9d49501aeb252 Mon Sep 17 00:00:00 2001 From: ahmetkotan Date: Sun, 3 Feb 2019 15:35:37 +0300 Subject: [PATCH] cleaned small bugs --- install.sh | 10 ++++++++-- postman_tests/RestPi.postman_collection | 6 +++--- requirements.txt | 12 ++++++------ templates/index.html | 3 +-- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/install.sh b/install.sh index 6a5cfe4..589fadf 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash -pip install --upgrade pip -pip install -r requirements.txt +if [ -z $VIRTUAL_ENV ]; + then + sudo pip install --upgrade pip + sudo pip install -r requirements.txt + else + pip install --upgrade pip + pip install -r requirements.txt +fi; python manage.py migrate echo "yes" | python manage.py collectstatic python manage.py createsuperuser \ No newline at end of file diff --git a/postman_tests/RestPi.postman_collection b/postman_tests/RestPi.postman_collection index 3793de1..cc56a49 100644 --- a/postman_tests/RestPi.postman_collection +++ b/postman_tests/RestPi.postman_collection @@ -28,7 +28,7 @@ } ], "request": { - "url": "http://192.168.1.29:8001/tokens/", + "url": "{{raspi_url}}/tokens/", "method": "POST", "header": [ { @@ -67,7 +67,7 @@ } ], "request": { - "url": "http://192.168.1.29:8001/pins/api/11", + "url": "{{raspi_url}}/pins/api/11", "method": "POST", "header": [ { @@ -111,7 +111,7 @@ } ], "request": { - "url": "http://192.168.1.29:8001/pins/api/11", + "url": "{{raspi_url}}/pins/api/11", "method": "GET", "header": [ { diff --git a/requirements.txt b/requirements.txt index 638ae88..204dd7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -Django==1.11.18 -djangorestframework==3.9.1 -pytz==2018.9 -tokenauth==0.9.1 -django-cors-headers==2.4.0 -RPi.GPIO==0.6.5 \ No newline at end of file +Django>=1.11.6 +djangorestframework +pytz>=2018.9 +tokenauth>=0.9.1 +django-cors-headers +RPi.GPIO>=0.6.5 \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 269de8d..b550a22 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% block title %}Login{% endblock %} +{% block title %}Homepage{% endblock %} {% block mainarea %}
@@ -16,7 +16,6 @@ -
{% endblock %} \ No newline at end of file