[update] v2.2

McAlec1 · McAlec1 · commit 24a79646e30f · 2025-07-04T02:18:22.000-04:00
[fix] build mechanism
[edit] both `README` and `about-me` markdown files
[fix] some css imperfections
[remove] declutter some files that werent being used
[format] sort files in  `/img/`
[edit] updated the `config.json`
[fix] replace `startup.js` with `index.js` for better compatibility
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+github: mcalec-dev
+pateron: McAlec
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,24 +17,17 @@ jobs:
         with:
           node-version: 20
           cache: 'npm'
-      - name: Cache node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-      - name: Install dependencies
-        run: npm ci
-      - name: Build project
-        run: npm install
+      - name: Install dependencies and build
+        run: |
+          npm ci
+          npm run build
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-output
           path: |
+            dist/
             public/
-            node_modules/
             package*.json
             startup.js
             src/
@@ -47,9 +40,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: build-output
-      - name: Prepare deployment
-        run: |
-          npm run build
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-/.vscode
+.env
 node_modules/
+/.vscode
 /dist
diff --git a/README.md b/README.md
@@ -1,21 +1,9 @@
 # mcalec development
 
-## DISCLAIMER
-
-I have "moved on" from developing to focus on school and my mental health. This site (and many others) won't be updated as often.  
-If you really need to contact me find my email below. See the Bluesky post [here](https://bsky.mcalec.dev/).
-
 ## What is this?
 
 This is my personal website hosted at [mcalec.dev](https://mcalec.dev/).
 
-## For GitHub/GitLab (etc.)
-
-Before suspending my account please contact the email below to let me know before any removals or takedowns.
-I do NOT condone or partake in any malicious or hacking activities.
-
-GitHub/GitLab Removals: removals[at]mcalec[dot]dev
-
 ## Contact Me
 
 General: hello[at]mcalec[dot]dev
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "mcalec.dev",
-  "version": "v2.1",
+  "version": "v2.2",
   "description": "personal website",
-  "main": "startup.js",
+  "main": "index.js",
   "scripts": {
-    "start": "node startup.js",
+    "start": "node index.js",
     "build": "node src/build.js"
   },
   "repository": {
diff --git a/public/css/music.css b/public/css/music.css
@@ -111,7 +111,7 @@ p {
 #collapse-toggle {
   width: 30px;
   height: 20px;
-  background: url("/img/arrow1.png") no-repeat center center;
+  background: url("/img/music/collapse.png") no-repeat center center;
   background-size: contain;
   border: none;
   padding-left: 10px;
diff --git a/public/img/arrow.svg b/public/img/arrow.svg
diff --git a/public/img/mcalec-dev.png b/public/img/mcalec-dev.png
diff --git a/public/img/music/collapse.png b/public/img/music/collapse.png
diff --git a/public/index.html b/public/index.html
@@ -6,7 +6,6 @@
     <img src="/img/load.gif" alt="Loading..." class="loader-gif">
     <div id="loaderText" class="loader-text">Loading...</div>
   </div>
-
   <script src="/js/loader.js"></script>
 
   <div id="music-box">
@@ -23,7 +22,6 @@
       <audio id="music-src" hidden=""></audio>
     </div>
   </div>
-
   <script defer src="/js/music.js"></script>
 
   <nav class="navbar transparent" id="navbar">
@@ -35,24 +33,24 @@
     </div>
     <ul>
       <li class="active"><a href="/">Home</a></li>
-      <li><a href="https://old.mcalec.dev/about-me">About</a></li>
-      <li><a href="https://old.mcalec.dev/legal">Legal</a></li>
-      <li><a href="https://old.mcalec.dev/home" target="_blank">Old Site</a></li>
+      <li><a href="//old.mcalec.dev/about-me">About</a></li>
+      <li><a href="//old.mcalec.dev/legal">Legal</a></li>
+      <li><a href="//old.mcalec.dev/home" target="_blank">Old Site</a></li>
     </ul>
   </nav>
-
   <script defer src="/js/navbar.js"></script>
 
   <div class="bg" id="home">
     <div class="bgimage"></div>
     <div class="bgtext"><h1>mcalec</h1></div>
   </div>
 
-  <span><zero-md src="/md/about-me.md">
+  <zero-md src="/md/about-me.md">
     <template>
       <link rel="stylesheet" href="/css/content.css">
     </template>
-  </zero-md></span>
+  </zero-md>
+
   <div>
     <!--
     <div id="bannerify">
@@ -62,10 +60,10 @@
     <div class="footer" id="foot">
       <p>McAlec Development © 2025 McAlec</p>
       <ul>
-        <li><a href="https://old.mcalec.dev/legal/license/">License</a></li>
-        <li><a href="https://old.mcalec.dev/legal/credits/">Credits</a></li>
-        <li><a href="https://old.mcalec.dev/legal/terms-of-use/">Terms</a></li>
-        <li><a href="https://old.mcalec.dev/legal/privacy-policy/">Privacy</a></li>
+        <li><a href="//old.mcalec.dev/legal/license/">License</a></li>
+        <li><a href="//old.mcalec.dev/legal/credits/">Credits</a></li>
+        <li><a href="//old.mcalec.dev/legal/terms-of-use/">Terms</a></li>
+        <li><a href="//old.mcalec.dev/legal/privacy-policy/">Privacy</a></li>
       </ul>
     </div>
   </div>
diff --git a/public/js/navbar.js b/public/js/navbar.js
@@ -9,16 +9,16 @@ window.addEventListener("scroll", () => {
   }
 });
 document.addEventListener('DOMContentLoaded', () => {
-    const menuIcon = document.querySelector('.menu-icon');
-    const navList = document.querySelector('.navbar ul');
-    menuIcon.addEventListener('click', () => {
-        navList.classList.toggle('show');
-    });
-    document.addEventListener('click', (e) => {
-        if (!e.target.closest('.navbar')) {
-            navList.classList.remove('show');
-        }
-    });
+  const menuIcon = document.querySelector('.menu-icon');
+  const navList = document.querySelector('.navbar ul');
+  menuIcon.addEventListener('click', () => {
+    navList.classList.toggle('show');
+  });
+  document.addEventListener('click', (e) => {
+    if (!e.target.closest('.navbar')) {
+      navList.classList.remove('show');
+    }
+  });
 });
 document.getElementById("collapse-toggle").addEventListener("click", () => {
   document.getElementById("music-box").classList.toggle("collapsed");
diff --git a/public/js/zero-md.min.js b/public/js/zero-md.min.js
diff --git a/public/json/config.json b/public/json/config.json
@@ -1,18 +1,20 @@
 {
   "title": "mcalec.dev",
-  "description": "mcalec development ..and yet im still here making stuff",
+  "description": "mcalec development",
   "author": "McAlec",
   "keywords": [
-    "sample",
-    "project",
-    "configuration"
+    "mcalec",
+    "mcalec.dev",
+    "web dev",
+    "personal website",
+    "website"
   ],
   "url": "https://mcalec.dev/",
-  "version": "1.0.0",
+  "version": "v2.2",
   "license": "MIT",
   "robots": [
     "index",
     "nofollow"
   ],
-  "theme-color": "#00000"
+  "theme-color": "#000000"
 }
diff --git a/public/md/about-me.md b/public/md/about-me.md
@@ -1,25 +1,23 @@
 # <span>mcalec development</span>
 
-## <span>DISCLAIMER</span>
+<span>this site is not complete (at all!) so try to find it all in one piece.</span>  
 
-<span>This site (and many others) won't be updated as often. Since I've had some personal problems in real life.</span>  
-<span>If you really need to contact me find my email(s) below.</span>  
-
-<span>This site may not be fully complete, I suggest you to use [old.mcalec.dev](//old.mcalec.dev/) for any sort of updated information.</span>  
-
-## <span>About Me</span>
+## <span>About Me?</span>
 
 <span>Hi, I see that you landed here on my website! So let me tell you about myself (if you care).</span>  
-<span>I am a [Front-End Dev](https://www.w3schools.com/whatis/whatis_frontenddev.asp) and a (somewhat of a) [Full-stack Dev](https://www.w3schools.com/whatis/whatis_fullstack.asp).</span>  
+<span>I am a [Full-stack Dev](https://www.w3schools.com/whatis/whatis_fullstack.asp).</span>  
 <span>I've created some small projects (i.e. this website) and created, now dead, Minecraft mods.</span>  
-<span>I have many other web projects at my [GitHub Projects Website](https://git.mcalec.dev/) and at my [Gitea Page](https://gitea.mcalec.dev/).</span>  
+<span>I have other projects at my [GitHub Projects Website](https://git.mcalec.dev/).</span>  
+
+<span>I am currently creating [gdl-api](https://github.com/mcalec-dev/gdl-api)</span>  
+<span>Now backend coding is my main background but I for sure know my way around [Node.js](https://nodejs.org/), [Express.js](https://expressjs.com/), and other that are similar.</span>  
+
+## <span>Socials</span>
 
-<span>Also I know alot of PowerShell and Batch scripting. Not sure why I like it, but go check it out on my GitHub (linked above).</span>  
-<span>Some front-end languages I know are, HTML, CSS, and JavaScript. Web frameworks wise I am planning to learn (soon).</span>  
-<span>Now backend isn't my strongest background but I know my way around [Node.js](https://nodejs.org/) and [Express.js](https://expressjs.com/).</span>  
+<span>Want my socials? I left it somewhere on the internet in **one piece**. `Good luck finding them ;)`</span>
 
 ## <span>Contact Me</span>
 
-<span>questions - hello[at]mcalec[dot]dev</span>  
+<span>email - hello[at]mcalec[dot]dev</span>  
 <span>inquries - inqury[at]mcalec[dot]dev</span>  
-<span>dmca - dmca[at]mcalec[dot]dev</span>  
+<span>takedowns - takedowns[at]mcalec[dot]dev</span>  
diff --git a/src/build.js b/src/build.js
@@ -2,43 +2,33 @@ const fs = require('fs').promises;
 const path = require('path');
 const glob = require('glob');
 const { applyHeadTags } = require('./utils/head.js');
-
 async function buildWebsite() {
   try {
-    // Create dist directory if it doesn't exist
     await fs.mkdir(path.join(process.cwd(), 'dist'), { recursive: true });
-
-    // Copy all static files from public to dist
     const files = await glob.sync('public/**/*', {
       nodir: true,
       cwd: process.cwd()
     });
-
     for (const file of files) {
       const srcPath = path.join(process.cwd(), file);
       const destPath = path.join(process.cwd(), 'dist', file.replace('public/', ''));
-      
-      // Create target directory if it doesn't exist
       await fs.mkdir(path.dirname(destPath), { recursive: true });
-      
-      // If it's an HTML file, process it with head tags
       if (file.endsWith('.html')) {
         const htmlContent = await fs.readFile(srcPath, 'utf-8');
         const processedHtml = await applyHeadTags(htmlContent);
         await fs.writeFile(destPath, processedHtml);
       } else {
-        // Otherwise just copy the file
         await fs.copyFile(srcPath, destPath);
       }
     }
-
     console.log('🚀 Build completed successfully!');
     console.log('📁 Output directory: /dist');
   } catch (error) {
     console.error('❌ Build failed:', error);
     process.exit(1);
   }
 }
-
-// Run the build process
-buildWebsite();
+buildWebsite();
+exports = {
+  buildWebsite
+};
diff --git a/src/routes/index.js b/src/routes/index.js
diff --git a/src/utils/head.js b/src/utils/head.js
@@ -12,7 +12,6 @@ async function loadConfig() {
 }
 function generateHeadTags(config) {
   if (!config) return '';
-
   const metaTags = [
     `<meta charset="utf-8">`,
     `<meta name="viewport" content="width=device-width, initial-scale=1.0">`,
@@ -25,7 +24,6 @@ function generateHeadTags(config) {
     `<meta property="og:description" content="${config.description}">`,
     `<meta property="og:url" content="${config.url}">`,
   ];
-
   const linkTags = [
     `<link rel="stylesheet" type="text/css" href="/css/style.css">`,
     `<link rel="stylesheet" type="text/css" href="/css/loader.css">`,
@@ -38,19 +36,17 @@ function generateHeadTags(config) {
     `<link rel="shortcut icon" href="/favicon.ico">`,
     `<link rel="mask-icon" href="/favicon.ico" color="#000000">`
   ];
-
   const scriptTags = [
-    `<script defer type="module" src="https://cdn.mcalec.dev/web/js/zero-md/zero-md.min.js"></script>`,
+    `<script defer type="module" src="//cdn.mcalec.dev/web/js/zero-md/zero-md.min.js"></script>`,
     `<script defer src="//gc.zgo.at/count.js" data-goatcounter="https://mcalec.goatcounter.com/count"></script>`,
-    `<script defer src="https://cloud.umami.is/script.js" data-website-id="37488ff3-cb26-4748-8ebe-8c7cb712f602"></script>`
+    `<script defer src="//cloud.umami.is/script.js" data-website-id="37488ff3-cb26-4748-8ebe-8c7cb712f602"></script>`
   ];
-
-  return `
-    <title>${config.title}</title>
-    ${metaTags.join('\n    ')}
-    ${linkTags.join('\n    ')}
-    ${scriptTags.join('\n    ')}
-  `;
+  return [
+    `<title>${config.title}</title>`,
+    ...metaTags,
+    ...linkTags,
+    ...scriptTags
+  ].join('\n  ');
 }
 async function applyHeadTags(htmlContent) {
   try {
@@ -60,11 +56,11 @@ async function applyHeadTags(htmlContent) {
     const headRegex = /<head>[\s\S]*?<\/head>/i;
     const htmlRegex = /<html[^>]*>/i;
     if (headRegex.test(htmlContent)) {
-      return htmlContent.replace(headRegex, `<head>\n    ${headTags}\n  </head>`);
+      return htmlContent.replace(headRegex, `<head>\n  ${headTags}\n</head>`);
     } else if (htmlRegex.test(htmlContent)) {
-      return htmlContent.replace(htmlRegex, `$&\n  <head>\n    ${headTags}\n  </head>`);
+      return htmlContent.replace(htmlRegex, `$&<head>\n  ${headTags}\n</head>`);
     }
-    return `<html>\n  <head>\n    ${headTags}\n  </head>\n${htmlContent}\n</html>`;
+    return `<html><head>\n  ${headTags}\n</head>${htmlContent}</html>`;
   } catch (error) {
     return htmlContent;
   }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+github: mcalec-dev`
	`2`	`+pateron: McAlec`