From 521a1f94ebacd20c164af410b0b7ccacf8163e8f Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Tue, 10 May 2022 20:02:38 +0200
Subject: [PATCH] removed das banner, added das to support links

---
 frontend/src/styles/about.scss          |  4 ++++
 frontend/src/styles/popups.scss         |  2 +-
 frontend/src/ts/popups/support-popup.ts |  2 +-
 frontend/src/ts/ready.ts                | 30 ++++++++++++-------------
 frontend/static/html/pages/about.html   | 15 +++++--------
 frontend/static/html/popups.html        |  6 ++---
 6 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/frontend/src/styles/about.scss b/frontend/src/styles/about.scss
index 575a39d52..059e5ebd5 100644
--- a/frontend/src/styles/about.scss
+++ b/frontend/src/styles/about.scss
@@ -38,6 +38,10 @@
       }
     }
 
+    .supportButtons {
+      grid-template-columns: 1fr;
+    }
+
     .supporters,
     .contributors {
       display: grid;
diff --git a/frontend/src/styles/popups.scss b/frontend/src/styles/popups.scss
index 7b1587493..ec98f535f 100644
--- a/frontend/src/styles/popups.scss
+++ b/frontend/src/styles/popups.scss
@@ -1093,7 +1093,7 @@
 
     .buttons {
       display: grid;
-      grid-template-columns: 1fr 1fr 1fr 1fr;
+      grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
       gap: 1rem;
 
       .button {
diff --git a/frontend/src/ts/popups/support-popup.ts b/frontend/src/ts/popups/support-popup.ts
index d2ded8ea1..0bf12e5d1 100644
--- a/frontend/src/ts/popups/support-popup.ts
+++ b/frontend/src/ts/popups/support-popup.ts
@@ -1,7 +1,7 @@
 import * as Commandline from "../elements/commandline";
 import * as CommandlineLists from "../elements/commandline-lists";
 
-$(document.body).on("click", "#supportMeButton", () => {
+$(document.body).on("click", "#supportMeButton, #supportMeAboutButton", () => {
   $("#supportMeWrapper")
     .css("opacity", 0)
     .removeClass("hidden")
diff --git a/frontend/src/ts/ready.ts b/frontend/src/ts/ready.ts
index a039579c0..e2d7f88b7 100644
--- a/frontend/src/ts/ready.ts
+++ b/frontend/src/ts/ready.ts
@@ -48,28 +48,28 @@ $(document).ready(() => {
   if (Config.quickTab) {
     $("#restartTestButton").addClass("hidden");
   }
-  // if (!window.localStorage.getItem("merchbannerclosed")) {
-  //   Notifications.addBanner(
-  //     `Checkout our merchandise, available at <a target="_blank" href="https://monkeytype.store/">monkeytype.store</a>`,
-  //     1,
-  //     "images/merchdropwebsite2.png",
-  //     false,
-  //     () => {
-  //       window.localStorage.setItem("merchbannerclosed", "true");
-  //     }
-  //   );
-  // }
-  if (!window.localStorage.getItem("dasbannerclosed")) {
+  if (!window.localStorage.getItem("merchbannerclosed")) {
     Notifications.addBanner(
-      `Looking to buy a new keyboard? Check out <a target="_blank" href="https://www.monkeytype.com/das">DasKeyboard</a>. `,
+      `Checkout our merchandise, available at <a target="_blank" href="https://monkeytype.store/">monkeytype.store</a>`,
       1,
-      "images/dasbanner.png",
+      "images/merchdropwebsite2.png",
       false,
       () => {
-        window.localStorage.setItem("dasbannerclosed", "true");
+        window.localStorage.setItem("merchbannerclosed", "true");
       }
     );
   }
+  // if (!window.localStorage.getItem("dasbannerclosed")) {
+  //   Notifications.addBanner(
+  //     `Looking to buy a new keyboard? Check out <a target="_blank" href="https://www.monkeytype.com/das">DasKeyboard</a>. `,
+  //     1,
+  //     "images/dasbanner.png",
+  //     false,
+  //     () => {
+  //       window.localStorage.setItem("dasbannerclosed", "true");
+  //     }
+  //   );
+  // }
   $("#centerContent")
     .css("opacity", "0")
     .removeClass("hidden")
diff --git a/frontend/static/html/pages/about.html b/frontend/static/html/pages/about.html
index 3a8f7b8f9..5fd5643a5 100644
--- a/frontend/static/html/pages/about.html
+++ b/frontend/static/html/pages/about.html
@@ -98,7 +98,11 @@
       possible without you and your continued support.
     </p>
     <div class="supportButtons">
-      <a class="button ads">
+      <div class="button" id="supportMeAboutButton">
+        <div class="fas fa-donate"></div>
+        Support
+      </div>
+      <!-- <a class="button ads">
         <div class="fas fa-ad"></div>
         Ads
       </a>
@@ -128,15 +132,6 @@
       >
         <div class="fas fa-tshirt"></div>
         Merch
-      </a>
-      <!-- <a
-        class="button"
-        href="https://monkeytype.com/das"
-        target="_blank"
-        rel="noreferrer"
-      >
-        <div class="fas fa-keyboard"></div>
-        Keyboards
       </a> -->
     </div>
   </div>
diff --git a/frontend/static/html/popups.html b/frontend/static/html/popups.html
index b4e50fa40..e126ea90c 100644
--- a/frontend/static/html/popups.html
+++ b/frontend/static/html/popups.html
@@ -860,15 +860,15 @@
         <div class="icon"><i class="fas fa-tshirt"></i></div>
         <div class="text">Buy Merch</div>
       </a>
-      <!-- <a
+      <a
         class="button"
         href="https://monkeytype.com/das"
         target="_blank"
         rel="noreferrer"
       >
         <div class="icon"><i class="fas fa-keyboard"></i></div>
-        <div class="text">Buy a Keyboard</div>
-      </a> -->
+        <div class="text">Buy a DAS Keyboard</div>
+      </a>
     </div>
   </div>
 </div>