From 3add66dea1652e4d38489da1da8e9bc1696fc7e2 Mon Sep 17 00:00:00 2001
From: Levi Muniz <levi.muniz17@gmail.com>
Date: Fri, 31 May 2024 02:50:51 -0600
Subject: [PATCH] Update theme

---
 .gitignore                  |  3 ++-
 _config.yml                 |  4 +++-
 _includes/common_js.html    | 26 --------------------------
 _includes/links.html        | 13 -------------
 _includes/loader.html       |  6 ------
 _includes/meta.html         | 19 +------------------
 _includes/navbar.html       | 28 ----------------------------
 _includes/navbar_links.html | 11 +++++++++++
 _includes/preconnect.html   |  6 ------
 _layouts/captcha.html       | 14 ++++++++------
 _layouts/default.html       | 12 +++++++-----
 _layouts/home.html          | 16 +++++++++-------
 _layouts/redirect-ext.html  |  4 ----
 _layouts/redirect-int.html  |  4 ----
 _layouts/redirect.html      | 22 ----------------------
 scripts/serve_local.bat     |  9 +++++++--
 scripts/serve_local.sh      |  9 +++++++--
 17 files changed, 55 insertions(+), 151 deletions(-)
 delete mode 100644 _includes/common_js.html
 delete mode 100644 _includes/links.html
 delete mode 100644 _includes/loader.html
 delete mode 100644 _includes/navbar.html
 create mode 100644 _includes/navbar_links.html
 delete mode 100644 _includes/preconnect.html
 delete mode 100644 _layouts/redirect-ext.html
 delete mode 100644 _layouts/redirect-int.html
 delete mode 100644 _layouts/redirect.html

diff --git a/.gitignore b/.gitignore
index ec318fa..261dc7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .jekyll-cache/
 _site/
-vendor/
\ No newline at end of file
+vendor/
+_vendor/
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index 842b13f..9841acd 100644
--- a/_config.yml
+++ b/_config.yml
@@ -35,7 +35,9 @@ defaults:
     values:
       sitemap: false
 
-remote_theme: sebs-scholarship/Theme@2024-05-17-1
+remote_theme: sebs-scholarship/Theme@2024-05-31-1
+
+analytics_id: G-DCKNB7HP7R
 
 exclude:
   - .github
diff --git a/_includes/common_js.html b/_includes/common_js.html
deleted file mode 100644
index 9f718e2..0000000
--- a/_includes/common_js.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<script src="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.js" data-cfasync="false"></script>
-<script>
-    window.cookieconsent.initialise({
-        "palette": {
-            "popup": {
-                "background": "#000"
-            },
-            "button": {
-                "background": "#800000"
-            }
-        },
-        "theme": "edgeless",
-        "position": "bottom-left",
-        "content": {
-            "href": "https://sebsscholarship.org/privacy_policy.html"
-        }
-    });
-</script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/waypoints/4.0.1/jquery.waypoints.min.js" integrity="sha512-CEiA+78TpP9KAIPzqBvxUv8hy41jyI3f2uHi7DGp/Y/Ka973qgSdybNegWFciqh6GrN2UePx2KkflnQUbUhNIA==" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js" integrity="sha512-0QbL0ph8Tc8g5bLhfVzSqxe9GERORsKhIn1IrpxDAgUsbBGz/V7iSav2zzW325XGd1OMLdL4UiqRJj702IeqnQ==" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" crossorigin="anonymous"></script>
-<script src="/assets/js/main.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.4.4/umd/popper.min.js" integrity="sha512-eUQ9hGdLjBjY3F41CScH3UX+4JDSI9zXeroz7hJ+RteoCaY+GP/LDoM8AO+Pt+DRFw3nXqsjh9Zsts8hnYv8/A==" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick.min.js" integrity="sha512-XtmMtDEcNz2j7ekrtHvOVR4iwwaD6o/FUJe6+Zq+HgcCsk3kj4uSQQR8weQ2QVj1o0Pk6PwYLohm206ZzNfubg==" crossorigin="anonymous"></script>
-<script src="https://kit.fontawesome.com/cb1f2db9bd.js" crossorigin="anonymous"></script>
diff --git a/_includes/links.html b/_includes/links.html
deleted file mode 100644
index 29bc4d8..0000000
--- a/_includes/links.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<link rel="canonical" href="{{ site.url | append: page.url }}">
-<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/apple-touch-icon.png">
-<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon-32x32.png">
-<link rel="icon" type="image/png" sizes="16x16" href="/assets/images/favicon-16x16.png">
-<link rel="manifest" href="/assets/images/site.webmanifest">
-<link rel="mask-icon" href="/assets/images/safari-pinned-tab.svg" color="#5bbad5">
-<link rel="shortcut icon" href="/assets/images/favicon.ico">
-<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" crossorigin="anonymous">
-<link rel="stylesheet" href="/assets/css/slick.css">
-<link rel="stylesheet" href="/assets/css/slick-theme.css">
-<link rel="stylesheet" href="/assets/css/style.css">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Crimson+Text:400,400i,600|Montserrat:200,300,400">
-<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/cookieconsent@3/build/cookieconsent.min.css" />
diff --git a/_includes/loader.html b/_includes/loader.html
deleted file mode 100644
index ad90786..0000000
--- a/_includes/loader.html
+++ /dev/null
@@ -1,6 +0,0 @@
-    <div id="pb-loader" class="show fullscreen">
-        <svg class="circular" width="48px" height="48px">
-            <circle class="path-bg" cx="24" cy="24" r="22" fill="none" stroke-width="4" stroke="#eeeeee"/>
-            <circle class="path" cx="24" cy="24" r="22" fill="none" stroke-width="4" stroke-miterlimit="10" stroke="#800000"/>
-        </svg>
-    </div>
\ No newline at end of file
diff --git a/_includes/meta.html b/_includes/meta.html
index 69da791..e5dea53 100644
--- a/_includes/meta.html
+++ b/_includes/meta.html
@@ -1,20 +1,3 @@
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-{% if page.title %}
-<title>{{ page.title }} - {{ site.title }}</title>
-<meta property="og:title" content="{{ page.title }}" />
-<meta name="description" content="{{ page.content | strip_html | truncatewords:50 }}">
-<meta property="og:description" content="{{ page.content | strip_html | truncatewords:50 }}">
-{% else %}
-<title>{{ site.title }}</title>
-<meta property="og:title" content="{{ site.title }}" />
-<meta name="description" content="{{ site.description }}">
-<meta property="og:description" content="{{ site.description }}">
-{% endif %}
 <meta name="keywords" content="sebs scholarship, sebs scholarships, sebs, sebs school, school of engineering and biomedical science, sebs scholarship foundation, pueblo, charity, {{ page.keywords }}">
 <meta property="og:type" content="website" />
-<meta property="og:url" content="{{ site.url | append: page.url }}" />
-<meta property="og:image" content="{{ site.url | append: "/assets/images/logo-large-min.png" }}" />
-<meta name="msapplication-TileColor" content="#b91d47">
-<meta name="msapplication-config" content="/assets/images/browserconfig.xml">
-<meta name="theme-color" content="#800000">
\ No newline at end of file
+<meta property="og:image" content="{{ site.url | append: "/assets/images/logo-large-min.png" }}" />
\ No newline at end of file
diff --git a/_includes/navbar.html b/_includes/navbar.html
deleted file mode 100644
index 48d60fb..0000000
--- a/_includes/navbar.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% assign prefix = "/" %}
-{% unless page.title %}
-{% assign prefix = "" %}
-{% endunless %}
-{% if page.title %}
-    <nav class="navbar navbar-expand-lg navbar-light pb-navbar light pb-scrolled-light" id="pb-navbar">
-{% else %}
-    <nav class="navbar navbar-expand-lg navbar-dark pb-navbar pb-scrolled-light" id="pb-navbar">
-{% endif %}
-        <div class="container">
-            <a class="navbar-brand navbar-brand-lg smoothscroll no-nav-expand" href="{{ prefix | append: "#section-home" }}"><img src="/assets/images/logo-min.png" alt=""></a>
-            <a class="navbar-brand navbar-brand-lg smoothscroll no-nav-expand" href="{{ prefix | append: "#section-home" }}">SEBS Scholarship</a>
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#probootstrap-navbar" aria-controls="probootstrap-navbar" aria-expanded="false" aria-label="Toggle navigation">
-                <span><i class="fa fa-bars"></i></span>
-            </button>
-            <div class="collapse navbar-collapse" id="probootstrap-navbar">
-                <ul class="navbar-nav ml-auto">
-                    <li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-about" }}">About</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-details" }}">Scholarship</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-resumes" }}">Resume Workshop</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-donate" }}">Donate</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-volunteering" }}">Volunteering</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-contact" }}">Contact</a></li>
-                    <li class="nav-item"><a class="nav-link" href="https://blog.sebsscholarship.org/">Blog</a></li>
-                </ul>
-            </div>
-        </div>
-    </nav>
\ No newline at end of file
diff --git a/_includes/navbar_links.html b/_includes/navbar_links.html
new file mode 100644
index 0000000..d3fab85
--- /dev/null
+++ b/_includes/navbar_links.html
@@ -0,0 +1,11 @@
+{% assign prefix = "/" %}
+{% unless page.title %}
+{% assign prefix = "" %}
+{% endunless %}
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-about" }}">About</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-details" }}">Scholarship</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-resumes" }}">Resume Workshop</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-donate" }}">Donate</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-volunteering" }}">Volunteering</a></li>
+<li class="nav-item"><a class="nav-link" href="{{ prefix | append: "#section-contact" }}">Contact</a></li>
+<li class="nav-item"><a class="nav-link" href="https://blog.sebsscholarship.org/">Blog</a></li>
\ No newline at end of file
diff --git a/_includes/preconnect.html b/_includes/preconnect.html
deleted file mode 100644
index cb0d8da..0000000
--- a/_includes/preconnect.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<link rel="preconnect" href="https://stackpath.bootstrapcdn.com/" crossorigin>
-<link rel="preconnect" href="https://fonts.googleapis.com/" crossorigin>
-<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin>
-<link rel="preconnect" href="https://cdnjs.cloudflare.com/" crossorigin>
-<link rel="preconnect" href="https://cdn.jsdelivr.net/" crossorigin>
-<link rel="preconnect" href="https://kit.fontawesome.com/" crossorigin>
\ No newline at end of file
diff --git a/_layouts/captcha.html b/_layouts/captcha.html
index 3e49352..b67860e 100644
--- a/_layouts/captcha.html
+++ b/_layouts/captcha.html
@@ -1,18 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        {% include_cached analytics.html %}
+        {% include_cached theme_preconnect.html %}
         <link rel="preconnect" href="https://www.google.com/" crossorigin>
-        {% include_cached preconnect.html %}
-        {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-        {% include meta.html %}
-        {% include links.html %}
+        {% include theme_meta.html %}
+        {% include_cached meta.html %}
+        {% include_cached theme_links.html %}
+        {% include_cached theme_styles.html %}
     </head>
     <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
         {% include_cached loader.html %}
         {% include navbar.html %}
         {{ content }}
-        {% include footer.html %}
-        {% include_cached common_js.html %}
+        {% include_cached footer.html prefix="/" %}
+        {% include_cached theme_js.html %}
         <script defer src="https://www.google.com/recaptcha/api.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 74d1ecd..ef3ffc8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,16 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        {% include_cached preconnect.html %}
-        {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-        {% include meta.html %}
-        {% include links.html %}
+        {% include_cached analytics.html %}
+        {% include_cached theme_preconnect.html %}
+        {% include theme_meta.html %}
+        {% include_cached meta.html %}
+        {% include_cached theme_links.html %}
+        {% include_cached theme_styles.html %}
     </head>
     <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
         {% include_cached loader.html %}
         {% include navbar.html %}
         {{ content }}
         {% include_cached footer.html prefix="/" %}
-        {% include_cached common_js.html %}
+        {% include_cached theme_js.html %}
     </body>
 </html>
\ No newline at end of file
diff --git a/_layouts/home.html b/_layouts/home.html
index 8d26d01..cef528c 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -1,19 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        {% include_cached analytics.html %}
+        {% include_cached theme_preconnect.html %}
         <link rel="preconnect" href="https://donorbox.org/" crossorigin>
         <link rel="preconnect" href="https://www.google.com/" crossorigin>
-        {% include_cached preconnect.html %}
-        {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-        {% include meta.html %}
-        {% include links.html %}
+        {% include theme_meta.html %}
+        {% include_cached meta.html %}
+        {% include_cached theme_links.html %}
+        {% include_cached theme_styles.html %}
     </head>
     <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
         {% include_cached loader.html %}
-        {% include navbar.html %}
+        {% include navbar.html dark="true" %}
         {{ content }}
-        {% include footer.html prefix="" %}
-        {% include_cached common_js.html %}
+        {% include_cached footer.html prefix="" %} %}
+        {% include_cached theme_js.html %}
         {% include_cached home_js.html %}
         <script defer src="https://donorbox.org/widget.js" paypalExpress="false"></script>
         <script defer data-jsd-embedded data-key="cded3bfa-9345-4aa7-968f-1ce6ae6389da" data-base-url="https://jsd-widget.atlassian.com" src="https://jsd-widget.atlassian.com/assets/embed.js"></script>
diff --git a/_layouts/redirect-ext.html b/_layouts/redirect-ext.html
deleted file mode 100644
index 19e1c28..0000000
--- a/_layouts/redirect-ext.html
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: redirect
----
-<meta http-equiv="refresh" content="0; url={{ page.location }}">
\ No newline at end of file
diff --git a/_layouts/redirect-int.html b/_layouts/redirect-int.html
deleted file mode 100644
index 47d2c08..0000000
--- a/_layouts/redirect-int.html
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: redirect
----
-<meta http-equiv="refresh" content="0; url={{ site.url | append: page.location }}">
\ No newline at end of file
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
deleted file mode 100644
index 37d987d..0000000
--- a/_layouts/redirect.html
+++ /dev/null
@@ -1,22 +0,0 @@
----
-sitemap: false
----
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    {% include_cached analytics.html id="G-DCKNB7HP7R" %}
-    <!-- HTML meta refresh URL redirection -->
-    {{ content }}
-    <title>{{ page.title }} - {{ site.title }}</title>
-    <meta name="description" content="{{ page.description }}">
-    <meta name="robots" content="noindex">
-    <meta property="og:title" content="{{ page.title }}" />
-    <meta property="og:description" content="{{ page.description }}">
-    <meta property="og:type" content="website" />
-    <meta property="og:url" content="{{ site.url | append: page.url }}" />
-    <meta property="og:image" content="{{ site.url | append: "/assets/images/logo-large-min.png" }}" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/assets/images/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/assets/images/favicon-16x16.png">
-    <link rel="shortcut icon" href="/assets/images/favicon.ico">
-</head>
-</html>
\ No newline at end of file
diff --git a/scripts/serve_local.bat b/scripts/serve_local.bat
index cfb603e..6b67214 100644
--- a/scripts/serve_local.bat
+++ b/scripts/serve_local.bat
@@ -1,2 +1,7 @@
-docker run -v %cd%:/srv/jekyll -p 4000:4000 --rm ^
-jekyll/builder:4.2.2 /bin/bash -c "chmod 777 /srv/jekyll && jekyll serve --future --drafts"
\ No newline at end of file
+docker run -p 4000:4000 -it --rm ^
+-v "./":/srv/jekyll -v "./_vendor/bundle":/usr/local/bundle -v "./_vendor/gem":/usr/gem ^
+-e JEKYLL_UID=1001 -e JEKYLL_GID=1001 ^
+jekyll/builder:4.2.2 /bin/bash -c ^
+"chmod 777 /srv/jekyll ^
+&& chmod 777 /srv/jekyll/assets/images ^
+&& jekyll serve --future --drafts"
\ No newline at end of file
diff --git a/scripts/serve_local.sh b/scripts/serve_local.sh
index 456231a..8900a3a 100755
--- a/scripts/serve_local.sh
+++ b/scripts/serve_local.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
 
-docker run -v "$(pwd)":/srv/jekyll -p 4000:4000 --rm jekyll/builder:4.2.2 \
-/bin/bash -c "chmod 777 /srv/jekyll && jekyll serve --future --drafts"
\ No newline at end of file
+docker run -p 4000:4000 -it --rm \
+-v "./":/srv/jekyll -v "./_vendor/bundle":/usr/local/bundle -v "./_vendor/gem":/usr/gem \
+-e JEKYLL_UID=1001 -e JEKYLL_GID=1001 \
+jekyll/builder:4.2.2 /bin/bash -c \
+"chmod 777 /srv/jekyll \
+&& chmod 777 /srv/jekyll/assets/images \
+&& jekyll serve --future --drafts"
\ No newline at end of file