Merge branch 'main' into ip-icmp-packets

MegaRedHand · Oct 27, 2024 · 855db97 · 855db97
2 parents 378e679 + a1855b3
commit 855db97
Show file tree

Hide file tree

Showing 16 changed files with 1,010 additions and 329 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -1,6 +1,6 @@
 // @ts-check
 
-// @ts-ignore
+// @ts-expect-error: Import necessary for compatibility with eslint config
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "pixi-viewport": "5.0.3",
+    "pixi-viewport": "^5.0.3",
     "pixi.js": "8.4.1"
   },
   "name": "netsim",
@@ -22,7 +22,7 @@
     "typescript-eslint": "^8.8.1",
     "webpack": "5.94.0",
     "webpack-cli": "5.1.4",
-    "webpack-dev-server": "5.1.0"
+    "webpack-dev-server": "^5.1.0"
   },
   "scripts": {
     "test": "jest",

diff --git a/src/assets/connection.svg b/src/assets/connection.svg
diff --git a/src/assets/pc.svg b/src/assets/pc.svg
diff --git a/src/assets/router.svg b/src/assets/router.svg
diff --git a/src/assets/server.svg b/src/assets/server.svg
diff --git a/src/index.ejs b/src/index.ejs
@@ -9,14 +9,27 @@
 
 <body>
     <div id="top-bar">
-        <button id="open-file-button">Open file</button>
+        <button id="save-button" class="save-button" title="Save">Save</button>
+        <button id="load-button" class="load-button" title="Load">Load</button>
+        <div id="app-title">GEduNet</div>
     </div>
     <div id="bottom-screen" class="row container">
-        <div id="left-bar" class="sidebar"></div>
-        <div class="center-bar">
-            <canvas id="canvas"> </canvas>
+        <div id="left-bar" class="left-bar"></div>
+        <div class="canvas-container">
+            <canvas id="canvas"></canvas>
+            <select id="layer-select" class="dropdown-menu">
+                <option value="application">Capa de Aplicación</option>
+                <option value="transport">Capa de Transporte</option>
+                <option value="network">Capa de Red</option>
+                <option value="link">Capa de Enlace</option>
+            </select>
+        </div>
+        <div id="right-bar" class="right-bar"> 
+            <h2>Información</h2>
+            <div id="info-content">
+                <!-- Información dinámica sobre el conejo y los routers se mostrará aquí -->
+            </div>
         </div>
-        <div id="right-bar" class="sidebar"></div>
     </div>
 </body>