diff --git a/flask_frontend.py b/flask_frontend.py index 02e4eb2..f119077 100644 --- a/flask_frontend.py +++ b/flask_frontend.py @@ -58,9 +58,19 @@ def ratio_pyro(): freq_plot = fig.to_html() return render_template( - 'results.html', + 'pyrometry-results.html', img_orig_b64=img_orig_b64, img_res_b64=img_res_b64, legend=key, freq_plot=freq_plot ) + + +@app.route('/projected_area') +def projected_area(): + return render_template('projected-area.html') + + +@app.route('/projected_area_results') +def projected_area_results(): + return render_template('projected-area-results.html') diff --git a/static/app.css b/static/app.css new file mode 100644 index 0000000..0944be4 --- /dev/null +++ b/static/app.css @@ -0,0 +1,60 @@ +* { + font-family: sans-serif; +} + +html { + margin: 0px; + padding: 0px; +} + +.navbar { + display: flex; + flex-direction: row; + align-items: center; + padding: 0px 2rem; + background-color: #e0e0e0; + border-radius: 1rem; +} + +.navbar-links { + display: flex; + flex-direction: row; + align-items: center; + margin-left: auto; +} + +.navbar-link { + display: flex; + margin-left: 3rem; +} + +.form { + display: flex; + flex-direction: column; +} + +.img-table-heading { + padding: 4px 10px; +} + +.img-table-cell { + padding: 10px 20px; +} + +.img-out { + width: 32rem; +} + +.legend { + border-spacing: 0px; + border-collapse: collapse; +} + +.legend-heading { + padding: 4px; +} + +.legend-cell { + border-width: 0px; + padding: 0px 20px; +} diff --git a/templates/app.css b/templates/app.css deleted file mode 100644 index 86c1669..0000000 --- a/templates/app.css +++ /dev/null @@ -1,4 +0,0 @@ -.form { - display: flex; - flex-direction: column; -} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index d42930c..c7e685c 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,15 +1,17 @@ Pyrometry Application - + + +
{% block content required %} {% endblock %} - - diff --git a/templates/projected-area-results.html b/templates/projected-area-results.html new file mode 100644 index 0000000..3b97d52 --- /dev/null +++ b/templates/projected-area-results.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% block content %} + + + +{% endblock %} \ No newline at end of file diff --git a/templates/projected-area.html b/templates/projected-area.html new file mode 100644 index 0000000..3b97d52 --- /dev/null +++ b/templates/projected-area.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% block content %} + + + +{% endblock %} \ No newline at end of file diff --git a/templates/results.html b/templates/pyrometry-results.html similarity index 78% rename from templates/results.html rename to templates/pyrometry-results.html index 0ba4fd8..b84ac1f 100644 --- a/templates/results.html +++ b/templates/pyrometry-results.html @@ -39,32 +39,4 @@ Temperature Distribution {{freq_plot}} - - {% endblock %}