Skip to content
Snippets Groups Projects
Commit 25b3ec2b authored by Kenny Gao's avatar Kenny Gao
Browse files

CORS now operational

parent 82be8476
No related branches found
No related tags found
1 merge request!2Order form
No preview for this file type
...@@ -259,7 +259,11 @@ def jsonReturn(frame, symbols, site, inst, jsonFormat, epoch): ...@@ -259,7 +259,11 @@ def jsonReturn(frame, symbols, site, inst, jsonFormat, epoch):
newRow = [] newRow = []
for symbol in symbols: for symbol in symbols:
newRow.append(row[symbol]) if(row[symbol]):
newRow.append(float(row[symbol]))
else:
newRow.append(row[symbol])
dataList.append(newRow) dataList.append(newRow)
...@@ -401,7 +405,7 @@ def handleResult(fmt, result, symbols, interval, sep, spd, wDir): ...@@ -401,7 +405,7 @@ def handleResult(fmt, result, symbols, interval, sep, spd, wDir):
direction[row] = 0 direction[row] = 0
elif(wEast[row] == 0): elif(wEast[row] == 0):
if(wNorth > 0): if(wNorth[row] > 0):
direction[row] = 0 direction[row] = 0
else: else:
direction[row] = 180 direction[row] = 180
......
...@@ -189,7 +189,11 @@ def jsonReturn(frame, symbols, jsonFormat, epoch): ...@@ -189,7 +189,11 @@ def jsonReturn(frame, symbols, jsonFormat, epoch):
newRow = [] newRow = []
for symbol in symbols: for symbol in symbols:
newRow.append(row[symbol]) if(row[symbol]):
newRow.append(float(row[symbol]))
else:
newRow.append(row[symbol])
dataList.append(newRow) dataList.append(newRow)
......
#might have to restart from scratch again #might have to restart from scratch again
from flask import Flask, render_template, request, jsonify, Response from flask import Flask, render_template, request, jsonify, Response
from flask_cors import CORS, cross_origin
from flask_json import FlaskJSON, as_json_p from flask_json import FlaskJSON, as_json_p
import Util import Util
import modifyData import modifyData
...@@ -13,6 +14,7 @@ app = Flask(__name__) ...@@ -13,6 +14,7 @@ app = Flask(__name__)
app.config['SECRET_KEY'] = 'secret!' app.config['SECRET_KEY'] = 'secret!'
app.config['JSONIFY_PRETTYPRINT_REGULAR'] = False app.config['JSONIFY_PRETTYPRINT_REGULAR'] = False
json = FlaskJSON(app) json = FlaskJSON(app)
CORS(app, resources=r'/api/*', allow_headers='Content-Type')
def handleIntError(statusNo, fmt): def handleIntError(statusNo, fmt):
if(statusNo == 500): if(statusNo == 500):
...@@ -219,7 +221,7 @@ def page_not_found(e): ...@@ -219,7 +221,7 @@ def page_not_found(e):
def internal_server(e): def internal_server(e):
return render_template('500.html'), 500 return render_template('500.html'), 500
@app.route('/api/data.<fmt>') @app.route('/api/data.<fmt>', methods=['GET'])
def test(fmt): def test(fmt):
sites = request.args.get('site') sites = request.args.get('site')
inst = request.args.get('inst') inst = request.args.get('inst')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment