feat: add now page, include in nav and index, and add pic to info

4 files changed, 64 insertions, 18 deletions

diff --git a/includes/nav.php b/includes/nav.php
index 0022c14..779e89f 100644
--- a/includes/nav.php
+++ b/includes/nav.php
@@ -7,14 +7,13 @@
 
 	<ul>
 		<li>
-			<a href="/">
-				Home
-			</a>
+			<a href="/">Home</a>
 		</li>
 		<li>
-			<a href="/contact">
-				Contact
-			</a>
+			<a href="/now">Now</a>
+		</li>
+		<li>
+			<a href="/contact">Contact</a>
 		</li>
 		<!--<li>
 			<a href="/hireme">
@@ -22,24 +21,19 @@
 			</a>
 		</li>-->
 		<li>
-			<a href="/info">
-				Info
-			</a>
+			<a href="/info">Info</a>
 		</li>
 		<li>
-			<a href="/links">
-				Links
-			</a>
+			<a href="/#posts">Posts</a>
 		</li>
 		<li>
-			<a target="_blank" href="https://git.53hor.net/">
-				Repos
-			</a>
+			<a href="/links">Links</a>
 		</li>
 		<li>
-			<a href="/feed.php">
-				RSS
-			</a>
+			<a target="_blank" href="https://git.53hor.net/">Repos</a>
+		</li>
+		<li>
+			<a href="/feed.php">RSS</a>
 		</li>
 	</ul>
 </nav>
diff --git a/pages/index.php b/pages/index.php
index 111e84e..d4d2099 100644
--- a/pages/index.php
+++ b/pages/index.php
@@ -1,5 +1,11 @@
 <h1> The World Wide Web pages of Adam Carpenter (53hornet) </h1>
 
+<?php include('./pages/now.php'); ?>
+
+<hr />
+
+<h2 id="posts">Posts</h2>
+
 <dl>
 	<?php
 	$posts = scandir('./posts', SCANDIR_SORT_DESCENDING);
diff --git a/pages/info.php b/pages/info.php
index 6f5b10e..30e161d 100644
--- a/pages/info.php
+++ b/pages/info.php
@@ -29,6 +29,11 @@
 	<li>Games, movies, and music</li>
 </ul>
 
+
+<p>
+	<img src="https://nextcloud.53hor.net/index.php/s/QEnkKnRXHA7tANX/preview" />
+</p>
+
 <h2>Disclaimer</h2>
 
 <p>
diff --git a/pages/now.php b/pages/now.php
new file mode 100644
index 0000000..239b2be
--- /dev/null
+++ b/pages/now.php
@@ -0,0 +1,41 @@
+<?php
+if ("/now" == $_SERVER['REQUEST_URI']) {
+	printf('<a href="https://nownownow.com/about"><h1>Now</h1></a>');
+} else {
+	printf('<h2>Now</h2>');
+}
+?>
+
+<p>
+	What am I up to now?
+</p>
+
+<h3>Work</h3>
+
+<ul>
+	<li>Still a manager and software engineer at Automatic Data Processing, Inc.</li>
+	<li>Trying to improve on change control by encouraging continuous integration. Advertising it as a way to reduce defects, delivery more frequently, and avoid change restriction. Using Jenkins, Kubernetes, and Bitbucket to do those things.</li>
+	<li>Reeling in chaos from unplanned work and scope change. Using sprint demos, Jira, and aggressive estimate planning to do that.
+	<li>Open to private contractor software development and website building projects.</li>
+</ul>
+
+<h3>Hobbies</h3>
+
+<ul>
+	<li>Eagerly awaiting a free day to rebuild Ol' Blue's fuel pump. Upgrading to a secondary vacuum unit to (hopefully) power future wiper washer.</li>
+	<li>(Continual) posting practical programming tutorials to <a href="https://www.youtube.com/@carpentertutoring841">Carpenter Tutoring YouTube channel</a>.</li>
+	<li>Translating a Computational Problem Solving course (CS 101) from Python to Rust. Intend on releasing first chapters on YouTube in coming weeks.</li>
+</ul>
+
+<h3>Life</h3>
+
+<ul>
+	<li>Enjoyed recent trip to NYC for wedding and tourism.</li>
+	<li>Getting over illness scares in wife and puppy. Be thankful for your health, it's underrated!</li>
+	<li>Gearing up for two more wedding trips in coming months.</li>
+	<li>Settling into spring and summer. Warm weather welcome, pollen be gone!</li>
+</ul>
+
+<p>
+	<em>Last updated 2023-05-11</em>
+</p>