Merge branch 'release/1.7.1'

EsupPortail · Jul 11, 2023 · 5f20c87 · 5f20c87
2 parents 903f53e + 496c3e7
commit 5f20c87
Show file tree

Hide file tree

Showing 148 changed files with 3,825 additions and 378 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ pnpmfile.js
 pnpm-lock.yaml
 /.apt_generated/
 /.apt_generated_tests/
+/package-lock.json
diff --git a/frontend/styles/app-color.css b/frontend/styles/app-color.css
@@ -1,7 +1,9 @@
 html, [theme~="dark"] {
+	/*
   --material-primary-color: rgb(var(--app-color-rgb));
   --lumo-primary-color: rgb(var(--app-color-rgb));
   --lumo-primary-color-50pct: rgba(var(--app-color-rgb), 0.5);
   --lumo-primary-color-10pct: rgba(var(--app-color-rgb), 0.1);
   --lumo-primary-text-color: var(--lumo-primary-color);
+  */
 }
diff --git a/frontend/styles/mdw-default.css b/frontend/styles/mdw-default.css
@@ -1,6 +1,3 @@
-html {
-  --main-color: #0096ea;
-}
 
 .card-with-separator {
    border-bottom-width:0.1em;
@@ -9,14 +6,15 @@ html {
 
 .card-title-bordered {
 	border-bottom:1px solid;
-	border-image : linear-gradient(45deg,var(--main-color),#ffffff) 1;
+	border-image : linear-gradient(45deg,var(--header-card-separator-color),#ffffff) 1;
 	width: 100%;
+	margin-bottom: 0.5em;
 	/*border-color:var(--main-color);*/
 }
 
 .card-title-bordered-closed {
 	border-bottom:1px solid;
-	border-image : linear-gradient(45deg,var(--main-color),#ffffff) 0;
+	border-image : linear-gradient(45deg,var(--header-card-separator-color),#ffffff) 0;
 	width: 100%;
 }
 
@@ -34,13 +32,13 @@ html {
     font-size: .7rem;
     letter-spacing: .08em;
     text-transform: uppercase;
-    color: #343a40;
+    color: var(--txt-color);
 }
 
 .label-valeur {
 	font-weight: 700;
     padding: 0;
-    color: #343a40;
+    color: var(--txt-color);
     margin: 0;
 }
 
@@ -74,6 +72,10 @@ html {
 	transform-origin: top center;
 }
 
+.basicView {
+	background-color: white;
+}
+
 @keyframes shrink {
     0% {
         transform: scaleY(1);

diff --git a/frontend/styles/vaadin-app-layout.css b/frontend/styles/vaadin-app-layout.css
@@ -5,13 +5,11 @@
 }
 
 [part="navbar"]::before {
-	/*background-color: var(--lumo-secondary-text-color);*/
-	background-color: #343a40!important;
+	background-color: var(--main-color)!important;
 	opacity: 1;
 }
 
 [part="drawer"] {
-	background-color : var(--lumo-contrast-5pct);
 	min-width: 28%;
 	border: none !important;
 }

diff --git a/frontend/styles/vaadin-tab.css b/frontend/styles/vaadin-tab.css
@@ -1,13 +1,10 @@
 
 :host([selected]) {
-	/*color: #343a40;*/
 	color: var(--main-color);
    background-color: #7b7b7b4a;
-   /*background-color: var(--main-color);*/
 }
 
 :host([focused]) {
-	/*color: #343a40;*/
 	color: var(--main-color);
     background-color: #7b7b7b4a;
 }

diff --git a/frontend/styles/vaadin-tabs.css b/frontend/styles/vaadin-tabs.css
@@ -0,0 +1,10 @@
+
+:host {
+	margin-left: auto;
+	margin-right: auto;
+	box-shadow: none !important;
+	border-radius: 3%;
+	max-width: 18em;
+	border: 1px solid lightgrey;
+	background-color: white;
+}
diff --git a/frontend/styles/vaadin-text-field-pointer.css b/frontend/styles/vaadin-text-field-pointer.css
@@ -4,13 +4,13 @@
     font-size: .7rem;
     letter-spacing: .08em;
     text-transform: uppercase;
-    color: #343a40;
+    color: var(--main-color);
 }
 
 :host input {
 	font-weight: 700;
     padding: 0;
-    color: 	#343a40;
+    color: 	var(--main-color);
 }
 
 

diff --git a/package.json b/package.json
@@ -2,18 +2,8 @@
   "name": "no-name",
   "license": "UNLICENSED",
   "dependencies": {
-    "@polymer/iron-a11y-announcer": "3.0.2",
-    "@polymer/iron-a11y-keys-behavior": "3.0.1",
-    "@polymer/iron-fit-behavior": "3.0.2",
-    "@polymer/iron-flex-layout": "3.0.1",
     "@polymer/iron-icon": "3.0.1",
-    "@polymer/iron-iconset-svg": "3.0.1",
     "@polymer/iron-list": "3.1.0",
-    "@polymer/iron-media-query": "3.0.1",
-    "@polymer/iron-meta": "3.0.1",
-    "@polymer/iron-overlay-behavior": "3.0.3",
-    "@polymer/iron-resizable-behavior": "3.0.1",
-    "@polymer/iron-scroll-target-behavior": "3.0.1",
     "@polymer/polymer": "3.2.0",
     "@vaadin/vaadin-accordion": "1.2.0",
     "@vaadin/vaadin-app-layout": "2.2.0",
@@ -22,46 +12,39 @@
     "@vaadin/vaadin-checkbox": "2.5.1",
     "@vaadin/vaadin-combo-box": "5.4.12",
     "@vaadin/vaadin-context-menu": "4.6.0",
-    "@vaadin/vaadin-control-state-mixin": "2.2.6",
-    "@vaadin/vaadin-core-shrinkwrap": "14.8.18",
+    "@vaadin/vaadin-core-shrinkwrap": "14.9.7",
     "@vaadin/vaadin-custom-field": "1.3.1",
-    "@vaadin/vaadin-date-picker": "4.4.3",
+    "@vaadin/vaadin-date-picker": "4.4.5",
     "@vaadin/vaadin-date-time-picker": "1.4.0",
     "@vaadin/vaadin-details": "1.2.1",
-    "@vaadin/vaadin-development-mode-detector": "2.0.5",
     "@vaadin/vaadin-dialog": "2.6.0",
-    "@vaadin/vaadin-element-mixin": "2.4.2",
     "@vaadin/vaadin-form-layout": "2.3.0",
-    "@vaadin/vaadin-grid": "5.9.6",
+    "@vaadin/vaadin-grid": "5.9.7",
     "@vaadin/vaadin-icons": "4.3.2",
     "@vaadin/vaadin-item": "2.3.0",
     "@vaadin/vaadin-list-box": "1.4.0",
-    "@vaadin/vaadin-list-mixin": "2.5.1",
     "@vaadin/vaadin-login": "1.2.0",
     "@vaadin/vaadin-lumo-styles": "1.6.1",
     "@vaadin/vaadin-material-styles": "1.3.2",
     "@vaadin/vaadin-menu-bar": "1.3.0",
     "@vaadin/vaadin-messages": "1.0.2",
     "@vaadin/vaadin-notification": "1.6.2",
     "@vaadin/vaadin-ordered-layout": "1.4.0",
-    "@vaadin/vaadin-overlay": "3.5.1",
     "@vaadin/vaadin-progress-bar": "1.3.0",
     "@vaadin/vaadin-radio-button": "1.5.4",
     "@vaadin/vaadin-select": "2.4.4",
     "@vaadin/vaadin-split-layout": "4.3.1",
     "@vaadin/vaadin-tabs": "3.2.0",
     "@vaadin/vaadin-text-field": "2.9.2",
-    "@vaadin/vaadin-themable-mixin": "1.6.2",
     "@vaadin/vaadin-time-picker": "2.4.0",
     "@vaadin/vaadin-upload": "4.4.3",
-    "@vaadin/vaadin-usage-statistics": "2.1.2",
-    "@webcomponents/shadycss": "1.8.0",
     "@webcomponents/webcomponentsjs": "^2.2.10",
     "construct-style-sheets-polyfill": "3.0.4",
     "lit-element": "2.5.1",
     "lit-html": "1.4.1"
   },
   "devDependencies": {
+    "@types/node": "18.14.0",
     "babel-loader": "8.2.2",
     "chokidar": "^3.5.0",
     "compression-webpack-plugin": "4.0.1",
@@ -72,6 +55,7 @@
     "file-loader": "6.1.0",
     "html-webpack-plugin": "4.5.2",
     "lit-css-loader": "0.0.4",
+    "loader-utils": "2.0.4",
     "raw-loader": "3.1.0",
     "ts-loader": "8.0.12",
     "typescript": "4.0.3",
@@ -83,18 +67,8 @@
   },
   "vaadin": {
     "dependencies": {
-      "@polymer/iron-a11y-announcer": "3.0.2",
-      "@polymer/iron-a11y-keys-behavior": "3.0.1",
-      "@polymer/iron-fit-behavior": "3.0.2",
-      "@polymer/iron-flex-layout": "3.0.1",
       "@polymer/iron-icon": "3.0.1",
-      "@polymer/iron-iconset-svg": "3.0.1",
       "@polymer/iron-list": "3.1.0",
-      "@polymer/iron-media-query": "3.0.1",
-      "@polymer/iron-meta": "3.0.1",
-      "@polymer/iron-overlay-behavior": "3.0.3",
-      "@polymer/iron-resizable-behavior": "3.0.1",
-      "@polymer/iron-scroll-target-behavior": "3.0.1",
       "@polymer/polymer": "3.2.0",
       "@vaadin/vaadin-accordion": "1.2.0",
       "@vaadin/vaadin-app-layout": "2.2.0",
@@ -103,46 +77,39 @@
       "@vaadin/vaadin-checkbox": "2.5.1",
       "@vaadin/vaadin-combo-box": "5.4.12",
       "@vaadin/vaadin-context-menu": "4.6.0",
-      "@vaadin/vaadin-control-state-mixin": "2.2.6",
-      "@vaadin/vaadin-core-shrinkwrap": "14.8.18",
+      "@vaadin/vaadin-core-shrinkwrap": "14.9.7",
       "@vaadin/vaadin-custom-field": "1.3.1",
-      "@vaadin/vaadin-date-picker": "4.4.3",
+      "@vaadin/vaadin-date-picker": "4.4.5",
       "@vaadin/vaadin-date-time-picker": "1.4.0",
       "@vaadin/vaadin-details": "1.2.1",
-      "@vaadin/vaadin-development-mode-detector": "2.0.5",
       "@vaadin/vaadin-dialog": "2.6.0",
-      "@vaadin/vaadin-element-mixin": "2.4.2",
       "@vaadin/vaadin-form-layout": "2.3.0",
-      "@vaadin/vaadin-grid": "5.9.6",
+      "@vaadin/vaadin-grid": "5.9.7",
       "@vaadin/vaadin-icons": "4.3.2",
       "@vaadin/vaadin-item": "2.3.0",
       "@vaadin/vaadin-list-box": "1.4.0",
-      "@vaadin/vaadin-list-mixin": "2.5.1",
       "@vaadin/vaadin-login": "1.2.0",
       "@vaadin/vaadin-lumo-styles": "1.6.1",
       "@vaadin/vaadin-material-styles": "1.3.2",
       "@vaadin/vaadin-menu-bar": "1.3.0",
       "@vaadin/vaadin-messages": "1.0.2",
       "@vaadin/vaadin-notification": "1.6.2",
       "@vaadin/vaadin-ordered-layout": "1.4.0",
-      "@vaadin/vaadin-overlay": "3.5.1",
       "@vaadin/vaadin-progress-bar": "1.3.0",
       "@vaadin/vaadin-radio-button": "1.5.4",
       "@vaadin/vaadin-select": "2.4.4",
       "@vaadin/vaadin-split-layout": "4.3.1",
       "@vaadin/vaadin-tabs": "3.2.0",
       "@vaadin/vaadin-text-field": "2.9.2",
-      "@vaadin/vaadin-themable-mixin": "1.6.2",
       "@vaadin/vaadin-time-picker": "2.4.0",
       "@vaadin/vaadin-upload": "4.4.3",
-      "@vaadin/vaadin-usage-statistics": "2.1.2",
-      "@webcomponents/shadycss": "1.8.0",
       "@webcomponents/webcomponentsjs": "^2.2.10",
       "construct-style-sheets-polyfill": "3.0.4",
       "lit-element": "2.5.1",
       "lit-html": "1.4.1"
     },
     "devDependencies": {
+      "@types/node": "18.14.0",
       "babel-loader": "8.2.2",
       "chokidar": "^3.5.0",
       "compression-webpack-plugin": "4.0.1",
@@ -153,6 +120,7 @@
       "file-loader": "6.1.0",
       "html-webpack-plugin": "4.5.2",
       "lit-css-loader": "0.0.4",
+      "loader-utils": "2.0.4",
       "raw-loader": "3.1.0",
       "ts-loader": "8.0.12",
       "typescript": "4.0.3",
@@ -162,6 +130,6 @@
       "webpack-dev-server": "3.11.0",
       "webpack-merge": "4.2.2"
     },
-    "hash": "5d7a8812b42c6cd166516c72f8019f38653bb24e3956eaa02fd531ff0ec76aeb"
+    "hash": "db51fadee4a0bcc12a2c8f0710f9ebdd8713c61f562372a2752a7ae32862c85e"
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -45,11 +45,11 @@
 	</parent>
 
 	<properties>
-		<revision>1.6.0</revision>
+		<revision>1.7.1</revision>
 		<sha1></sha1>
 		<changelist>-SNAPSHOT</changelist>
 		<java.version>11</java.version>
-		<vaadin.version>14.8.18</vaadin.version>
+		<vaadin.version>14.9.7</vaadin.version>
 		<gson-fire-version>1.8.4</gson-fire-version>
         <swagger-core-version>1.5.24</swagger-core-version>
         <okhttp-version>4.9.3</okhttp-version> 

diff --git a/src/main/java/fr/univlorraine/mondossierweb/controllers/ConfigController.java b/src/main/java/fr/univlorraine/mondossierweb/controllers/ConfigController.java
@@ -121,9 +121,22 @@ public class ConfigController {
 	private static final String SMTP_FROM = "SMTP_FROM";
 
 	private static final String LOG_MAIL_TO = "LOG_MAIL_TO";
-
+	
 	private static final String ADMINS = "ADMINS";
 
+	private static final String CSS_MAIN_COLOR = "CSS_MAIN_COLOR";
+
+	private static final String CSS_SECOND_COLOR = "CSS_SECOND_COLOR";
+
+	private static final String CSS_HEADER_CARD_SEP_COLOR = "CSS_HEADER_CARD_SEP_COLOR";
+
+	private static final String CSS_TEXT_COLOR = "CSS_TEXT_COLOR";
+
+	private static final String CSS_BTN_COLOR = "CSS_BTN_COLOR";
+
+	private static final String CSS_BACKGROUND_COLOR = "CSS_BACKGROUND_COLOR";
+
+
 
 	@Autowired
 	private PreferencesService prefService;
@@ -281,6 +294,24 @@ public String getLogMailTo() {
 	public String getAdmins() {
 		return getStringValueForParameter(ADMINS);
 	}
+	public String getCssMainColor() {
+		return getStringValueForParameter(CSS_MAIN_COLOR);
+	}
+	public String getCssSecondColor() {
+		return getStringValueForParameter(CSS_SECOND_COLOR);
+	}
+	public String getCssHeaderCardSepColor() {
+		return getStringValueForParameter(CSS_HEADER_CARD_SEP_COLOR);
+	}
+	public String getCssTextColor() {
+		return getStringValueForParameter(CSS_TEXT_COLOR);
+	}
+	public String getCssBtnColor() {
+		return getStringValueForParameter(CSS_BTN_COLOR);
+	}
+	public String getCssBackgroundColor() {
+		return getStringValueForParameter(CSS_BACKGROUND_COLOR);
+	}
 
 
 	/**