From 75615694da2821a8fa085696d3f7300b5f18d369 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 7 Jul 2021 11:03:29 +0200 Subject: [PATCH] moved common static files in common module --- .../organizations/MockSecurityConfig.java | 2 +- .../OAuth2WebSecurityConfig.java | 2 +- .../templates/alreadyRegistered.html | 4 ++-- .../templates/authorizationRequest.html | 20 +++++++++--------- .../src/main/resources/templates/home.html | 8 +++---- .../src/main/resources/templates/login.html | 8 +++---- .../src/main/resources/templates/main.html | 19 +++++++++-------- .../static/common}/css/bootstrap.min.css | 0 .../static/common}/css/bootstrap.min.css.map | 0 .../common}/css/fontawesome-all.min.css | 0 .../static/common}/js/angular-route.min.js | 0 .../common}/js/angular-route.min.js.map | 0 .../static/common}/js/angular.min.js | 0 .../static/common}/js/angular.min.js.map | 0 .../static/common}/js/bootstrap.min.js | 0 .../static/common}/js/bootstrap.min.js.map | 0 .../static/common}/js/checklist-model.js | 0 .../static/common}/js/jquery-3.4.1.min.js | 0 .../static/common}/js/jquery-3.4.1.min.map | 0 .../resources/static/common}/js/popper.min.js | 0 .../static/common}/js/popper.min.js.map | 0 .../main/resources/static/common}/js/spin.js | 0 .../static/common}/webfonts/fa-brands-400.eot | Bin .../static/common}/webfonts/fa-brands-400.svg | 0 .../static/common}/webfonts/fa-brands-400.ttf | Bin .../common}/webfonts/fa-brands-400.woff | Bin .../common}/webfonts/fa-brands-400.woff2 | Bin .../common}/webfonts/fa-regular-400.eot | Bin .../common}/webfonts/fa-regular-400.svg | 0 .../common}/webfonts/fa-regular-400.ttf | Bin .../common}/webfonts/fa-regular-400.woff | Bin .../common}/webfonts/fa-regular-400.woff2 | Bin .../static/common}/webfonts/fa-solid-900.eot | Bin .../static/common}/webfonts/fa-solid-900.svg | 0 .../static/common}/webfonts/fa-solid-900.ttf | Bin .../static/common}/webfonts/fa-solid-900.woff | Bin .../common}/webfonts/fa-solid-900.woff2 | Bin 37 files changed, 32 insertions(+), 31 deletions(-) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/css/bootstrap.min.css (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/css/bootstrap.min.css.map (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/css/fontawesome-all.min.css (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/angular-route.min.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/angular-route.min.js.map (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/angular.min.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/angular.min.js.map (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/bootstrap.min.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/bootstrap.min.js.map (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/checklist-model.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/jquery-3.4.1.min.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/jquery-3.4.1.min.map (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/popper.min.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/popper.min.js.map (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/js/spin.js (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-brands-400.eot (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-brands-400.svg (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-brands-400.ttf (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-brands-400.woff (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-brands-400.woff2 (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-regular-400.eot (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-regular-400.svg (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-regular-400.ttf (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-regular-400.woff (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-regular-400.woff2 (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-solid-900.eot (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-solid-900.svg (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-solid-900.ttf (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-solid-900.woff (100%) rename {apps/dnet-orgs-database-application/src/main/resources/static/resources => libs/dnet-apps-common/src/main/resources/static/common}/webfonts/fa-solid-900.woff2 (100%) diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MockSecurityConfig.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MockSecurityConfig.java index d7cada0f..17fc36c2 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MockSecurityConfig.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/MockSecurityConfig.java @@ -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() diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/OAuth2WebSecurityConfig.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/OAuth2WebSecurityConfig.java index 7c62e4c7..7125793a 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/OAuth2WebSecurityConfig.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/OAuth2WebSecurityConfig.java @@ -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) diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html b/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html index 4c9823ac..46cfa412 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html +++ b/apps/dnet-orgs-database-application/src/main/resources/templates/alreadyRegistered.html @@ -9,9 +9,9 @@ - + - + Organizations Database: user already registered diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/authorizationRequest.html b/apps/dnet-orgs-database-application/src/main/resources/templates/authorizationRequest.html index 4b1ae912..88b8edf1 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/templates/authorizationRequest.html +++ b/apps/dnet-orgs-database-application/src/main/resources/templates/authorizationRequest.html @@ -9,9 +9,9 @@ - + - + Organizations Database: authorization request @@ -64,14 +64,14 @@ - - - - - - - - + + + + + + + + - - + + + - - + + + diff --git a/apps/dnet-orgs-database-application/src/main/resources/templates/main.html b/apps/dnet-orgs-database-application/src/main/resources/templates/main.html index 79ae03a0..9c23b683 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/templates/main.html +++ b/apps/dnet-orgs-database-application/src/main/resources/templates/main.html @@ -10,9 +10,9 @@ - + - +