[pull] master from monkeytypegame:master

.github/workflows/monkey-ci.yml

@@ -49,7 +49,7 @@ jobs:
               - 'backend/package.json'
             fe-src:
               - 'frontend/**/*.{ts,scss,html}'
-              - 'frontend/package.json'
+              - 'frontend/**/package.json'
             pkg-src:
               - 'packages/**/*'
             anti-cheat:

frontend/__tests__/test/events/stats.spec.ts

@@ -13,6 +13,7 @@ vi.mock("../../../src/ts/test/test-state", () => ({
 
 vi.mock("../../../src/ts/config/store", () => ({
   Config: { mode: "words", funbox: [] as string[] },
+  getConfig: {},
 }));
 
 vi.mock("../../../src/ts/test/test-words", () => {

frontend/src/html/pages/account-settings.html

@@ -246,25 +246,7 @@
           </div>
         </div>
         <div class="tab hidden" data-tab="blockedUsers">
-          <div class="section blockedUsers">
-            <div class="title">
-              <i class="fas fa-user-shield"></i>
-              <span>blocked users</span>
-            </div>
-            <div class="text">
-              Blocked users cannot send you friend requests.
-            </div>
-          </div>
-          <table>
-            <thead>
-              <tr>
-                <td>name</td>
-                <td>blocked on</td>
-                <td></td>
-              </tr>
-            </thead>
-            <tbody></tbody>
-          </table>
+          <mount data-component="blockedusers" />
         </div>
         <div class="tab hidden" data-tab="dangerZone">
           <div class="section resetAccount">

frontend/src/index.html

@@ -58,7 +58,11 @@
         <load src="html/pages/test.html" />
         <load src="html/pages/404.html" />
         <load src="html/pages/account-settings.html" />
-        <load src="html/pages/friends.html" />
+
+        <div class="page pageFriends hidden" id="pageFriends">
+          <mount data-component="friendspage"></mount>
+        </div>
+
         <div class="page pageLeaderboards hidden" id="pageLeaderboards">
           <mount data-component="leaderboardpage"></mount>
         </div>

frontend/src/styles/account-settings.scss

@@ -116,8 +116,7 @@
             }
           }
         }
-        &[data-tab="apeKeys"],
-        &[data-tab="blockedUsers"] {
+        &[data-tab="apeKeys"] {
           table {
             width: 100%;
             border-spacing: 0;
@@ -186,15 +185,6 @@
             text-align: center;
           }
         }
-        &[data-tab="blockedUsers"] {
-          tr td:first-child a {
-            text-decoration: none;
-            color: var(--text-color);
-          }
-          tr td:last-child {
-            text-align: right;
-          }
-        }
       }
     }
     // .right {

frontend/src/styles/index.scss

@@ -18,7 +18,7 @@
 @layer custom-styles {
   @import "buttons", "404", "ads", "test-activity", "animations", "caret",
     "commandline", "core", "fonts", "inputs", "keymap", "monkey", "popups",
-    "scroll", "account-settings", "test", "loading", "friends", "media-queries";
+    "scroll", "account-settings", "test", "loading", "media-queries";
 
   .chartCanvas {
     width: 100% !important;

frontend/src/styles/media-queries-blue.scss

@@ -35,7 +35,6 @@
       }
     }
   }
-
   .pageAccountSettings {
     .main {
       grid-template-columns: 1fr;
@@ -51,13 +50,6 @@
       }
     }
   }
-
-  .pageFriends {
-    .content .friends table,
-    .content .pendingRequests table {
-      font-size: 0.75rem;
-    }
-  }
 }
 @media (pointer: coarse) and (max-width: 778px) {
   #restartTestButton {