-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into pathJS-testFunctions
- Loading branch information
Showing
26 changed files
with
648 additions
and
427 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
|
||
|
||
|
||
name: Run Tests | ||
|
||
on: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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: [16.x, 18.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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
<meta name="keywords" content="camicroscope, quip" /> | ||
<meta charset='utf-8'> | ||
<meta http-equiv='X-UA-Compatible' content='IE=edge'> | ||
|
||
<meta name='viewport' | ||
content='width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=2.0'> | ||
<!-- common --> | ||
|
@@ -13,22 +14,9 @@ | |
<!-- Font Awesome --> | ||
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"> | ||
|
||
<script src='../common/authChecker.js'></script> | ||
<script> | ||
__auth_check(1) | ||
</script> | ||
|
||
<script src='../core/Store.js'></script> | ||
<script src='../common/util.js'></script> | ||
<script src='../common/ajv.js'></script> | ||
<script src='../components/loading/loading.js'></script> | ||
<script src="./loader/loader.js"></script> | ||
<script src="./loader/chunked_upload.js"></script> | ||
<title>CaMicroscope Data Table</title> | ||
|
||
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" | ||
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" | ||
crossorigin="anonymous"></script> | ||
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> | ||
|
||
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" | ||
rel="stylesheet" | ||
|
@@ -57,7 +45,7 @@ | |
<div> | ||
<nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;"> | ||
<div class="container-fluid"> | ||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> | ||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation" style="width: 100%;"> | ||
<span class="navbar-toggler-icon"></span> | ||
</button> | ||
<div class="collapse navbar-collapse" id="navbarSupportedContent" > | ||
|
@@ -106,21 +94,24 @@ <h4 class="modal-title" id="title-of-dialog">Slide Information Details</h4> | |
<div class="modal-body"> | ||
<div> | ||
<div id="content"> | ||
<div class="alert alert-info" role="alert"> | ||
|
||
<h4 style="text-align:center">Synopsis</h4><hr style="margin-top:0px;"> | ||
<table id="detailtable"> | ||
</table> | ||
<div class="card alert alert-info" role="alert"> | ||
<div class="card-body"> | ||
<h4 class="card-title text-center">Synopsis</h4><hr class="mt-0"> | ||
<div class="table-responsive"> | ||
<table id="detailtable"> | ||
</table> | ||
</div> | ||
</div> | ||
</div> | ||
<div class="alert alert-info" role="alert"> | ||
|
||
<h4 style="text-align:center">Annotations</h4><hr style="margin-top:0px;"> | ||
<h4 style="text-align:center">Annotations</h4><hr class="mt-0"> | ||
<table id="annotationtable"> | ||
</table> | ||
</div> | ||
<div class="alert alert-info" role="alert"> | ||
|
||
<h4 style="text-align:center">Heatmaps</h4><hr style="margin-top:0px;"> | ||
<h4 style="text-align:center">Heatmaps</h4><hr class="mt-0"> | ||
<table id="heatmaptable"> | ||
</table> | ||
</div> | ||
|
@@ -152,10 +143,6 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor | |
<input id="search-table" type="text" class="form-control" placeholder="Search"> | ||
</div> | ||
|
||
|
||
|
||
|
||
|
||
<div class="table-responsive" id="summary"> | ||
<table class="table table-striped"> | ||
<thead id="infothead"></thead> | ||
|
@@ -170,9 +157,24 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor | |
<footer id="footer-layout"></footer> | ||
</div> | ||
|
||
|
||
<!-- script to call a footer(layout footer in the common > utils folder) function --> | ||
<script> insertFooterLayout(); </script> | ||
|
||
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script> | ||
|
||
<script src='../common/authChecker.js'></script> | ||
|
||
<script> | ||
__auth_check(1) | ||
</script> | ||
|
||
<script src='../core/Store.js'></script> | ||
<script src='../common/util.js'></script> | ||
<script src='../common/ajv.js'></script> | ||
<script src='../components/loading/loading.js'></script> | ||
<script src="./loader/loader.js"></script> | ||
<script src="./loader/chunked_upload.js"></script> | ||
</body> | ||
<script> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.