From 23a9c365e816f90e561207c29fefc1d3bfe56038 Mon Sep 17 00:00:00 2001
From: Kurtis Holsapple <kurtis@openfunctioncomputers.com>
Date: Thu, 5 Dec 2024 08:00:41 -0800
Subject: [PATCH] build test

---
 .../themes/medicalalert/dist/app.css          |  9 +++++-
 .../medicalalert/dist/mix-manifest.json       |  2 +-
 wp/wp-content/themes/medicalalert/header.php  |  2 +-
 .../medicalalert/helpers/sfconfig-test.php    | 16 +++++++---
 .../medicalalert/src/scss/_variables.scss     |  6 +++-
 .../themes/medicalalert/src/scss/header.scss  | 32 ++++++++++++++-----
 .../better-wordpress/src/Site.php             |  6 ++--
 7 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/wp/wp-content/themes/medicalalert/dist/app.css b/wp/wp-content/themes/medicalalert/dist/app.css
index b7b2e1af..fe4c52c6 100644
--- a/wp/wp-content/themes/medicalalert/dist/app.css
+++ b/wp/wp-content/themes/medicalalert/dist/app.css
@@ -12117,8 +12117,15 @@ button[type=submit].single_add_to_cart_button,
   }
 }
 
+.consumer-brand .top-menu {
+  background: linear-gradient(to right, #000066, #3399FF);
+  padding: 3.5px;
+}
+.consumer-brand .top-menu a {
+  color: #FFFFFF;
+}
 .consumer-brand .main-header {
-  background: #000066;
+  background: #FFFFFF;
 }
 .consumer-brand #menu-consumer .dropdown-menu {
   background: #000066;
diff --git a/wp/wp-content/themes/medicalalert/dist/mix-manifest.json b/wp/wp-content/themes/medicalalert/dist/mix-manifest.json
index 4a268676..378b558d 100644
--- a/wp/wp-content/themes/medicalalert/dist/mix-manifest.json
+++ b/wp/wp-content/themes/medicalalert/dist/mix-manifest.json
@@ -1,4 +1,4 @@
 {
     "/app.js": "/app.js?id=def087bfee86b3ced20472c4fd21ee05",
-    "/app.css": "/app.css?id=5cddfa7b15796e50a20e60f390ee1b62"
+    "/app.css": "/app.css?id=a50d195945336a7989a494964e8ab470"
 }
diff --git a/wp/wp-content/themes/medicalalert/header.php b/wp/wp-content/themes/medicalalert/header.php
index c7d76829..1b44304f 100644
--- a/wp/wp-content/themes/medicalalert/header.php
+++ b/wp/wp-content/themes/medicalalert/header.php
@@ -38,7 +38,7 @@
 ?>
 
 <header class="w-100 sticky-top main-header <?php echo $stylesheet; ?>">
-    <div class="bg-light top-menu">
+    <div class="top-menu">
         <div class="container">
             <div class="row justify-content-end align-items-center d-none d-md-flex top-bar">
                 <div class="nav-btn col col-lg-2 d-flex justify-content-end">
diff --git a/wp/wp-content/themes/medicalalert/helpers/sfconfig-test.php b/wp/wp-content/themes/medicalalert/helpers/sfconfig-test.php
index ad215711..fcdb74f6 100755
--- a/wp/wp-content/themes/medicalalert/helpers/sfconfig-test.php
+++ b/wp/wp-content/themes/medicalalert/helpers/sfconfig-test.php
@@ -1,16 +1,23 @@
 <?php
 
 /** Salesforce Api Url */
-define("SALESFORCE_API_URL","https://connectamerica--full.sandbox.my.salesforce-sites.com/RestServices/services/apexrest");
+if (!defined("SALESFORCE_API_URL")) {
+    define("SALESFORCE_API_URL","https://connectamerica--full.sandbox.my.salesforce-sites.com/RestServices/services/apexrest");
+}
 
 /** Salesforce Brand ID */
-define("SALESFORCE_BRAND","MedicalAlert");
+if (!defined("SALESFORCE_BRAND")) {
+    define("SALESFORCE_BRAND","MedicalAlert");
+}
 
 /** Encryption key */
-define("ENCRYPTION_KEY","potEgc8+5f32y+jpXSz/NqFEPuVWoT95V7aYiyRNjpQ=");
+if (!defined("ENCRYPTION_KEY")) {
+    define("ENCRYPTION_KEY","potEgc8+5f32y+jpXSz/NqFEPuVWoT95V7aYiyRNjpQ=");
+}
 
 /** Signature */
-define("SIGNATURE_KEY","-----BEGIN PRIVATE KEY-----
+if (!defined("SIGNATURE_KEY")) {
+    define("SIGNATURE_KEY","-----BEGIN PRIVATE KEY-----
 MIICcgIBADANBgkqhkiG9w0BAQEFAASCAlwwggJYAgEAAoGAwCSPvGdoZsC1Q4btJETb9fnkM/ne
 zBA4F4f0bX3JymVZ83H9F1CTykhQWjZ8WiAuPFGHNaUESGtfr0pWF113KrY5ei910WcvcBKd1w6w
 JrpUdhWC5bAgoXfLoS0itbX7TvIKrvoXcHbtAPMEDyMNv/Dy/RstNTqUBzF2fLKTwTkCAwEAAQKB
@@ -24,3 +31,4 @@ F0iyEOmbjieJ1cgSluByPjKDqMXhlxEr9c/SMLG1TlRxyyVGKSZ3NP765sEXSBq0EBSdAkCX8h79
 z9mezZxyRcdod2Sk4t1hWUf0AnLhkzfAgdQoNwY692uBYXsyKXGufLNkb+RznASmn5Lr6NanIL4c
 6S9P
 -----END PRIVATE KEY-----");
+}
diff --git a/wp/wp-content/themes/medicalalert/src/scss/_variables.scss b/wp/wp-content/themes/medicalalert/src/scss/_variables.scss
index 09a94066..9e752056 100644
--- a/wp/wp-content/themes/medicalalert/src/scss/_variables.scss
+++ b/wp/wp-content/themes/medicalalert/src/scss/_variables.scss
@@ -13,6 +13,10 @@ $consumer-highlight: rgba(255, 202, 211, 0.15);
 $business-primary: #00447C;
 $light-blue: #EAEFF3;
 $orange: #CC0033;
+
+$ma-navy: #000066;
+$ma-sky: #3399FF;
+
 .consumer-primary {
     color: $consumer-primary;
 }
@@ -73,4 +77,4 @@ $dropdown-link-hover-bg: none;
 $dropdown-link-active-bg: none;
 $dropdown-item-padding-y: 1rem;
 // $dropdown-dark-bg: $primary;
-$dropdown-dark-border-color: none;
\ No newline at end of file
+$dropdown-dark-border-color: none;
diff --git a/wp/wp-content/themes/medicalalert/src/scss/header.scss b/wp/wp-content/themes/medicalalert/src/scss/header.scss
index d264da2e..73bb5bdb 100644
--- a/wp/wp-content/themes/medicalalert/src/scss/header.scss
+++ b/wp/wp-content/themes/medicalalert/src/scss/header.scss
@@ -2,54 +2,60 @@
     h1 {
         color: $white;
     }
+
     .top-bar-mobile {
         color: $light-gray;
+
         .top-bar-mobile-phone {
             .fa-phone-volume {
                 position: relative;
                 top: 3px;
                 right: 5px;
             }
+
             p {
                 margin: auto 0;
             }
         }
     }
+
     .top-nav-mobile {
         list-style: none;
         text-align: center;
         padding: 0;
+
         li {
             a {
                 color: $white;
             }
         }
     }
+
     .top-bar-items li {
         position: relative;
         align-self: center;
         margin-right: 20px;
     }
-    // .top-bar-items li:first-child::after {
-    //     content: "|";
-    //     color: #505050;
-    //     padding-left: 14px
-    // }
+
     .main-nav {
         .navbar-nav li.dropdown:hover>ul.dropdown-menu {
             display: block;
         }
+
         .dropdown-menu {
             li {
                 text-align: left;
             }
         }
+
         .dropdown-toggle::after {
             content: none;
         }
+
         .main-logo img {
             max-width: 296px;
         }
+
         @include media-breakpoint-up(lg) {
             .menu-item-has-children::after {
                 content: "";
@@ -65,6 +71,7 @@
                 content: unset;
             }
         }
+
         .menu-item {
             white-space: nowrap;
             @include media-breakpoint-up(lg) {
@@ -109,9 +116,18 @@
 }
 
 .consumer-brand {
-    .main-header {
-        background: $consumer-primary;
+    .top-menu {
+        background: linear-gradient(to right, $ma-navy, $ma-sky);
+        padding: 3.5px;
+
+        a {
+            color: $white;
+        }
     }
+    .main-header {
+        background: $white;
+    }
+
     #menu-consumer {
         .dropdown-menu {
             background: $consumer-primary;
@@ -141,4 +157,4 @@
     box-sizing: border-box;
     display: inline-block;
     padding-right: 0px !important;
-  }
\ No newline at end of file
+  }
diff --git a/wp/wp-content/themes/medicalalert/vendor/open-function-computers-llc/better-wordpress/src/Site.php b/wp/wp-content/themes/medicalalert/vendor/open-function-computers-llc/better-wordpress/src/Site.php
index b8a7d4ff..dfd942cf 100644
--- a/wp/wp-content/themes/medicalalert/vendor/open-function-computers-llc/better-wordpress/src/Site.php
+++ b/wp/wp-content/themes/medicalalert/vendor/open-function-computers-llc/better-wordpress/src/Site.php
@@ -210,7 +210,8 @@ class Site
 
         $items = json_decode(file_get_contents($manifestFile), true);
         foreach ($items as $file => $version) {
-            $extension = end(explode(".", $file));
+            $parts = explode(".", $file);
+            $extension = end($parts);
             $tag = $this->stringify($file);
             if ($extension === "js") {
                 add_action('wp_enqueue_scripts', function () use ($file, $version, $tag) {
@@ -313,8 +314,9 @@ class Site
             return;
         }
 
-        if (!function_exists("acf_add_options_page")) {
+        if (!function_exists("acf_add_options_page") && isset($this->config["options-pages"])) {
             $this->adminError("You can't register options pages without the Pro version of Advanced Custom Fields.");
+            return;
         }
 
         $i = 100;