moved common static files in common module

This commit is contained in:
Michele Artini 2021-07-07 11:03:29 +02:00
parent 77b3750a3a
commit 75615694da
37 changed files with 32 additions and 31 deletions

View File

@ -49,7 +49,7 @@ public class MockSecurityConfig extends WebSecurityConfigurerAdapter {
.hasAnyRole(OpenOrgsConstants.VALID_ROLES)
.antMatchers("/registration_api/**")
.hasRole(OpenOrgsConstants.NOT_AUTORIZED_ROLE)
.antMatchers("/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
.antMatchers("/common/**", "/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
.permitAll()
.antMatchers("/oa_api/**")
.permitAll()

View File

@ -62,7 +62,7 @@ public class OAuth2WebSecurityConfig extends WebSecurityConfigurerAdapter {
.hasAnyRole(OpenOrgsConstants.VALID_ROLES)
.antMatchers("/registration_api/**")
.hasRole(OpenOrgsConstants.NOT_AUTORIZED_ROLE)
.antMatchers("/", "/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
.antMatchers("/", "/common/**", "/resources/**", "/webjars/**", "/metrics", "/health", "/dbmodel/**")
.permitAll()
.antMatchers("/oa_api/**")
.hasIpAddress(openaireApiValidSubnet)

View File

@ -9,9 +9,9 @@
<meta http-equiv="Expires" content="0">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
<!-- Icons CSS -->
<link rel="stylesheet" href="resources/css/fontawesome-all.min.css">
<link rel="stylesheet" href="common/css/fontawesome-all.min.css">
<title>Organizations Database: user already registered</title>
</head>

View File

@ -9,9 +9,9 @@
<meta http-equiv="Expires" content="0">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
<!-- Icons CSS -->
<link rel="stylesheet" href="resources/css/fontawesome-all.min.css">
<link rel="stylesheet" href="common/css/fontawesome-all.min.css">
<title>Organizations Database: authorization request</title>
</head>
@ -64,14 +64,14 @@
</div>
</div>
<script src="resources/js/jquery-3.4.1.min.js"></script>
<script src="resources/js/popper.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
<script src="resources/js/jquery-3.4.1.min.js"></script>
<script src="resources/js/popper.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
<script src="resources/js/angular.min.js"></script>
<script src='resources/js/checklist-model.js'></script>
<script src="common/js/jquery-3.4.1.min.js"></script>
<script src="common/js/popper.min.js"></script>
<script src="common/js/bootstrap.min.js"></script>
<script src="common/js/jquery-3.4.1.min.js"></script>
<script src="common/js/popper.min.js"></script>
<script src="common/js/bootstrap.min.js"></script>
<script src="common/js/angular.min.js"></script>
<script src='common/js/checklist-model.js'></script>
<script>
angular.module('authReqApp', ['checklist-model']).controller('authReqCtrl', function($scope, $http) {

View File

@ -13,7 +13,7 @@
<meta http-equiv="Expires" content="0">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
<title>Organizations Database: Login</title>
</head>
@ -64,9 +64,9 @@
</div>
</div>
<script src="resources/js/jquery-3.4.1.min.js"></script>
<script src="resources/js/popper.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
<script src="common/js/jquery-3.4.1.min.js"></script>
<script src="common/js/popper.min.js"></script>
<script src="common/js/bootstrap.min.js"></script>
<script>
$('#tabList a').on('click', function (e) {

View File

@ -13,7 +13,7 @@
<meta http-equiv="Expires" content="0">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
<title>Organizations Database: Login</title>
</head>
@ -69,9 +69,9 @@
</div>
</div>
<script src="resources/js/jquery-3.4.1.min.js"></script>
<script src="resources/js/popper.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
<script src="common/js/jquery-3.4.1.min.js"></script>
<script src="common/js/popper.min.js"></script>
<script src="common/js/bootstrap.min.js"></script>
</body>
</html>

View File

@ -10,9 +10,9 @@
<meta http-equiv="Expires" content="0">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="resources/css/bootstrap.min.css" />
<link rel="stylesheet" href="common/css/bootstrap.min.css" />
<!-- Icons CSS -->
<link rel="stylesheet" href="resources/css/fontawesome-all.min.css">
<link rel="stylesheet" href="common/css/fontawesome-all.min.css">
<style type="text/css">
.table > tbody > tr > td { vertical-align : middle !important; }
@ -157,14 +157,15 @@ fieldset > legend { font-size : 1.2rem !important; }
function currentUser() { return document.getElementById('current_user').textContent; }
</script>
<script src="resources/js/jquery-3.4.1.min.js"></script>
<script src="resources/js/popper.min.js"></script>
<script src="resources/js/bootstrap.min.js"></script>
<script src="resources/js/angular.min.js"></script>
<script src="resources/js/angular-route.min.js"></script>
<script src='resources/js/checklist-model.js'></script>
<script src="common/js/jquery-3.4.1.min.js"></script>
<script src="common/js/popper.min.js"></script>
<script src="common/js/bootstrap.min.js"></script>
<script src="common/js/angular.min.js"></script>
<script src="common/js/angular-route.min.js"></script>
<script src='common/js/checklist-model.js'></script>
<script src="common/js/spin.js"></script>
<script src="resources/js/organizations.js"></script>
<script src="resources/js/spin.js"></script>
<script>
// Spinner show/hide methods ~ Andrea Mannocci