Merge pull request #443 from phillip-kruger/sample-cleanup

Clean up some of the UI code in the samples
quarkiverse · Apr 4, 2024 · 1d583b5 · 1d583b5
2 parents 90cbd53 + 11053ad
commit 1d583b5
Show file tree

Hide file tree

Showing 28 changed files with 27 additions and 5,763 deletions.
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,3 +1,3 @@
 :project-version: 0.10.2
 :langchain4j-version: 0.29.1
-:examples-dir: ./../examples/
+:examples-dir: ./../examples/
diff --git a/samples/chatbot-easy-rag/pom.xml b/samples/chatbot-easy-rag/pom.xml
@@ -49,21 +49,15 @@
 
         <!-- UI -->
         <dependency>
-            <groupId>org.mvnpm</groupId>
+            <groupId>io.mvnpm</groupId>
             <artifactId>importmap</artifactId>
-            <version>1.0.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mvnpm.at.mvnpm</groupId>
-            <artifactId>vaadin-webcomponents</artifactId>
-            <version>24.3.8</version>
-            <scope>runtime</scope>
+            <version>1.0.10</version>
         </dependency>
         <dependency>
             <groupId>org.mvnpm</groupId>
-            <artifactId>es-module-shims</artifactId>
+            <artifactId>lit</artifactId>
+            <version>3.1.2</version>
             <scope>runtime</scope>
-            <version>1.8.2</version>
         </dependency>
         <dependency>
             <groupId>org.mvnpm</groupId>

diff --git a/...t-easy-rag/src/main/java/io/quarkiverse/langchain4j/sample/chatbot/ImportmapResource.java b/...t-easy-rag/src/main/java/io/quarkiverse/langchain4j/sample/chatbot/ImportmapResource.java
@@ -6,7 +6,7 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 
-import org.mvnpm.importmap.Aggregator;
+import io.mvnpm.importmap.Aggregator;
 
 /**
  * Dynamically create the import map

diff --git a/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/components/demo-chat.js b/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/components/demo-chat.js
@@ -1,22 +1,7 @@
-import {css, LitElement} from 'lit';
-import '@vaadin/icon';
-import '@vaadin/button';
-import '@vaadin/text-field';
-import '@vaadin/text-area';
-import '@vaadin/form-layout';
-import '@vaadin/progress-bar';
-import '@vaadin/checkbox';
-import '@vaadin/horizontal-layout';
-import '@vaadin/grid';
-import '@vaadin/grid/vaadin-grid-sort-column.js';
+import {LitElement} from 'lit';
 
 export class DemoChat extends LitElement {
-    static styles = css`
-      .button {
-        cursor: pointer;
-      }
-    `;
-
+
     connectedCallback() {
         const chatBot = document.getElementsByTagName("chat-bot")[0];
 

diff --git a/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/components/demo-title.js b/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/components/demo-title.js
@@ -1,13 +1,4 @@
 import {LitElement, html, css} from 'lit';
-import '@vaadin/icon';
-import '@vaadin/button';
-import '@vaadin/text-field';
-import '@vaadin/text-area';
-import '@vaadin/form-layout';
-import '@vaadin/progress-bar';
-import '@vaadin/checkbox';
-import '@vaadin/grid';
-import '@vaadin/grid/vaadin-grid-sort-column.js';
 
 export class DemoTitle extends LitElement {
 

diff --git a/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/icons/font-awesome-solid.js b/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/icons/font-awesome-solid.js
diff --git a/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/icons/font-awesome.js b/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/icons/font-awesome.js
diff --git a/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/index.html b/samples/chatbot-easy-rag/src/main/resources/META-INF/resources/index.html
@@ -8,7 +8,6 @@
     <script src="/_importmap/dynamic-importmap.js"></script>
 
     <script type="module">
-        import 'icons/font-awesome.js';
         import 'components/demo-title.js';
         import 'components/demo-chat.js';
         import 'wc-chatbot';
@@ -33,7 +32,6 @@
             display: flex;
             flex-direction: column;
             justify-content: center;
-            color: var(--lumo-body-text-color);
             background: var(--main-bg-color);
         }
 

diff --git a/samples/chatbot/pom.xml b/samples/chatbot/pom.xml
@@ -48,21 +48,15 @@
 
         <!-- UI -->
         <dependency>
-            <groupId>org.mvnpm</groupId>
+            <groupId>io.mvnpm</groupId>
             <artifactId>importmap</artifactId>
-            <version>1.0.8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mvnpm.at.mvnpm</groupId>
-            <artifactId>vaadin-webcomponents</artifactId>
-            <version>24.3.8</version>
-            <scope>runtime</scope>
+            <version>1.0.10</version>
         </dependency>
         <dependency>
             <groupId>org.mvnpm</groupId>
-            <artifactId>es-module-shims</artifactId>
+            <artifactId>lit</artifactId>
+            <version>3.1.2</version>
             <scope>runtime</scope>
-            <version>1.8.2</version>
         </dependency>
         <dependency>
             <groupId>org.mvnpm</groupId>

diff --git a/...es/chatbot/src/main/java/io/quarkiverse/langchain4j/sample/chatbot/ImportmapResource.java b/...es/chatbot/src/main/java/io/quarkiverse/langchain4j/sample/chatbot/ImportmapResource.java
@@ -6,7 +6,7 @@
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 
-import org.mvnpm.importmap.Aggregator;
+import io.mvnpm.importmap.Aggregator;
 
 /**
  * Dynamically create the import map

diff --git a/samples/chatbot/src/main/resources/META-INF/resources/components/demo-chat.js b/samples/chatbot/src/main/resources/META-INF/resources/components/demo-chat.js
@@ -1,22 +1,8 @@
-import {css, LitElement} from 'lit';
-import '@vaadin/icon';
-import '@vaadin/button';
-import '@vaadin/text-field';
-import '@vaadin/text-area';
-import '@vaadin/form-layout';
-import '@vaadin/progress-bar';
-import '@vaadin/checkbox';
-import '@vaadin/horizontal-layout';
-import '@vaadin/grid';
-import '@vaadin/grid/vaadin-grid-sort-column.js';
+import {LitElement} from 'lit';
 
-export class DemoChat extends LitElement {
-    static styles = css`
-      .button {
-        cursor: pointer;
-      }
-    `;
 
+export class DemoChat extends LitElement {
+
     connectedCallback() {
         const chatBot = document.getElementsByTagName("chat-bot")[0];
 

diff --git a/samples/chatbot/src/main/resources/META-INF/resources/components/demo-title.js b/samples/chatbot/src/main/resources/META-INF/resources/components/demo-title.js
@@ -1,13 +1,4 @@
 import {LitElement, html, css} from 'lit';
-import '@vaadin/icon';
-import '@vaadin/button';
-import '@vaadin/text-field';
-import '@vaadin/text-area';
-import '@vaadin/form-layout';
-import '@vaadin/progress-bar';
-import '@vaadin/checkbox';
-import '@vaadin/grid';
-import '@vaadin/grid/vaadin-grid-sort-column.js';
 
 export class DemoTitle extends LitElement {