Merge branch 'master' into feature/friends-leaderboard

Author: fehmer

.github/workflows/monkey-ci.yml

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

frontend/scripts/fontawesome.ts

@@ -99,7 +99,9 @@ export function getFontawesomeConfig(debug = false): FontawesomeConfig {
     (it) => !(solid.includes(it) || regular.includes(it) || brands.includes(it))
   );
   if (leftOvers.length !== 0) {
-    throw new Error("unknown icons: " + leftOvers.toString());
+    throw new Error(
+      "Fontawesome failed with unknown icons: " + leftOvers.toString()
+    );
   }
 
   if (debug) {

frontend/src/html/pages/account.html

@@ -685,10 +685,19 @@
         <thead>
           <tr>
             <td></td>
-            <td type="button" class="sortable history-wpm-header">wpm</td>
-            <td type="button" class="sortable history-raw-header">raw</td>
-            <td type="button" class="sortable history-acc-header">accuracy</td>
-            <td type="button" class="sortable history-consistency-header">
+            <td data-sort-property="wpm" data-sort-default-direction="desc">
+              wpm
+            </td>
+            <td data-sort-property="rawWpm" data-sort-default-direction="desc">
+              raw
+            </td>
+            <td data-sort-property="acc" data-sort-default-direction="desc">
+              accuracy
+            </td>
+            <td
+              data-sort-property="consistency"
+              data-sort-default-direction="desc"
+            >
               consistency
             </td>
             <td
@@ -701,9 +710,11 @@
             <!-- <td>punctuation</td> -->
             <td>info</td>
             <td>tags</td>
-            <td type="button" class="sortable history-date-header">
+            <td
+              data-sort-property="timestamp"
+              data-sort-default-direction="desc"
+            >
               date
-              <i class="fas fa-sort-down" aria-hidden="true"></i>
             </td>
           </tr>
         </thead>

frontend/src/styles/account.scss

@@ -440,18 +440,6 @@
     }
   }
 }
-
-.headerSorted {
-  font-weight: bold;
-}
-
-.sortable:hover {
-  cursor: pointer;
-  -webkit-user-select: none;
-  user-select: none;
-  background-color: var(--sub-alt-color);
-}
-
 .testActivity {
   // width: max-content;
   // justify-self: center;