Merge branch 'main' of https://github.com/LukeGus/Termix

.idea/workspace.xml

@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b4334dc3-7c1b-4d3b-8e6f-0aa81272fbd4" name="Changes" comment="Fix stupid error (forgot to change websocket to wsUrl)" />
+    <list default="true" id="8497df64-d86b-4c98-ac58-c157d9d3fb1e" name="Changes" comment="Fix web-socket timeout." />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -21,12 +21,12 @@
   <component name="GitHubPullRequestSearchHistory">{
   &quot;lastFilter&quot;: {}
 }</component>
-  <component name="GithubPullRequestsUISettings">{
+  <component name="GithubPullRequestsUISettings"><![CDATA[{
-  &quot;selectedUrlAndAccountId&quot;: {
+  "selectedUrlAndAccountId": {
-    &quot;url&quot;: &quot;https://github.com/LukeGus/Termix&quot;,
+    "url": "https://github.com/LukeGus/Termix",
-    &quot;accountId&quot;: &quot;f107d505-1915-4c73-a3f4-e0440737e1dc&quot;
+    "accountId": "f107d505-1915-4c73-a3f4-e0440737e1dc"
   }
-}</component>
+}]]></component>
   <component name="ProjectColorInfo">{
   &quot;customColor&quot;: &quot;636378de&quot;,
   &quot;associatedIndex&quot;: 8
@@ -39,32 +39,32 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
+  <component name="PropertiesComponent"><![CDATA[{
-  &quot;keyToString&quot;: {
+  "keyToString": {
-    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    "RunOnceActivity.ShowReadmeOnStart": "true",
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
+    "RunOnceActivity.git.unshallow": "true",
-    &quot;Shell Script.Node Server.js Start.executor&quot;: &quot;Run&quot;,
+    "Shell Script.Node Server.js Start.executor": "Run",
-    &quot;Shell Script.Run backend and frontend.executor&quot;: &quot;Run&quot;,
+    "Shell Script.Run backend and frontend.executor": "Run",
-    &quot;Shell Script.run_backend_frontend.executor&quot;: &quot;Run&quot;,
+    "Shell Script.run_backend_frontend.executor": "Run",
-    &quot;git-widget-placeholder&quot;: &quot;release-1.0&quot;,
+    "git-widget-placeholder": "release-1.0",
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    "ignore.virus.scanning.warn.message": "true",
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/Luke/Documents/Personal Projects/Termix/frontend&quot;,
+    "last_opened_file_path": "C:/Users/Luke/Documents/Personal Projects/Termix/frontend",
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.eslint": "true",
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    "node.js.detected.package.tslint": "true",
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.eslint": "(autodetect)",
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    "node.js.selected.package.tslint": "(autodetect)",
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    "nodejs_package_manager_path": "npm",
-    &quot;npm.run_start.executor&quot;: &quot;Run&quot;,
+    "npm.run_start.executor": "Run",
-    &quot;npm.run_start_frontend.executor&quot;: &quot;Run&quot;,
+    "npm.run_start_frontend.executor": "Run",
-    &quot;npm.run_start_node_backend.executor&quot;: &quot;Run&quot;,
+    "npm.run_start_node_backend.executor": "Run",
-    &quot;npm.run_start_vite.executor&quot;: &quot;Run&quot;,
+    "npm.run_start_vite.executor": "Run",
-    &quot;npm.start.executor&quot;: &quot;Run&quot;,
+    "npm.start.executor": "Run",
-    &quot;settings.editor.selected.configurable&quot;: &quot;ml.llm.LLMConfigurable&quot;,
+    "settings.editor.selected.configurable": "ml.llm.LLMConfigurable",
-    &quot;ts.external.directory.path&quot;: &quot;D:\\Program Files (x86)\\Applications\\Jetbrains Webstorm\\WebStorm 2024.3.1\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external&quot;,
+    "ts.external.directory.path": "D:\\Program Files (x86)\\Applications\\Jetbrains Webstorm\\WebStorm 2024.3.1\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external",
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\Luke\Documents\Personal Projects\Termix\frontend" />
@@ -133,8 +133,7 @@
       <workItem from="1733804654516" duration="339000" />
       <workItem from="1733805003742" duration="9000" />
       <workItem from="1733883751079" duration="757000" />
-      <workItem from="1733884522510" duration="3958000" />
+      <workItem from="1733884522510" duration="2933000" />
-      <workItem from="1734052874393" duration="34000" />
     </task>
     <task id="LOCAL-00001" summary="Nano zoom fix #11">
       <option name="closed" value="true" />
@@ -408,15 +407,7 @@
       <option name="project" value="LOCAL" />
       <updated>1733887722496</updated>
     </task>
-    <task id="LOCAL-00035" summary="Fix timeout on close.">
+    <option name="localTasksCounter" value="35" />
-      <option name="closed" value="true" />
-      <created>1733887980750</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1733887980750</updated>
-    </task>
-    <option name="localTasksCounter" value="36" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -434,6 +425,7 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <MESSAGE value="Full return back to old code with minor fixes" />
     <MESSAGE value="Terminal size fix #18 (rows &amp; cols fix)" />
     <MESSAGE value="Test ntfy build notification system" />
     <MESSAGE value="Silent resize cmds &amp; Auto resize terminal #1" />
@@ -458,7 +450,6 @@
     <MESSAGE value="Update name (need to fix logo)" />
     <MESSAGE value="Final updates (I hope for real this time)" />
     <MESSAGE value="Fix web-socket timeout." />
-    <MESSAGE value="Fix timeout on close." />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix web-socket timeout." />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix timeout on close." />
   </component>
 </project>

frontend/src/App.jsx

@@ -82,7 +82,7 @@ const App = () => {
       return;
     }
 
-    socket.current = new WebSocket(wsUrl);
+    socket.current = new WebSocket("ws://localhost:8081");
 
     socket.current.onopen = () => {
       terminal.current.writeln(`Connected to WebSocket server at ${wsUrl}`);