From 7065e87c0218a6fe3a23f515fe26ce2e61fb0dbf Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Tue, 17 Jun 2025 19:18:30 -0700
Subject: [PATCH] Fix gutter ads, move in-game add to bottom right corner.
 (#1214)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the in-game add to underneath the control panel, ensure both are
320px.

Remove black squares on home page when user has ad blocker

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors
regression is found:
openfront

<img width="420" alt="Screenshot 2025-06-17 at 7 13 51 PM"
src="https://github.com/user-attachments/assets/2177e0b3-de1b-4196-afd7-2ceca412e9fe"
/>
---
 src/client/GutterAdModal.ts                | 22 ++++++----------------
 src/client/graphics/layers/ControlPanel.ts |  2 +-
 src/client/graphics/layers/LeftInGameAd.ts |  2 +-
 src/client/index.html                      | 11 +++++++----
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/client/GutterAdModal.ts b/src/client/GutterAdModal.ts
index bbeedaf5f..2fcaf0c9b 100644
--- a/src/client/GutterAdModal.ts
+++ b/src/client/GutterAdModal.ts
@@ -57,6 +57,7 @@ export class GutterAdModal extends LitElement {
 
     if (!window.ramp) {
       console.warn("Playwire RAMP not available");
+      this.hide();
       return;
     }
 
@@ -82,6 +83,7 @@ export class GutterAdModal extends LitElement {
       });
     } catch (error) {
       console.error("Failed to load Playwire ads:", error);
+      this.hide();
     }
   }
 
@@ -109,36 +111,24 @@ export class GutterAdModal extends LitElement {
     return html`
       <!-- Left Gutter Ad -->
       <div
-        class="hidden xl:flex fixed left-0 top-1/2 transform -translate-y-1/2 w-[160px] min-h-[600px] bg-gray-900 border border-gray-600 z-[9999] pointer-events-auto items-center justify-center shadow-lg"
+        class="hidden xl:flex fixed left-0 top-1/2 transform -translate-y-1/2 w-[160px] min-h-[600px] z-[10] pointer-events-auto items-center justify-center"
         style="margin-left: ${this.margin};"
       >
         <div
           id="${this.leftContainerId}"
           class="w-full h-full flex items-center justify-center p-2"
-        >
-          ${!this.adLoaded
-            ? html`<span class="text-white text-xs text-center"
-                >Loading ad...</span
-              >`
-            : ""}
-        </div>
+        ></div>
       </div>
 
       <!-- Right Gutter Ad -->
       <div
-        class="hidden xl:flex fixed right-0 top-1/2 transform -translate-y-1/2 w-[160px] min-h-[600px] bg-gray-900 border border-gray-600 z-[9999] pointer-events-auto items-center justify-center shadow-lg"
+        class="hidden xl:flex fixed right-0 top-1/2 transform -translate-y-1/2 w-[160px] min-h-[600px] z-[10] pointer-events-auto items-center justify-center"
         style="margin-right: ${this.margin};"
       >
         <div
           id="${this.rightContainerId}"
           class="w-full h-full flex items-center justify-center p-2"
-        >
-          ${!this.adLoaded
-            ? html`<span class="text-white text-xs text-center"
-                >Loading ad...</span
-              >`
-            : ""}
-        </div>
+        ></div>
       </div>
     `;
   }
diff --git a/src/client/graphics/layers/ControlPanel.ts b/src/client/graphics/layers/ControlPanel.ts
index e3aafaa0b..142b358d0 100644
--- a/src/client/graphics/layers/ControlPanel.ts
+++ b/src/client/graphics/layers/ControlPanel.ts
@@ -206,7 +206,7 @@ export class ControlPanel extends LitElement implements Layer {
       </style>
       <div
         class="${this._isVisible
-          ? "w-full text-sm lg:text-m lg:w-72 bg-gray-800/70 p-2 pr-3 lg:p-4 shadow-lg lg:rounded-lg backdrop-blur"
+          ? "w-[320px] text-sm lg:text-m bg-gray-800/70 p-2 pr-3 lg:p-4 shadow-lg lg:rounded-lg backdrop-blur"
           : "hidden"}"
         @contextmenu=${(e) => e.preventDefault()}
       >
diff --git a/src/client/graphics/layers/LeftInGameAd.ts b/src/client/graphics/layers/LeftInGameAd.ts
index 2231c8941..75822ae0b 100644
--- a/src/client/graphics/layers/LeftInGameAd.ts
+++ b/src/client/graphics/layers/LeftInGameAd.ts
@@ -118,7 +118,7 @@ export class LeftInGameAd extends LitElement implements Layer {
 
     return html`
       <div
-        class="w-full min-h-[100px] bg-gray-900 border border-gray-600 z-[9999] pointer-events-auto flex items-center justify-center"
+        class="w-[320px] min-h-[100px] bg-gray-900 border border-gray-600 flex items-center justify-center"
       >
         <div
           id="${AD_CONTAINER_ID}"
diff --git a/src/client/index.html b/src/client/index.html
index 0da61da52..7543a1e85 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -269,15 +269,18 @@
       style="position: fixed; pointer-events: none"
     >
       <div
-        class="w-full sm:w-2/3 sm:fixed sm:right-0 sm:bottom-0 sm:flex justify-end"
+        class="w-full sm:w-2/3 sm:fixed sm:right-0 sm:bottom-0 sm:flex flex-col items-end"
         style="pointer-events: none"
       >
         <chat-display></chat-display>
         <events-display></events-display>
       </div>
-      <div class="w-full sm:w-1/3 md:max-w-72" style="pointer-events: auto">
-        <left-in-game-ad></left-in-game-ad>
+      <div
+        class="w-[320px] flex flex-col items-center"
+        style="pointer-events: auto"
+      >
         <control-panel></control-panel>
+        <left-in-game-ad></left-in-game-ad>
       </div>
     </div>
 
@@ -354,7 +357,7 @@
     <user-setting></user-setting>
     <multi-tab-modal></multi-tab-modal>
     <news-modal></news-modal>
-    <left-in-game-ad></left-in-game-ad>
+    <game-left-sidebar></game-left-sidebar>
     <div
       id="language-modal"
       class="fixed inset-0 bg-black bg-opacity-50 z-50 hidden flex justify-center items-center"