Rearranged main components (eff03bfa) · Commits · OpenFlexure / openflexure-microscope-server

openflexure_microscope/api/static/package-lock.json

+98 −98

Original line number	Diff line number	Diff line
		@@ -2828,6 +2828,16 @@
		"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
		"dev": true
		},
		"ansi-styles": {
		"version": "4.3.0",
		"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
		"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
		"dev": true,
		"optional": true,
		"requires": {
		"color-convert": "^2.0.1"
		}
		},
		"browserslist": {
		"version": "4.14.3",
		"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz",
		@@ -2872,12 +2882,36 @@
		"integrity": "sha512-ziNcheTGTHlu9g34EVoHQdIu5g4foc8EsxMGC7Xkokmvw0dqNtX8BS8RgCgFBaAiSp2IdjvBxNdh0ssib28eVQ==",
		"dev": true
		},
		"color-convert": {
		"version": "2.0.1",
		"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
		"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
		"dev": true,
		"optional": true,
		"requires": {
		"color-name": "~1.1.4"
		}
		},
		"color-name": {
		"version": "1.1.4",
		"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
		"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
		"dev": true,
		"optional": true
		},
		"electron-to-chromium": {
		"version": "1.3.570",
		"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz",
		"integrity": "sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==",
		"dev": true
		},
		"emojis-list": {
		"version": "3.0.0",
		"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
		"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
		"dev": true,
		"optional": true
		},
		"fast-deep-equal": {
		"version": "3.1.3",
		"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
		@@ -2911,6 +2945,35 @@
		"integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
		"dev": true
		},
		"has-flag": {
		"version": "4.0.0",
		"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
		"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
		"dev": true,
		"optional": true
		},
		"json5": {
		"version": "2.1.3",
		"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
		"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
		"dev": true,
		"optional": true,
		"requires": {
		"minimist": "^1.2.5"
		}
		},
		"loader-utils": {
		"version": "2.0.0",
		"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
		"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
		"dev": true,
		"optional": true,
		"requires": {
		"big.js": "^5.2.2",
		"emojis-list": "^3.0.0",
		"json5": "^2.1.2"
		}
		},
		"locate-path": {
		"version": "5.0.0",
		"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
		@@ -3053,6 +3116,16 @@
		"ansi-regex": "^5.0.0"
		}
		},
		"supports-color": {
		"version": "7.2.0",
		"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
		"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
		"dev": true,
		"optional": true,
		"requires": {
		"has-flag": "^4.0.0"
		}
		},
		"terser-webpack-plugin": {
		"version": "2.3.8",
		"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz",
		@@ -3079,6 +3152,31 @@
		"psl": "^1.1.28",
		"punycode": "^2.1.1"
		}
		},
		"vue-loader-v16": {
		"version": "npm:vue-loader@16.0.0-beta.8",
		"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz",
		"integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==",
		"dev": true,
		"optional": true,
		"requires": {
		"chalk": "^4.1.0",
		"hash-sum": "^2.0.0",
		"loader-utils": "^2.0.0"
		},
		"dependencies": {
		"chalk": {
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
		"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
		"dev": true,
		"optional": true,
		"requires": {
		"ansi-styles": "^4.1.0",
		"supports-color": "^7.1.0"
		}
		}
		}
		}
		}
		},
		@@ -13291,104 +13389,6 @@
		}
		}
		},
		"vue-loader-v16": {
		"version": "npm:vue-loader@16.0.0-beta.8",
		"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.0.0-beta.8.tgz",
		"integrity": "sha512-oouKUQWWHbSihqSD7mhymGPX1OQ4hedzAHyvm8RdyHh6m3oIvoRF+NM45i/bhNOlo8jCnuJhaSUf/6oDjv978g==",
		"dev": true,
		"optional": true,
		"requires": {
		"chalk": "^4.1.0",
		"hash-sum": "^2.0.0",
		"loader-utils": "^2.0.0"
		},
		"dependencies": {
		"ansi-styles": {
		"version": "4.3.0",
		"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
		"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
		"dev": true,
		"optional": true,
		"requires": {
		"color-convert": "^2.0.1"
		}
		},
		"chalk": {
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
		"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
		"dev": true,
		"optional": true,
		"requires": {
		"ansi-styles": "^4.1.0",
		"supports-color": "^7.1.0"
		}
		},
		"color-convert": {
		"version": "2.0.1",
		"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
		"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
		"dev": true,
		"optional": true,
		"requires": {
		"color-name": "~1.1.4"
		}
		},
		"color-name": {
		"version": "1.1.4",
		"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
		"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
		"dev": true,
		"optional": true
		},
		"emojis-list": {
		"version": "3.0.0",
		"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
		"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
		"dev": true,
		"optional": true
		},
		"has-flag": {
		"version": "4.0.0",
		"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
		"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
		"dev": true,
		"optional": true
		},
		"json5": {
		"version": "2.1.3",
		"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
		"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
		"dev": true,
		"optional": true,
		"requires": {
		"minimist": "^1.2.5"
		}
		},
		"loader-utils": {
		"version": "2.0.0",
		"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
		"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
		"dev": true,
		"optional": true,
		"requires": {
		"big.js": "^5.2.2",
		"emojis-list": "^3.0.0",
		"json5": "^2.1.2"
		}
		},
		"supports-color": {
		"version": "7.2.0",
		"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
		"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
		"dev": true,
		"optional": true,
		"requires": {
		"has-flag": "^4.0.0"
		}
		}
		}
		},
		"vue-observe-visibility": {
		"version": "0.4.6",
		"resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",

openflexure_microscope/api/static/src/components/viewComponents/miniStreamDisplay.vue→openflexure_microscope/api/static/src/components/genericComponents/miniStreamDisplay.vue

+0 −0

File moved.

View file

openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue

+2 −2

Original line number	Diff line number	Diff line
		@@ -200,13 +200,13 @@ export default {
		// If task ends with an error
		else if (result == "error") {
		// Pass the error string back with reject
		console.log("Rejecting pollTask due to error")
		console.log("Rejecting pollTask due to error");
		reject(new Error(response.data.output));
		}
		// If task ends with termination
		else if (result == "cancelled") {
		// Pass a generic termination error back with reject
		console.log("Rejecting pollTask due to cancellation")
		console.log("Rejecting pollTask due to cancellation");
		reject(new Error("Task cancelled"));
		} else {
		// Since the task is still running, we can update the progress bar

openflexure_microscope/api/static/src/components/loadingContent.vue

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		</template>

		<script>
		import devTools from "./controlComponents/devTools.vue";
		import devTools from "./tabContentComponents/aboutComponents/devTools.vue";

		// Export main app
		export default {

openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue

+3 −3

Original line number	Diff line number	Diff line
		@@ -148,9 +148,9 @@
		<script>
		import axios from "axios";

		import cameraCalibrationSettings from "../viewComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue";
		import CSMCalibrationSettings from "../viewComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue";
		import miniStreamDisplay from "../viewComponents/miniStreamDisplay.vue";
		import cameraCalibrationSettings from "../tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue";
		import CSMCalibrationSettings from "../tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue";
		import miniStreamDisplay from "../genericComponents/miniStreamDisplay.vue";

		export default {
		name: "CalibrationModal",