From 6d745f1e8c7b870524e01ee7a4886db38634e2ae Mon Sep 17 00:00:00 2001
From: Thedro Neely <thedroneely@gmail.com>
Date: Sat, 6 Jan 2024 19:16:12 -0500
Subject: app/partials: Unify headers

Make easier to maintain. Use native upload and add htm.
---
 app/views/index.view.php              |  2 +-
 app/views/partials/footer.php         |  2 --
 app/views/partials/head.css.php       | 15 +++++++++++++++
 app/views/partials/head.discovery.php |  5 +++++
 app/views/partials/head.js.php        |  1 +
 app/views/partials/head.manifests.php |  7 +++++++
 app/views/partials/head.meta.php      | 11 +++++++++++
 app/views/partials/header.error.php   |  5 -----
 app/views/partials/header.php         | 19 ++++++++++++-------
 app/views/partials/header.posts.php   |  7 ++++---
 app/views/partials/header.resume.php  | 22 ++++++++++++++++++++++
 app/views/partials/header.upload.php  | 18 ++++++++++++++++++
 app/views/resume.view.php             | 26 ++------------------------
 app/views/snippets/favicons.php       |  7 -------
 app/views/snippets/rss.php            |  5 -----
 app/views/snippets/stylesheets.php    | 15 ---------------
 app/views/upload.view.php             | 23 +----------------------
 17 files changed, 99 insertions(+), 91 deletions(-)
 create mode 100644 app/views/partials/head.css.php
 create mode 100644 app/views/partials/head.discovery.php
 create mode 100644 app/views/partials/head.js.php
 create mode 100644 app/views/partials/head.manifests.php
 create mode 100644 app/views/partials/head.meta.php
 delete mode 100644 app/views/partials/header.error.php
 create mode 100644 app/views/partials/header.resume.php
 create mode 100644 app/views/partials/header.upload.php
 delete mode 100644 app/views/snippets/favicons.php
 delete mode 100644 app/views/snippets/rss.php
 delete mode 100644 app/views/snippets/stylesheets.php

(limited to 'app')

diff --git a/app/views/index.view.php b/app/views/index.view.php
index 1331140..8bfa2c1 100644
--- a/app/views/index.view.php
+++ b/app/views/index.view.php
@@ -8,7 +8,7 @@
   <home-page>
     <article>
 
-      <h1>Web <em>Developer </em></h1>
+      <h1>Web <em>Developer</em></h1>
 
       <h2>In it for the long haul</h2>
 
diff --git a/app/views/partials/footer.php b/app/views/partials/footer.php
index 0a7b37b..fe9d9d3 100644
--- a/app/views/partials/footer.php
+++ b/app/views/partials/footer.php
@@ -35,5 +35,3 @@
   </p>
 
 </footer>
-
-<script src="/js/app.js"></script>
diff --git a/app/views/partials/head.css.php b/app/views/partials/head.css.php
new file mode 100644
index 0000000..62b2ad9
--- /dev/null
+++ b/app/views/partials/head.css.php
@@ -0,0 +1,15 @@
+<link rel="stylesheet" href="/css/tdro.css">
+
+<?php if ($theme->color() === 'dark') { ?>
+<link rel="stylesheet" href="/css/tdro-dark.css">
+<?php } ?>
+
+<noscript>
+  <style>
+    article-comments,
+    [href="#isso-thread"],
+    article header aside:nth-child(2) svg:first-child {
+      display: none;
+    }
+  </style>
+</noscript>
diff --git a/app/views/partials/head.discovery.php b/app/views/partials/head.discovery.php
new file mode 100644
index 0000000..a37df92
--- /dev/null
+++ b/app/views/partials/head.discovery.php
@@ -0,0 +1,5 @@
+<link href="/rss.xml" rel="alternate" type="application/rss+xml" title="All at Thedro Neely"/>
+<link href="/index.json" rel="alternate" type="application/json" title="All at Thedro Neely"/>
+<link href="/posts/rss.xml" rel="alternate" type="application/rss+xml" title="Posts at Thedro Neely"/>
+<link href="/projects/rss.xml" rel="alternate" type="application/rss+xml" title="Projects at Thedro Neely"/>
+<link href="/abstracts/rss.xml" rel="alternate" type="application/rss+xml" title="Abstracts at Thedro Neely"/>
diff --git a/app/views/partials/head.js.php b/app/views/partials/head.js.php
new file mode 100644
index 0000000..f1ccc3a
--- /dev/null
+++ b/app/views/partials/head.js.php
@@ -0,0 +1 @@
+<script src="/js/app.js"></script>
diff --git a/app/views/partials/head.manifests.php b/app/views/partials/head.manifests.php
new file mode 100644
index 0000000..f052ee5
--- /dev/null
+++ b/app/views/partials/head.manifests.php
@@ -0,0 +1,7 @@
+<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="data:image/png;base64,<?php echo base64('/public/favicon-32x32.png'); ?>">
+<link rel="icon" type="image/png" sizes="16x16" href="data:image/png;base64,<?php echo base64('/public/favicon-16x16.png'); ?>">
+<link rel="manifest" href="data:application/manifest+json;base64,<?php echo base64('/public/site.webmanifest'); ?>">
+<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+<meta name="msapplication-TileColor" content="#b91d47">
+<meta name="theme-color" content="#ffffff">
diff --git a/app/views/partials/head.meta.php b/app/views/partials/head.meta.php
new file mode 100644
index 0000000..9f92e77
--- /dev/null
+++ b/app/views/partials/head.meta.php
@@ -0,0 +1,11 @@
+<title>
+  <?php echo $title = $title ?? 'Portfolio - '; ?>
+  Thedro Neely
+</title>
+
+<meta charset="utf-8">
+<meta name="robots"      content="index,follow">
+<meta name="author"      content="Thedro Neely">
+<meta name="description" content="Thedro's Portfolio Website">
+<meta name="keywords"    content="Thedro,Neely,Portfolio,Website">
+<meta name="viewport"    content="width=device-width, initial-scale=1">
diff --git a/app/views/partials/header.error.php b/app/views/partials/header.error.php
deleted file mode 100644
index 5e11869..0000000
--- a/app/views/partials/header.error.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/bootstrap/Bootstrap.php'; ?>
-
-<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/header.php'; ?>
-
-<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/navigator.php'; ?>
diff --git a/app/views/partials/header.php b/app/views/partials/header.php
index e5439be..c52ca19 100644
--- a/app/views/partials/header.php
+++ b/app/views/partials/header.php
@@ -1,9 +1,15 @@
 <!DOCTYPE html>
-<html lang="en-us" itemscope itemtype="http://schema.org/WebPage">
+<html
+  itemscope=""
+  itemtype="http://schema.org/WebPage"
+  lang="en-us"
+>
 
 <head>
 
-<title><?php echo $title = $title ?? 'Portfolio - '; ?>Thedro Neely</title>
+<title>
+  <?php echo $title = $title ?? 'Portfolio - '; ?>Thedro Neely
+</title>
 
 <meta charset="utf-8">
 <meta name="robots" content="index,follow">
@@ -12,10 +18,9 @@
 <meta name="keywords" content="Thedro,Neely,Portfolio,Website">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
-<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/rss.php'; ?>
-
-<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/favicons.php'; ?>
-
-<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/stylesheets.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.discovery.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.manifests.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.css.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.js.php'; ?>
 
 </head>
diff --git a/app/views/partials/header.posts.php b/app/views/partials/header.posts.php
index d98d3c4..a473e24 100644
--- a/app/views/partials/header.posts.php
+++ b/app/views/partials/header.posts.php
@@ -1,6 +1,7 @@
 <?php
 
 require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/bootstrap/Bootstrap.php';
-require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/rss.php';
-require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/favicons.php';
-require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/stylesheets.php';
+require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.discovery.php';
+require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.manifests.php';
+require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.css.php';
+require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.js.php';
diff --git a/app/views/partials/header.resume.php b/app/views/partials/header.resume.php
new file mode 100644
index 0000000..92c3a41
--- /dev/null
+++ b/app/views/partials/header.resume.php
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html
+  data-page="resume"
+  lang="en-us"
+>
+
+<head>
+
+<title>Resume - Thedro Neely</title>
+
+<meta charset="utf-8">
+<meta name="description" content="Thedro's Web Development Resume">
+<meta name="keywords"    content="Thedro,Neely,Portfolio,Website,Resume">
+<meta name="author"      content="Thedro Neely">
+<meta name="viewport"    content="width=device-width, initial-scale=1">
+<meta name="robots"      content="index,follow">
+
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.discovery.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.manifests.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.css.php'; ?>
+
+</head>
diff --git a/app/views/partials/header.upload.php b/app/views/partials/header.upload.php
new file mode 100644
index 0000000..3710280
--- /dev/null
+++ b/app/views/partials/header.upload.php
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html
+  lang="en-us"
+  itemscope=""
+  itemtype="http://schema.org/WebPage"
+>
+
+<head>
+
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.meta.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.discovery.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.manifests.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.css.php'; ?>
+<?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/partials/head.js.php'; ?>
+
+<script type="module" src="/js/upload.js"></script>
+
+</head>
diff --git a/app/views/resume.view.php b/app/views/resume.view.php
index dd3d3e8..ede40eb 100644
--- a/app/views/resume.view.php
+++ b/app/views/resume.view.php
@@ -1,28 +1,6 @@
-<!DOCTYPE html>
-<html lang="en-us" style="scrollbar-width: none;">
+<?php require __DIR__ . '/partials/header.resume.php'; ?>
 
-<head>
-
-  <title>Resume - Thedro Neely</title>
-
-  <meta charset="utf-8">
-  <meta name="description" content="Thedro's Web Development Resume">
-  <meta name="keywords" content="Thedro,Neely,Portfolio,Website,Resume">
-  <meta name="author" content="Thedro Neely">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="robots" content="index,follow">
-
-  <style>html::-webkit-scrollbar { height: 0; width: 0; }</style>
-
-  <?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/rss.php'; ?>
-
-  <?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/favicons.php'; ?>
-
-  <?php require $_SERVER['DOCUMENT_ROOT'] . '/..' . '/app/views/snippets/stylesheets.php'; ?>
-
-</head>
-
-    <body data-resume>
+    <body data-page="resume">
 
         <resume-page>
 
diff --git a/app/views/snippets/favicons.php b/app/views/snippets/favicons.php
deleted file mode 100644
index f052ee5..0000000
--- a/app/views/snippets/favicons.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="data:image/png;base64,<?php echo base64('/public/favicon-32x32.png'); ?>">
-<link rel="icon" type="image/png" sizes="16x16" href="data:image/png;base64,<?php echo base64('/public/favicon-16x16.png'); ?>">
-<link rel="manifest" href="data:application/manifest+json;base64,<?php echo base64('/public/site.webmanifest'); ?>">
-<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
-<meta name="msapplication-TileColor" content="#b91d47">
-<meta name="theme-color" content="#ffffff">
diff --git a/app/views/snippets/rss.php b/app/views/snippets/rss.php
deleted file mode 100644
index a37df92..0000000
--- a/app/views/snippets/rss.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<link href="/rss.xml" rel="alternate" type="application/rss+xml" title="All at Thedro Neely"/>
-<link href="/index.json" rel="alternate" type="application/json" title="All at Thedro Neely"/>
-<link href="/posts/rss.xml" rel="alternate" type="application/rss+xml" title="Posts at Thedro Neely"/>
-<link href="/projects/rss.xml" rel="alternate" type="application/rss+xml" title="Projects at Thedro Neely"/>
-<link href="/abstracts/rss.xml" rel="alternate" type="application/rss+xml" title="Abstracts at Thedro Neely"/>
diff --git a/app/views/snippets/stylesheets.php b/app/views/snippets/stylesheets.php
deleted file mode 100644
index 62b2ad9..0000000
--- a/app/views/snippets/stylesheets.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<link rel="stylesheet" href="/css/tdro.css">
-
-<?php if ($theme->color() === 'dark') { ?>
-<link rel="stylesheet" href="/css/tdro-dark.css">
-<?php } ?>
-
-<noscript>
-  <style>
-    article-comments,
-    [href="#isso-thread"],
-    article header aside:nth-child(2) svg:first-child {
-      display: none;
-    }
-  </style>
-</noscript>
diff --git a/app/views/upload.view.php b/app/views/upload.view.php
index f504d5b..d4f913f 100644
--- a/app/views/upload.view.php
+++ b/app/views/upload.view.php
@@ -1,32 +1,11 @@
 <?php $title = 'Upload Files - ' ?>
 
-<?php require __DIR__ . '/partials/header.php';?>
+<?php require __DIR__ . '/partials/header.upload.php';?>
 
 <body>
 
 <?php require __DIR__ . '/partials/navigator.php';?>
 
-  <main>
-    <article>
-      <upload-page>
-        <h1>Upload Files</h1>
-        <div id="file-upload-area"></div>
-      </upload-page>
-    </article>
-  </main>
-
-  <link href="/css/uppy.min.css" rel="stylesheet">
-
-  <script src="/js/uppy.min.js"></script>
-
-  <script>
-   var uppy = Uppy.Core()
-    .use(Uppy.Url, { companionUrl: 'https://www.thedroneely.com/' })
-    .use(Uppy.Webcam, {})
-    .use(Uppy.Dashboard, { inline: true, target: '#file-upload-area',  plugins: ['Url', 'Webcam'] })
-    .use(Uppy.XHRUpload, {endpoint: '/upload/', formdata: true, fieldName: 'upload' })
-  </script>
-
 <?php require __DIR__ . '/partials/footer.php';?>
 
 </body>
-- 
cgit v1.2.3