From 3f3e0e2ae8c857a267dcdb264883fea87389f7f7 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 8 Mar 2023 15:17:15 -0500
Subject: [PATCH] modal essentially complete but for scripts

---
 website/client/src/app.vue                    |  3 +
 .../src/components/externalLinkModal.vue      | 93 ++++++++++++-------
 website/common/locales/en/generic.json        |  4 +-
 3 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/website/client/src/app.vue b/website/client/src/app.vue
index ede7eb8c9c..95cb2ba425 100644
--- a/website/client/src/app.vue
+++ b/website/client/src/app.vue
@@ -35,6 +35,7 @@
       <sub-canceled-modal v-if="isUserLoaded" />
       <bug-report-modal v-if="isUserLoaded" />
       <bug-report-success-modal v-if="isUserLoaded" />
+      <external-link-modal />
       <birthday-modal />
       <snackbars />
       <router-view v-if="!isUserLoggedIn || isStaticPage" />
@@ -175,6 +176,7 @@ import amazonPaymentsModal from '@/components/payments/amazonModal';
 import paymentsSuccessModal from '@/components/payments/successModal';
 import subCancelModalConfirm from '@/components/payments/cancelModalConfirm';
 import subCanceledModal from '@/components/payments/canceledModal';
+import externalLinkModal from '@/components/externalLinkModal.vue';
 
 import spellsMixin from '@/mixins/spells';
 import {
@@ -210,6 +212,7 @@ export default {
     subCanceledModal,
     bugReportModal,
     bugReportSuccessModal,
+    externalLinkModal,
   },
   mixins: [notifications, spellsMixin],
   data () {
diff --git a/website/client/src/components/externalLinkModal.vue b/website/client/src/components/externalLinkModal.vue
index e0aea90077..1ff7ca2c54 100644
--- a/website/client/src/components/externalLinkModal.vue
+++ b/website/client/src/components/externalLinkModal.vue
@@ -22,21 +22,26 @@
           v-html="icons.exclamation"
         ></div>
       </div>
-      <h2>You are about to leave Habitica.com</h2>
+      <h2>
+        {{ $t('leaveHabitica') }}
+      </h2>
     </div>
-    <div class="row">
-      Habitica is not responsible for the content of any linked
-      website that is not owned or operated by HabitRPG.
-      Please note that these websites' practices may differ
-      from Habitica’s community guidelines.
+
+    <!-- BODY -->
+    <div
+      class="row leave-warning-text"
+      v-html="$t('leaveHabiticaText')"
+    >
     </div>
+
+    <!-- FOOTER -->
     <div slot="modal-footer">
       <button
         v-once
         class="btn btn-primary"
-        @click="submit()"
+        @click="close()"
       >
-        {{ $t('onwards') }}
+        {{ $t('continue') }}
       </button>
     </div>
   </b-modal>
@@ -44,7 +49,32 @@
 
 <style lang="scss">
 @import '~@/assets/scss/colors.scss';
+
 #external-link-modal {
+  .modal-md {
+    max-width: 448px;
+    min-width: 330px;
+
+  .modal-close {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    cursor: pointer;
+
+    .icon-close {
+      width: 18px;
+      height: 18px;
+      vertical-align: middle;
+
+      & svg {
+        fill: $yellow-1;
+      }
+       & :hover {
+        fill: $yellow-1;
+      }
+    }
+  }
+
   .modal-content {
     background: transparent;
   }
@@ -58,10 +88,6 @@
     border-top-left-radius: 8px;
     border-bottom: none;
 
-    h2 {
-      color: $green-1;
-    }
-
     .exclamation-container {
       width: 64px;
       height: 64px;
@@ -72,43 +98,42 @@
     }
 
     .svg-exclamation {
-      width: 45px;
+      width: 8px;
       color: $white;
     }
+
+    h2 {
+      color: $yellow-1;
+      // font-size: 1.25rem;
+    }
   }
 
   .modal-body {
-    padding: 16px 32px 24px 32px;
+    padding: 16px 44px 20px 44px;
     background: $white;
 
-    .modal-body-col {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
+    .leave-warning-text {
+      font-size: 0.875rem;
+      line-height: 1.71;
       text-align: center;
-
-      .btn.btn-primary {
-        margin-top: 24px;
-      }
     }
+  }
 
-    .details-block {
-      background: $gray-700;
-      border-radius: 4px;
-      padding: 8px 16px;
-      margin-top: 16px;
-      display: inline-flex;
-      flex-direction: row;
-      text-align: center;
-      }
+    .modal-footer {
+      background: $white;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      justify-content: center;
+      border-top: none;
+      padding-top: 0;
     }
   }
 }
 </style>
 
 <script>
-import exclamationIcon from '@assets/svg/exclamation.svg';
-import closeIcon from '@/assets/svg/close.svg';
+import exclamationIcon from '@/assets/svg/exclamation.svg';
+import closeIcon from '@/assets/svg/new-close.svg';
 
 export default {
   data () {
@@ -123,7 +148,7 @@ export default {
     close () {
       this.$root.$emit('bv::hide::modal', 'external-link-modal');
       console.log('Bye!');
-    }
+    },
   },
 };
 </script>
diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json
index 67b27d5633..d360bed360 100644
--- a/website/common/locales/en/generic.json
+++ b/website/common/locales/en/generic.json
@@ -212,5 +212,7 @@
   "contactForm": "Contact the Moderation Team",
   "loadEarlierMessages": "Load Earlier Messages",
   "askQuestion": "Ask a Question",
-  "emptyReportBugMessage": "Report Bug Message missing"
+  "emptyReportBugMessage": "Report Bug Message missing",
+  "leaveHabitica": "You are about to leave Habitica.com",
+  "leaveHabiticaText": "Habitica is not responsible for the content of any linked website that is not owned or operated by HabitRPG.<br>Please note that these websites' practices may differ from Habitica’s community guidelines."
 }