danielmoch.com

Static site for www.danielmoch.com
git clone git://git.danielmoch.com/danielmoch.com.git
Log | Files | Refs | LICENSE

commit 9bed923fe0337b652a21276b88ba4f2909e12a8b
parent be02026d64904172fef7a5b5bc6b7dc179b28d91
Author: Daniel Moch <daniel@danielmoch.com>
Date:   Sun, 28 Nov 2021 15:29:04 -0500

Rearrange landing/about page

Diffstat:
MMakefile | 17+++++++++--------
Dtemplates/about.html | 70----------------------------------------------------------------------
Atemplates/index.html | 78++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Mtemplates/landing_header.html | 10+++++-----
Mtemplates/nav.html | 7++-----
Mtemplates/post_header.html | 4++--
6 files changed, 96 insertions(+), 90 deletions(-)

diff --git a/Makefile b/Makefile @@ -1,23 +1,24 @@ # See LICENSE file for copyright and license details .POSIX: -all: dag target/index.html target/sitemap.xml target/rss.xml +all: dag target/index.html target/posts/index.html target/sitemap.xml target/rss.xml -target/index.html: index.db target/about/index.html templates/landing_header.html templates/landing_footer.html +target/posts/index.html: index.db templates/landing_header.html templates/landing_footer.html templates/nav.html m4 -I templates templates/landing_header.html >$@ dagindex -Gohtml >>$@ cat templates/landing_footer.html >>$@ -target/about/index.html: templates/about.html templates/nav.html - dagindex -A -t "About" -s "about/" \ - -p $$(stat -f%m templates/about.html) -x 1 - mkdir -p target/about - m4 -I templates templates/about.html >$@ +target/index.html: templates/index.html templates/nav.html + dagindex -A -t "Home" -s "/" \ + -p $$(stat -f%m templates/index.html) -x + mkdir -p target + m4 -I templates -DSLUG=https://www.danielmoch.com/ \ + templates/index.html >$@ target/sitemap.xml: index.db dagindex -Gositemap -f https://www.danielmoch.com >$@ -target/rss.xml: index.db +target/rss.xml: index.db target/posts/index.html dagindex -Gorss -t "Daniel Moch's Weblog" -f 'https://www.danielmoch.com' \ -d "Daniel Moch's Weblog" -r 'https://www.danielmoch.com/rss.xml' -l en \ -c 'Contents © 2021 Daniel Moch, CC BY-SA 4.0 License' >$@ diff --git a/templates/about.html b/templates/about.html @@ -1,70 +0,0 @@ -<!DOCTYPE html> -<html prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article#" vocab="http://ogp.me/ns" lang="en"> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>About | Daniel Moch's Weblog</title> - <link href="/assets/css/site.css" rel="stylesheet" type="text/css"> - <meta name="theme-color" content="#155799"> - <meta name="generator" content="dag (git.danielmoch.com/dag)"> - <link rel="alternate" type="application/rss+xml" title="RSS" hreflang="en" href="/rss.xml"> - <link rel="canonical" href="SLUG"> - <link rel="icon" href="/favicon.ico" sizes="16x16"> - <link rel="icon" href="/favicon.ico" sizes="32x32"> - <link rel="icon" href="/favicon.ico" sizes="48x48"> - <link rel="icon" href="/favicon.ico" sizes="64x64"> - <link rel="icon" href="/favicon.ico" sizes="256x256"> - <meta property="og:site_name" content="Daniel Moch's Weblog"> - <meta property="og:title" content="About"> - <meta property="og:type" content="article"> - <meta property="og:image" content="https://www.danielmoch.com/assets/initials-blue.jpg"> - <meta name="twitter:image" content="https://www.danielmoch.com/assets/initials-blue.jpg"> - <meta name="twitter:card" content="About Daniel Moch"> -</head> -<body> -include(nav.html) - <div id="main"> - <h1>About Me</h1> - <div class="h-card"> - <img class="u-photo" src="/assets/avatar.jpg" id="logo" alt="Daniel Moch" width="200" height="200"> - <h2 class="p-name">Daniel Moch</h1> - <div class="p-note"> - I am a <span class="p-job-title">Software Engineer</span> currently living in - Orlando, Florida. My interests range from technology to entrepreneurship. I - am also interested in writing, movies, and astronomy. I'm also passionate - about seeing people take control of their own data. - </div> - <table style="width: auto; margin: 1em 2em;"> - <tr> - <td>Email:</td> - <td><a class="u-email" rel="me" href="mailto:daniel@danielmoch.com">daniel@danielmoch.com</a></td> - </tr> - <tr> - <td>PGP:</td> - <td><a class="u-url" rel="me" href="/static/gpg.asc">84BDDD43</a></td> - </tr> - <tr> - <td>Signify:</td> - <td><a class="u-url" rel="me" href="/static/djmoch-signify.pub">djmoch-signify.pub</a></td> - </tr> - <tr> - <td>Social Media:</td> - <td><a href="https://www.amazon.com/Arguments-Deleting-Social-Media-Accounts/dp/1250239087">deleted</a></td> - </tr> - </table> - </div> - <h2>License Info</h2> - <table style="width: auto; margin: 1em 2em;"> - <tr> - <td>Content: </td> - <td><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a></td> - </tr> - <tr> - <td>Code: </td> - <td><a href="https://git.danielmoch.com/danielmoch.com/file/LICENSE.html">ISC</a></td> - </tr> - </table> - </div> -</body> -</html> diff --git a/templates/index.html b/templates/index.html @@ -0,0 +1,78 @@ +<!DOCTYPE html> +<html prefix="og: http://ogp.me/ns# article: http://ogp.me/ns/article#" vocab="http://ogp.me/ns" lang="en"> +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>Home | Daniel Moch's Web Home</title> + <link href="/assets/css/site.css" rel="stylesheet" type="text/css"> + <meta name="theme-color" content="#155799"> + <meta name="generator" content="dag (git.danielmoch.com/dag)"> + <link rel="alternate" type="application/rss+xml" title="RSS" hreflang="en" href="/rss.xml"> + <link rel="canonical" href="SLUG"> + <link rel="icon" href="/favicon.ico" sizes="16x16"> + <link rel="icon" href="/favicon.ico" sizes="32x32"> + <link rel="icon" href="/favicon.ico" sizes="48x48"> + <link rel="icon" href="/favicon.ico" sizes="64x64"> + <link rel="icon" href="/favicon.ico" sizes="256x256"> + <meta property="og:site_name" content="Daniel Moch's Web Home"> + <meta property="og:title" content="Home"> + <meta property="og:type" content="article"> + <meta property="og:image" content="https://www.danielmoch.com/assets/initials-blue.jpg"> + <meta name="twitter:image" content="https://www.danielmoch.com/assets/initials-blue.jpg"> + <meta name="twitter:card" content="About Daniel Moch"> +</head> +<body> +include(nav.html) + <div id="main"> + <div class="h-card"> + <h1 class="p-name">Daniel Moch</h1> + <img class="u-photo" src="/assets/avatar.jpg" id="logo" alt="Daniel Moch" width="200" height="200"> + <div class="p-note"> + <p> + I am a <span class="p-job-title">Software + Engineer</span> currently living + in Orlando, Florida. My interests + range from technology to entrepreneurship. + I am also interested in writing, + movies, and astronomy. I'm also + passionate about seeing people take + control of their own data. + </p> + </div> + <h2>Social Links</h2> + <ul> + <li> + <a class="u-email" href="mailto:daniel@danielmoch.com">Email</a> + </li> + <li> + <a class="u-url" href="/static/gpg.asc">PGP</a> + </li> + <li> + <a class="u-url" href="/static/djmoch-signify.pub">Signify</a> + </li> + <li> + <a class="u-url" rel="me" href="https://github.com/djmoch">GitHub</a> + </li> + <li> + <a class="u-url" href="https://www.linkedin.com/in/djmoch/">LinkedIn</a> + </li> + <li> + <a href="https://www.amazon.com/Arguments-Deleting-Social-Media-Accounts/dp/1250239087">Other Social Media</a> + </li> + </ul> + </div> + <h2>License Info</h2> + <table style="width: auto; margin: 1em 2em;"> + <tr> + <td>Content: </td> + <td><a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a></td> + </tr> + <tr> + <td>Code: </td> + <td><a href="https://git.danielmoch.com/danielmoch.com/file/LICENSE.html">ISC</a></td> + </tr> + </table> + </div> +</body> +</html> diff --git a/templates/landing_header.html b/templates/landing_header.html @@ -7,19 +7,19 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="description" content="Daniel Moch's Weblog"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>Daniel Moch's Weblog</title> + <title>Post Index | Daniel Moch's Web Home</title> <link href="/assets/css/site.css" rel="stylesheet" type="text/css"> <meta name="theme-color" content="#155799"> <meta name="generator" content="Dag (git.danielmoch.com/dag)"> <link rel="alternate" type="application/rss+xml" title="RSS" hreflang="en" href="/rss.xml"> - <link rel="canonical" href="https://www.danielmoch.com/"> + <link rel="canonical" href="https://www.danielmoch.com/posts/"> <link rel="icon" href="/favicon.ico" sizes="16x16"> <link rel="icon" href="/favicon.ico" sizes="32x32"> <link rel="icon" href="/favicon.ico" sizes="48x48"> <link rel="icon" href="/favicon.ico" sizes="64x64"> <link rel="icon" href="/favicon.ico" sizes="256x256"> - <meta property="og:site_name" content="Daniel Moch's Weblog"> - <meta property="og:title" content="Daniel Moch's Weblog"> + <meta property="og:site_name" content="Daniel Moch's Web Home"> + <meta property="og:title" content="Daniel Moch's Web Home"> <meta property="og:type" content="website"> <meta property="og:image" content="https://www.danielmoch.com/assets/initials-blue.jpg"> <meta name="twitter:image" content="https://www.danielmoch.com/assets/initials-blue.jpg"> @@ -28,4 +28,4 @@ <body> include(nav.html) <div id="main"> - <h1><a class="subtle h-card" href="/about/">Daniel Moch</a>'s Weblog</h1> + <h1>Post Index</h1> diff --git a/templates/nav.html b/templates/nav.html @@ -6,12 +6,9 @@ <img src="/assets/initials-blue.png" alt="Daniel Moch's Weblog"> <a href="/">Home</a> | - <a href="https://git.danielmoch.com">Git</a> - </td> - <td align="right"> - <a class="u-url" rel="me" href="https://github.com/djmoch">GitHub</a> + <a href="/posts/">Posts</a> | - <a href="/about/">About</a> + <a href="https://git.danielmoch.com">Git</a> </td> </tr> </table> diff --git a/templates/post_header.html b/templates/post_header.html @@ -5,7 +5,7 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="description" content="DESCRIPTION"> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title>PAGE_TITLE | Daniel Moch's Weblog</title> + <title>PAGE_TITLE | Daniel Moch's Web Home</title> <link href="/assets/css/site.css" rel="stylesheet" type="text/css"> <meta name="theme-color" content="#155799"> <meta name="generator" content="dag (git.danielmoch.com/dag)"> @@ -16,7 +16,7 @@ <link rel="icon" href="/favicon.ico" sizes="48x48"> <link rel="icon" href="/favicon.ico" sizes="64x64"> <link rel="icon" href="/favicon.ico" sizes="256x256"> - <meta property="og:site_name" content="Daniel Moch's Weblog"> + <meta property="og:site_name" content="Daniel Moch's Web Home"> <meta property="og:title" content="PAGE_TITLE"> <meta property="og:type" content="article"> <meta property="og:image" content="https://www.danielmoch.com/assets/initials-blue.jpg">