diff --git a/openflexure_microscope/api/static/package.json b/openflexure_microscope/api/static/package.json index af5be7b0..b2cc386c 100644 --- a/openflexure_microscope/api/static/package.json +++ b/openflexure_microscope/api/static/package.json @@ -10,7 +10,7 @@ "license": "GNU General Public License v3.0 ", "scripts": { "build": "vue-cli-service build --mode production", - "serve": "vue-cli-service serve --mode development" + "serve": "vue-cli-service serve --mode development" }, "dependencies": { "material-design-icons": "^3.0.1", diff --git a/openflexure_microscope/api/static/src/components/appContent.vue b/openflexure_microscope/api/static/src/components/appContent.vue index 24439529..54b89b73 100644 --- a/openflexure_microscope/api/static/src/components/appContent.vue +++ b/openflexure_microscope/api/static/src/components/appContent.vue @@ -55,6 +55,15 @@ > camera_alt + + camera_alt + + + + +
+
No scan extension found
+
+

Sample Scan Wizard

+ +
+
+

User information (1/4)

+ + + +
+ + +
+ +
+

Patient information (2/4)

+ + + +
+
+ +
+

Sample information (3/4)

+ + +
+ + +
+ + +
+
+ +
+

Start scan (4/4)

+ + +

+ Your name: + {{ username }} +

+

+ Patient ID: + {{ patientID }} +

+

+ Sample type: + {{ sampleType }} +

+
+
+ +
+

{{ message }}

+ +
+ +
+ + +
+

+ +

+
+
+
+ + + + + \ No newline at end of file diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue b/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue new file mode 100644 index 00000000..cf17e76d --- /dev/null +++ b/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue @@ -0,0 +1,25 @@ + + + diff --git a/poetry.lock b/poetry.lock index 2d480366..a3f4ebfb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -302,7 +302,7 @@ webargs = "^6.0.0" zeroconf = ">=0.24.5,<0.29.0" [package.source] -reference = "c79e6f28d5ffbd61dcfe7fc94130db604cdb4e2d" +reference = "bf41b5009e8e0e465222399f38c0cd2104dbd0b7" type = "git" url = "https://github.com/labthings/python-labthings.git" [[package]] @@ -718,16 +718,16 @@ description = "Declarative parsing and validation of HTTP request objects, with name = "webargs" optional = false python-versions = ">=3.5" -version = "6.1.0" +version = "6.1.1" [package.dependencies] marshmallow = ">=2.15.2" [package.extras] -dev = ["pytest", "webtest (2.0.35)", "webtest-aiohttp (2.0.0)", "pytest-aiohttp (>=0.3.0)", "Flask (>=0.12.2)", "Django (>=1.11.16)", "bottle (>=0.12.13)", "tornado (>=4.5.2)", "pyramid (>=1.9.1)", "webapp2 (>=3.0.0b1)", "falcon (>=2.0.0)", "aiohttp (>=3.0.0)", "mypy (0.770)", "flake8 (3.7.9)", "flake8-bugbear (20.1.4)", "pre-commit (>=1.20,<3.0)", "tox", "mock"] -docs = ["Sphinx (3.0.3)", "sphinx-issues (1.2.0)", "sphinx-typlog-theme (0.8.0)", "Flask (>=0.12.2)", "Django (>=1.11.16)", "bottle (>=0.12.13)", "tornado (>=4.5.2)", "pyramid (>=1.9.1)", "webapp2 (>=3.0.0b1)", "falcon (>=2.0.0)", "aiohttp (>=3.0.0)"] +dev = ["pytest", "webtest (2.0.35)", "webtest-aiohttp (2.0.0)", "pytest-aiohttp (>=0.3.0)", "Flask (>=0.12.2)", "Django (>=1.11.16)", "bottle (>=0.12.13)", "tornado (>=4.5.2)", "pyramid (>=1.9.1)", "webapp2 (>=3.0.0b1)", "falcon (>=2.0.0)", "aiohttp (>=3.0.0)", "mypy (0.782)", "flake8 (3.8.3)", "flake8-bugbear (20.1.4)", "pre-commit (>=2.4,<3.0)", "tox", "mock"] +docs = ["Sphinx (3.2.1)", "sphinx-issues (1.2.0)", "sphinx-typlog-theme (0.8.0)", "Flask (>=0.12.2)", "Django (>=1.11.16)", "bottle (>=0.12.13)", "tornado (>=4.5.2)", "pyramid (>=1.9.1)", "webapp2 (>=3.0.0b1)", "falcon (>=2.0.0)", "aiohttp (>=3.0.0)"] frameworks = ["Flask (>=0.12.2)", "Django (>=1.11.16)", "bottle (>=0.12.13)", "tornado (>=4.5.2)", "pyramid (>=1.9.1)", "webapp2 (>=3.0.0b1)", "falcon (>=2.0.0)", "aiohttp (>=3.0.0)"] -lint = ["mypy (0.770)", "flake8 (3.7.9)", "flake8-bugbear (20.1.4)", "pre-commit (>=1.20,<3.0)"] +lint = ["mypy (0.782)", "flake8 (3.8.3)", "flake8-bugbear (20.1.4)", "pre-commit (>=2.4,<3.0)"] tests = ["pytest", "webtest (2.0.35)", "webtest-aiohttp (2.0.0)", "pytest-aiohttp (>=0.3.0)", "Flask (>=0.12.2)", "Django (>=1.11.16)", "bottle (>=0.12.13)", "tornado (>=4.5.2)", "pyramid (>=1.9.1)", "webapp2 (>=3.0.0b1)", "falcon (>=2.0.0)", "aiohttp (>=3.0.0)", "mock"] [[package]] @@ -1220,8 +1220,8 @@ urllib3 = [ {file = "urllib3-1.25.10.tar.gz", hash = "sha256:91056c15fa70756691db97756772bb1eb9678fa585d9184f24534b100dc60f4a"}, ] webargs = [ - {file = "webargs-6.1.0-py2.py3-none-any.whl", hash = "sha256:cf0b5e2fdfb81f28b9332fce15621069d3fbc910a01c7ca8a5e166371699927b"}, - {file = "webargs-6.1.0.tar.gz", hash = "sha256:ebb47fb35c3c4fc764213a17d1686e82fec54759ebed2b0715907d566668bb3f"}, + {file = "webargs-6.1.1-py2.py3-none-any.whl", hash = "sha256:2ead6ce38559152043ab4ada4d389aef6c804b0c169482e7c92b3f498f690b2c"}, + {file = "webargs-6.1.1.tar.gz", hash = "sha256:412ecadd977afdea0ed6fa5f5b65ddd13a099269e622ec537f9c74c443ce4d0b"}, ] werkzeug = [ {file = "Werkzeug-1.0.1-py2.py3-none-any.whl", hash = "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43"},