Merge branch 'staging'

.github/workflows/main.yml

@@ -15,31 +15,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
-    name: Lint the source
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Lint Code Base
-        uses: docker://ghcr.io/github/super-linter:slim-v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VALIDATE_YAML: true
-          VALIDATE_XML: true
-          VALIDATE_BASH: true
-          VALIDATE_PHP: true
-          VALIDATE_JAVASCRIPT_STANDARD: true
-          VALIDATE_CSS: true
-
   build:
     name: Build the site
     runs-on: ubuntu-latest
-    needs:
-      - lint
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -103,7 +81,7 @@ jobs:
           path: _site/
 
       - name: Install SSH key
-        uses: webfactory/ssh-agent@v0.8.0
+        uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ env.SITE_KEY }}
 
@@ -120,7 +98,6 @@ jobs:
     name: Send job complete notification
     runs-on: ubuntu-latest
     needs:
-      - lint
       - build
       - deploy
     # Run if on staging or main
@@ -140,7 +117,7 @@ jobs:
 
       - name: Notify on success
         # If the site was successfully built and indexed
-        if: needs.lint.result == 'success' && needs.build.result == 'success' && needs.deploy.result == 'success'
+        if: needs.build.result == 'success' && needs.deploy.result == 'success'
         uses: appleboy/discord-action@v1.0.0
         with:
           webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
@@ -153,7 +130,7 @@ jobs:
 
       - name: Notify on failure
         # If the site failed at any point
-        if: needs.lint.result == 'failure' || needs.build.result == 'failure' || needs.deploy.result == 'failure'
+        if: needs.build.result == 'failure' || needs.deploy.result == 'failure'
         uses: appleboy/discord-action@v1.0.0
         with:
           webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}

.gitignore

@@ -1,3 +1,4 @@
 .jekyll-cache/
 _site/
-vendor/
+vendor/
+_vendor/

Gemfile.lock

@@ -60,12 +60,14 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.5.0)

_config.yml

@@ -35,7 +35,9 @@ defaults:
     values:
       sitemap: false
 
-remote_theme: sebs-scholarship/Theme@2024-01-15-1
+remote_theme: sebs-scholarship/Theme@2024-05-31-2
+
+analytics_id: G-DCKNB7HP7R
 
 exclude:
   - .github

_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">
+<meta property="og:image" content="{{ site.url | append: "/assets/images/logo-large-min.png" }}" />

_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>

_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>

_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>

_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>

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"
+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"

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"
+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"