From aa3dc8f6b4a1a23a0bb74d5b43c282bb5539ae3b Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 2 Aug 2022 13:04:35 -0400
Subject: [PATCH 1/5] chore(deps): bump skeleton-v2 to v2.10.0

---
 .holo/sources/skeleton-v2.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.holo/sources/skeleton-v2.toml b/.holo/sources/skeleton-v2.toml
index b4e73a3e..1b2b8449 100644
--- a/.holo/sources/skeleton-v2.toml
+++ b/.holo/sources/skeleton-v2.toml
@@ -1,3 +1,3 @@
 [holosource]
 url = "https://github.com/JarvusInnovations/emergence-skeleton-v2"
-ref = "refs/tags/v2.8.7"
+ref = "refs/tags/v2.10.0"

From 4aac3def547e8291b3ec2663003868425e494bd9 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 2 Aug 2022 13:07:20 -0400
Subject: [PATCH 2/5] fix(contact): correct syntax for phone hint translation

---
 html-templates/contact/contact.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html-templates/contact/contact.tpl b/html-templates/contact/contact.tpl
index c0d928a5..b3e44e03 100644
--- a/html-templates/contact/contact.tpl
+++ b/html-templates/contact/contact.tpl
@@ -31,7 +31,7 @@
 
                 {field inputName=Name  label=Name  error=$validationErrors.Name  required=true attribs='autofocus autocapitalize="words"'}
                 {field inputName=Email label=Email error=$validationErrors.Email type=email required=true}
-                {field inputName=Phone label=Phone error=$validationErrors.Phone type=tel hint='{_ "Optional. Include your area code."}'}
+                {field inputName=Phone label=Phone error=$validationErrors.Phone type=tel hint=_("Optional. Include your area code.")}
 
                 {textarea inputName=Message label=Message error=$validationErrors.Message required=true}
 

From 73156fb973f5d9812a88ae28d268a189c753d461 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 2 Aug 2022 13:07:48 -0400
Subject: [PATCH 3/5] feat(recaptcha): upgrade to v3

---
 html-templates/contact/contact.tpl   | 19 +++++++++++++------
 html-templates/register/register.tpl | 19 ++++++++++++++-----
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/html-templates/contact/contact.tpl b/html-templates/contact/contact.tpl
index b3e44e03..ecf1f60f 100644
--- a/html-templates/contact/contact.tpl
+++ b/html-templates/contact/contact.tpl
@@ -7,6 +7,11 @@
 
     {if RemoteSystems\ReCaptcha::$siteKey}
         <script src='https://www.google.com/recaptcha/api.js'></script>
+        <script>
+            function onSubmit(token) {
+                document.getElementById('contact-form').submit();
+            }
+        </script>
     {/if}
 {/block}
 
@@ -20,7 +25,7 @@
 
             {contentBlock "contact-introduction"}
 
-            <form action="/contact" method="POST" class="contact-form">
+            <form action="/contact" method="POST" class="contact-form" id="contact-form">
                 {if $validationErrors}
                     <div class="alert alert-danger">
                         {_ "Please double-check the fields highlighted below."}
@@ -35,15 +40,17 @@
 
                 {textarea inputName=Message label=Message error=$validationErrors.Message required=true}
 
-                {if RemoteSystems\ReCaptcha::$siteKey}
-                    <div class="form-group g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}"></div>
-                {/if}
-
                 {if $validationErrors.ReCaptcha}
                     <p class="text-danger">{$validationErrors.ReCaptcha}</p>
                 {/if}
 
-                <button type="submit" class="btn btn-primary">{_ Send}</button>
+                {if RemoteSystems\ReCaptcha::$siteKey}
+                    <button type="submit" class="btn btn-primary g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}" data-callback='onSubmit' data-action='submit'>
+                {else}
+                    <button type="submit" class="btn btn-primary">
+                {/if}
+                    {_ "Send"}
+                </button>
             </form>
 
         </div>
diff --git a/html-templates/register/register.tpl b/html-templates/register/register.tpl
index 46a38b18..8604fb80 100644
--- a/html-templates/register/register.tpl
+++ b/html-templates/register/register.tpl
@@ -7,6 +7,11 @@
 
     {if RemoteSystems\ReCaptcha::$siteKey}
         <script src='https://www.google.com/recaptcha/api.js'></script>
+        <script>
+            function onSubmit(token) {
+                document.getElementById('register').submit();
+            }
+        </script>
     {/if}
 {/block}
 
@@ -65,12 +70,16 @@
                         <input type="password" class="form-control" id="PasswordConfirm" name="PasswordConfirm" value="{refill field=PasswordConfirm}">
                     </div>
 
-                    {if RemoteSystems\ReCaptcha::$siteKey}
-                        <div class="form-group g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}"></div>
-                    {/if}
-
                     <div class="form-group">
-                        <p><button type="submit" class="btn btn-primary">{_ "Create Account"}</button></p>
+                        <p>
+                            {if RemoteSystems\ReCaptcha::$siteKey}
+                                <button type="submit" class="btn btn-primary g-recaptcha" data-sitekey="{RemoteSystems\ReCaptcha::$siteKey|escape}" data-callback='onSubmit' data-action='submit'>
+                            {else}
+                                <button type="submit" class="btn btn-primary">
+                            {/if}
+                                {_ "Create Account"}
+                            </button>
+                        </p>
                         <p class="help-block">{_ "Already have an account?"} <a href="/login{tif $.request.return ? cat('?return=', escape($.request.return, url))}">{_ "Log in"}</a></p>
                     </div>
                 {/strip}

From 6acb3e848ed27c0d4f5660ee5d02a0d03352512c Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 2 Aug 2022 13:09:28 -0400
Subject: [PATCH 4/5] feat(dev): add xdebug launch config

---
 .vscode/launch.json | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..4de4bf12
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,22 @@
+
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/hab/svc/php-runtime/var/site": "${workspaceRoot}"
+            },
+            "ignore": [
+                "**/vendor/**/*.php",
+                "**/src-compat/File.php"
+            ]
+        }
+    ]
+}
\ No newline at end of file

From c27b1c8b339575fc5f19e23fa04114c64ee1f9b4 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 2 Aug 2022 20:10:02 -0400
Subject: [PATCH 5/5] fix(ci): upgrade destroy API

---
 .github/workflows/k8s-destroy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/k8s-destroy.yml b/.github/workflows/k8s-destroy.yml
index 1af2ef6a..1958f2c5 100644
--- a/.github/workflows/k8s-destroy.yml
+++ b/.github/workflows/k8s-destroy.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Delete PR Deployment
       run: |
         kubectl config set-context --current --namespace="${KUBE_NAMESPACE}"
-        kubectl delete deployment,replicaset,ingress,all -l "app.kubernetes.io/instance=${RELEASE_NAME}"
+        helm uninstall "${RELEASE_NAME}"
         kubectl delete secret "${RELEASE_NAME}-tls"
 
     - name: Deactivate Github Deployment