Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support grid JSON response #50

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support grid JSON response #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions frontend/app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from boto3.dynamodb.conditions import Key, Attr
from flask import Flask, render_template, request, redirect, url_for
from flask import Flask, jsonify, render_template, request, redirect, url_for

import boto3
import json
Expand Down Expand Up @@ -81,16 +81,19 @@ def grid(show_data, timeframe):
'p_99': round(float(item['p_99']), 2),
}

return render_template(
'index.html',
title='Home',
values=return_data,
regions_from=enabled_regions,
regions_to=enabled_regions_to,
show_data=show_data,
selected_percentile=show_data,
selected_timeframe=timeframe
)
if request.accept_mimetypes.accept_json:
return jsonify(return_data)
else:
return render_template(
'index.html',
title='Home',
values=return_data,
regions_from=enabled_regions,
regions_to=enabled_regions_to,
show_data=show_data,
selected_percentile=show_data,
selected_timeframe=timeframe
)

@app.route('/about')
def about():
Expand Down