Remove frontend proxying because we have CORS now

tnoodle-ui/package.json

@@ -3,7 +3,6 @@
     "version": "0.1.0",
     "private": true,
     "homepage": "http://localhost:2014/scramble",
-    "proxy": "http://localhost:2014",
     "dependencies": {
         "bootstrap": "^4.4.1",
         "fetch-intercept": "^2.3.1",

tnoodle-ui/src/main/api/tnoodle.api.js

@@ -1,5 +1,7 @@
-let baseUrl = window.location.origin;
-// let baseUrl = "http://localhost:2014";
+let backendUrl = new URL(window.location.origin);
+backendUrl.port = 2014;
+
+export const tNoodleBackend = backendUrl.toString();
 
 let zipEndpoint = "/wcif/zip";
 let versionEndpoint = "/version";
@@ -20,9 +22,7 @@ export const fetchZip = (scrambleClient, wcif, mbld, password, translations) =>
         payload.zipPassword = password;
     }
 
-    let targetMarker = wcif.id;
-
-    return scrambleClient.loadScrambles(zipEndpoint, payload, targetMarker)
+    return scrambleClient.loadScrambles(zipEndpoint, payload, wcif.id)
         .then((result) => convertToBlob(result))
         .catch((error) => console.error(error));
 };
@@ -35,13 +35,13 @@ const convertToBlob = async (result) => {
 };
 
 export const fetchWcaEvents = () => {
-    return fetch(baseUrl + wcaEventsEndpoint)
+    return fetch(tNoodleBackend + wcaEventsEndpoint)
         .then((response) => response.json())
         .catch((error) => console.error(error));
 };
 
 export const fetchFormats = () => {
-    return fetch(baseUrl + formatsEndpoint)
+    return fetch(tNoodleBackend + formatsEndpoint)
         .then((response) => response.json())
         .catch((error) => console.error(error));
 };
@@ -59,13 +59,13 @@ export const fetchBestMbldAttempt = (wcif) => {
 };
 
 export const fetchRunningVersion = () => {
-    return fetch(baseUrl + versionEndpoint)
+    return fetch(tNoodleBackend + versionEndpoint)
         .then((response) => response.json())
         .catch((error) => console.error(error));
 };
 
 export const fetchAvailableFmcTranslations = () => {
-    return fetch(baseUrl + fmcTranslationsEndpoint)
+    return fetch(tNoodleBackend + fmcTranslationsEndpoint)
         .then((response) => response.json())
         .catch((error) => console.error(error));
 };
@@ -86,7 +86,7 @@ const fmcTranslationsHelper = (translations) => {
 };
 
 const postToTnoodle = (endpoint, payload) =>
-    fetch(baseUrl + endpoint, {
+    fetch(tNoodleBackend + endpoint, {
         method: "POST",
         headers: {
             Accept: "application/json",

tnoodle-ui/src/main/api/tnoodle.socket.js

@@ -1,3 +1,5 @@
+import { tNoodleBackend } from "./tnoodle.api";
+
 export class ScrambleClient {
     constructor(onHandshake, onProgress) {
         this.onHandshake = onHandshake;
@@ -65,7 +67,10 @@ export class ScrambleClient {
     }
 }
 
-const BASE_URL = window.location.origin.replace(/^https?:\/\//,'ws://');
+let wsTNoodleBackend = new URL(tNoodleBackend);
+wsTNoodleBackend.protocol = "ws:";
+
+const BASE_URL = wsTNoodleBackend.toString();
 
 const SCRAMBLING_STATES = {
     IDLE: "IDLE",