Merge branch 'develop' into dicom-connect

.github/workflows/axe-a11y-check.yml

@@ -0,0 +1,31 @@
+name: axe
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+jobs:
+  axe:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20.x]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm install -g http-server
+      - run: npm run build --if-present
+      - run: http-server -s &
+      - name: Run axe
+        run: |
+          npm install -g @axe-core/cli
+          sleep 90
+          axe http://127.0.0.1:8080 --exit

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+
+
+name: Run Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'  
+
+      - name: Install dependencies and ESLint
+        run: |
+          npm install
+          npm install eslint eslint-config-google
+
+      - name: Run Jest tests and linting
+        run: |
+          npm run lint && npm test

apps/dev-workbench/workbench.css

@@ -22,7 +22,7 @@
   display: flex;
   flex-direction: row;
 }
-.navbar-brand{
+.navbar-brand {
   margin-right: 10rem !important;
 }
 /* All display none */
@@ -40,22 +40,30 @@
   display: none;
 }
 
-
-#goBack{
+#goBack {
   display: flex;
   margin: 0 1rem;
 }
 @media only screen and (max-width: 551px) {
   nav {
     flex-direction: column;
   }
-  
+
   nav ul {
     flex-direction: column;
   }
-  
+
   nav ul li {
     margin: 10px 0;
   }
 }
 
+.dropdown-menu {
+  margin-left: -5em !important;
+}
+
+@media (max-width: 425px) {
+  .dropdown-menu {
+    margin-left: 0 !important;
+  }
+}

apps/dev-workbench/workbench.html

@@ -70,7 +70,7 @@
       <div style="cursor: pointer;" id="goBack">
         <i data-feather="arrow-left" class="text-white"></i>
       </div>
-      
+
       <!-- Navbar brand --> 
 
       <div class="navbar-brand-div flex-grow-1">
@@ -81,6 +81,7 @@
 
 
       <ul class="navbar-nav mr-auto px-2">
+
         <!-- Dropdown -->
         <li
 

apps/model/model.css

@@ -276,6 +276,14 @@ ul.disabled {
 }
 #upload_panel .modalbox-content{
     width: 30%;
+
+    @media only screen and ( max-width: 1100px ) {
+        width: 50%;
+    }
+
+    @media only screen and ( max-width: 600px ) {
+        width: 85%;
+    }
 }
 
 #roi_panel .modalbox-content{

apps/table.html

@@ -86,7 +86,7 @@ <h1 class="h1">caMicroscope</h1>
 		</div>
 	</div>
 
-	<div class="bg-light">
+	<div class="bg-light" style="overflow-x:scroll;">
 		<div class="p-2">
         <div class="d-flex justify-content-between">
             <div class="d-md-inline-flex m-2 w-100">

common/DrawHelper.js

@@ -349,3 +349,7 @@ caDrawHelper.prototype.clearCanvas = function(canvas){
 
 var DrawHelper = new caDrawHelper();
 //OpenSeadragon.DrawHelper = DrawHelper;
+
+
+module.exports = caDrawHelper;
+

components/modalbox/modalbox.css

@@ -22,11 +22,19 @@
   padding: 0;
   border: 1px solid #888;
   width: 80%;
+
   box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
   -webkit-animation-name: animatetop;
   -webkit-animation-duration: 0.4s;
   animation-name: animatetop;
-  animation-duration: 0.4s
+  animation-duration: 0.4s;
+}
+
+.modalbox-content #modelupload, 
+.modalbox-content #weightsupload {
+  @media only screen and (max-width: 600px) {
+        width: 90%;
+  }
 }
 
 /* Add Animation */