Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

canvas implementation #15

Merged
merged 17 commits into from
Oct 27, 2024
Merged

canvas implementation #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a6a8c78
se agregan routers, computadoras y servidores
Manuel-Pol Oct 5, 2024
577130e
se mueven los dispositivos
Manuel-Pol Oct 13, 2024
6670d1d
dragging function is more fluid
Manuel-Pol Oct 18, 2024
f2b22c3
fix: connections follows devices movements
Manuel-Pol Oct 19, 2024
2f9c969
refactor: device’s class and util’s files created
Manuel-Pol Oct 19, 2024
1cce65e
refactor
Manuel-Pol Oct 22, 2024
7242e44
refactor
Manuel-Pol Oct 22, 2024
408eebe
refactor: network graph and canvaManager added
Manuel-Pol Oct 22, 2024
3fa4ab4
fix: appears device’s nodes and connections, it works with screen’s d…
Manuel-Pol Oct 22, 2024
6817504
feat: styles
pgallino Oct 22, 2024
d8f07c9
fix: style configuration, resize handling, and edge connections
pgallino Oct 23, 2024
ec7b7b2
feat: add device-specific information display in rightbar
pgallino Oct 23, 2024
8193d81
feat: Add save/load logic and prevent connections from drawing over d…
pgallino Oct 23, 2024
9ccf433
Merge branch 'main' into canva-static-b
pgallino Oct 23, 2024
a88e652
fix: lint warnings
pgallino Oct 23, 2024
cc54381
chore: remove carriage returns
MegaRedHand Oct 26, 2024
1d292f9
chore: remove unused file
MegaRedHand Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eslint.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"pixi-viewport": "5.0.3",
"pixi-viewport": "^5.0.3",
"pixi.js": "8.4.1"
},
"name": "netsim",
Expand All @@ -19,7 +19,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": "echo \"Error: no test specified\" && exit 1",
Expand All @@ -31,4 +31,4 @@
"author": "",
"license": "ISC",
"description": ""
}
}
8 changes: 4 additions & 4 deletions src/assets/connection.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/pc.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 8 additions & 14 deletions src/assets/router.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/assets/server.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 18 additions & 5 deletions src/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading