Merge branch 'devel'
This commit is contained in:
commit
6b69a844a7
@ -30,6 +30,12 @@ public class MyErrorController implements ErrorController {
|
|||||||
if(statusCode == HttpStatus.NOT_FOUND.value()) {
|
if(statusCode == HttpStatus.NOT_FOUND.value()) {
|
||||||
return "error/404";
|
return "error/404";
|
||||||
}
|
}
|
||||||
|
else if(statusCode == HttpStatus.FORBIDDEN.value()){
|
||||||
|
return "error/403";
|
||||||
|
}
|
||||||
|
else if(statusCode == HttpStatus.INTERNAL_SERVER_ERROR.value()){
|
||||||
|
return "error/500";
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return "error";
|
return "error";
|
||||||
|
|||||||
BIN
src/main/resources/static/img/403.webp
Normal file
BIN
src/main/resources/static/img/403.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 MiB |
BIN
src/main/resources/static/img/500.gif
Normal file
BIN
src/main/resources/static/img/500.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.2 MiB |
87
src/main/resources/templates/error/403.html
Normal file
87
src/main/resources/templates/error/403.html
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
|
||||||
|
<title>Claptrap Bot</title>
|
||||||
|
<link rel="icon"
|
||||||
|
type="image/x-icon"
|
||||||
|
href="/favicon.png"/>
|
||||||
|
|
||||||
|
<!-- CSS -->
|
||||||
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>
|
||||||
|
<link href="css/materialize.css" type="text/css" rel="stylesheet" media="screen,projection"/>
|
||||||
|
<link href="css/style.css" type="text/css" rel="stylesheet" media="screen,projection"/>
|
||||||
|
<link rel="manifest" href="/manifest.json"/>
|
||||||
|
<meta name="theme-color" content="#263238"/>
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width: 992px) {
|
||||||
|
.row.valign-wrapper {
|
||||||
|
display: inherit;
|
||||||
|
}
|
||||||
|
img{
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media only screen and (min-width: 992px) {
|
||||||
|
img{
|
||||||
|
width: 70%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body class="blue-grey lighten-5" >
|
||||||
|
|
||||||
|
<div th:replace="header :: header ('home',${guild_name},${redirect_url}, ${guild_name})">...</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="section no-pad-bot main" id="index-banner">
|
||||||
|
|
||||||
|
<div class="center row " >
|
||||||
|
<div class="row center valign-wrapper ">
|
||||||
|
<div class="col l6 m12 s12">
|
||||||
|
<h2 class="red-text text-darken-2" style="font-weight: 1000">STOP !</h2>
|
||||||
|
<h3 class=" blue-grey-text "><b>Who are you ??? Why are you here ???</b></h3>
|
||||||
|
|
||||||
|
|
||||||
|
<a class="btn btn-large light-green darken-3 waves-effect" href="/">
|
||||||
|
<i class="large material-icons">home</i>
|
||||||
|
</a>
|
||||||
|
<h6 class=" blue-grey-text ">403 – Forbidden</h6>
|
||||||
|
</div>
|
||||||
|
<div class="col l6 m12 s12">
|
||||||
|
<img class="" src="/img/403.webp" style="border:none;outline: none"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Scripts-->
|
||||||
|
<script th:src="@{/js/jquery-3.3.1.min.js}"></script>
|
||||||
|
<script th:src="@{/js/materialize.js}"></script>
|
||||||
|
<script th:src="@{/js/navabar.js}"></script>
|
||||||
|
<script th:src="@{/js/js.cookie.js}"></script>
|
||||||
|
<script th:src="@{/js/fontawesome.js}"></script>
|
||||||
|
<script th:src="@{/js/workerRegister.js}"></script>
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -31,11 +31,13 @@
|
|||||||
<div class="center row">
|
<div class="center row">
|
||||||
<div class="row center">
|
<div class="row center">
|
||||||
<div class="col l6 m12 s12">
|
<div class="col l6 m12 s12">
|
||||||
<h1 class="red-text text-darken-2 "><b>Oops!</b></h1>
|
<h2 class="red-text text-darken-2" style="font-weight: 1000" >Oops !</h2>
|
||||||
<h2 class=" blue-grey-text "><b>Page not found!</b></h2>
|
<h3 class=" blue-grey-text "><b>You are lost !</b></h3>
|
||||||
|
<h3 class=" blue-grey-text "><b>Page not found !</b></h3>
|
||||||
<a class="btn btn-large light-green darken-3 waves-effect" href="/">
|
<a class="btn btn-large light-green darken-3 waves-effect" href="/">
|
||||||
<i class="large material-icons">home</i>
|
<i class="large material-icons">home</i>
|
||||||
</a>
|
</a>
|
||||||
|
<h6 class=" blue-grey-text ">404 – Not Found</h6>
|
||||||
</div>
|
</div>
|
||||||
<div class="col l6 m12 s12">
|
<div class="col l6 m12 s12">
|
||||||
<img class="" src="/img/404.gif" style="border:none;outline: none"/>
|
<img class="" src="/img/404.gif" style="border:none;outline: none"/>
|
||||||
|
|||||||
84
src/main/resources/templates/error/500.html
Normal file
84
src/main/resources/templates/error/500.html
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html xmlns:th="http://www.thymeleaf.org">
|
||||||
|
<head>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
|
||||||
|
<title>Claptrap Bot</title>
|
||||||
|
<link rel="icon"
|
||||||
|
type="image/x-icon"
|
||||||
|
href="/favicon.png"/>
|
||||||
|
|
||||||
|
<!-- CSS -->
|
||||||
|
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"/>
|
||||||
|
<link href="css/materialize.css" type="text/css" rel="stylesheet" media="screen,projection"/>
|
||||||
|
<link href="css/style.css" type="text/css" rel="stylesheet" media="screen,projection"/>
|
||||||
|
<link rel="manifest" href="/manifest.json"/>
|
||||||
|
<meta name="theme-color" content="#263238"/>
|
||||||
|
<style>
|
||||||
|
@media only screen and (max-width: 992px) {
|
||||||
|
.row.valign-wrapper {
|
||||||
|
display: inherit;
|
||||||
|
}
|
||||||
|
img{
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@media only screen and (min-width: 992px) {
|
||||||
|
img{
|
||||||
|
width: 70%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body class="blue-grey lighten-5" >
|
||||||
|
|
||||||
|
<div th:replace="header :: header ('home',${guild_name},${redirect_url}, ${guild_name})">...</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="section no-pad-bot main" id="index-banner">
|
||||||
|
|
||||||
|
<div class="center row " >
|
||||||
|
<div class="row center valign-wrapper ">
|
||||||
|
<div class="col l6 m12 s12">
|
||||||
|
<h2 class="red-text text-darken-2 " style="font-weight: 1000">Well...</h2>
|
||||||
|
<h3 class=" blue-grey-text ">Something was wrong with the server... </h3>
|
||||||
|
<h2 class=" blue-grey-text "><i class="fas fa-grin-beam-sweat"></i></h2>
|
||||||
|
|
||||||
|
<a class="btn btn-large light-green darken-3 waves-effect" href="/">
|
||||||
|
<i class="large material-icons">home</i>
|
||||||
|
</a>
|
||||||
|
<h6 class=" blue-grey-text ">500 – Internal Server Error</h6>
|
||||||
|
</div>
|
||||||
|
<div class="col l6 m12 s12">
|
||||||
|
<img class="" src="/img/500.gif" style="border:none;outline: none"/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Scripts-->
|
||||||
|
<script th:src="@{/js/jquery-3.3.1.min.js}"></script>
|
||||||
|
<script th:src="@{/js/materialize.js}"></script>
|
||||||
|
<script th:src="@{/js/navabar.js}"></script>
|
||||||
|
<script th:src="@{/js/js.cookie.js}"></script>
|
||||||
|
<script th:src="@{/js/fontawesome.js}"></script>
|
||||||
|
<script th:src="@{/js/workerRegister.js}"></script>
|
||||||
|
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user