Initial touchup

tetsuo13 · Aug 23, 2024 · 7cc91bc · 7cc91bc
1 parent d8e25f9
commit 7cc91bc
Show file tree

Hide file tree

Showing 23 changed files with 184 additions and 736 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,11 @@
+# Editor configuration, see https://editorconfig.org
+
+# Top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: monthly
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,22 @@
+name: Continuous integration
+
+on:
+  push:
+
+jobs:
+  build:
+    name: Build site
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Setup Hugo
+        uses: peaceiris/[email protected]
+        with:
+          hugo-version: latest
+
+      - name: Build
+        working-directory: src
+        run: hugo --minify --logLevel info
+
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-public
+# Generated files by hugo
+/public/
+/.hugo_build.lock
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-This is the personal web site https://andreinicholson.com/
+This is the personal website https://andreinicholson.com/
 
 Generated with [Hugo](https://gohugo.io/).
-
diff --git a/archetypes/default.md b/archetypes/default.md
@@ -0,0 +1,5 @@
++++
+title = '{{ replace .File.ContentBaseName "-" " " | title }}'
+date = {{ .Date }}
+draft = true
++++
diff --git a/assets/images/flickr-logo.svg b/assets/images/flickr-logo.svg
diff --git a/assets/images/github-logo.svg b/assets/images/github-logo.svg
diff --git a/assets/images/linkedin-logo.svg b/assets/images/linkedin-logo.svg
diff --git a/config.toml b/config.toml
diff --git a/content/.gitinclude b/content/.gitinclude
diff --git a/hugo.toml b/hugo.toml
@@ -0,0 +1,18 @@
+baseURL = 'https://andreinicholson.com/'
+languageCode = 'en-us'
+title = 'Andrei Nicholson'
+enableRobotsTXT = true
+
+# Disable the <meta name="generator" content="Hugo 0.74.3" /> tag.
+disableHugoGeneratorInject = true
+
+# Disable category and tag pages.
+disableKinds = ["taxonomy"]
+
+[params]
+  description = 'Software developer and UI designer.'
+  author = 'Andrei Nicholson'
+  email = '[email protected]'
+  gitHubUsername = 'tetsuo13'
+  flickrPhotostream = '90329256@N00'
+  linkedInProfile = 'andrei-nicholson-2a46976'
diff --git a/layouts/404.html b/layouts/404.html
@@ -0,0 +1,13 @@
+{{ define "main"}}
+
+<section class="section">
+  <div class="content has-text-centered">
+    <h3>Uh-oh</h3>
+    <p>
+      The page you're looking for doesn't exist.
+      Try <a href="{{ "/" | relURL }}">going home</a>.
+    </p>
+  </div>
+</section>
+
+{{ end }}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="{{ .Site.Language.Lang }}">
+<head>
+    <meta charset="UTF-8">
+    <title>{{ block "title" . }}{{ .Site.Title }}{{ end }}</title>
+    {{ partial "head" . }}
+</head>
+<body>
+  {{ block "main" . }}{{ end }}
+  {{ partial "analytics" . }}
+</body>
+</html>
diff --git a/layouts/index.html b/layouts/index.html
@@ -1,75 +1,3 @@
-<!doctype html>
-<html lang="en" itemscope itemtype="http://schema.org/Person">
-    <head>
-        <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
-        <title>{{ .Site.Params.Author }}</title>
-        <meta name="description" content="{{ .Site.Params.description }}" />
-        <meta name="author" content="{{ .Site.Params.Author }}" />
-        <meta name="keywords" content="andrei, andre, nicholson, developer, programmer, designer, neo-anime, python, crystal reports, php, c#, .net, java, visual studio, lamp, linux, sql, postgresql, mssql, mysql, javascript, jquery, html5, subversion, git" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link href="/css/normalize.css" rel="stylesheet" type="text/css" />
-        <link href="/css/base.css" rel="stylesheet" type="text/css" />
-        <meta name="robots" content="FOLLOW,INDEX" />
-        <link rel="me" href="{{ .Site.BaseURL }}" />
-    </head>
-    <body>
-
-        <div id="holder">
-            <header>
-                <div class="limit">
-                    <hgroup>
-                        <h2 title="{{ .Site.Params.Author }} is a web developer and UI designer" itemprop="name">{{ .Site.Params.Author }}</h2>
-                    </hgroup>
-                </div>
-            </header>
-
-            <div id="content" class="limit">
-                <article>
-                    <div id="intro" itemprop="description">
-                        <h3>
-                            I'm a passionate <span class="style1">web developer</span>
-                            and <span class="style2">UI designer</span>. I create
-                            <span class="style3">solutions</span> that inspire confidence.
-                        </h3>
-                    </div>
-
-                    <hr />
-
-                    <div id="outro">
-                        <h3>
-                            I'm fanatical about user experiences and design.
-                            When there's time I use
-                            <a href="https://github.com/{{ .Site.Params.github_username }}" rel="me" class="style2">GitHub</a>,
-                            upload photos to
-                            <a href="{{ .Site.Params.flickr_link }}" rel="me" class="style1">Flickr</a>
-                            and neglect Facebook. Send me an
-                            <a href="mailto:{{ .Site.Params.email }}" rel="me" class="style5">email</a>.
-                        </h3>
-                    </div>
-
-                    <aside>
-                        <div class="l">
-                            <h3 class="style3">Areas of Interest</h3>
-                            <p>
-                                Software solutions<br />
-                                Advisory &amp; consulting services<br />
-                                Server &amp; storage<br />
-                                Networking security<br />
-                                Support &amp; managed services
-                            </p>
-                        </div>
-
-                        <div class="r">
-                            <h3 class="style2">Get in Touch</h3>
-                            <a href="mailto:{{ .Site.Params.email }}" itemprop="email">{{ .Site.Params.email }}</a>
-                        </div>
-                        <div class="c"></div>
-                    </aside>
-                </article>
-            </div>
-
-            {{ partial "footer.html" . }}
-        </div>
-
-    </body>
-</html>
+{{ define "main" }}
+  {{ partial "home.html" . }}
+{{ end }}
diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
@@ -1,13 +1,15 @@
-<script type="text/javascript">
-  var _paq = _paq || [];
+<script>
+  const _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u="//analytics.andreinicholson.com/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    const u="https://analytics.andreinicholson.com/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
     _paq.push(['setSiteId', '2']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+    const d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
-<noscript><p><img src="//analytics.andreinicholson.com/piwik.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+<noscript><p><img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.andreinicholson.com/matomo.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -0,0 +1,25 @@
+<meta name="description" content="{{ .Site.Params.description }}">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="author" content="{{ .Site.Params.author }}">
+
+<link rel="canonical" href="{{ .Permalink }}">
+<link rel="home" href="{{ .Site.BaseURL }}">
+
+<meta property="og:site_name" content="{{ .Site.Title }}">
+<meta property="og:type" content="website">
+<meta property="og:title" content="{{ .Site.Title }}">
+<meta property="og:description" content="{{ .Site.Params.description }}">
+<meta property="og:url" content="{{ .Site.BaseURL }}">
+
+<script type="application/ld+json">
+{
+  "@context": "https://schema.org",
+  "@type": "Person",
+  "@id": "{{ .Site.BaseURL }}",
+  "name": "{{ .Site.Params.author }}",
+  "email": "{{ .Site.Params.email }}",
+  "description": "{{ .Site.Params.description }}",
+  "url": "{{ .Site.BaseURL }}",
+}
+</script>
+
diff --git a/layouts/partials/home.html b/layouts/partials/home.html
@@ -0,0 +1,29 @@
+<main itemscope itemtype="https://schema.org/Person">
+  <h1>Hi, I'm <span itemprop="givenName">Andrei</span>.</h1>
+
+  <h2 itemprop="knowsAbout">
+    I'm a passionate developer and UI designer.
+    I create solutions that inspire confidence.
+  </h2>
+
+  <ul>
+    <li>
+      {{ $image := resources.Get "/images/github-logo.svg" | fingerprint }}
+      <a href="https://github.com/{{ .Site.Params.gitHubUsername }}" target="_blank" rel="noreferrer" itemprop="sameAs" aria-label="{{ .Site.Params.Author }} on GitHub"><img
+        src="{{ $image.RelPermalink }}" alt="GitHub logo" /></a>
+    </li>
+
+    <li>
+      {{ $image := resources.Get "/images/flickr-logo.svg" | fingerprint }}
+      <a href="https://www.flickr.com/photos/{{ .Site.Params.flickrPhotostream }}" target="_blank" rel="noreferrer" itemprop="sameAs" aria-label="{{ .Site.Params.Author }} occasionally posting photos to Flickr"><img
+        src="{{ $image.RelPermalink }}" alt="Flickr logo" /></a>
+    </li>
+
+    <li>
+      {{ $image := resources.Get "/images/linkedin-logo.svg" | fingerprint }}
+      <a href="https://www.linkedin.com/in/{{ .Site.Params.linkedInProfile }}" target="_blank" rel="noreferrer" itemprop="sameAs" aria-label="{{ .Site.Params.Author }} on LinkedIn"><img
+        src="{{ $image.RelPermalink }}" alt="LinkedIn logo" /></a>
+    </li>
+  </ul>
+</main>
+
diff --git a/layouts/robots.txt b/layouts/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Sitemap: {{ .Site.BaseURL }}sitemap.xml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		User-agent: *
		Sitemap: {{ .Site.BaseURL }}sitemap.xml