Merge branch 'release/2.0'

EsupPortail · Sep 28, 2023 · 8cd6898 · 8cd6898
2 parents 5f20c87 + 74fac17
commit 8cd6898
Show file tree

Hide file tree

Showing 233 changed files with 7,466 additions and 2,377 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,17 +1,30 @@
 # build
 node/
 node_modules/
+frontend/generated/
+src/main/dev-bundle/
 /target/
 webpack.generated.js
+drivers/
+/config/
+
 
 # IDE
 .classpath
+.factorypath
 .project
 .settings
 .idea/
+*.iml
+.DS_Store
+
 
 # local dev
 **/application.properties
+**/application.yml
+**/~*.docx
+**/~*.tmp
+
 
 # local dev test
 **/test.properties
@@ -29,7 +42,9 @@ helmchart
 helmchart/**/.*
 
 pnpmfile.js
-pnpm-lock.yaml
 /.apt_generated/
 /.apt_generated_tests/
 /package-lock.json
+/bin/
+/.pnpmfile.cjs
+/.npmrc
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 include:
   - project: 'dn-sied/ci-config'
-    file: '/.gitlab-ci-template.yml'
+    file: '/.gitlab-ci-template-jdk17.yml'
 
 variables:
   MAVEN_ADDITIONAL_CLI_OPTS: "-Pcoverage,production"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
 # Changelog
 
-Se reporter au [WIKI ESUP](https://www.esup-portail.org/wiki/x/C4DEPg).
+Se reporter au [WIKI ESUP](https://www.esup-portail.org/wiki/x/C4DEPg)
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # Stage that builds the application, a prerequisite for the running stage
-FROM maven:3-jdk-11 as build
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+FROM maven:3.8.5-openjdk-17-slim as build
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt-get update -qq && apt-get install -qq --no-install-recommends nodejs
 
 # Stop running as root at this point
@@ -16,14 +16,14 @@ RUN mvn dependency:go-offline -Pproduction
 # Copy all needed project files to a folder
 COPY --chown=myuser:myuser src src
 COPY --chown=myuser:myuser frontend frontend
-COPY --chown=myuser:myuser package.json webpack.config.js ./
+COPY --chown=myuser:myuser package.json pnpm-lock.yaml webpack.config.js ./
 
 
 # Build the production package, assuming that we validated the version before so no need for running tests again
 RUN mvn clean package -DskipTests -Pproduction
 
 # Running stage: the part that is used for running the application
-FROM tomcat:9-jdk11
+FROM tomcat:9-jdk17
 COPY --from=build /usr/src/app/target/*.war /usr/local/tomcat/webapps/ROOT.war
 #RUN export JAVA_OPTS="$JAVA_OPTS -Dspring.config.location=/usr/local/application.properties"
 EXPOSE 8080

diff --git a/frontend/index.html b/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html>
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/frontend/src/set-dark-mode.js b/frontend/src/set-dark-mode.js
diff --git a/frontend/styles/mdw-default.css b/frontend/styles/mdw-default.css
@@ -8,8 +8,8 @@
 	border-bottom:1px solid;
 	border-image : linear-gradient(45deg,var(--header-card-separator-color),#ffffff) 1;
 	width: 100%;
-	margin-bottom: 0.5em;
-	/*border-color:var(--main-color);*/
+	/* margin-bottom: 0.5em; */
+	/* border-color:var(--main-color); */
 }
 
 .card-title-bordered-closed {

diff --git a/frontend/styles/vaadin-app-layout.css b/frontend/styles/vaadin-app-layout.css
@@ -1,7 +1,9 @@
 [part="navbar"] {
 	padding: var(--lumo-space-s);
 	align-items: baseline;
+	background-color: var(--main-color)!important;
 	color: white;
+	min-height: var(--lumo-size-l) !important;
 }
 
 [part="navbar"]::before {

diff --git a/frontend/styles/vaadin-drawer-toggle.css b/frontend/styles/vaadin-drawer-toggle.css
@@ -1,5 +1,5 @@
 
 :host {
-	color: white;
+	color: white !important;
 }