Skip to content

Commit 494acb3

Browse files
birmbirm
authored
Merge pull request #480 from camicroscope/develop
For 3.8.4
2 parents b61df7f + 2090652 commit 494acb3

File tree

27 files changed

+1820
-232
lines changed

27 files changed

+1820
-232
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ module.exports = {
2121
"no-var" : 0,
2222
"new-cap" : 0,
2323
"prefer-const":0,
24+
"linebreak-style": 0,
2425
},
2526
};

‎HISTORY.md‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2323
* **Version 1**
2424
* [1.0.x](#camicroscope-10)
2525

26-
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.8.3...camicroscope:develop)
26+
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.8.4...camicroscope:develop)
2727
###### TBD
28-
*
2928

30-
### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.8.2...camicroscope:v3.8.3)
29+
30+
### caMicroscope [3.8.4](https://github.com/camicroscope/camicroscope/compare/v3.8.3...camicroscope:v3.8.4)
31+
###### 2021-01-25
32+
* Addition of a collection type, and related panel in table
33+
* Google Drive Upload Support [#467](https://github.com/camicroscope/caMicroscope/pull/467)
34+
* Upload process enhancement [#463](https://github.com/camicroscope/caMicroscope/pull/463)
35+
* Table and Info page UI harmonization [#464](https://github.com/camicroscope/caMicroscope/pull/464)
36+
* Footer Position Imrovements for Info and Table [#475](https://github.com/camicroscope/caMicroscope/pull/475)
37+
* Add Login button to signup page [#461](https://github.com/camicroscope/caMicroscope/pull/461)
38+
* Windows Lint Linebreak Fix [#470](https://github.com/camicroscope/caMicroscope/pull/470)
39+
* Default Annotation Shape set to Polygon [#466](https://github.com/camicroscope/caMicroscope/pull/466)
40+
* Heatmap Default Color Change to "Rainbow"
41+
42+
### caMicroscope [3.8.3](https://github.com/camicroscope/camicroscope/compare/v3.8.2...camicroscope:v3.8.3)
3143
###### 2020-12-03
3244
* Bugfix: Model Failed to read coordinates [#454](https://github.com/camicroscope/caMicroscope/pull/454)[#455](https://github.com/camicroscope/caMicroscope/pull/455)
3345
* multislide explorer [#456](https://github.com/camicroscope/caMicroscope/pull/456)

‎apps/Info.html‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
</head>
5252

5353
<body>
54+
<div class="page-container">
55+
<div>
5456
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark" style="position: sticky;">
5557
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
5658
<span class="navbar-toggler-icon"></span>
@@ -60,7 +62,7 @@
6062
<li class="nav-item link">
6163
<a class="nav-link" href="landing/landing.html"> <i class="fas fa-home"></i> Home</a>
6264
</li>
63-
<li class="nav-item link active">
65+
<li class="nav-item link">
6466
<a class="nav-link" href="table.html"> <i class="fas fa-list-ul"></i> Slides</a>
6567
</li>
6668
<li class="nav-item active link">
@@ -163,9 +165,11 @@ <h3 class="text-center h3 mb-2" style="margin-top:8px;margin-bottom:10px;">Infor
163165
</table>
164166
</div>
165167
</div>
168+
</div>
166169

167-
<div class="text-center text-white bg-dark p-3 mt-2 footer" style="position: static;bottom: 0;width: 100%;">
168-
<p class="p">Copyright © 2020 caMicroscope</p>
170+
<footer class="text-center text-white bg-dark p-3 mt-2">
171+
<p class="p">Copyright © 2021 caMicroscope</p>
172+
</footer>
169173
</div>
170174

171175
</body>

‎apps/admin/admin.css‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
body {
2+
font-size: 0.875rem;
3+
}
4+
5+
.feather {
6+
width: 16px;
7+
height: 16px;
8+
vertical-align: text-bottom;
9+
}
10+
11+
/*
12+
* Sidebar
13+
*/
14+
15+
.sidebar {
16+
position: fixed;
17+
top: 0;
18+
bottom: 0;
19+
left: 0;
20+
z-index: 100; /* Behind the navbar */
21+
padding: 48px 0 0; /* Height of navbar */
22+
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.1);
23+
}
24+
25+
@media (max-width: 767.98px) {
26+
.sidebar {
27+
top: 2rem;
28+
}
29+
}
30+
31+
.sidebar-sticky {
32+
position: relative;
33+
top: 0;
34+
height: calc(100vh - 48px);
35+
padding-top: 0.5rem;
36+
overflow-x: hidden;
37+
overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
38+
}
39+
40+
iframe {
41+
position: absolute;
42+
top: 0;
43+
left: 0;
44+
bottom: 0;
45+
right: 0;
46+
width: 100%;
47+
height: 100%;
48+
}
49+
.sidebar .nav-link {
50+
font-weight: 500;
51+
color: #5c5c5c;
52+
}
53+
.sidebar .nav-link.active {
54+
font-weight: bold;
55+
}
56+
57+
#sidebarMenu.sidebar .nav-link div.title {
58+
margin: 0 0.5rem;
59+
}
60+
.sidebar .nav-link .feather {
61+
margin-right: 4px;
62+
color: #727272;
63+
}
64+
65+
.sidebar .nav-link.active {
66+
color: #007bff;
67+
}
68+
69+
.sidebar .nav-link:hover .feather,
70+
.sidebar .nav-link.active .feather {
71+
color: inherit;
72+
}
73+
74+
.sidebar-heading {
75+
font-size: 0.75rem;
76+
text-transform: uppercase;
77+
}
78+
79+
/*
80+
* Navbar
81+
*/
82+
83+
.navbar-brand {
84+
padding-top: 0.75rem;
85+
padding-bottom: 0.75rem;
86+
font-size: 1rem;
87+
background-color: rgba(0, 0, 0, 0.25);
88+
box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25);
89+
}
90+
91+
.navbar .navbar-toggler {
92+
top: 0.25rem;
93+
right: 1rem;
94+
}
95+
96+
.navbar .form-control {
97+
padding: 0.75rem 1rem;
98+
border-width: 0;
99+
border-radius: 0;
100+
}
101+
102+
.form-control-dark {
103+
color: #fff;
104+
background-color: rgba(255, 255, 255, 0.1);
105+
border-color: rgba(255, 255, 255, 0.1);
106+
}
107+
108+
.form-control-dark:focus {
109+
border-color: transparent;
110+
box-shadow: 0 0 0 3px rgba(255, 255, 255, 0.25);
111+
}
112+
113+
.title-icon {
114+
background-image: url("../../favicon.ico");
115+
background-repeat: no-repeat;
116+
background-size: 3rem 3rem;
117+
}
118+
119+
.title-txt {
120+
font-weight: bold;
121+
margin-left: 3rem;
122+
}

‎apps/admin/admin.html‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<meta author="JasoxNaN" />
7+
<!-- css files -->
8+
<link rel="stylesheet" href="../common.css"/>
9+
<link
10+
rel="stylesheet"
11+
href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"
12+
/>
13+
14+
<link
15+
rel="stylesheet"
16+
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
17+
integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2"
18+
crossorigin="anonymous"
19+
/>
20+
21+
<link href="./admin.css" rel="stylesheet" />
22+
<link
23+
rel="stylesheet"
24+
href="https://use.fontawesome.com/releases/v5.8.2/css/all.css"
25+
/>
26+
27+
<script src="../../common/authChecker.js"></script>
28+
<script>
29+
__auth_check(2);
30+
</script>
31+
<!-- camic -->
32+
<script src="../../core/Store.js"></script>
33+
<script src="../../common/util.js"></script>
34+
<script src="../../common/ajv.js"></script>
35+
<script src="../../components/loading/loading.js"></script>
36+
37+
<meta name="theme-color" content="#7952b3" />
38+
39+
<style></style>
40+
<title>CaMicroScope Bashboard</title>
41+
</head>
42+
<body>
43+
<header id="nav-bar"
44+
class="navbar navbar-dark sticky-top bg-primary flex-md-nowrap p-0 shadow"
45+
>
46+
<a
47+
class="navbar-brand col-md-3 col-lg-2 me-0 px-3 title-icon"
48+
style="margin-right: 0"
49+
href="#"
50+
>
51+
<div class="title-txt">CaMicroscope</div>
52+
</a>
53+
<button
54+
class="navbar-toggler position-absolute d-md-none collapsed"
55+
type="button"
56+
data-toggle="collapse"
57+
data-target="#sidebarMenu"
58+
aria-controls="sidebarMenu"
59+
aria-expanded="false"
60+
aria-label="Toggle navigation"
61+
>
62+
<span class="navbar-toggler-icon"></span>
63+
</button>
64+
<!-- <input class="form-control form-control-primary w-100" type="text" placeholder="Search" aria-label="Search"> -->
65+
<ul class="navbar-nav px-3">
66+
<li class="nav-item text-nowrap">
67+
<a class="nav-link" href="#">Sign out</a>
68+
</li>
69+
</ul>
70+
</header>
71+
72+
<div class="container-fluid">
73+
<div class="row">
74+
<nav
75+
id="sidebarMenu"
76+
class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse"
77+
style=""
78+
>
79+
<div class="position-sticky pt-3">
80+
<ul class="nav flex-column">
81+
<li class="nav-item">
82+
<div
83+
class="nav-link active d-flex align-items-center"
84+
aria-current="page"
85+
>
86+
<i class="fa fa-archive"></i>
87+
<div class="title">Collection</div>
88+
</div>
89+
</li>
90+
<li class="nav-item">
91+
<div
92+
class="nav-link d-flex align-items-center"
93+
aria-current="page"
94+
>
95+
<i class="fas fa-tag"></i>
96+
<div class="title">Preset Label</div>
97+
</div>
98+
</li>
99+
<li class="nav-item">
100+
<div
101+
class="nav-link d-flex align-items-center"
102+
aria-current="page"
103+
>
104+
<i class="fas fa-user"></i>
105+
<div class="title">User</div>
106+
</div>
107+
</li>
108+
</ul>
109+
</div>
110+
</nav>
111+
<main id="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">
112+
<iframe src="../collection/collection.html" frameborder="0" ></iframe>
113+
</main>
114+
</div>
115+
</div>
116+
<!-- bootstrap -->
117+
<script
118+
src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
119+
integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
120+
crossorigin="anonymous"
121+
></script>
122+
<script
123+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"
124+
integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN"
125+
crossorigin="anonymous"
126+
></script>
127+
<script
128+
src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
129+
integrity="sha384-w1Q4orYjBQndcko6MimVbzY0tgp4pWB4lZ7lr30WKz0vr/aWKhXdBNmNb5D92v7s"
130+
crossorigin="anonymous"
131+
></script>
132+
<script src="./admin.js"></script>
133+
</body>
134+
</html>

‎apps/admin/admin.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
function calculateMainHeight() {
2+
const height = $(window).height() - $('#nav-bar').height();
3+
$('#main').height(height);
4+
}
5+
calculateMainHeight();
6+
$(window).resize(function () {
7+
calculateMainHeight();
8+
});

0 commit comments

Comments
 (0)