[pull] master from monkeytypegame:master

.eslintignore

@@ -2,4 +2,5 @@ backend/dist
 backend/__migration__
 docker
 backend/scripts
+backend/private
 **/vitest.config.js

backend/private/index.html

@@ -55,6 +55,7 @@ <h1>API Server Configuration</h1>
       <span id="form-loader" class="loader"></span>
     </div>
     <div id="save">Save Changes</div>
+    <div id="export">Export Configuration</div>
     <script src="script.js"></script>
   </body>
 </html>

backend/private/script.js

@@ -281,4 +281,27 @@ window.onload = async () => {
       saveButton.disabled = false;
     }, 3000);
   });
+
+  const exportButton = document.querySelector("#export");
+
+  exportButton.addEventListener("click", async () => {
+    download(
+      "backend-configuration.json",
+      JSON.stringify({ configuration: state })
+    );
+  });
 };
+
+function download(filename, text) {
+  let element = document.createElement("a");
+  element.setAttribute(
+    "href",
+    "data:text/plain;charset=utf-8," + encodeURIComponent(text)
+  );
+  element.setAttribute("download", filename);
+
+  element.style.display = "none";
+  document.body.appendChild(element);
+  element.click();
+  document.body.removeChild(element);
+}

backend/private/style.css

@@ -74,7 +74,8 @@ body {
   background-color: #d84b4b;
 }
 
-#save {
+#save,
+#export {
   position: fixed;
   right: 6rem;
   bottom: 3rem;
@@ -90,7 +91,12 @@ body {
   transition: 0.125s;
 }
 
-#save:hover {
+#export {
+  bottom: 9rem;
+}
+
+#save:hover,
+#export:hover {
   background-color: var(--text-color);
   color: var(--bg-color);
 }

docker/backend/Dockerfile

@@ -29,6 +29,7 @@ COPY --from=builder /prod/backend/node_modules /app/backend/node_modules
 COPY --from=builder /prod/backend/dist /app/backend/dist
 COPY --from=builder /prod/backend/email-templates /app/backend/email-templates
 COPY --from=builder /prod/backend/redis-scripts /app/backend/redis-scripts
+COPY --from=builder /prod/backend/private /app/backend/private
 
 ## to build directory
 WORKDIR /app/backend/dist
@@ -38,7 +39,7 @@ RUN mkdir -p /app/backend/dist/logs
 
 COPY ["docker/backend/entry-point.sh", "docker/backend/applyConfig.sh", "./"]
 
-#run in env mode (no anticheat)
+#run in dev mode (no anticheat)
 ENV MODE=dev
 
 EXPOSE 5005

docs/SELF_HOSTING.md

@@ -168,8 +168,8 @@ If you don't want to update this file manually you can
 
 - open the backend url in your browser, e.g. `http://localhost:5005/configure/`
 - adjust the settings and click `Save Changes`
-- open the configuration in your browser, e.g. `http://localhost:5005/configuration`
-- copy everything from `data` into the `backend-configuration.json` file.
+- click `Export Configuration` 
+- save the file as `backend-configuration.json`, overwriting the existing one.
 
 Example output from `http://localhost:5005/configuration`:
 ```json

frontend/src/ts/event-handlers/test.ts

@@ -12,6 +12,8 @@ import * as QuoteReportModal from "../modals/quote-report";
 import * as QuoteSearchModal from "../modals/quote-search";
 import * as CustomTextModal from "../modals/custom-text";
 import * as PractiseWordsModal from "../modals/practise-words";
+import { navigate } from "../controllers/route-controller";
+import { getMode2 } from "../utils/misc";
 
 $(".pageTest").on("click", "#testModesNotice .textButton", async (event) => {
   const attr = $(event.currentTarget).attr("commands");
@@ -84,3 +86,12 @@ $(".pageTest").on("click", "#practiseWordsButton", () => {
   }
   PractiseWordsModal.show();
 });
+
+$(".pageTest #dailyLeaderboardRank").on("click", async () => {
+  navigate(
+    `/leaderboards?type=daily&language=${Config.language}&mode2=${getMode2(
+      Config,
+      null
+    )}`
+  );
+});

frontend/static/themes/_list.json

@@ -398,6 +398,13 @@
     "subColor": "#2aa198",
     "textColor": "#181819"
   },
+  {
+    "name": "solarized_osaka",
+    "bgColor": "#00141a",
+    "mainColor": "#859900",
+    "subColor": "#2aa198",
+    "textColor": "#b58900"
+  },
   {
     "name": "terra",
     "bgColor": "#0c100e",

frontend/static/themes/solarized_osaka.css

@@ -0,0 +1,56 @@
+:root {
+  --bg-color: #00141a;
+  --main-color: #859900;
+  --caret-color: #b58900;
+  --sub-color: #2aa198;
+  --sub-alt-color: #00222b;
+  --text-color: #eee8d5;
+  --error-color: #dc322f;
+  --error-extra-color: #9b225c;
+  --colorful-error-color: #d33682;
+  --colorful-error-extra-color: #9b225c;
+}
+
+#words {
+  --correct-letter-color: var(--text-color);
+  --untyped-letter-color: #586e75;
+}
+
+header #logo {
+  color: var(--text-color);
+}
+
+header #logo .icon {
+  color: var(--text-color) !important;
+}
+
+key {
+  color: var(--text-color);
+  background-color: var(--sub-alt-color);
+}
+
+button.text:hover,
+.button.text:hover,
+.textButton:hover {
+  color: var(--caret-color);
+}
+
+button.text.active,
+.button.text.active,
+.textButton.active {
+  color: var(--main-color);
+}
+
+button:hover,
+.button:hover,
+input[type="button"]:hover,
+input[type="reset"]:hover,
+input[type="submit"]:hover {
+  color: var(--bg-color);
+  background: var(--caret-color);
+}
+
+.scrollToTopButton:hover {
+  background: var(--caret-color);
+  color: var(--bg-color);
+}