address merge conflicts

frontend/public/index.html

@@ -7,7 +7,7 @@
 		<meta name="theme-color" content="#000000" />
 		<meta
 			name="description"
-			content="Web site created using create-react-app"
+			content="Create surface codes"
 		/>
 		<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
 		<!--

frontend/public/manifest.json

@@ -1,21 +1,21 @@
 {
-	"short_name": "TQEC Visualizer",
-	"name": "Create TQEC Visualizer App",
+	"short_name": "TQEC",
+	"name": "TQEC Visualizer",
 	"icons": [
 		{
 			"src": "favicon.ico",
-			"sizes": "64x64 32x32 24x24 16x16",
-			"type": "image/x-icon"
+			"type": "image/x-icon",
+			"sizes": "64x64 32x32 24x24 16x16"
 		},
 		{
-			"src": "logo192.png",
+			"src": "favicon-32x32.png",
 			"type": "image/png",
-			"sizes": "192x192"
+			"sizes": "32x32"
 		},
 		{
-			"src": "logo512.png",
+			"src": "favicon-16x16.png",
 			"type": "image/png",
-			"sizes": "512x512"
+			"sizes": "16x16"
 		}
 	],
 	"start_url": ".",

frontend/src/components/download/DownloadButton.js

@@ -4,8 +4,6 @@ import Template from '../../plaquettes/Template';
 import config from './config';
 import notification from '../notification';
 
-const assert = require('assert');
-
 export default class DownloadButton extends Button {
   constructor(
     workspace,
@@ -44,16 +42,12 @@ export default class DownloadButton extends Button {
             .toSorted((a, b) => a.globalX - b.globalX) // leftmost qubits
             .toSorted((a, b) => a.globalY - b.globalY)[0]; // topmost qubit
           plaquette.qubits.forEach((qubit) => {
-            assert(
-              qubit.qubitType === 'data' || qubit.qubitType === 'syndrome',
-              "Qubit type must be either 'data' or 'syndrome'",
-            );
             marshalledPlaquette.qubits.push({
               x:
                 (originQubit.globalX - qubit.globalX) / this.workspace.gridSize,
               y:
                 (originQubit.globalY - qubit.globalY) / this.workspace.gridSize,
-              qubitType: qubit.qubitType,
+              qubitType: qubit.label,
             });
           });
           payload.plaquettes.push(marshalledPlaquette);

frontend/src/graphics/Grid.js

@@ -59,7 +59,6 @@ export default class Grid extends Graphics {
   contains = (qubits) => {
     const minX = Math.min(...this.visibleUnits().map((unit) => unit.x));
     const minY = Math.min(...this.visibleUnits().map((unit) => unit.y));
-    console.log('Min x, min y', minX, minY);
     const unitXs = new Set(this.visibleUnits().map((unit) => [unit.x, unit.x + this.gridSize]).flat());
     const unitYs = new Set(this.visibleUnits().map((unit) => [unit.y, unit.y + this.gridSize]).flat());
     for (const qubit of qubits) {

frontend/src/graphics/GridUnit.js

@@ -50,7 +50,6 @@ export default class GridUnit extends Graphics {
     }
     // Check whether the click was within the bounds of the grid unit
     if (relativeX === this.x && relativeY === this.y) {
-      console.log('Toggling visibility of ', this.name);
       this.visible = !this.visible;
     }
   };