From 71bce741a48d04d75a02eadb7e4334eace8c5c8b Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Mon, 7 Nov 2022 19:08:39 -0600 Subject: [PATCH 1/8] added vercel.json --- api-service/vercel.json | 15 +++++++++++++++ api-service/widgets/handler.py | 3 +-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 api-service/vercel.json diff --git a/api-service/vercel.json b/api-service/vercel.json new file mode 100644 index 0000000..77be35c --- /dev/null +++ b/api-service/vercel.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "builds": [ + { + "src": "./index.py", + "use": "@vercel/python" + } + ], + "routes": [ + { + "src": "/(.*)", + "dest": "/" + } + ] +} \ No newline at end of file diff --git a/api-service/widgets/handler.py b/api-service/widgets/handler.py index 9e8505d..55b6bc5 100644 --- a/api-service/widgets/handler.py +++ b/api-service/widgets/handler.py @@ -9,7 +9,6 @@ class WeatherAPI(MethodView): def get(self) -> Response: - args = request.args latitude: float = args.get('latitude') longitude: float = args.get('longitude') @@ -46,5 +45,5 @@ def post(self) -> Response: '/weather', view_func=WeatherAPI.as_view('weather'), methods=['GET']) widget_bp.add_url_rule( - '/news', view_func=NewsAPI.as_view('news'), methods=[]) + '/news', view_func=NewsAPI.as_view('news'), methods=['GET']) From a6013efd260ea9fc650f5c627bf3fb667bb92abd Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Mon, 7 Nov 2022 19:13:12 -0600 Subject: [PATCH 2/8] edited vercel.json --- api-service/vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-service/vercel.json b/api-service/vercel.json index 77be35c..ae293be 100644 --- a/api-service/vercel.json +++ b/api-service/vercel.json @@ -2,7 +2,7 @@ "version": 2, "builds": [ { - "src": "./index.py", + "src": "./api.py", "use": "@vercel/python" } ], From 7185412392fbb26b2141a35a4f5850baf1de4d30 Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Mon, 7 Nov 2022 19:40:00 -0600 Subject: [PATCH 3/8] added to api.py --- api-service/api.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api-service/api.py b/api-service/api.py index 24b30b3..45fc99e 100644 --- a/api-service/api.py +++ b/api-service/api.py @@ -6,6 +6,10 @@ app.register_blueprint(widget_bp, url_prefix='/widget') +@app.route('/') +def base_page(): + return {"success" : 'yayyyy'} + if __name__ == '__main__': # Get the arguments of the given command From daed972b351a1270cf791e8893acf9a84052a4e4 Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Thu, 17 Nov 2022 18:18:38 -0600 Subject: [PATCH 4/8] changed api.py to index.py (class name) --- api-service/{api.py => index.py} | 0 api-service/vercel.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename api-service/{api.py => index.py} (100%) diff --git a/api-service/api.py b/api-service/index.py similarity index 100% rename from api-service/api.py rename to api-service/index.py diff --git a/api-service/vercel.json b/api-service/vercel.json index ae293be..77be35c 100644 --- a/api-service/vercel.json +++ b/api-service/vercel.json @@ -2,7 +2,7 @@ "version": 2, "builds": [ { - "src": "./api.py", + "src": "./index.py", "use": "@vercel/python" } ], From ab5cdd6dc7b3e4e564f6604889b5f6442436e1d6 Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Thu, 17 Nov 2022 18:22:25 -0600 Subject: [PATCH 5/8] jsonify --- api-service/index.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api-service/index.py b/api-service/index.py index 45fc99e..058c903 100644 --- a/api-service/index.py +++ b/api-service/index.py @@ -1,4 +1,4 @@ -from flask import Flask +from flask import Flask, jsonify import argparse from widgets.handler import widget_bp @@ -8,7 +8,7 @@ @app.route('/') def base_page(): - return {"success" : 'yayyyy'} + return jsonify({"success" : 'yayyyy'}) if __name__ == '__main__': From deb9a8c8c8de9ad088f7fea39f7ed96d702a7ba7 Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Thu, 17 Nov 2022 18:31:46 -0600 Subject: [PATCH 6/8] jsonify with make_response --- api-service/index.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/api-service/index.py b/api-service/index.py index 058c903..405dd97 100644 --- a/api-service/index.py +++ b/api-service/index.py @@ -1,4 +1,4 @@ -from flask import Flask, jsonify +from flask import Flask, jsonify, make_response import argparse from widgets.handler import widget_bp @@ -8,7 +8,12 @@ @app.route('/') def base_page(): - return jsonify({"success" : 'yayyyy'}) + msg= jsonify({"success" : 'yayyyy'}) + res= make_response(msg,200) + res.headers['Content-Type'] = 'application/json' + return res + + if __name__ == '__main__': From ca480f84e374934a4df9e51f73495ff593461a15 Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Thu, 17 Nov 2022 18:35:17 -0600 Subject: [PATCH 7/8] yooooo --- api-service/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-service/index.py b/api-service/index.py index 405dd97..f57d4d4 100644 --- a/api-service/index.py +++ b/api-service/index.py @@ -8,7 +8,7 @@ @app.route('/') def base_page(): - msg= jsonify({"success" : 'yayyyy'}) + msg= jsonify({"success" : 'yooooo'}) res= make_response(msg,200) res.headers['Content-Type'] = 'application/json' return res From bef0c0391a1288821855a8a90cbcc09d930bccf0 Mon Sep 17 00:00:00 2001 From: Mehul Murali Date: Thu, 17 Nov 2022 18:36:19 -0600 Subject: [PATCH 8/8] yayyyy debugging --- api-service/index.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api-service/index.py b/api-service/index.py index f57d4d4..3ca35e8 100644 --- a/api-service/index.py +++ b/api-service/index.py @@ -8,7 +8,7 @@ @app.route('/') def base_page(): - msg= jsonify({"success" : 'yooooo'}) + msg= jsonify({"success" : 'yayyyyy'}) res= make_response(msg,200) res.headers['Content-Type'] = 'application/json' return res