Merge branch 'main' of github.com:xNS5/michaelkennedy.dev

xNS5 · Jan 5, 2024 · 53a2506 · 53a2506
2 parents dcc57a7 + 7b38d52
commit 53a2506
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 221 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,7 +11,7 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
       - name: build_and_deploy
-        uses: shalzz/zola-deploy-action@v0.16.1
+        uses: shalzz/zola-deploy-action@v0.17.2-1
         env:
           # Target branch
           PAGES_BRANCH: prod

diff --git a/config.toml b/config.toml
@@ -1,5 +1,5 @@
 # The URL the site will be built for
-base_url = "https://michaelkennedy.dev/"
+base_url = "https://www.michaelkennedy.dev/"
 
 # Whether to automatically compile all Sass files in the sass directory
 # compile_sass = true
@@ -91,14 +91,10 @@ navbar_items = [
         { url="/resume", title="Resume"},
         { url="https://github.com/xNS5", title="Github"},
         { url="https://www.linkedin.com/in/mw-kennedy/", title="Linkedin"},
-        { url="mailto:[email protected]?subject=Website%20Contact%20Inquiry ", title="Contact"},
-
+        { url="mailto:[email protected]?subject=Website%20Contact%20Inquiry ", title="Contact"}
    ]},
 ]
 
-[extra.analytics]
-google="G-QK10RKYRF7"
-
 [extra.author]
 name = "Michael Kennedy"
 avatar = "images/profile_picture.png"
@@ -110,5 +106,4 @@ mailto = "mailto:[email protected]?subject=Website%20Contact%20Inquiry"
 [extra.social]
 github="xNS5"
 linkedin="mw-kennedy"
-email="[email protected]"
-
+email="[email protected]"
diff --git a/content/blog/work.md b/content/blog/work.md
@@ -1,9 +1,11 @@
 +++
 title = "Working for a living"
 description = "Me talking about adulting stuff"
-draft = false
+draft = true
 date = 2022-12-15
 +++
 ---
 
-# Finding a Job
+# Coming Soon...
+
+
diff --git a/templates/archive/base.html b/templates/archive/base.html
diff --git a/templates/archive/index.html b/templates/archive/index.html
diff --git a/templates/base.html b/templates/base.html
@@ -23,11 +23,6 @@
     {{ config.title }}
     {% endblock title %}
   </title>
-
-  {% block analytics %}
-  <div id="analytics-div" on></div>
-
-  {% endblock analytics %}
 </head>
 
 <body class="has-background-white is-preload">
@@ -109,6 +104,7 @@
 <script>
   const lightSchemeIcon = document.getElementById('light-scheme-icon');
   const darkSchemeIcon = document.getElementById('dark-scheme-icon');
+
   if(window.matchMedia('(prefers-color-scheme: dark)').matches){
     darkSchemeIcon.remove();
     document.head.append(lightSchemeIcon);
@@ -117,19 +113,10 @@
     document.head.append(darkSchemeIcon);
   }
 
-  window.addEventListener("load", () => {
-    if (location.hostname !== "localhost" && location.hostname !== '127.0.0.0.1' && "{{ config.extra.analytics.google }}".length > 0) {
-      var head = document.getElementsByName("head")[0];
-      var outerScript = document.createElement('script');
-      var innerScript = document.createElement('script');
-      outerScript.setAttribute("async", "");
-      outerScript.setAttribute("src", "https://www.googletagmanager.com/gtag/js?id={{ config.extra.analytics.google }}");
-      innerScript.setAttribute("type", "text/javascript");
-      innerScript.innerHTML = 'window.dataLayer = window.dataLayer || []; function getag() { dataLayer.push(arguments); } gtag("js", new Date()); gtag("config", {{ config.extra.analytics.google }});';
-      outerScript.appendChild(innerScript);
-      head.appendChild(outerScript);
-    }
-  });
+  function htmlDecode(input){
+    let doc = new DOMParser().parseFromString(input, 'text/html');
+    return doc.documentElement.textContent;
+  }
 </script>
 
 <script type="text/javascript" src='{{ get_url(path="js/jquery.min.js") }}'></script>

diff --git a/templates/section.html b/templates/section.html
@@ -33,6 +33,10 @@ <h3 class="project-title">
                   <p class="tech">{{ page.extra.tech }}</p>
                 </h3>
               </a>
+              {% else %}
+              <h3 class="project-title">
+                  {{ page.title }}
+                </h3>
               {% endif %}
             </div>
           </h2>