Merge branch 'staging'

sebs-scholarship · Jan 11, 2024 · 053f2a1 · 053f2a1
2 parents 476e5e9 + 9b83b18
commit 053f2a1
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 409 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,20 +1,20 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.2)
+    jekyll (4.3.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -56,19 +56,19 @@ GEM
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.1)
+    public_suffix (5.0.4)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (4.0.1)
+    rexml (3.2.6)
+    rouge (4.2.0)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     webrick (1.8.1)
 
 PLATFORMS

diff --git a/_config.yml b/_config.yml
@@ -8,6 +8,8 @@ description: >-
 
 url: "https://sebsscholarship.org"
 
+repo: sebs-scholarship/Website
+
 baseurl: ""
 
 plugins:
@@ -33,7 +35,7 @@ defaults:
     values:
       sitemap: false
 
-remote_theme: sebs-scholarship/Theme@2023-04-05-1
+remote_theme: sebs-scholarship/Theme@2024-01-04-1
 
 exclude:
   - .github

diff --git a/_includes/common_js.html b/_includes/common_js.html
@@ -10,6 +10,7 @@
             }
         },
         "theme": "edgeless",
+        "position": "bottom-left",
         "content": {
             "href": "https://sebsscholarship.org/privacy_policy.html"
         }

diff --git a/_includes/contact.html b/_includes/contact.html
@@ -3,44 +3,22 @@
         <div class="row justify-content-md-center text-center mb-5">
             <div class="col-lg-7">
                 <h2 class="mt-0 heading-border-top font-weight-normal">Get In Touch</h2>
-                <p>If you have any questions, please use the form below to contact us. Someone should get back to you in a few business days.</p>
+                <p>If you have any questions, you can reach us using the information below. Someone will get back to you in a few business days.</p>
             </div>
         </div>
-        <div class="row">
-            <div class="col-md-8 pr-md-5 pr-sm-0 mb-4">
-                <form action="javascript:" onsubmit="contactSubmit()">
-                    <div class="row">
-                        <div class="col-md">
-                            <div class="form-group">
-                                <label for="name">Name</label>
-                                <input type="text" class="form-control p-3 rounded-0 form-input" id="name" required>
-                            </div>
-                        </div>
-                        <div class="col-md">
-                            <div class="form-group">
-                                <label for="email">Email</label>
-                                <input type="email" class="form-control p-3 rounded-0 form-input" id="email" required>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="message">Message</label>
-                        <textarea cols="30" rows="10" class="form-control p-3 rounded-0 form-input" id="message" required></textarea>
-                    </div>
-                    <div id='recaptcha' class="g-recaptcha" data-sitekey="6LdjYNwUAAAAAMFxSuVRyqUdg2ZqVQu1CYDCBljg" data-callback="contact" data-size="invisible"></div>
-                    <div class="form-group">
-                        <input type="submit" id="send" class="btn pb-outline-dark p-3 rounded-0" value="Send Message">
-                    </div>
-                    <p id="status"></p>
-                </form>
+        <div class="row justify-content-md-center text-center mb-5">
+            <div class="col-lg-7">
+                <div style="font-size: 1.25rem">
+                    <p><a href="https://sebsscholarship.atlassian.net/servicedesk/customer/portal/1" role="button" class="btn pb-outline-dark p-3 rounded-0"  target="_blank" rel="noopener">Email Us</a></p>
+                </div>
             </div>
-            <div class="col-md-4">
-                <ul class="pb-contact-details-v1">
-                    <li>
-                        <span class="text-uppercase">Phone</span>
-                        <a href="tel:719-582-8713">(719) 582-8713</a>
-                    </li>
-                </ul>
+        </div>
+        <div class="row justify-content-md-center text-center mb-5">
+            <div class="col-lg-7">
+                <h3 class="mt-0 mb-3 font-weight-normal">Phone</h3>
+                <div style="font-size: 1.25rem">
+                    <a href="tel:719-582-8713">(719) 582-8713</a>
+                </div>
             </div>
         </div>
     </div>

diff --git a/_includes/footer.html b/_includes/footer.html
diff --git a/_includes/footer_links.html b/_includes/footer_links.html
@@ -0,0 +1,14 @@
+<ul class="list-inline mb-0">
+    <li class="list-inline-item">
+        <p><a href="/privacy_policy.html">Privacy Policy</a></p>
+    </li>
+    <li class="list-inline-item">
+        <p><a href="/tax_documents.html">Tax Documents</a></p>
+    </li>
+    <li class="list-inline-item">
+        <p><a href="/selection_process.html">Selection Process</a></p>
+    </li>
+    <li class="list-inline-item">
+        <p><a href="/assets/documents/Rubric.pdf">Rubric</a></p>
+    </li>
+</ul>
diff --git a/_includes/home_js.html b/_includes/home_js.html
@@ -200,40 +200,4 @@
         console.log("Are you a SEBS graduate interested in helping work on our website? Please visit the link below to fill out our interest form!");
         console.log("https://forms.gle/r7PGCqciGPRyn2PA6");
     });
-
-
-    function contactSubmit() {
-        grecaptcha.execute();
-    }
-
-    function contact(token) {
-        const name = document.getElementById("name").value;
-        const email = document.getElementById("email").value;
-        const message = document.getElementById("message").value;
-        document.getElementById("status").innerHTML = "";
-        const send = document.getElementById("send");
-        send.value = "Sending...";
-        send.disabled = true;
-
-        const xhttp = new XMLHttpRequest();
-        xhttp.onreadystatechange = function () {
-            if (this.readyState === 4) {
-                if (this.status === 200) {
-                    document.getElementById("name").value = "";
-                    document.getElementById("email").value = "";
-                    document.getElementById("message").value = "";
-                    document.getElementById("status").innerHTML = "Message has been sent!";
-                } else {
-                    document.getElementById("status").innerHTML = "There was an error sending your message. Please try again and email <a href=\"mailto:help@sebsscholarship.org\">help@sebsscholarship.org</a> directly if the issue persists.";
-                }
-
-                const send = document.getElementById("send");
-                send.value = "Send Message";
-                send.disabled = false;
-            }
-        };
-        xhttp.open("POST", "/email/contact.php", true);
-        xhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-        xhttp.send("name=" + name + "&email=" + email + "&message=" + message + "&token=" + token);
-    }
 </script>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -10,7 +10,7 @@
         {% include_cached loader.html %}
         {% include navbar.html %}
         {{ content }}
-        {% include footer.html %}
+        {% include_cached footer.html prefix="/" %}
         {% include_cached common_js.html %}
     </body>
 </html>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <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 %}
-</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 home_js.html %}
-    <script defer src="https://donorbox.org/widget.js" paypalExpress="false"></script>
-    <script defer src="https://www.google.com/recaptcha/api.js"></script>
-</body>
+    <head>
+        <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 %}
+    </head>
+    <body data-spy="scroll" data-target="#pb-navbar" data-offset="200">
+        {% include_cached loader.html %}
+        {% include navbar.html %}
+        {{ content }}
+        {% include footer.html prefix="" %}
+        {% include_cached common_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>
+    </body>
 </html>
diff --git a/composer.json b/composer.json
@@ -1,9 +1,8 @@
 {
-  "require": {
-    "firebase/php-jwt": "v6.10.0",
-    "ext-json": "*",
-    "ext-curl": "*"
-  },
   "name": "sebs-scholarship/website",
-  "description": "Website for the SEBS Scholarship Foundation"
+  "description": "Website for the SEBS Scholarship Foundation",
+  "require": {
+    "ext-curl": "*",
+    "ext-json": "*"
+  }
 }