diff --git a/src/app.py b/src/app.py index 220318c..850b50f 100644 --- a/src/app.py +++ b/src/app.py @@ -71,29 +71,29 @@ def hotspotsRIT(): def hotspotsProxy(path): return requests.get(f"{HotspotsURL}/{path}").content -@app.errorhandler(Exception) -def page404(e): - eCode = e.code - message = e.description - try: - message = e.length - finally: - pagevars = { - "template": "error.html", - "title": f"{eCode} - Simonson", - "description": "Error on Andrew Simonson's Digital Portfolio", - "canonical": "404", - } - return ( - flask.render_template( - "header.html", - var=pagevars, - error=eCode, - message=message, - title=f"{eCode} - Simonson Portfolio", - ), - eCode, - ) +# @app.errorhandler(Exception) +# def page404(e): +# eCode = e.code +# message = e.description +# try: +# message = e.length +# finally: +# pagevars = { +# "template": "error.html", +# "title": f"{eCode} - Simonson", +# "description": "Error on Andrew Simonson's Digital Portfolio", +# "canonical": "404", +# } +# return ( +# flask.render_template( +# "header.html", +# var=pagevars, +# error=eCode, +# message=message, +# title=f"{eCode} - Simonson Portfolio", +# ), +# eCode, +# ) @app.route("/sitemap.xml") diff --git a/src/static/Resume.pdf b/src/static/Resume.pdf index 58d36fb..51d94fe 100644 Binary files a/src/static/Resume.pdf and b/src/static/Resume.pdf differ diff --git a/src/static/css/App.css b/src/static/css/App.css index f0de231..eabd300 100644 --- a/src/static/css/App.css +++ b/src/static/css/App.css @@ -259,7 +259,6 @@ a { .foregroundContent p { line-height: 1.5em; - max-width: min(90%, 40rem); } .homeground { @@ -311,10 +310,6 @@ a { text-align: center; } -#nametag *:not(h1) { - text-shadow: .1em .1em rgba(255, 255, 255, 0.2); -} - #nametag h2{ font-size: medium; } @@ -397,7 +392,6 @@ a { background-size: contain; background-repeat: no-repeat; background-position-y: center; - opacity: 0.4; height: 100%; width: 100%; position: absolute; @@ -510,23 +504,13 @@ a { padding: 0px; display: flex; flex-wrap: wrap; - justify-content: center; margin-left: auto; margin-right: auto; width: 100%; - text-align: center; } .project { - display: inline-block; - text-align: left; - margin: 1rem; - width: 20rem; - height: 22rem; - border: .3rem rgba(156, 49, 45, .8) solid; - background-color: rgba(22, 22, 22, .8); - transition: .3s; - overflow: hidden; + border-top: .3rem rgba(156, 49, 45, .8) solid; } .projTitle>* { @@ -536,9 +520,18 @@ a { .projBody { position: relative; z-index: 3; + display: flex; } -.project .topBox, .project .bottomBox, .project .projTitle { +.grow { + flex-grow: 1; +} + +.projImage{ + width: min(100%, 35em); +} + +.project .projTitle { padding: 0 1rem; z-index: inherit; } @@ -558,7 +551,7 @@ a { border-bottom: black solid .2rem; } -.project img { +.projectLink { margin-top: auto; height: 3rem; } @@ -687,6 +680,7 @@ a { background-color: rgb(24, 24, 24, .85); padding: 0 8em; padding-top: 1em; + border-top: solid 4px rgba(139,36,36,0.5); } #homeProjects { diff --git a/src/static/json/projects.json b/src/static/json/projects.json index 3945b2e..46d9d6f 100644 --- a/src/static/json/projects.json +++ b/src/static/json/projects.json @@ -13,6 +13,28 @@ ] ] }, + "Antietam-Conococheague Watershed Monitoring": { + "status": "complete", + "classes": "geospacial", + "bgi": "watershedTemps.png", + "content": "Geospacial analysis of Maryland's Antietam and Conococheague sub-watersheds, monitoring water quality and temperatures through the summer months for reporting to governmental review boards for environmental protection" + }, + "Calorimetry Analysis Engineering": { + "status": "complete", + "classes": "pinned programming", + "bgi": "calorimeterAnalysis.png", + "content": "An analytical toolkit designed for reactive chemistry analysis, especially calorimetry. Works include automatic analysis, alerting unusual and dangerous results derived from a wide range of testing envrionments and equipment", + "links": [] + }, + "Geography of Alternative Energy": { + "status": "complete", + "classes":"pinned geospacial", + "bgi": "energyGeography.png", + "content": "An ArcGIS geospacial analysis comparing the difference in effectiveness of wind, solar, and geothermal energy across the continental 48 United States.", + "links": [ + ["globe", "https://ritarcgis.maps.arcgis.com/apps/dashboards/17d5bda01edc4a2eb6205a4922d889c9", "Dashboard"] + ] + }, "OccupyRIT": { "status": "WIP", "classes": "pinned programming", @@ -22,16 +44,6 @@ ["github", "https://github.com/asimonson1125/Occupy-RIT", "git repo"] ] }, - "Digital Portfolio": { - "status": "WIP", - "classes": "pinned programming", - "bgi": "website.png", - "content": "My personal portfolio website (you're on it now!)", - "links": [ - ["github", "https://github.com/asimonson1125/asimonson1125.github.io", "git repo"], - ["globe", "https://asimonson.com", "site link"] - ] - }, "Slate": { "status": "complete", "classes": "pinned programming", @@ -42,7 +54,7 @@ ["globe", "https://slate.csh.rit.edu", "site link"] ] }, - "NationsGame Rolls Sim": { + "Monte Carlo Engine for NationsGame": { "status": "complete", "classes": "programming", "bgi": "ceoOfYugo.png", diff --git a/src/static/photos/me_robot.jpeg b/src/static/photos/me_robot.jpeg deleted file mode 100644 index ac0c36d..0000000 Binary files a/src/static/photos/me_robot.jpeg and /dev/null differ diff --git a/src/static/photos/projects/calorimeterAnalysis.png b/src/static/photos/projects/calorimeterAnalysis.png new file mode 100644 index 0000000..be5093c Binary files /dev/null and b/src/static/photos/projects/calorimeterAnalysis.png differ diff --git a/src/static/photos/ceoOfYugo.png b/src/static/photos/projects/ceoOfYugo.png similarity index 100% rename from src/static/photos/ceoOfYugo.png rename to src/static/photos/projects/ceoOfYugo.png diff --git a/src/static/photos/projects/energyGeography.png b/src/static/photos/projects/energyGeography.png new file mode 100644 index 0000000..d83853c Binary files /dev/null and b/src/static/photos/projects/energyGeography.png differ diff --git a/src/static/photos/hotspotsrit.png b/src/static/photos/projects/hotspotsrit.png similarity index 100% rename from src/static/photos/hotspotsrit.png rename to src/static/photos/projects/hotspotsrit.png diff --git a/src/static/photos/occupyRIT.png b/src/static/photos/projects/occupyRIT.png similarity index 100% rename from src/static/photos/occupyRIT.png rename to src/static/photos/projects/occupyRIT.png diff --git a/src/static/photos/placeholder.png b/src/static/photos/projects/placeholder.png similarity index 100% rename from src/static/photos/placeholder.png rename to src/static/photos/projects/placeholder.png diff --git a/src/static/photos/slate.png b/src/static/photos/projects/slate.png similarity index 100% rename from src/static/photos/slate.png rename to src/static/photos/projects/slate.png diff --git a/src/static/photos/projects/watershedTemps.png b/src/static/photos/projects/watershedTemps.png new file mode 100644 index 0000000..87de63a Binary files /dev/null and b/src/static/photos/projects/watershedTemps.png differ diff --git a/src/static/photos/sun.png b/src/static/photos/sun.png deleted file mode 100644 index 176f5bf..0000000 Binary files a/src/static/photos/sun.png and /dev/null differ diff --git a/src/static/photos/website.png b/src/static/photos/website.png deleted file mode 100644 index 2736411..0000000 Binary files a/src/static/photos/website.png and /dev/null differ diff --git a/src/templates/partials/project.html b/src/templates/partials/project.html index 91ce459..bc8db07 100644 --- a/src/templates/partials/project.html +++ b/src/templates/partials/project.html @@ -1,32 +1,42 @@ {% macro project(title, classes, status, bgi, content, links) %}
-
-
-

{{ title }}

-

+
+

{{ title }}

+

{{ status }}

+
+
+ {% if bgi|length > 0 %} {% set path = url_for('static', + filename='photos/projects/' + bgi) %} +
+ Ref image for {{ title }} project
-
- {% if bgi|length > 0 %} - {% set path = url_for('static', filename='photos/' + bgi) %} -
+ {% endif %} + +
+

{{ content }}

+
+
diff --git a/src/templates/projects.html b/src/templates/projects.html index 12834f0..f6915ef 100644 --- a/src/templates/projects.html +++ b/src/templates/projects.html @@ -3,15 +3,7 @@

Projects

-

- Project status is indicated by the color of the project card: -
- - Complete -
- - Work In Progress -
- - Incomplete -

+

This page is currently undergoing a reconstruction. It's messy, but I needed to push some changes before I was ready for some very good and secret reasons.

-
+
{% from 'partials/project.html' import project %} {% for i in var["projects"] %} {{ project(i, var["projects"][i]["classes"], var["projects"][i]["status"], var["projects"][i]["bgi"], var["projects"][i]["content"], var["projects"][i]["links"]) }}