From 2cb1368440410c2ea32d7e443f9dd7aec3ed930b Mon Sep 17 00:00:00 2001
From: Andrew Simonson <asimonson1125@gmail.com>
Date: Sun, 19 May 2024 11:16:05 -0500
Subject: [PATCH] replace about page with homepage content

---
 src/app.py                 |   6 +-
 src/static/css/App.css     |  24 ++++++--
 src/static/json/pages.json |   6 --
 src/static/sitemap.xml     |   4 +-
 src/templates/about.html   | 112 -------------------------------------
 src/templates/header.html  |   4 --
 src/templates/home.html    |  70 ++++++++++++++++++++---
 7 files changed, 87 insertions(+), 139 deletions(-)
 delete mode 100644 src/templates/about.html

diff --git a/src/app.py b/src/app.py
index 6d715a2..220318c 100644
--- a/src/app.py
+++ b/src/app.py
@@ -10,10 +10,10 @@ books = json.load(open("./static/json/books.json", "r"))
 skillList = json.load(open("./static/json/skills.json", "r"))
 timeline = json.load(open("./static/json/timeline.json", "r"))
 pages = json.load(open("./static/json/pages.json", "r"))
-pages['about']['skillList'] = skillList
-pages['about']['timeline'] = timeline
+pages['home']['skillList'] = skillList
+# pages['about']['timeline'] = timeline
 pages['projects']['projects'] = proj
-pages['about']['books'] = books
+pages['home']['books'] = books
 pages['books']['books'] = books
 
 app = flask.Flask(__name__)
diff --git a/src/static/css/App.css b/src/static/css/App.css
index 763263f..f0de231 100644
--- a/src/static/css/App.css
+++ b/src/static/css/App.css
@@ -343,6 +343,14 @@ a {
   justify-content: space-around;
 }
 
+.equalitems {
+  column-gap: 1em;
+}
+
+.equalitems > * {
+  flex: 1 1 0;
+}
+
 .vFlex {
   display: flex;
   flex-direction: column;
@@ -354,10 +362,6 @@ a {
   max-width: 100%;
 }
 
-#aboutCards {
-  justify-content: left;
-}
-
 #aboutCards > * {
   margin: .25em;
 }
@@ -370,6 +374,11 @@ a {
   justify-content: left;
 }
 
+.hSpacer {
+  width: 2em;
+  height: 0;
+}
+
 .relative {
   position: relative;
 }
@@ -677,6 +686,7 @@ a {
 .homeSubContent {
   background-color: rgb(24, 24, 24, .85);
   padding: 0 8em;
+  padding-top: 1em;
 }
 
 #homeProjects {
@@ -1031,6 +1041,10 @@ a {
     margin: 0;
   }
 
+  .vertOnMobile {
+    flex-direction: column;
+  }
+
   .projectList {
     width: 95%;
   }
@@ -1056,7 +1070,7 @@ a {
   }
 
   .homeSubContent {
-    padding: 0;
+    padding: 1em;
   }
 
   .onRight {
diff --git a/src/static/json/pages.json b/src/static/json/pages.json
index 2298159..666b9f1 100644
--- a/src/static/json/pages.json
+++ b/src/static/json/pages.json
@@ -11,12 +11,6 @@
         "description": "Recent projects by Andrew Simonson on his lovely portfolio website :)",
         "canonical": "/projects"
     },
-    "about": {
-        "template": "about.html",
-        "title": "Andrew Simonson - About Me",
-        "description": "About Andrew Simonson",
-        "canonical": "/about"
-    },
     "books": {
         "template": "books.html",
         "title": "Andrew Simonson - Bookshelf",
diff --git a/src/static/sitemap.xml b/src/static/sitemap.xml
index 8fc4dbd..ff372c7 100644
--- a/src/static/sitemap.xml
+++ b/src/static/sitemap.xml
@@ -2,9 +2,9 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>
     <loc>https://asimonson.com</loc>
-    <loc>https://asimonson.com/about</loc>
     <loc>https://asimonson.com/projects</loc>
     <loc>https://asimonson.com/Resume</loc>
-    <lastmod>2022-06-04</lastmod>
+    <loc>https://asimonson.com/duck</loc>
+    <lastmod>2024-05-19</lastmod>
   </url>
 </urlset>
\ No newline at end of file
diff --git a/src/templates/about.html b/src/templates/about.html
deleted file mode 100644
index f70b88d..0000000
--- a/src/templates/about.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% block content %}
-<div class="foreground"></div>
-<div class="foregroundContent">
-  <div class="relative">
-    <div id="aboutMe" data-aos="fade-up">
-      <h2 class="concentratedHead">About Me</h2>
-      <p>
-        I'm Andrew Simonson<!--, CEO of the anti-thermodynamics syndicate.-->, a
-        senior undergrad at
-        <strong>Rochester Institute of Technology </strong>
-        in the <b>Computer Science BS</b> program (international relations
-        minor), pursuing a career in data science.
-        <br />
-        <br />
-        My philosophy is that if it isn't explainable then you didn't learn anything.  
-        Data without sound methodology is at best meaningless and at worst
-        counterproductive and costly.  
-        Bringing logical transparency and literal deductions back
-        into digital analysis enables us to learn about the world through computing,
-        rather than letting computers make decisions for the world we think we know.  
-        We as data scientists shouldn't just be building heuristics. We should
-        be making discoveries and building new knowledge.
-        <br />
-        <br />
-        <strong>Bring the scientific method to AI.</strong>
-      </p>
-    </div>
-    <div data-aos="fade-up">
-      <div id="skills">
-        <h2 id="skillstag">Skills</h2>
-        {% from 'partials/skills.html' import skills %} {{
-        skills(var['skillList']) }}
-      </div>
-      <div id="timeline">
-        <h2>Timeline</h2>
-        <div class="checkbox-wrapper">
-          <div class="flex start">
-            <label class="switch" htmlFor="pinned">
-              <input
-                type="checkbox"
-                id="pinned"
-                onClick='toggleCheckbox("up")'
-                checked
-              />
-              <div class="slider round"></div>
-              <strong>Pinned</strong>
-            </label>
-          </div>
-          <div class="flex start">
-            <label class="switch" htmlFor="education">
-              <input
-                type="checkbox"
-                id="education"
-                onClick="toggleCheckbox('up')"
-              />
-              <div class="slider round"></div>
-              <strong>Education</strong>
-            </label>
-          </div>
-          <div class="flex start">
-            <label
-              class="switch"
-              htmlFor="experience"
-              onClick="toggleCheckbox('up')"
-            >
-              <input type="checkbox" id="experience" />
-              <div class="slider round"></div>
-              <strong>Work Experience</strong>
-            </label>
-          </div>
-          <div class="flex start">
-            <label
-              class="switch"
-              htmlFor="technical"
-              onClick="toggleCheckbox('up')"
-            >
-              <input type="checkbox" id="technical" />
-              <div class="slider round"></div>
-              <strong>Technical</strong>
-            </label>
-          </div>
-        </div>
-        <div class="timeline checkbox-client">
-          {% from 'partials/timeline.html' import timeitem %} {% for i in
-          var["timeline"] %} {{ timeitem(i, var["timeline"][i]["classes"],
-          var["timeline"][i]["date"], var["timeline"][i]["content"])}} {% endfor
-          %}
-        </div>
-        <script>
-          toggleCheckbox("up");
-        </script>
-      </div>
-    </div>
-  </div>
-  <div id="aboutCards" class="flex">
-    <div class="chess">
-      {% from 'partials/chess.html' import chess %} {{ chess('asimonson1125') }}
-    </div>
-    <br />
-    {% from 'partials/bookshelf.html' import bookshelf %} {{
-    bookshelf(var.books) }}
-    <br />
-    <div class="pointer" onClick="goto('duck')">
-      <img
-        alt="duck spinning"
-        src="{{ url_for('static', filename='photos/gifs/duck-spinning.gif') }}"
-        class="smallImg"
-      />
-    </div>
-  </div>
-</div>
-{% endblock %}
diff --git a/src/templates/header.html b/src/templates/header.html
index fec65c0..9661bdd 100644
--- a/src/templates/header.html
+++ b/src/templates/header.html
@@ -91,10 +91,6 @@
             <div onclick="goto('projects')" class="navElement">
               <p>Projects</p>
             </div>
-            <!-- <a href="/activities">Activities</a> -->
-            <div onclick="goto('about')" class="navElement">
-              <p>About Me</p>
-            </div>
           </div>
         </div>
       </div>
diff --git a/src/templates/home.html b/src/templates/home.html
index 8bf18ee..28f377b 100644
--- a/src/templates/home.html
+++ b/src/templates/home.html
@@ -6,17 +6,73 @@
     alt="logo"
   />
   <h1 id="homeName" class="textGrad">Andrew Simonson</h1>
-  <h2 class="textGrad">Digital Analysis Beyond Controlled Environments</h2>
+  <h2 class="textGrad">Data Science Beyond Theoretical Environments</h2>
 </div>
 {% endmacro %}
 
 <div class="foreground homeground"></div>
 <div class="relative">
   <div id="nametag" class="flex" data-aos="fade-up">{{ nameplate() }}</div>
+  <!--<INSERT SMALL BANNER HERE FOR PROJECT IMAGECARD CAROUSEL>-->
+  <div id="desktopSpacer"></div>
+  <div class="homeSubContent">
+    <div class="flex equalitems vertOnMobile">
+      <div>
+        <h2>About Me</h2>
+        <p>
+          I'm Andrew Simonson<!--, CEO of the anti-thermodynamics syndicate.-->,
+          a senior undergrad at
+          <strong>Rochester Institute of Technology </strong>
+          in the <b>Computer Science BS</b> program (international relations
+          minor), pursuing a career in data science. I have study clusters in
+          Data Science and AI and run independent studies in probability theory.
+          <br />
+          <br />
+          I've worked on a variety of projects, from building analytical tools
+          performing reactive chemical safety to live feed processing for
+          frantic work environments looking to improve service. I also do
+          personal experimentation leveraging open source info streams ranging
+          from human traffic around campus to watershed temperature monitoring.
+          <br />
+          <br />
+          My philosophy is that if it isn't explainable then you didn't learn
+          anything. Data without sound methodology is at best meaningless and at
+          worst counterproductive and costly. Bringing logical transparency and
+          literal deductions back into digital analysis enables us to learn
+          about the world through computing, rather than letting computers make
+          decisions for the world we think we know. We as data scientists
+          shouldn't just be building heuristics. We should be making discoveries
+          and building new knowledge.
+          <br />
+          <br />
+          <strong>Bring the scientific method to AI.</strong>
+          <br />
+          <br />
+        </p>
+      </div>
+      <div id="skills">
+        <h2 id="skillstag">Skills</h2>
+        {% from 'partials/skills.html' import skills %} {{
+        skills(var['skillList']) }}
+      </div>
+    </div>
+    <div id="aboutCards" class="flex">
+      <div class="chess">
+        {% from 'partials/chess.html' import chess %} {{ chess('asimonson1125')
+        }}
+      </div>
+      <br />
+      {% from 'partials/bookshelf.html' import bookshelf %} {{
+      bookshelf(var.books) }}
+      <br />
+      <div class="pointer" onClick="goto('duck')">
+        <img
+          alt="duck spinning"
+          src="{{ url_for('static', filename='photos/gifs/duck-spinning.gif') }}"
+          class="smallImg"
+        />
+      </div>
+    </div>
+  </div>
 </div>
-<!--<INSERT SMALL BANNER HERE FOR PROJECT IMAGECARD CAROUSEL>-->
-<div id="desktopSpacer"></div>
-<div class="homeSubContent">
-  <h1>About Me</h1>
-</div>
-  {% endblock %}
+{% endblock %}