diff --git a/echo-master/echo_api/__pycache__/api.cpython-38.pyc b/echo-master/echo_api/__pycache__/api.cpython-38.pyc index 933b7b7..583133a 100644 Binary files a/echo-master/echo_api/__pycache__/api.cpython-38.pyc and b/echo-master/echo_api/__pycache__/api.cpython-38.pyc differ diff --git a/echo-master/echo_api/api.py b/echo-master/echo_api/api.py index 6d4574a..88e9a96 100644 --- a/echo-master/echo_api/api.py +++ b/echo-master/echo_api/api.py @@ -1,7 +1,7 @@ import flask -from flask import request, abort, Flask, g -from flask_restful import Resource, Api +from flask import abort, Flask +from flask_restful import Resource, Api, request from flask_cors import CORS, cross_origin import echo_api.auth as Auth diff --git a/echo-master/echo_controller/__pycache__/led_strip.cpython-38.pyc b/echo-master/echo_controller/__pycache__/led_strip.cpython-38.pyc index 94e0026..041afdb 100644 Binary files a/echo-master/echo_controller/__pycache__/led_strip.cpython-38.pyc and b/echo-master/echo_controller/__pycache__/led_strip.cpython-38.pyc differ diff --git a/echo-mobile-app/echo/package.json b/echo-mobile-app/echo/package.json index 43d8d86..f6d78e8 100644 --- a/echo-mobile-app/echo/package.json +++ b/echo-mobile-app/echo/package.json @@ -80,4 +80,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/echo-mobile-app/echo/src/app/services/controller.service.ts b/echo-mobile-app/echo/src/app/services/controller.service.ts index 3713d42..7a3816c 100644 --- a/echo-mobile-app/echo/src/app/services/controller.service.ts +++ b/echo-mobile-app/echo/src/app/services/controller.service.ts @@ -11,7 +11,7 @@ export class ControllerService { } // Connection - APIEndpoint: String = "127.0.0.1:1337"; + APIEndpoint: String = "86.87.42.42:1337"; APIAuthToken: String = "f8c85565-ece7-471e-999f-9bb6a7b61a4c"; public echoConnectionError: BehaviorSubject = new BehaviorSubject(false);