Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions frontend/__tests__/test/events/stats.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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", () => {
Expand Down
20 changes: 1 addition & 19 deletions frontend/src/html/pages/account-settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
82 changes: 0 additions & 82 deletions frontend/src/html/pages/friends.html

This file was deleted.

6 changes: 5 additions & 1 deletion frontend/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 1 addition & 11 deletions frontend/src/styles/account-settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@
}
}
}
&[data-tab="apeKeys"],
&[data-tab="blockedUsers"] {
&[data-tab="apeKeys"] {
table {
width: 100%;
border-spacing: 0;
Expand Down Expand Up @@ -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 {
Expand Down
143 changes: 0 additions & 143 deletions frontend/src/styles/friends.scss

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/src/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions frontend/src/styles/media-queries-blue.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
}
}
}

.pageAccountSettings {
.main {
grid-template-columns: 1fr;
Expand All @@ -51,13 +50,6 @@
}
}
}

.pageFriends {
.content .friends table,
.content .pendingRequests table {
font-size: 0.75rem;
}
}
}
@media (pointer: coarse) and (max-width: 778px) {
#restartTestButton {
Expand Down
21 changes: 0 additions & 21 deletions frontend/src/styles/media-queries-brown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,4 @@
.testActivity {
display: none;
}
.pageFriends {
.content .friends table {
td:nth-child(3) {
display: none;
}
}
.content .pendingRequests table {
td:nth-child(2) {
display: none;
}
}
}

.pageAccountSettings [data-tab="blockedUsers"] {
table {
font-size: 0.75rem;
td:nth-child(2) {
display: none;
}
}
}
}
10 changes: 0 additions & 10 deletions frontend/src/styles/media-queries-green.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,4 @@
// border-radius: 0.2em;
// }
}

.pageFriends {
.content .friends table {
td:nth-child(4),
td:nth-child(7),
td:nth-child(8) {
display: none;
}
}
}
}
15 changes: 0 additions & 15 deletions frontend/src/styles/media-queries-purple.scss
Original file line number Diff line number Diff line change
Expand Up @@ -92,19 +92,4 @@
.modalWrapper .modal .inputs.withLabel {
grid-template-columns: 1fr;
}

.pageFriends {
.content .friends table {
td:nth-child(5),
td:nth-child(6) {
display: none;
}
}
}

.pageAccountSettings [data-tab="blockedUsers"] {
table {
font-size: 0.75rem;
}
}
}
Loading
Loading