From a9e8ace1124e6d021394bdbe8164fdb7263d9e6d Mon Sep 17 00:00:00 2001
From: Adam Burgess <adamburgess@users.noreply.github.com>
Date: Thu, 9 Dec 2021 12:13:03 +1100
Subject: [PATCH] update for new deploy

---
 .deployignore                                 |   3 +
 Caddyfile                                     |  10 +++
 {assets => assets.v1}/inter-regular.woff2     | Bin
 {assets => assets.v1}/laputa.webp             | Bin
 .../merriweather-black.woff2                  | Bin
 .../merriweather-light.woff2                  | Bin
 .../merriweather-regular.woff2                | Bin
 deploy                                        |   4 +
 index.html                                    |  10 +--
 index.tsx                                     |  26 ------
 old.html                                      |  80 ------------------
 11 files changed, 22 insertions(+), 111 deletions(-)
 create mode 100644 .deployignore
 create mode 100644 Caddyfile
 rename {assets => assets.v1}/inter-regular.woff2 (100%)
 rename {assets => assets.v1}/laputa.webp (100%)
 rename {assets => assets.v1}/merriweather-black.woff2 (100%)
 rename {assets => assets.v1}/merriweather-light.woff2 (100%)
 rename {assets => assets.v1}/merriweather-regular.woff2 (100%)
 create mode 100755 deploy
 delete mode 100644 index.tsx
 delete mode 100644 old.html

diff --git a/.deployignore b/.deployignore
new file mode 100644
index 0000000..44dc145
--- /dev/null
+++ b/.deployignore
@@ -0,0 +1,3 @@
+.deployignore
+Caddyfile
+deploy
diff --git a/Caddyfile b/Caddyfile
new file mode 100644
index 0000000..82fad45
--- /dev/null
+++ b/Caddyfile
@@ -0,0 +1,10 @@
+adam.id.au {
+    root * /w/homepage/latest
+    
+    import file-server-defaults
+    import ssl-cloudflare-dns
+    import strict-transport-security
+    import cors
+
+    header /assets.v1/* Cache-Control "public, max-age=31556952, immutable"
+}
diff --git a/assets/inter-regular.woff2 b/assets.v1/inter-regular.woff2
similarity index 100%
rename from assets/inter-regular.woff2
rename to assets.v1/inter-regular.woff2
diff --git a/assets/laputa.webp b/assets.v1/laputa.webp
similarity index 100%
rename from assets/laputa.webp
rename to assets.v1/laputa.webp
diff --git a/assets/merriweather-black.woff2 b/assets.v1/merriweather-black.woff2
similarity index 100%
rename from assets/merriweather-black.woff2
rename to assets.v1/merriweather-black.woff2
diff --git a/assets/merriweather-light.woff2 b/assets.v1/merriweather-light.woff2
similarity index 100%
rename from assets/merriweather-light.woff2
rename to assets.v1/merriweather-light.woff2
diff --git a/assets/merriweather-regular.woff2 b/assets.v1/merriweather-regular.woff2
similarity index 100%
rename from assets/merriweather-regular.woff2
rename to assets.v1/merriweather-regular.woff2
diff --git a/deploy b/deploy
new file mode 100755
index 0000000..e2a9295
--- /dev/null
+++ b/deploy
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+curl https://deploy.arm.adam.id.au/client.mjs > /tmp/client.mjs
+DEPLOY_PATH=./ DEPLOY_PROJECT=homepage DEPLOY_CADDYFILE=Caddyfile node /tmp/client.mjs
diff --git a/index.html b/index.html
index e75d9c1..26a1654 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
             box-sizing: border-box;
         }
         body {
-            background-image: url(assets/laputa.webp);
+            background-image: url(assets.v1/laputa.webp);
             /* todo: revist image-set */
             background-position-x: center;
             background-size: cover;
@@ -109,7 +109,7 @@
             font-style: normal;
             font-weight: 400;
             font-display: block;
-            src: url(assets/merriweather-regular.woff2) format('woff2');
+            src: url(assets.v1/merriweather-regular.woff2) format('woff2');
         }
 
         @font-face {
@@ -117,7 +117,7 @@
             font-style: normal;
             font-weight: 300;
             font-display: block;
-            src: url(assets/merriweather-light.woff2) format('woff2');
+            src: url(assets.v1/merriweather-light.woff2) format('woff2');
         }
 
         @font-face {
@@ -125,7 +125,7 @@
             font-style: normal;
             font-weight: 900;
             font-display: block;
-            src: url(assets/merriweather-black.woff2) format('woff2');
+            src: url(assets.v1/merriweather-black.woff2) format('woff2');
         }
 
         @font-face {
@@ -133,7 +133,7 @@
             font-style: normal;
             font-weight: 400;
             font-display: block;
-            src: url(assets/inter-regular.woff2) format('woff2');
+            src: url(assets.v1/inter-regular.woff2) format('woff2');
         }
     </style>
     <!--
diff --git a/index.tsx b/index.tsx
deleted file mode 100644
index b377b34..0000000
--- a/index.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { render, Fragment, h } from 'preact'
-
-function App() {
-    return <>
-        <div>Hi, I'm Adam.</div>
-        <div>Here are some npm modules I've made:</div>
-        <ul>
-            <li>@adamburgess/linq - a small but feature-full linq library using iterators.</li>
-            <li>alpine-apk - query the alpine package repository.</li>
-            <li>@adamburgess/nr - a simple shell script to run commands in package.json.</li>
-        </ul>
-        <div>And here are some sites:</div>
-        <ul>
-            <li>https://crop.adam.id.au - A helper for ffmpeg's "crop" filter. Drag and drop an image and select it to get a crop filter.</li>
-            <li>https://tarkov-time.adam.id.au - Check the current time in Escape From Tarkov.</li>
-            <li>https://bundlesize.adam.id.au - A bundlephobia-like site using Skypack and Rollup in the browser to find bundle sizes. WIP. Only available in console for now.</li>
-        </ul>
-        <div>Here's some other projects I've made:</div>
-        <ul>
-            <li>Celeste High Frame Rate - Unlocks Celeste's framerate (normally 60).</li>
-            <li>Image Builder - Most of my projects use docker. I build my base images automatically when their dependencies change.</li>
-        </ul>
-    </>
-}
-
-render(<App />, document.body);
diff --git a/old.html b/old.html
deleted file mode 100644
index c87d626..0000000
--- a/old.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<html>
-
-<head>
-    <title>Adam</title>
-    <style>
-        * {
-            box-sizing: border-box;
-        }
-        body {
-            font-family: monospace;
-        }
-        code {
-            background-color: #dadada;
-            padding-left: 4px;
-            padding-right: 4px;
-            border-radius: 2px;
-        }
-        li {
-            margin-bottom: 1em;
-        }
-        li p {
-            margin-top: 0.25em;
-            margin-bottom: 0.25em;
-        }
-    </style>
-</head>
-
-<body>
-    <p>Hi there!<br/>&nbsp;- Adam</p>
-    <p>I'm a software developer in Sydney.</p>
-    <p>Here are some projects I've created:</p>
-    <ul>
-        <li>
-            <p><a href="https://github.com/adamburgess/linq#readme">https://github.com/adamburgess/linq</a> - <a href="https://www.npmjs.com/package/@adamburgess/linq">@adamburgess/linq</a> on npm</p>
-            <p>I use C#'s <code>IEnumerable</code> extensions quite a lot, and the javascript version, <code>linq.js</code>, is very large. My version is 1.25kb.</p>
-        </li>
-        <li>
-            <p><a href="https://github.com/adamburgess/alpine-apk#readme">https://github.com/adamburgess/alpine-apk</a> - <a href="https://www.npmjs.com/package/alpine-apk">alpine-apk</a> on npm</p>
-            <p>Alpine Linux is a minimal linux distro, great for docker. I wanted to query its package manager, APK, from Node.</p>
-        </li>
-        <li>
-            <p><a href="https://github.com/adamburgess/nr#readme">https://github.com/adamburgess/nr</a> - <a href="https://www.npmjs.com/package/@adamburgess/nr">@adamburgess/nr</a> on npm</p>
-            <p>
-                NPM's package.json <code>scripts</code> is quite convenient for running things. Yet, <code>npm run X</code> and <code>yarn X</code> are fairly slow - 150ms+.<br/>
-                nr is a simple bash script using jq to run scripts. 30ms. Much faster.
-            </p>
-        </li>
-        <li>
-            <p><a href="https://github.com/adamburgess/celeste-high-frame-rate#readme">https://github.com/adamburgess/celeste-high-frame-rate</a></p>
-            <p>Celeste is a fun platformer, with a banger soundtrack. The developers lock the ingame framerate to 60 fps, which is in my opinion <b>painful</b>.<br/>
-               This small patch overrides that limitation, and the game easily hits 240fps.
-            </p>
-        </li>
-        <li>
-            <p><a href="https://tarkov-time.adam.id.au">https://tarkov-time.adam.id.au</a> - source at <a href="https://github.com/adamburgess/tarkov-time">https://github.com/adamburgess/tarkov-time</a></p>
-            <p>Escape from Tarkov has a day/night cycle. This site shows you the time, and how long it will be to a future time. Deployed on netlify.</p>
-        </li>
-        <li>
-            <p><a href="https://crop.adam.id.au">https://crop.adam.id.au</a></p>
-            <p>A helper for <code>ffmpeg</code>'s <code>crop</code> filter. Drag and drop an image and select it to get a crop filter in the correct format.</p>
-        </li>
-        <li>
-            <p><a href="https://bundlephobia.fly.adam.id.au/size/@adamburgess/linq">https://bundlephobia.fly.adam.id.au/size/@adamburgess/linq</a></p>
-            <p>
-                bundlephobia.com uses webpack. I've found it gives slightly inaccurate results because of this. I also wanted to get the brotlified sizes for my packages.<br/>
-                This builds the package with rollup. Deployed on fly.io.<br/>
-                No UI as of yet, but it also generates <a href="https://bundlephobia.fly.adam.id.au/size/@adamburgess/linq?shield&brotli">shields</a> – see the readme of my linq package above for examples.
-            </p>
-        </li>
-        <li>
-            <p><a href="https://github.com/adamburgess/image-builder">https://github.com/adamburgess/image-builder</a></p>
-            <p>
-                I build a lot (all) of my projects with Docker, so I've made my own base images. <br/>
-                Using Github Actions and a generated Makefile, they automatically update whenever a dependency changes – whether it be the docker image, an alpine package, a github/lab repo, or an npm package.
-            </p>
-        </li>
-    </ul>
-</body>
-
-</html>