D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MockSecurityConfig.java
View File

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

2
apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/OAuth2WebSecurityConfig.java
View File

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

4
apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html
View File

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

20
apps/dnet-orgs-database-application/src/main/resources/templates/authorizationRequest.html
View File

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

8
apps/dnet-orgs-database-application/src/main/resources/templates/home.html
View File

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

8
apps/dnet-orgs-database-application/src/main/resources/templates/login.html
View File

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

19
apps/dnet-orgs-database-application/src/main/resources/templates/main.html
View File

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

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/css/bootstrap.min.css → libs/dnet-apps-common/src/main/resources/static/common/css/bootstrap.min.css vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/css/bootstrap.min.css.map → libs/dnet-apps-common/src/main/resources/static/common/css/bootstrap.min.css.map
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/css/fontawesome-all.min.css → libs/dnet-apps-common/src/main/resources/static/common/css/fontawesome-all.min.css vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/angular-route.min.js → libs/dnet-apps-common/src/main/resources/static/common/js/angular-route.min.js vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/angular-route.min.js.map → libs/dnet-apps-common/src/main/resources/static/common/js/angular-route.min.js.map
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/angular.min.js → libs/dnet-apps-common/src/main/resources/static/common/js/angular.min.js vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/angular.min.js.map → libs/dnet-apps-common/src/main/resources/static/common/js/angular.min.js.map
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/bootstrap.min.js → libs/dnet-apps-common/src/main/resources/static/common/js/bootstrap.min.js vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/bootstrap.min.js.map → libs/dnet-apps-common/src/main/resources/static/common/js/bootstrap.min.js.map
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/checklist-model.js → libs/dnet-apps-common/src/main/resources/static/common/js/checklist-model.js
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/jquery-3.4.1.min.js → libs/dnet-apps-common/src/main/resources/static/common/js/jquery-3.4.1.min.js vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/jquery-3.4.1.min.map → libs/dnet-apps-common/src/main/resources/static/common/js/jquery-3.4.1.min.map
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/popper.min.js → libs/dnet-apps-common/src/main/resources/static/common/js/popper.min.js vendored
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/popper.min.js.map → libs/dnet-apps-common/src/main/resources/static/common/js/popper.min.js.map
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/js/spin.js → libs/dnet-apps-common/src/main/resources/static/common/js/spin.js
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-brands-400.eot → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-brands-400.eot
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-brands-400.svg → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-brands-400.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 684 KiB

After

Width:  |  Height:  |  Size: 684 KiB

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-brands-400.ttf → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-brands-400.ttf
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-brands-400.woff → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-brands-400.woff
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-brands-400.woff2 → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-brands-400.woff2
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-regular-400.eot → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-regular-400.eot
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-regular-400.svg → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-regular-400.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 141 KiB

After

Width:  |  Height:  |  Size: 141 KiB

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-regular-400.ttf → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-regular-400.ttf
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-regular-400.woff → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-regular-400.woff
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-regular-400.woff2 → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-regular-400.woff2
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-solid-900.eot → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-solid-900.eot
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-solid-900.svg → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-solid-900.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 823 KiB

After

Width:  |  Height:  |  Size: 823 KiB

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-solid-900.ttf → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-solid-900.ttf
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-solid-900.woff → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-solid-900.woff
View File

0
apps/dnet-orgs-database-application/src/main/resources/static/resources/webfonts/fa-solid-900.woff2 → libs/dnet-apps-common/src/main/resources/static/common/webfonts/fa-solid-900.woff2
View File