Skip to content

Commit a9058bd

Browse files
birmbirm
authored
Merge pull request #667 from camicroscope/develop
For 3.12.0
2 parents 55d8db2 + 79c9820 commit a9058bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+13125
-2154
lines changed

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: axe
2+
on:
3+
push:
4+
branches:
5+
- master
6+
- develop
7+
pull_request:
8+
branches:
9+
- master
10+
- develop
11+
jobs:
12+
axe:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
node-version: [20.x]
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v1
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
- run: npm install
24+
- run: npm install -g http-server
25+
- run: npm run build --if-present
26+
- run: http-server -s &
27+
- name: Run axe
28+
run: |
29+
npm install -g @axe-core/cli
30+
sleep 90
31+
axe http://127.0.0.1:8080 --exit

‎.github/workflows/test.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
3+
name: Run Tests
4+
5+
on:
6+
pull_request:
7+
branches:
8+
- master
9+
- develop
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v2
18+
19+
- name: Set up Node.js
20+
uses: actions/setup-node@v3
21+
with:
22+
node-version: '16.x'
23+
24+
- name: Install dependencies and ESLint
25+
run: |
26+
npm install
27+
npm install eslint eslint-config-google
28+
29+
- name: Run Jest tests and linting
30+
run: |
31+
npm run lint && npm test

‎HISTORY.md

Lines changed: 0 additions & 378 deletions
This file was deleted.

‎apps/Info.html

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,30 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33

44
<head>
55
<meta name="keywords" content="camicroscope, quip" />
66
<meta charset='utf-8'>
77
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
8+
89
<meta name='viewport'
9-
content='width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no'>
10+
content='width=device-width, initial-scale=1, minimum-scale=1.0, maximum-scale=2.0'>
1011
<!-- common -->
1112
<!-- <link rel='stylesheet' type='text/css' media='all' href='../css/style.css'/> -->
1213
<!-- Check If we're logged in ok, otherwise, log in for us -->
1314
<!-- Font Awesome -->
1415
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css">
1516

16-
<script src='../common/authChecker.js'></script>
17-
<script>
18-
__auth_check(1)
19-
</script>
20-
21-
<script src='../core/Store.js'></script>
22-
<script src='../common/util.js'></script>
23-
<script src='../common/ajv.js'></script>
24-
<script src='../components/loading/loading.js'></script>
25-
<script src="./loader/loader.js"></script>
26-
<script src="./loader/chunked_upload.js"></script>
2717
<title>CaMicroscope Data Table</title>
2818

29-
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
30-
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
31-
crossorigin="anonymous"></script>
19+
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
3220

3321
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/css/bootstrap.min.css"
3422
rel="stylesheet"
3523
integrity="sha384-wEmeIV1mKuiNpC+IOBjI7aAzPcEZeedi5yW5f2yOq55WWLwNGmvvx4Um1vskeMj0"
3624
crossorigin="anonymous">
3725
<link rel="stylesheet" href="../common/stacktable.css">
26+
<!-- common styling -->
27+
<link rel="stylesheet" href="./common.css">
3828
<style>
3929
html,
4030
body {
@@ -55,7 +45,7 @@
5545
<div>
5646
<nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark" style="position: sticky; margin-top: -4em;">
5747
<div class="container-fluid">
58-
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
48+
<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%;">
5949
<span class="navbar-toggler-icon"></span>
6050
</button>
6151
<div class="collapse navbar-collapse" id="navbarSupportedContent" >
@@ -75,17 +65,14 @@
7565
<li class="nav-item link" style="font-family: sans-serif;">
7666
<a class="nav-link" href="./signup/signup.html"> <i class="fas fa-user-plus"></i> Signup</a>
7767
</li>
78-
<li class="nav-item link" style="font-family: sans-serif;">
79-
<a class="nav-link" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform"> <i class="fas fa-comment"></i> Feedback</a>
80-
</li>
8168
</ul>
8269
</div>
8370
</div>
8471
</nav>
8572

8673
<div class="header text-center text-white bg-info p-4">
8774
<h1 class="h1">caMicroscope</h1>
88-
<p>Digital pathology image viewer with support for human/machine generated annotations and markups.</p>
75+
<p style="font-weight: bold; font-size: 14pt;">Digital pathology image viewer with support for human/machine generated annotations and markups.</p>
8976
<div style="align-content: center;">
9077
<div class="btn-group" role="group">
9178
<a href="./table.html"> <button style="border-color: white; border-radius: 5px 0 0 5px;" type="button" class="btn btn-secondary bg-info text-light" title="Slides Table"><i class="fas fa-list-alt"></i> Slides</button> </a>
@@ -107,21 +94,24 @@ <h4 class="modal-title" id="title-of-dialog">Slide Information Details</h4>
10794
<div class="modal-body">
10895
<div>
10996
<div id="content">
110-
<div class="alert alert-info" role="alert">
111-
112-
<h4 style="text-align:center">Synopsis</h4><hr style="margin-top:0px;">
113-
<table id="detailtable">
114-
</table>
97+
<div class="card alert alert-info" role="alert">
98+
<div class="card-body">
99+
<h4 class="card-title text-center">Synopsis</h4><hr class="mt-0">
100+
<div class="table-responsive">
101+
<table id="detailtable">
102+
</table>
103+
</div>
104+
</div>
115105
</div>
116106
<div class="alert alert-info" role="alert">
117107

118-
<h4 style="text-align:center">Annotations</h4><hr style="margin-top:0px;">
108+
<h4 style="text-align:center">Annotations</h4><hr class="mt-0">
119109
<table id="annotationtable">
120110
</table>
121111
</div>
122112
<div class="alert alert-info" role="alert">
123113

124-
<h4 style="text-align:center">Heatmaps</h4><hr style="margin-top:0px;">
114+
<h4 style="text-align:center">Heatmaps</h4><hr class="mt-0">
125115
<table id="heatmaptable">
126116
</table>
127117
</div>
@@ -153,10 +143,6 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
153143
<input id="search-table" type="text" class="form-control" placeholder="Search">
154144
</div>
155145

156-
157-
158-
159-
160146
<div class="table-responsive" id="summary">
161147
<table class="table table-striped">
162148
<thead id="infothead"></thead>
@@ -166,11 +152,29 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
166152
</div>
167153
</div>
168154

169-
<footer class="text-center text-white bg-dark p-3 mt-2">
170-
<p class="p">Copyright © 2021 caMicroscope</p>
171-
</footer>
155+
156+
<!-- footer -->
157+
<footer id="footer-layout"></footer>
172158
</div>
159+
160+
161+
<!-- script to call a footer(layout footer in the common > utils folder) function -->
162+
<script> insertFooterLayout(); </script>
163+
173164
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-p34f1UUtsS3wqzfto5wAAmdvj+osOnFyQFpp4Ua3gs/ZVWx6oOypYoCJhGGScy+8" crossorigin="anonymous"></script>
165+
166+
<script src='../common/authChecker.js'></script>
167+
168+
<script>
169+
__auth_check(1)
170+
</script>
171+
172+
<script src='../core/Store.js'></script>
173+
<script src='../common/util.js'></script>
174+
<script src='../common/ajv.js'></script>
175+
<script src='../components/loading/loading.js'></script>
176+
<script src="./loader/loader.js"></script>
177+
<script src="./loader/chunked_upload.js"></script>
174178
</body>
175179
<script>
176180

‎apps/common.css

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,52 @@
11
.text-in-line {
2-
margin: 0 auto;
3-
white-space: nowrap;
4-
overflow: hidden;
5-
text-overflow: ellipsis;
2+
margin: 0 auto;
3+
white-space: nowrap;
4+
overflow: hidden;
5+
text-overflow: ellipsis;
66
}
77

8+
/* layout footer styles */
9+
#footer-layout hr {
10+
border-bottom-color: #ffffff;
11+
padding: 0;
12+
margin: 0;
13+
}
14+
15+
#footer-layout hr {
16+
border-bottom-color: #ffffff;
17+
padding: 0;
18+
margin: 0;
19+
}
20+
21+
#footer-layout {
22+
color: whitesmoke;
23+
text-align: left;
24+
padding: 2.5em 4.5em;
25+
background-color: #343a40;
26+
}
27+
28+
#footer-layout p {
29+
color: whitesmoke;
30+
}
31+
32+
.company-name {
33+
color: #e5c1ea;
34+
}
35+
36+
.company-name a {
37+
color: #e5c1ea;
38+
}
39+
40+
.company-name:hover {
41+
color: #d5c1ea;
42+
}
43+
#footer-layout strong,
44+
#footer-layout b {
45+
color: #ffffff;
46+
}
47+
48+
@media (max-width: 768px) {
49+
#footer-layout {
50+
padding: 2em 2.5em;
51+
}
52+
}

‎apps/dev-workbench/workbench.css

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
display: flex;
2323
flex-direction: row;
2424
}
25-
.navbar-brand{
25+
.navbar-brand {
2626
margin-right: 10rem !important;
2727
}
2828
/* All display none */
@@ -40,22 +40,30 @@
4040
display: none;
4141
}
4242

43-
44-
#goBack{
43+
#goBack {
4544
display: flex;
4645
margin: 0 1rem;
4746
}
4847
@media only screen and (max-width: 551px) {
4948
nav {
5049
flex-direction: column;
5150
}
52-
51+
5352
nav ul {
5453
flex-direction: column;
5554
}
56-
55+
5756
nav ul li {
5857
margin: 10px 0;
5958
}
6059
}
6160

61+
.dropdown-menu {
62+
margin-left: -5em !important;
63+
}
64+
65+
@media (max-width: 425px) {
66+
.dropdown-menu {
67+
margin-left: 0 !important;
68+
}
69+
}

0 commit comments

Comments
 (0)