Skip to content

Commit 5277275

Browse files
zoran995zoran995
committed
Merge remote-tracking branch 'origin/main' into move-loader-to-react-mobx
2 parents 9a48090 + 28f30a2 commit 5277275

File tree

98 files changed

+93
-21561
lines changed

Some content is hidden

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

98 files changed

+93
-21561
lines changed

‎.prettierignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ yarn.lock
3737
.yarn/releases/
3838

3939
# wwwroot
40-
wwwroot/help/
4140
wwwroot/public/
4241
wwwroot/*.html
4342

‎wwwroot/404.html‎

Lines changed: 47 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,50 @@
1-
<!doctype html>
21
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<title>The NationalMap - not found</title>
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="/public/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="all"/>
8-
<link href="/public/css/custom.css" rel="stylesheet" type="text/css" media="all"/>
9-
<link href='//fonts.googleapis.com/css?family=Roboto:300' rel='stylesheet' type='text/css'>
10-
<style>
11-
body {
12-
padding-top: 50px;
13-
}
14-
.starter-template {
15-
padding: 40px 15px;
16-
}
17-
</style>
18-
<!-- TODO: Complete this project :) -->
19-
</head>
20-
<body>
21-
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
22-
<div class="container">
23-
<!-- Brand and toggle get grouped for better mobile display -->
24-
<div class="navbar-header">
25-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
26-
<span class="sr-only">Toggle navigation</span>
27-
<span class="icon-bar"></span>
28-
<span class="icon-bar"></span>
29-
<span class="icon-bar"></span>
30-
</button>
31-
<a class="navbar-brand" href="about.html"><img src="/public/img/nm-logo.png"></a>
32-
</div>
33-
<!-- Collect the nav links, forms, and other content for toggling -->
34-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
35-
<ul class="nav navbar-nav">
36-
<li class="active"><a href="about.html">About National Map</a></li>
37-
<li ><a href="help/howto.html">Help &amp; FAQ</a></li>
38-
<li ><a href="privacy.html">Privacy</a></li>
39-
<li><a href="http://nationalmap.gov.au">Launch the National Map</a></li>
40-
</ul>
41-
42-
</div>
43-
<!-- /.navbar-collapse -->
44-
</div>
45-
<!-- /.container -->
46-
</nav>
47-
<div class="container">
48-
49-
50-
<div class="starter-template">
51-
<div class="row">
52-
<div class="col-md-2">
53-
<img height="105" class="logo center-block" src="/public/img/pmc-stacked.jpg" style="opacity:0.6" alt="Logo of Department of the Prime Minister and Cabinet"><!-- match desaturated GA logo. -->
54-
<img height="80" class="logo center-block" src="/public/img/GA-dark.png" alt="Logo of Geoscience Australia">
55-
<img height="80" class="logo center-block" src="/public/img/data61-white.jpg" alt="Logo of Data61/CSIRO">
56-
<img height="140" class="logo center-block" src="/public/img/iawards.png" alt="Logo of iAwards">
57-
<img width="160" class="logo center-block" src="/public/img/Finalist-Innovation.gif" alt="Finalist in Innovation at CeBIT AU Business Awards 2015">
58-
</div>
59-
<div class="col-md-9">
60-
61-
<h2>That page doesn't seem to be here</h2>
62-
<p>The page you're looking for doesn't seem to exist. If you think this is an error, please send an email to <a href="mailto:[email protected]">[email protected]</a>.</p>
63-
<p><b>&larr; Return to <a href="/">NationalMap</a></b>.
64-
<div style="font-size: 300px; color: lightgray; text-align:center">404</div>
65-
66-
67-
</div>
68-
</div>
69-
70-
71-
</div>
72-
</div>
73-
<!-- Footer -->
74-
<footer class="footer">
75-
<div class="container">
76-
<div class="col-lg-12">
77-
<p>&copy; Department of the Prime Minister and Cabinet, Department of Communications, and National ICT Australia Limited (NICTA) 2014-2015. All Rights Reserved.</p>
78-
<p>
79-
<strong><a href="#terms">Terms and conditions</a></strong> –
80-
<strong><a href="privacy.html">Privacy</a></strong>
81-
</p>
82-
</div>
2+
<head>
3+
<meta charset="utf-8" />
4+
<title>TerriaJS</title>
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
7+
<link
8+
href="//fonts.googleapis.com/css?family=Roboto:300,600"
9+
rel="stylesheet"
10+
type="text/css"
11+
/>
12+
<style>
13+
* {
14+
box-sizing: border-box;
15+
}
16+
body {
17+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
18+
"Helvetica Neue", Arial, sans-serif;
19+
height: 100vh;
20+
display: flex;
21+
justify-content: center;
22+
align-items: center;
23+
gap: 1rem;
24+
color: #111827;
25+
}
26+
.error-number {
27+
font-family: inherit;
28+
font-size: 2.5rem;
29+
font-weight: 600;
30+
line-height: 1.2;
31+
margin: 0;
32+
padding-right: 1rem;
33+
border-right: 1px solid #dee2e6;
34+
}
35+
.error-description {
36+
font-family: inherit;
37+
font-size: 1.25rem;
38+
font-weight: 400;
39+
line-height: 1.2;
40+
margin: 0;
41+
}
42+
</style>
43+
</head>
44+
<body>
45+
<h1 class="error-number">404</h1>
46+
<div class="inline-block align-middle">
47+
<h2 class="error-description" id="desc">Not found.</h2>
8348
</div>
84-
</footer>
85-
<script src="//code.jquery.com/jquery.min.js"></script>
86-
<script>
87-
$(document).ready(function () {
88-
if (location.hash) {
89-
location.hash && $(location.hash + '.collapse').collapse('show');
90-
}
91-
});
92-
</script>
93-
<script src="/public/js/bootstrap.min.js"></script>
94-
</body>
49+
</body>
9550
</html>

‎wwwroot/500.html‎

Lines changed: 46 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,50 @@
1-
<!doctype html>
21
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<title>500 - Internal server error</title>
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<link href="/public/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="all"/>
8-
<link href="/public/css/custom.css" rel="stylesheet" type="text/css" media="all"/>
9-
<link href='//fonts.googleapis.com/css?family=Roboto:300' rel='stylesheet' type='text/css'>
10-
<style>
11-
body {
12-
padding-top: 50px;
13-
}
14-
.starter-template {
15-
padding: 40px 15px;
16-
}
17-
</style>
18-
<!-- TODO: Complete this project :) -->
19-
</head>
20-
<body>
21-
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
22-
<div class="container">
23-
<!-- Brand and toggle get grouped for better mobile display -->
24-
<div class="navbar-header">
25-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
26-
<span class="sr-only">Toggle navigation</span>
27-
<span class="icon-bar"></span>
28-
<span class="icon-bar"></span>
29-
<span class="icon-bar"></span>
30-
</button>
31-
<a class="navbar-brand" href="about.html"><img src="/public/img/nm-logo.png"></a>
32-
</div>
33-
<!-- Collect the nav links, forms, and other content for toggling -->
34-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
35-
<ul class="nav navbar-nav">
36-
<li class="active"><a href="about.html">About National Map</a></li>
37-
<li ><a href="help/howto.html">Help &amp; FAQ</a></li>
38-
<li ><a href="privacy.html">Privacy</a></li>
39-
<li><a href="http://nationalmap.gov.au">Launch the National Map</a></li>
40-
</ul>
2+
<head>
3+
<meta charset="utf-8" />
4+
<title>TerriaJS</title>
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
416

42-
</div>
43-
<!-- /.navbar-collapse -->
7+
<link
8+
href="//fonts.googleapis.com/css?family=Roboto:300,600"
9+
rel="stylesheet"
10+
type="text/css"
11+
/>
12+
<style>
13+
* {
14+
box-sizing: border-box;
15+
}
16+
body {
17+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
18+
"Helvetica Neue", Arial, sans-serif;
19+
height: 100vh;
20+
display: flex;
21+
justify-content: center;
22+
align-items: center;
23+
gap: 1rem;
24+
color: #111827;
25+
}
26+
.error-number {
27+
font-family: inherit;
28+
font-size: 2.5rem;
29+
font-weight: 600;
30+
line-height: 1.2;
31+
margin: 0;
32+
padding-right: 1rem;
33+
border-right: 1px solid #dee2e6;
34+
}
35+
.error-description {
36+
font-family: inherit;
37+
font-size: 1.25rem;
38+
font-weight: 400;
39+
line-height: 1.2;
40+
margin: 0;
41+
}
42+
</style>
43+
</head>
44+
<body>
45+
<h1 class="error-number">500</h1>
46+
<div class="inline-block align-middle">
47+
<h2 class="error-description" id="desc">Internal server error.</h2>
4448
</div>
45-
<!-- /.container -->
46-
</nav>
47-
<div class="container">
48-
49-
50-
<div class="starter-template">
51-
<div class="row">
52-
<div class="col-md-2">
53-
<img height="105" class="logo center-block" src="/public/img/pmc-stacked.jpg" style="opacity:0.6" alt="Logo of Department of the Prime Minister and Cabinet"><!-- match desaturated GA logo. -->
54-
<img height="80" class="logo center-block" src="/public/img/GA-dark.png" alt="Logo of Geoscience Australia">
55-
<img height="80" class="logo center-block" src="/public/img/data61-white.jpg" alt="Logo of Data61/CSIRO">
56-
<img height="140" class="logo center-block" src="/public/img/iawards.png" alt="Logo of iAwards">
57-
<img width="160" class="logo center-block" src="/public/img/Finalist-Innovation.gif" alt="Finalist in Innovation at CeBIT AU Business Awards 2015">
58-
</div>
59-
<div class="col-md-9">
60-
61-
<h2>Internal server error</h2>
62-
<p>Something went wrong on our server. Please send an email to <a href="mailto:[email protected]">[email protected]</a>, explaining what you were doing at the time it happened. This will help us track down the cause.</p>
63-
<p><b>&larr; Return to <a href="/">NationalMap</a></b>.
64-
<div style="font-size: 300px; color: hsl(0, 100%, 85%); text-align:center">500</div>
65-
66-
67-
</div>
68-
</div>
69-
70-
</div>
71-
</div>
72-
<!-- Footer -->
73-
<footer class="footer">
74-
<div class="container">
75-
<div class="col-lg-12">
76-
<p>&copy; Department of the Prime Minister and Cabinet, Department of Communications, and National ICT Australia Limited (NICTA) 2014-2015. All Rights Reserved.</p>
77-
<p>
78-
<strong><a href="#terms">Terms and conditions</a></strong> –
79-
<strong><a href="privacy.html">Privacy</a></strong>
80-
</p>
81-
</div>
82-
</div>
83-
</footer>
84-
<script src="//code.jquery.com/jquery.min.js"></script>
85-
<script>
86-
$(document).ready(function () {
87-
if (location.hash) {
88-
location.hash && $(location.hash + '.collapse').collapse('show');
89-
}
90-
});
91-
</script>
92-
<script src="/public/js/bootstrap.min.js"></script>
93-
</body>
49+
</body>
9450
</html>

0 commit comments

Comments
 (0)