Clean up code, add scss, fix LICENSE, add build script, optimize output

Author: baerchen201

.github/workflows/deploy-pages.yml

@@ -1,45 +1,37 @@
 name: Deploy website to GitHub Pages
 
 on:
-  # Automatically deploy when changes are made
   push:
-    branches: ["main"]
-
-  # Allow manual redeployment
   workflow_dispatch:
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: read
   pages: write
   id-token: write
 
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do not cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
   group: "pages"
   cancel-in-progress: false
 
 jobs:
-  build: # Compile TypeScript, build website, prepare for deployment
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Setup Pages
         uses: actions/configure-pages@v5
 
-      - name: Compile TypeScript
-        run: tsc
-      - name: Remove TypeScript source files # Not required, so just clean it up
-        run: rm -rf ./www/ts
+      - name: Run build script
+        run: bash ./build.sh
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: "./www" # Only upload website
+          path: "./www"
 
-  deploy: # Deploy prepared page
+  deploy:
+    if: github.ref == 'refs/heads/main'
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}

.gitignore

@@ -1,2 +1 @@
-js/
 node_modules/

.vscode/copyright.code-snippets

@@ -3,7 +3,7 @@
     "prefix": "!copyright-html",
     "body": [
       "<!--",
-      "    baer1 website\n    Copyright (C) 2024  baer1\n\n    This website is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    A copy of the GNU General Public License can be found on this website's\n    GitHub repository (LICENSE). If not, see <https://www.gnu.org/licenses/>.\n\n    [email protected]",
+      "    baer1 website\n    Copyright (C) 2024 baer1\n\n    This website is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    A copy of the GNU General Public License can be found on this website's\n    GitHub repository (LICENSE). If not, see <https://www.gnu.org/licenses/>.\n\n    [email protected]",
       "-->\n",
     ],
     "description": "Insert copyright notice formatted for HTML",
@@ -12,15 +12,15 @@
     "prefix": "!copyright-js",
     "body": [
       "/*",
-      "    baer1 website\n    Copyright (C) 2024  baer1\n\n    This website is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    A copy of the GNU General Public License can be found on this website's\n    GitHub repository (LICENSE). If not, see <https://www.gnu.org/licenses/>.\n\n    [email protected]",
+      "    baer1 website\n    Copyright (C) 2024 baer1\n\n    This website is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    A copy of the GNU General Public License can be found on this website's\n    GitHub repository (LICENSE). If not, see <https://www.gnu.org/licenses/>.\n\n    [email protected]",
       "*/\n",
     ],
     "description": "Insert copyright notice formatted for JS and CSS",
   },
   "Copyright": {
     "prefix": "!copyright",
     "body": [
-      "    baer1 website\n    Copyright (C) 2024  baer1\n\n    This website is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    A copy of the GNU General Public License can be found on this website's\n    GitHub repository (LICENSE). If not, see <https://www.gnu.org/licenses/>.\n\n    [email protected]",
+      "    baer1 website\n    Copyright (C) 2024 baer1\n\n    This website is free software: you can redistribute it and/or modify\n    it under the terms of the GNU General Public License as published by\n    the Free Software Foundation, either version 3 of the License, or\n    (at your option) any later version.\n\n    A copy of the GNU General Public License can be found on this website's\n    GitHub repository (LICENSE). If not, see <https://www.gnu.org/licenses/>.\n\n    [email protected]",
     ],
     "description": "Insert copyright notice",
   },

.vscode/tasks.json

@@ -12,6 +12,16 @@
       "presentation": {
         "reveal": "silent"
       }
+    },
+    {
+      "type": "shell",
+      "command": ["node ./node_modules/sass/sass.js", "--watch", "."],
+      "group": "build",
+      "label": "sass: watch",
+      "runOptions": { "runOn": "folderOpen" },
+      "presentation": {
+        "reveal": "silent"
+      }
     }
   ]
 }

LICENSE

@@ -634,7 +634,7 @@ the "copyright" line and a pointer to where the full notice is found.
 ---
 
     baer1 website
-    Copyright (C) 2024  baer1
+    Copyright (C) 2024 baer1
 
     This website is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

build.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+echo "Installing dependencies from npm..."
+npm i
+
+echo "Building typescript..."
+node ./node_modules/typescript/bin/tsc
+bash ./www/ts/postbuild.sh
+
+echo "Building scss..."
+node ./node_modules/sass/sass.js .
+bash ./www/scss/postbuild.sh