feat: update hire, updated css, tweaked payments

6 files changed, 98 insertions, 72 deletions

diff --git a/card b/card
deleted file mode 100644
index 6932985..0000000
--- a/card
+++ /dev/null
@@ -1,24 +0,0 @@
-╓─────────────────────────────────────────────────────────────────────────────╖
-║    ,---.    |              ,---.                         |                  ║
-║    |---|,---|,---.,-.-.    |    ,---.,---.,---.,---.,---.|--- ,---.,---.    ║
-║    |   ||   |,---|| | |    |    ,---||    |   ||---'|   ||    |---'|        ║
-║    `   '`---'`---^` ' '    `---'`---^`    |---'`---'`   '`---'`---'`        ║
-║                                           |
-║
-║
-║ - Professional Computer Programmer & Software Developer
-║ - Custom
-║
-║
-║                            http://www.53hor.net
-║                            mailto:atc@53hor.net
-║
-║
-║
-║
-║
-║
-║
-║
-║
-╙─────────────────────────────────────────────────────────────────────────────╜
diff --git a/cv.html b/cv.html
index 5334070..c9ecd92 100644
--- a/cv.html
+++ b/cv.html
@@ -1,3 +1,5 @@
+<h1>Adam T. Carpenter</h1>
+
 <label for="email">Email</label>
 <a id="email" href="mailto:atc@53hor.net">atc@53hor.net</a>
 <label for="www">WWW</label>
@@ -7,9 +9,6 @@
   >git.53hor.net</a
 >
 
-<hr />
-<h2>Summary</h2>
-
 <p>
   I am a computer programmer who has been developing and maintaining native and
   web applications since 2018. I have also been providing systems administration
@@ -22,18 +21,18 @@
   I am fluent in Rust, C#, Python, JavaScript, Bourne Shell, and HTML+CSS. I am
   also familiar with Java, PHP, C, C++, TypeScript, and PowerShell. I have used
   a variety of frameworks and libraries, as well as a myriad of web servers,
-  databases, and "DevOps" toolkits.
+  databases, and "DevOps" platforms.
 </p>
 
 <hr />
 <h2>Skills</h2>
 
-<h3>Software Development</h3>
+<h3>Software Engineering</h3>
 
 <ul>
   <li>
     Build performant, correct applications and services with a focus on
-    automating manual labor and making architects'/operators' lives easier.
+    automating manual labor and making architects' and operators' lives easier.
   </li>
   <li>
     Contribute to internal and client-facing front-end software that is simple
@@ -82,14 +81,19 @@
 </ul>
 
 <hr />
-<h2>Experience</h2>
+<h2>Work History</h2>
 
 <p>
-<h3>Automatic Data Processing | Software Engineer | Aughst 2021 to Present</h3>
+<h3>Software Engineer</h3>
+<em>Automatic Data Processing (August 2021-Present)</em>
+<ul>
+	<li>Promoted after three years of hard work as a junior application developer</li>
+</ul>
 </p>
 
 <p>
-<h3>Automatic Data Processing | Application Developer | June 2018 to August 2021</h3>
+<h3>Application Developer</h3>
+<em>Automatic Data Processing (June 2018-August 2021)</em>
 <ul>
   <li>
 	Authored <em>Altruistic Angelshark</em>, an Avaya Communication Manager
@@ -125,9 +129,8 @@
 </p>
 
 <p>
-<h3>
-  Freelance | Web Application Designer & Developer | Jul. 2019 to present
-</h3>
+<h3>Web Application Designer &amp; Developer</h3>
+<em>Freelance (July 2019-Present)</em>
 <ul>
   <li>
 	Built a from-scratch art studio storefront to exactly fit the customer's
@@ -141,10 +144,8 @@
 </p>
 
 <p>
-<h3>
-  The College of William and Mary | Technology Support Specialist | Feb.
-  2015 to May 2018
-</h3>
+<h3>Technology Support Specialist, Repair Technician</h3>
+<em>The College of William &amp; Mary (February 2015-May 2018)</em>
 <ul>
   <li>
 	Worked directly with customers to diagnose issues and install and
@@ -160,7 +161,7 @@
 </p>
 
 <hr />
-<h2>Academics</h2>
+<h2>Academic History</h2>
 
 <p>
   I have a Bachelor of Science in Computer Science and graduated from the
@@ -187,6 +188,5 @@
 </p>
 
 <p>
-  You can always find more on
-  <a href="https://www.53hor.net">my web site</a>.
+	I keep a <a href="https://www.53hor.net">public journal on my web site</a>.
 </p>
diff --git a/cv.php b/cv.php
deleted file mode 100644
index 71abfdd..0000000
--- a/cv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$title = "Adam T. Carpenter";
-$nav = false;
-include($_SERVER['DOCUMENT_ROOT'] . '/includes/head.php');
-include('cv.html');
diff --git a/hire.php b/hire.php
index 232c3d8..dd1a992 100644
--- a/hire.php
+++ b/hire.php
@@ -1,23 +1,40 @@
 <?php
-$title = "Hire Me";
+$title = "Carpenter Tech";
 include('./includes/head.php');
 ?>
 
 <p>
-	I am a freelance computer programmer and consultant. I offer the following services.
+	My name is Adam Carpenter and I am a freelance, general-purpose computer programmer.
 
+</p>
 <ul>
-	<li>Custom software design, development, and deployment</li>
-	<li>From-scratch web site construction and maintenance</li>
-	<li>Programming and information technology consulting</li>
+	<li>Does your business day consist of tedious, repetitive manual tasks? How do you go about streamlining the process and writing software to automate those tasks?</li>
+	<li>Maybe you've outgrown the limitations of DIY site designers such as Google Sites or Wix. How do you approach from-scratch web design and rich web applications?</li>
+	<li>Are you or your small business looking to take control of your IT by self-hosting? Wondering how to go about efficiently and securely serving your clients?</li>
 </ul>
+
+<p>
+	I run a business called <em>Carpenter Tech</em> that aims to help you answer these questions by offering the following services.
+
 </p>
 
-<p>You can see some of my work history in my CV
-	<a target="_blank" href="/cv.php">(HTML)</a>
-	<a href="/cgi-bin/cv.sh">(PDF)</a>.
+<ul>
+	<li>Software engineering, custom software design, development, and deployment</li>
+	<li>From-scratch web site construction, hosting, and maintenance</li>
+	<li>Programming, self-hosting, and IT consulting for small busineses</li>
+</ul>
+
+<p>
+	I am down to earth and enjoy solving problems. If you think I may be able to help solve yours, the best way to get in touch with me is writing to
+	<a href="mailto:atc@53hor.net">atc@53hor.net</a>.
+</p>
+
+
+<p>
+	Below is my CV and other related professional history. You may also <a href="/cgi-bin/cv.sh">download my CV as a PDF</a>.
 </p>
 
-<p>You can also view many of my personal projects in my <a target="_blank" href="https://git.53hor.net/explore/repos">Git repositories</a>.
+<hr />
 
-<p>The best way to get in touch with me is <a href="mailto:atc@53hor.net">atc@53hor.net</a>. </p>
+<?php
+include('cv.html');
diff --git a/includes/head.php b/includes/head.php
index c0a614b..c5e5287 100644
--- a/includes/head.php
+++ b/includes/head.php
@@ -150,6 +150,23 @@
 			width: 24px;
 			height: 24px;
 		}
+
+		.form {
+			text-align: center;
+		}
+
+		.form input {
+			font-size: 1em;
+			margin-top: 1em;
+			border-radius: 3em;
+			box-sizing: border-box;
+			padding: 0.5em;
+			border: 0;
+		}
+
+		.form .description {
+			display: none;
+		}
 	</style>
 
 	<meta charset="utf-8" />
diff --git a/payments.php b/payments.php
index 2fb35c3..9a7d037 100644
--- a/payments.php
+++ b/payments.php
@@ -1,13 +1,29 @@
-<div id="smart-button-container">
-	<div style="text-align: center"><label for="description">Description of services </label><input type="text" name="descriptionInput" id="description" maxlength="127" value=""></div>
-	<p id="descriptionError" style="visibility: hidden; color:red; text-align: center;">Please enter a description</p>
-	<div style="text-align: center"><label for="amount">Amount to be paid </label><input name="amountInput" type="number" id="amount" value=""><span> USD</span></div>
-	<p id="priceLabelError" style="visibility: hidden; color:red; text-align: center;">Please enter a price</p>
-	<div id="invoiceidDiv" style="text-align: center; display: none;"><label for="invoiceid">Invoice ID (if applicable) </label><input name="invoiceid" maxlength="127" type="text" id="invoiceid" value=""></div>
-	<p id="invoiceidError" style="visibility: hidden; color:red; text-align: center;">Please enter an Invoice ID</p>
+<?php
+$title = "Payments";
+include('./includes/head.php');
+?>
+
+<!--PAYPAL-->
+<div id="smart-button-container" class="form">
+	<p id="invoiceidError" class="description">Please enter an Invoice ID</p>
+	<p id="descriptionError" class="description">Please enter a description</p>
+	<p id="priceLabelError" class="description">Please enter a price</p>
+
+	<div id="invoiceidDiv"><label for="invoiceid">Invoice ID</label>
+		<input name="invoiceid" maxlength="127" type="text" id="invoiceid" value="<?php echo $_GET['invoice'] ?? ''; ?> ">
+	</div>
+
+	<div><label for="description">Description of services </label>
+		<input type="text" name="descriptionInput" id="description" maxlength="127" value="<?php echo $_GET['desc'] ?? ''; ?> ">
+	</div>
+	<div><label for="amount">Amount (USD)</label>
+		<input name="amountInput" type="number" id="amount" value="<?php echo $_GET['amount'] ?? ''; ?>">
+	</div>
 	<div style="text-align: center; margin-top: 0.625rem;" id="paypal-button-container"></div>
 </div>
+
 <script src="https://www.paypal.com/sdk/js?client-id=sb&enable-funding=venmo&currency=USD" data-sdk-integration-source="button-factory"></script>
+
 <script>
 	function initPayPalButton() {
 		var description = document.querySelector('#smart-button-container #description');
@@ -32,12 +48,17 @@
 			return event.value.length > 0;
 		}
 
+		//		var result = elArr.every(validate);
+		//		if (result) {
+		//			actions.enable();
+		//		}
+
 		paypal.Buttons({
 			style: {
 				color: 'white',
 				shape: 'pill',
 				label: 'pay',
-				layout: 'vertical',
+				layout: 'horizontal',
 
 			},
 
@@ -62,21 +83,21 @@
 
 			onClick: function() {
 				if (description.value.length < 1) {
-					descriptionError.style.visibility = "visible";
+					descriptionError.style.display = "block";
 				} else {
-					descriptionError.style.visibility = "hidden";
+					descriptionError.style.display = "none";
 				}
 
 				if (amount.value.length < 1) {
-					priceError.style.visibility = "visible";
+					priceError.style.display = "block";
 				} else {
-					priceError.style.visibility = "hidden";
+					priceError.style.display = "none";
 				}
 
 				if (invoiceid.value.length < 1 && invoiceidDiv.style.display === "block") {
-					invoiceidError.style.visibility = "visible";
+					invoiceidError.style.display = "block";
 				} else {
-					invoiceidError.style.visibility = "hidden";
+					invoiceidError.style.display = "none";
 				}
 
 				purchase_units[0].description = description.value;