refactor: merge PC and Server into Host

src/graphics/renderables/device_info.ts

@@ -74,10 +74,8 @@ function getTypeName(device: Device): string {
   switch (device.getType()) {
     case DeviceType.Router:
       return "Router";
-    case DeviceType.Server:
-      return "Server";
-    case DeviceType.Pc:
-      return "PC";
+    case DeviceType.Host:
+      return "Host";
   }
 }
 

src/index.ts

@@ -18,7 +18,6 @@ import { GlobalContext } from "./context";
 // Doing this includes the file in the build
 import "./style.css";
 import RouterSvg from "./assets/router.svg";
-import ServerSvg from "./assets/server.svg";
 import ComputerSvg from "./assets/pc.svg";
 import PlaySvg from "./assets/play-icon.svg";
 import PauseSvg from "./assets/pause-icon.svg";
@@ -37,7 +36,6 @@ import PauseSvg from "./assets/pause-icon.svg";
   const canvasPlaceholder = document.getElementById("canvas");
   canvasPlaceholder.replaceWith(app.canvas);
   await Assets.load(RouterSvg);
-  await Assets.load(ServerSvg);
   await Assets.load(ComputerSvg);
 
   // Context initialization
@@ -58,16 +56,13 @@ import PauseSvg from "./assets/pause-icon.svg";
     "Add Router",
   );
 
-  // Add server button
+  // Add Host button
   leftBar.addButton(
-    ServerSvg,
-    () => AddDevice(ctx, DeviceType.Server),
-    "Add Server",
+    ComputerSvg,
+    () => AddDevice(ctx, DeviceType.Host),
+    "Add Host",
   );
 
-  // Add PC button
-  leftBar.addButton(ComputerSvg, () => AddDevice(ctx, DeviceType.Pc), "Add PC");
-
   ctx.initialize(viewport);
 
   // Ticker logic

src/types/devices/device.ts

@@ -28,8 +28,7 @@ export enum Layer {
 
 export enum DeviceType {
   Router = 0,
-  Server = 1,
-  Pc = 2,
+  Host = 1,
 }
 
 export abstract class Device extends Sprite {

src/types/devices/pc.ts → src/types/devices/host.ts

@@ -3,7 +3,7 @@ import { ViewGraph } from "../graphs/viewgraph";
 import PcImage from "../../assets/pc.svg";
 import { Position } from "../common";
 
-export class Pc extends Device {
+export class Host extends Device {
   constructor(id: number, viewgraph: ViewGraph, position: Position) {
     super(id, PcImage, viewgraph, position);
   }
@@ -13,6 +13,6 @@ export class Pc extends Device {
   }
 
   getType(): DeviceType {
-    return DeviceType.Pc;
+    return DeviceType.Host;
   }
 }

src/types/devices/index.ts

@@ -2,6 +2,5 @@
 
 export { Device } from "./device";
 export { Router } from "./router";
-export { Server } from "./server";
-export { Pc } from "./pc";
+export { Host } from "./host";
 export { createDevice } from "./utils";

src/types/devices/utils.ts

@@ -1,8 +1,7 @@
 import { ViewGraph } from "../graphs/viewgraph";
 import { Device, DeviceType, Layer } from "./device";
-import { Pc } from "./pc";
+import { Host } from "./host";
 import { Router } from "./router";
-import { Server } from "./server";
 
 export interface CreateDevice {
   id: number;
@@ -21,10 +20,8 @@ export function createDevice(
   switch (deviceInfo.type) {
     case DeviceType.Router:
       return new Router(deviceInfo.id, viewgraph, position);
-    case DeviceType.Server:
-      return new Server(deviceInfo.id, viewgraph, position);
-    case DeviceType.Pc:
-      return new Pc(deviceInfo.id, viewgraph, position);
+    case DeviceType.Host:
+      return new Host(deviceInfo.id, viewgraph, position);
   }
 }
 

src/types/graphs/datagraph.ts

@@ -54,7 +54,7 @@ export class DataGraph {
         id: id,
         x: info.x,
         y: info.y,
-        type: info.type, // Save the device type (Router, Server, PC)
+        type: info.type, // Save the device type (Router, Host)
         connections: Array.from(info.connections.values()),
       });
     });