build not working

DiamondLightSource · Oct 30, 2023 · f4e56b3 · f4e56b3
1 parent a29f257
commit f4e56b3
Show file tree

Hide file tree

Showing 7 changed files with 489 additions and 724 deletions.
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -33,3 +33,6 @@ jobs:
 
       - name: Unit Tests
         run: npm run test
+
+      - name: build
+        run: npm run build
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Dedi-web
 
 [![dedi-web code CI](https://github.com/tizayi/dedi-web/actions/workflows/code.yml/badge.svg)](https://github.com/tizayi/dedi-web/actions/workflows/code.yml)
-[![gh-pages](https://github.com/tizayi/dedi-web/actions/workflows/gh-pages.yml/badge.svg)](https://github.com/tizayi/dedi-web/actions/workflows/gh-pages.yml)
+[![gh-pages](https://github.com/tizayi/dedi-web/actions/workflows/deploy.yml/badge.svg)](https://github.com/tizayi/dedi-web/actions/workflows/deploy.yml)
 
 A client only Q-Range calculator. Based on dedi within dawn science. Built using react, typescript, mui, zustand, three.js, and h5web/lib.
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,9 +10,7 @@
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "preview": "vite preview --port 3000",
-    "test": "npx vitest",
-    "predeploy": "npm run build",
-    "deploy": "gh-pages -d build"
+    "test": "npx vitest"
   },
   "dependencies": {
     "@emotion/react": "^11.11.1",
@@ -40,7 +38,6 @@
     "eslint-plugin-react": "^7.33.1",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.3",
-    "gh-pages": "^6.0.0",
     "typescript": "^5.0.2",
     "vite": "^4.4.5",
     "vitest": "^0.34.1"

diff --git a/src/calculations/ray.ts b/src/calculations/ray.ts
@@ -53,8 +53,8 @@ export class Ray {
     const b =
       2 * coeffOfx2 * this.direction.x * this.initial_point.x +
       coeffOfxy *
-        (this.direction.x * this.initial_point.y +
-          this.direction.y * this.initial_point.x) +
+      (this.direction.x * this.initial_point.y +
+        this.direction.y * this.initial_point.x) +
       2 * coeffOfy2 * this.direction.y * this.initial_point.y +
       coeffOfx * this.direction.x +
       coeffOfy * this.direction.y;

diff --git a/src/plot/centrePlot.tsx b/src/plot/centrePlot.tsx
@@ -175,14 +175,14 @@ export default function CentrePlot(): JSX.Element {
                       ),
                       new Vector3(
                         (ajustedBeamstop.centre.x ?? 0) +
-                          ajustedBeamstop.diameter / 2,
+                        ajustedBeamstop.diameter / 2,
                         ajustedBeamstop.centre.y ?? 0,
                       ),
                       new Vector3(
                         ajustedBeamstop.centre.x ?? 0,
                         (ajustedBeamstop.centre.y ?? 0) +
-                          ajustedBeamstop.diameter / 2 +
-                          (ajustedBeamstop.clearance ?? 0),
+                        ajustedBeamstop.diameter / 2 +
+                        (ajustedBeamstop.clearance ?? 0),
                       ),
                       new Vector3(
                         ajustedCameraTube.centre.x ?? 0,
@@ -191,7 +191,7 @@ export default function CentrePlot(): JSX.Element {
                       new Vector3(
                         ajustedCameraTube.centre.x ?? 0,
                         (ajustedCameraTube.centre.y ?? 0) +
-                          ajustedCameraTube.diameter / 2,
+                        ajustedCameraTube.diameter / 2,
                       ),
                       new Vector3(0, 0),
                       new Vector3(
@@ -200,8 +200,8 @@ export default function CentrePlot(): JSX.Element {
                       ),
                       new Vector3(ajustedPoints.ptMin.x, ajustedPoints.ptMin.y),
                       new Vector3(ajustedPoints.ptMax.x, ajustedPoints.ptMax.y),
-                      requestedMin,
-                      requestedMax,
+                      new Vector3(requestedMin.x, requestedMin.y),
+                      new Vector3(requestedMax.x, requestedMax.y)
                     ]}
                   >
                     {(
@@ -214,8 +214,8 @@ export default function CentrePlot(): JSX.Element {
                       detectorUpper: Vector3,
                       minQRange: Vector3,
                       maxQRange: Vector3,
-                      requestedMin: Vector2,
-                      requestedMax: Vector2,
+                      requestedMin: Vector3,
+                      requestedMax: Vector3,
                     ) => (
                       <SvgElement>
                         {plotConfig.cameraTube && (

diff --git a/src/results/resultsBar.tsx b/src/results/resultsBar.tsx
@@ -209,7 +209,7 @@ export default function ResultsBar(props: {
                           </FormControl>
                         </TableCell>
                       </TableRow>
-                      <TableRow key={"things"}>
+                      <TableRow key={"s"}>
                         <TableCell component="th" scope="row">
                           {ScatteringOptions.s}
                         </TableCell>
@@ -242,7 +242,7 @@ export default function ResultsBar(props: {
                           </FormControl>
                         </TableCell>
                       </TableRow>
-                      <TableRow key={"things"}>
+                      <TableRow key={"d"}>
                         <TableCell component="th" scope="row">
                           {ScatteringOptions.d}
                         </TableCell>