From 3a68cdc4089c208bc6dd1b70a577c1f6e9ff57fb Mon Sep 17 00:00:00 2001
From: Jim Shepich III <73664586+epicshepich@users.noreply.github.com>
Date: Sun, 4 Jun 2023 08:43:55 -0400
Subject: [PATCH] Rewrote home page

---
 .gitignore      |  1 +
 data/pages.json |  9 ++++++++-
 index.php       | 15 +++++++++++++--
 pages/home.html | 21 ++++-----------------
 scripts/nav.php |  6 ++++++
 5 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..78ecffe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+shepich resume.pdf
\ No newline at end of file
diff --git a/data/pages.json b/data/pages.json
index 751e7d2..42c3ab3 100644
--- a/data/pages.json
+++ b/data/pages.json
@@ -20,6 +20,13 @@
         "index" : 1
     },
 
+    "resume" : {
+        "name" : "Resume",
+        "query_value" : "resume",
+        "link" : "pages/shepich resume.pdf",
+        "index" : 2
+    },
+
     "epics" : {
         "name" : "Epics & Emprises",
         "query_value" : "epics",
@@ -31,6 +38,6 @@
         "name" : "Lists",
         "query_value" : "lists",
         "file" : "lists.html",
-        "index" : 2
+        "index" : -1
     }
 }
diff --git a/index.php b/index.php
index a796708..dc0525b 100644
--- a/index.php
+++ b/index.php
@@ -24,8 +24,19 @@
     </nav>
     <main>
         <?php
-            //echo "<iframe id='content' src='pages/".$page->file."'></iframe>";
-            echo file_get_contents(__DIR__ ."/pages/".$page->file);
+            if(isset($page->link)){
+                echo "<script>window.location.href = '".$page->link."'</script>";
+                //If the directory assigns the page to an external link, redirect to that location.
+            }
+
+            if(isset($page->iframe)){
+                echo "<iframe id='content' src='pages/".$page->file."'></iframe>";
+                //If the directory says to embed the page in an iframe, then do that.
+            } else {
+                echo file_get_contents(__DIR__ ."/pages/".$page->file);
+                //Otherwise, just write the HTML of the page in the content area.
+            }
+
         ?>
     </main>
     <footer>
diff --git a/pages/home.html b/pages/home.html
index 985a3c6..8b05c10 100644
--- a/pages/home.html
+++ b/pages/home.html
@@ -1,21 +1,8 @@
 <article>
 <h1>Welcome!</h1>
-<hr />
-<p>Welcome to my website! My name is Jim <span title="'&#643;&#603;p&#618;k">Shepich</span> (@epicshepich). I'm currently a Master's student at Johns Hopkins University studying Data Science and a Master Diviner at Ravenwood School of Magical Arts studying Storm Magic. I'm an avid hobbyist, and some of my interests include: math and science, computer programming, tabletop and video games, martial arts (especially jujutsu), cartoons/anime, reading (mostly sci-fi and fantasy), music, and DIY. I created this website to share some of the projects I'm working on and some of the things I've learned.</p>
-<h2>Some notable projects I'm working on:</h2>
-<ul>
-    <li>This website</li>
-    <li>Finding a job</li>
-    <li><a href="https://epics.shepich.com">Epics & Emprises</a> - a tabletop roleplaying system inspired by 3.5e D&D, 5e D&D, and JRPGs, with a focus on martial arts and a hard magic system</li>
-    <li><a href="https://www.youtube.com/watch?v=-qdo_XNdCbU" target="blank_">Design & Dissection</a> - a podcast co-hosted by Houston Webb about the design and philosophy of games, specifically TTRPGs (like E&E)</li>
-</ul>
-<h2>Some useful things I've learned:</h2>
-<ul>
-    <li>Black widows and quicksand can both be found in Michigan and are not as deadly as you are led to believe.</li>
-    <li>If you're compiling a LaTeX document and the compilation stops midway, type "R" into the console and hit Enter.</li>
-    <li>A good way to prevent ear infections is to sleep with your ear in the hole of a neck pillow because it allows your ear canal to remain cool and dry.</li>
-    <li>You can just put the copyright symbol at the bottom of your website without having a legal copyright.</li>
-    <li>You don't tug on superman's cape, you don't spit into the wind, you don't pull the mask off that old lone ranger, and you don't mess around with Jim.</li>
+    <hr />
+    <p>Welcome to my little corner of the Internet! My name is Jim <span title="'&#643;&#603;p&#618;k">Shepich</span> (@epicshepich). I like to introduce myself as a jack-of-all-trades with a Master's in data science. My main interests include STEM, martial arts (especially jūjutsu), sci-fi and fantasy, tabletop and video gaming, cartoons and comics, and DIY, but I also love to branch out and learn new things! My dream is to become "The Most Interesting Man in the World."</p> 
+
+    <p>This website started as a way for me to exercise and showcase my skills with vanilla HTML, JavaScript, CSS, and PHP. Now, it's just a matter of filling the site with content! My vision for this website is for it to serve as a gift to my future reincarnated self (if that's what happens) &mdash; a way to pass on the little tips and tricks, bits of wisdom, resources, and treasures I've accumulated over the course of my life (think <i>new game plus</i>). And if some other kindred spirits find something here that helps them on their journey, that's a bonus! </p>
 
-</ul>
 <article>
diff --git a/scripts/nav.php b/scripts/nav.php
index 3237512..65f4608 100644
--- a/scripts/nav.php
+++ b/scripts/nav.php
@@ -9,10 +9,16 @@ function page_comparator($a,$b){
 }
 
 function gen_nav_element($page){
+    $iframe = false;
+    //By default, echo the contents of a file instead of embedding it in an iframe.
     if(isset($page->file)){
         $href = "index.php?page=".$page->query_value;
         $target = "_self";
         //If the page is associated with a file, then point the navibar href to the file's query value.
+
+        $iframe = (isset($page->iframe)) ? true : false;
+        //If the page has the iframe attribute, then keep track of that.
+
     } elseif(isset($page->link)) {
         $href = $page->link;
         $target = "_blank";