From 3e33231440f5f1c7bf9ed618a140043c3c5a3fd7 Mon Sep 17 00:00:00 2001 From: Jason Williams Date: Wed, 4 Nov 2026 10:11:44 -0600 Subject: [PATCH 1/3] Reorganizing folder structure ready for automated deployment. --- .gitignore | 7 ++++--- .../themes}/jason-williamsca/assets/css/resume.css | 0 .../jason-williamsca/assets/css/sidemenu.css | 0 .../themes}/jason-williamsca/assets/css/theme.css | 0 .../assets/images/favicon-16x16.png | Bin .../assets/images/favicon-32x32.png | Bin .../jason-williamsca/assets/images/jwlogo.svg | 0 .../jason-williamsca/assets/images/loading.svg | 0 .../jason-williamsca/assets/images/madeinyyc.png | Bin .../jason-williamsca/assets/images/resume-photo.png | Bin .../assets/images/theme-preview.png | Bin .../jason-williamsca/assets/javascript/common.js | 0 .../jason-williamsca/assets/javascript/resume.js | 0 .../themes}/jason-williamsca/layouts/default.htm | 0 .../jason-williamsca/layouts/sidesubmenu.htm | 0 .../themes}/jason-williamsca/pages/contact.htm | 0 .../themes}/jason-williamsca/pages/found.htm | 0 .../themes}/jason-williamsca/pages/resume.htm | 0 .../themes}/jason-williamsca/pages/uh-oh.htm | 0 .../themes}/jason-williamsca/pages/welcome.htm | 0 .../partials/contactform/default.htm | 0 .../jason-williamsca/partials/foundform/default.htm | 0 .../themes}/jason-williamsca/partials/mainmenu.htm | 0 .../jason-williamsca/partials/resumemenu.htm | 0 .../themes}/jason-williamsca/partials/social.htm | 0 .../themes}/jason-williamsca/theme.yaml | 0 start-dev-environment.bat | 2 +- 27 files changed, 5 insertions(+), 4 deletions(-) rename {themes => public_html/themes}/jason-williamsca/assets/css/resume.css (100%) rename {themes => public_html/themes}/jason-williamsca/assets/css/sidemenu.css (100%) rename {themes => public_html/themes}/jason-williamsca/assets/css/theme.css (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/favicon-16x16.png (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/favicon-32x32.png (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/jwlogo.svg (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/loading.svg (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/madeinyyc.png (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/resume-photo.png (100%) rename {themes => public_html/themes}/jason-williamsca/assets/images/theme-preview.png (100%) rename {themes => public_html/themes}/jason-williamsca/assets/javascript/common.js (100%) rename {themes => public_html/themes}/jason-williamsca/assets/javascript/resume.js (100%) rename {themes => public_html/themes}/jason-williamsca/layouts/default.htm (100%) rename {themes => public_html/themes}/jason-williamsca/layouts/sidesubmenu.htm (100%) rename {themes => public_html/themes}/jason-williamsca/pages/contact.htm (100%) rename {themes => public_html/themes}/jason-williamsca/pages/found.htm (100%) rename {themes => public_html/themes}/jason-williamsca/pages/resume.htm (100%) rename {themes => public_html/themes}/jason-williamsca/pages/uh-oh.htm (100%) rename {themes => public_html/themes}/jason-williamsca/pages/welcome.htm (100%) rename {themes => public_html/themes}/jason-williamsca/partials/contactform/default.htm (100%) rename {themes => public_html/themes}/jason-williamsca/partials/foundform/default.htm (100%) rename {themes => public_html/themes}/jason-williamsca/partials/mainmenu.htm (100%) rename {themes => public_html/themes}/jason-williamsca/partials/resumemenu.htm (100%) rename {themes => public_html/themes}/jason-williamsca/partials/social.htm (100%) rename {themes => public_html/themes}/jason-williamsca/theme.yaml (100%) diff --git a/.gitignore b/.gitignore index 089a77a..159e739 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,12 @@ # Allow decending into directories !*/ -# Include files in the root directory +# Include files in the root and .gitea directories !/* +!/.gitea/** # Include the custom theme -!/themes/jason-williamsca/** +!/public_html/themes/jason-williamsca/** # Include custom plugins -!/plugins/jasonwilliams/** \ No newline at end of file +!/public_html/plugins/jasonwilliams/** \ No newline at end of file diff --git a/themes/jason-williamsca/assets/css/resume.css b/public_html/themes/jason-williamsca/assets/css/resume.css similarity index 100% rename from themes/jason-williamsca/assets/css/resume.css rename to public_html/themes/jason-williamsca/assets/css/resume.css diff --git a/themes/jason-williamsca/assets/css/sidemenu.css b/public_html/themes/jason-williamsca/assets/css/sidemenu.css similarity index 100% rename from themes/jason-williamsca/assets/css/sidemenu.css rename to public_html/themes/jason-williamsca/assets/css/sidemenu.css diff --git a/themes/jason-williamsca/assets/css/theme.css b/public_html/themes/jason-williamsca/assets/css/theme.css similarity index 100% rename from themes/jason-williamsca/assets/css/theme.css rename to public_html/themes/jason-williamsca/assets/css/theme.css diff --git a/themes/jason-williamsca/assets/images/favicon-16x16.png b/public_html/themes/jason-williamsca/assets/images/favicon-16x16.png similarity index 100% rename from themes/jason-williamsca/assets/images/favicon-16x16.png rename to public_html/themes/jason-williamsca/assets/images/favicon-16x16.png diff --git a/themes/jason-williamsca/assets/images/favicon-32x32.png b/public_html/themes/jason-williamsca/assets/images/favicon-32x32.png similarity index 100% rename from themes/jason-williamsca/assets/images/favicon-32x32.png rename to public_html/themes/jason-williamsca/assets/images/favicon-32x32.png diff --git a/themes/jason-williamsca/assets/images/jwlogo.svg b/public_html/themes/jason-williamsca/assets/images/jwlogo.svg similarity index 100% rename from themes/jason-williamsca/assets/images/jwlogo.svg rename to public_html/themes/jason-williamsca/assets/images/jwlogo.svg diff --git a/themes/jason-williamsca/assets/images/loading.svg b/public_html/themes/jason-williamsca/assets/images/loading.svg similarity index 100% rename from themes/jason-williamsca/assets/images/loading.svg rename to public_html/themes/jason-williamsca/assets/images/loading.svg diff --git a/themes/jason-williamsca/assets/images/madeinyyc.png b/public_html/themes/jason-williamsca/assets/images/madeinyyc.png similarity index 100% rename from themes/jason-williamsca/assets/images/madeinyyc.png rename to public_html/themes/jason-williamsca/assets/images/madeinyyc.png diff --git a/themes/jason-williamsca/assets/images/resume-photo.png b/public_html/themes/jason-williamsca/assets/images/resume-photo.png similarity index 100% rename from themes/jason-williamsca/assets/images/resume-photo.png rename to public_html/themes/jason-williamsca/assets/images/resume-photo.png diff --git a/themes/jason-williamsca/assets/images/theme-preview.png b/public_html/themes/jason-williamsca/assets/images/theme-preview.png similarity index 100% rename from themes/jason-williamsca/assets/images/theme-preview.png rename to public_html/themes/jason-williamsca/assets/images/theme-preview.png diff --git a/themes/jason-williamsca/assets/javascript/common.js b/public_html/themes/jason-williamsca/assets/javascript/common.js similarity index 100% rename from themes/jason-williamsca/assets/javascript/common.js rename to public_html/themes/jason-williamsca/assets/javascript/common.js diff --git a/themes/jason-williamsca/assets/javascript/resume.js b/public_html/themes/jason-williamsca/assets/javascript/resume.js similarity index 100% rename from themes/jason-williamsca/assets/javascript/resume.js rename to public_html/themes/jason-williamsca/assets/javascript/resume.js diff --git a/themes/jason-williamsca/layouts/default.htm b/public_html/themes/jason-williamsca/layouts/default.htm similarity index 100% rename from themes/jason-williamsca/layouts/default.htm rename to public_html/themes/jason-williamsca/layouts/default.htm diff --git a/themes/jason-williamsca/layouts/sidesubmenu.htm b/public_html/themes/jason-williamsca/layouts/sidesubmenu.htm similarity index 100% rename from themes/jason-williamsca/layouts/sidesubmenu.htm rename to public_html/themes/jason-williamsca/layouts/sidesubmenu.htm diff --git a/themes/jason-williamsca/pages/contact.htm b/public_html/themes/jason-williamsca/pages/contact.htm similarity index 100% rename from themes/jason-williamsca/pages/contact.htm rename to public_html/themes/jason-williamsca/pages/contact.htm diff --git a/themes/jason-williamsca/pages/found.htm b/public_html/themes/jason-williamsca/pages/found.htm similarity index 100% rename from themes/jason-williamsca/pages/found.htm rename to public_html/themes/jason-williamsca/pages/found.htm diff --git a/themes/jason-williamsca/pages/resume.htm b/public_html/themes/jason-williamsca/pages/resume.htm similarity index 100% rename from themes/jason-williamsca/pages/resume.htm rename to public_html/themes/jason-williamsca/pages/resume.htm diff --git a/themes/jason-williamsca/pages/uh-oh.htm b/public_html/themes/jason-williamsca/pages/uh-oh.htm similarity index 100% rename from themes/jason-williamsca/pages/uh-oh.htm rename to public_html/themes/jason-williamsca/pages/uh-oh.htm diff --git a/themes/jason-williamsca/pages/welcome.htm b/public_html/themes/jason-williamsca/pages/welcome.htm similarity index 100% rename from themes/jason-williamsca/pages/welcome.htm rename to public_html/themes/jason-williamsca/pages/welcome.htm diff --git a/themes/jason-williamsca/partials/contactform/default.htm b/public_html/themes/jason-williamsca/partials/contactform/default.htm similarity index 100% rename from themes/jason-williamsca/partials/contactform/default.htm rename to public_html/themes/jason-williamsca/partials/contactform/default.htm diff --git a/themes/jason-williamsca/partials/foundform/default.htm b/public_html/themes/jason-williamsca/partials/foundform/default.htm similarity index 100% rename from themes/jason-williamsca/partials/foundform/default.htm rename to public_html/themes/jason-williamsca/partials/foundform/default.htm diff --git a/themes/jason-williamsca/partials/mainmenu.htm b/public_html/themes/jason-williamsca/partials/mainmenu.htm similarity index 100% rename from themes/jason-williamsca/partials/mainmenu.htm rename to public_html/themes/jason-williamsca/partials/mainmenu.htm diff --git a/themes/jason-williamsca/partials/resumemenu.htm b/public_html/themes/jason-williamsca/partials/resumemenu.htm similarity index 100% rename from themes/jason-williamsca/partials/resumemenu.htm rename to public_html/themes/jason-williamsca/partials/resumemenu.htm diff --git a/themes/jason-williamsca/partials/social.htm b/public_html/themes/jason-williamsca/partials/social.htm similarity index 100% rename from themes/jason-williamsca/partials/social.htm rename to public_html/themes/jason-williamsca/partials/social.htm diff --git a/themes/jason-williamsca/theme.yaml b/public_html/themes/jason-williamsca/theme.yaml similarity index 100% rename from themes/jason-williamsca/theme.yaml rename to public_html/themes/jason-williamsca/theme.yaml diff --git a/start-dev-environment.bat b/start-dev-environment.bat index c77161d..b3b6b7b 100644 --- a/start-dev-environment.bat +++ b/start-dev-environment.bat @@ -1,4 +1,4 @@ podman machine start podman-machine-default -podman run --name winter -p 8000:8000 --env "ADMIN_PASSWORD=admin" --env "BACKEND_URI=backend" --env "ACTIVE_THEME=jason-williamsca" -v ./plugins:/winter/plugins -v ./themes:/winter/themes ghcr.io/wintercms/winter:latest +podman run --name winter -p 8000:8000 --env "ADMIN_PASSWORD=admin" --env "BACKEND_URI=backend" --env "ACTIVE_THEME=jason-williamsca" -v ./public_html/plugins:/winter/plugins -v ./public_html/themes:/winter/themes ghcr.io/wintercms/winter:latest podman system prune -af podman machine stop podman-machine-default \ No newline at end of file -- 2.54.0 From a7ed4b80730069afaf0b7b3c1aca2322955ccaeb Mon Sep 17 00:00:00 2001 From: Jason Williams Date: Wed, 4 Nov 2026 10:23:03 -0600 Subject: [PATCH 2/3] Adding CI deployment script for staging environment --- .gitea/workflows/stage.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .gitea/workflows/stage.yml diff --git a/.gitea/workflows/stage.yml b/.gitea/workflows/stage.yml new file mode 100644 index 0000000..958cd61 --- /dev/null +++ b/.gitea/workflows/stage.yml @@ -0,0 +1,22 @@ +name: Deploy to staging webserver +run-name: ${{ gitea.actor }} is deploying to staging environment +on: + push: + branches: [ staging ] + workflow_dispatch: + +jobs: + Deploy-To-Staging: + runs-on: ubuntu-latest + steps: + - name: Check out repository code + uses: actions/checkout@v4 + - name: Deploy via SFTP + uses: appleboy/scp-action@master + with: + host: ${{ secrets.STAGING_SFTP_HOST }} + username: ${{ secrets.STAGING_SFTP_USERNAME }} + key: ${{ secrets.STAGING_SFTP_PRIVATE_KEY }} + source: "public_html/" + target: "~/web/jasonwilliamsca.dev.jnf.me/public_html/" + strip_components: 1 \ No newline at end of file -- 2.54.0 From 618d324f54163c6943d20ef791c1f253acc0623c Mon Sep 17 00:00:00 2001 From: Jason Williams Date: Wed, 4 Nov 2026 10:30:53 -0600 Subject: [PATCH 3/3] Adding page for PGP public key --- .../jason-williamsca/pages/pgp-public-key.htm | 17 ++++++++++ .../jason-williamsca/partials/pgpkey.htm | 31 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 public_html/themes/jason-williamsca/pages/pgp-public-key.htm create mode 100644 public_html/themes/jason-williamsca/partials/pgpkey.htm diff --git a/public_html/themes/jason-williamsca/pages/pgp-public-key.htm b/public_html/themes/jason-williamsca/pages/pgp-public-key.htm new file mode 100644 index 0000000..0e02b65 --- /dev/null +++ b/public_html/themes/jason-williamsca/pages/pgp-public-key.htm @@ -0,0 +1,17 @@ +title = "PGP Public Key" +url = "/pgp" +layout = "default" +is_hidden = 0 +== +
+
+

PGP Public Key

+ {% partial 'pgpkey' %} +
+
+

About

+

If you wish, you may use my PGP public key here to encrypt anything that you send me. Of course I'll need a way to get my hands on your public key in order to be able to decrypt it, so please make sure you provide that or that you've published it to a well-known public directory like keyserver.pgp.com.

+

Contact Me

+ {% partial 'social' noinfrequent = true nocode = true %} +
+
\ No newline at end of file diff --git a/public_html/themes/jason-williamsca/partials/pgpkey.htm b/public_html/themes/jason-williamsca/partials/pgpkey.htm new file mode 100644 index 0000000..7cea2b2 --- /dev/null +++ b/public_html/themes/jason-williamsca/partials/pgpkey.htm @@ -0,0 +1,31 @@ + \ No newline at end of file -- 2.54.0