Merge pull request #210 from OsiriX-Foundation/update_open_source

Upgrade dependencies (SpringBoot 3, Vaadin 24, ...)+ new expression to call an API endpoint
OsiriX-Foundation · Dec 22, 2023 · 986e714 · 986e714
2 parents 628ca43 + 5e2a4b5
commit 986e714
Show file tree

Hide file tree

Showing 99 changed files with 1,028 additions and 656 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,8 @@ RUN cp ../target/karnak*.jar application.jar
 RUN java -Djarmode=layertools -jar application.jar extract
 
 # Build the final deployment image
-FROM eclipse-temurin:17-jre-jammy
+#FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17-jdk-jammy
 WORKDIR app
 
 COPY --from=builder /app/bin/dependencies/ ./

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/styles/shared-styles.css b/frontend/styles/shared-styles.css
@@ -58,7 +58,7 @@ label[disabled] {
 }
 
 .menu-link {
-  margin: 0 auto;
+  margin: 0 -5%;
   padding: 10px 37px;
 }
 

diff --git a/frontend/themes/common-theme/main-layout.css b/frontend/themes/common-theme/main-layout.css
@@ -0,0 +1,233 @@
+
+.stroked-button {
+  border: 1px solid currentColor;
+}
+
+.message-box {
+  width: 100%;
+}
+
+.message-box-layout {
+  border-style: solid;
+  border-width: 1px;
+  padding: 0px;
+}
+
+.message-box-layout-with-margin {
+  margin: 0px 16px 0px 16px;
+}
+
+.message-box-layout.info {
+  border-color: #2196F3;
+}
+
+.message-box-layout.warn {
+  border-color: #ff9800;
+}
+
+.message-box-layout.error {
+  border-color: #F44336;
+}
+
+.message-box-title {
+  color: #ffffff;
+  margin-left: 16px;
+  margin-top: 0px;
+  margin-right: 0px;
+  margin-bottom: 0px;
+  padding: 0.8rem;
+  box-shadow: 0 1px 4px 0 rgba(0, 0, 0, .2);
+}
+
+.message-box-title.info {
+  background-color: #2196F3;
+}
+
+.message-box-title.warn {
+  background-color: #ff9800;
+}
+
+.message-box-title.error {
+  background-color: #F44336;
+}
+
+.message-box-content {
+  color: #2f4f4f;
+  background-color: #ffffff;
+  width: 100%;
+  margin: 0px;
+  padding: 12px;
+}
+
+<!--
+/*The shared-styles.html is used instead of shared-styles.css so that*/
+/*-- the styles are also used for browsers that do not support CSS Custom Properties*/
+/*-- (mainly to support IE11)*/
+/*-- for more information see: https://cdn.vaadin.com/vaadin-lumo-styles/1.3.1/demo/compatibility.html*/
+-->
+<!--
+/*Remember to import custom-style, which is included in the Polymer package*/
+-->
+/*<link rel="import" href="../bower_components/polymer/lib/elements/custom-style.html">*/
+/*<custom-style>*/
+/*<style>*/
+html {
+  font-size: var(--lumo-font-size-s);
+}
+
+/* Stack login-screen vertically on narrow screen */
+@media (max-width: 800px) {
+  .login-screen {
+    flex-direction: column;
+  }
+
+  .login-information {
+    display: block;
+  }
+}
+
+label[disabled] {
+  pointer-events: none;
+  opacity: 0.7;
+}
+
+.main-layout {
+  flex-direction: row;
+
+  /* Used by the menu and form overlays */
+  --overlay-box-shadow: 0 0 3px 2px var(--lumo-contrast-10pct);
+}
+
+.menu-bar {
+  flex-direction: column;
+  flex-shrink: 0;
+  background: var(--lumo-base-color);
+  box-shadow: var(--overlay-box-shadow);
+}
+
+.menu-header {
+  padding: 11px 16px;
+}
+
+.menu-bar vaadin-tabs {
+  align-items: flex-start;
+  transition: transform 300ms;
+}
+
+.menu-bar vaadin-tab {
+  padding: 0;
+}
+
+.menu-link {
+  margin: 0 -5%;
+  padding: 10px 37px;
+}
+
+.menu-link > span {
+  display: block;
+}
+
+.menu-button {
+  display: none;
+}
+
+.forwardnode-form {
+  height: 100%;
+  width: 300%;
+  background: var(--lumo-base-color);
+}
+
+.inputsourcenode-form {
+  height: 100%;
+  width: 250%;
+  background: var(--lumo-base-color);
+}
+
+/* On narrow screens, move the side bar to the top,
+ * except for the link-tabs, which are hidden but
+ * can be opened via a button.
+ */
+@media (max-width: 800px) {
+  .main-layout {
+    flex-direction: column;
+    --top-bar-height: 50px;
+    --top-bar-margin: 5vw;
+  }
+
+  .menu-bar {
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    height: var(--top-bar-height);
+    margin: 0 var(--top-bar-margin);
+    background: none;
+    box-shadow: none;
+  }
+
+  .menu-bar vaadin-tabs {
+    transform: translateX(calc(-100% - var(--top-bar-margin)));
+    position: absolute;
+    top: var(--top-bar-height);
+    height: calc(100% - var(--top-bar-height));
+    z-index: 100;
+    box-shadow: var(--overlay-box-shadow);
+    background: var(--lumo-base-color);
+  }
+
+  .menu-bar .show-tabs {
+    transform: translateX(calc(0% - var(--top-bar-margin)));
+  }
+
+  .menu-button {
+    display: block;
+  }
+
+  .forwardnode-form {
+    height: calc(100% - var(--top-bar-height));
+  }
+
+  .destination-form {
+    height: calc(100% - var(--top-bar-height));
+  }
+
+  .sourcenode-form {
+    height: calc(100% - var(--top-bar-height));
+  }
+
+  .inputsourcenode-form {
+    height: calc(100% - var(--top-bar-height));
+  }
+}
+
+@media (max-width: 550px) {
+  .forwardnode-form {
+    width: 100%;
+
+    /* Prevent text-fields from overflowing on narrow screens */
+    --vaadin-text-field-default-width: 6em;
+  }
+
+  .destination-form {
+    width: 100%;
+
+    /* Prevent text-fields from overflowing on narrow screens */
+    --vaadin-text-field-default-width: 6em;
+  }
+
+  .sourcenode-form {
+    width: 100%;
+
+    /* Prevent text-fields from overflowing on narrow screens */
+    --vaadin-text-field-default-width: 6em;
+  }
+
+  .inputsourcenode-form {
+    width: 100%;
+
+    /* Prevent text-fields from overflowing on narrow screens */
+    --vaadin-text-field-default-width: 6em;
+  }
+}
+
+/*</style>*/
+/*</custom-style>*/
diff --git a/frontend/themes/common-theme/styles.css b/frontend/themes/common-theme/styles.css
@@ -0,0 +1 @@
+@import url('./main-layout.css');
diff --git a/frontend/themes/common-theme/theme.json b/frontend/themes/common-theme/theme.json
@@ -0,0 +1,3 @@
+{
+  "lumoImports": ["badge"]
+}