wineater-bot 3.0.1 → 3.0.3

package/index.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Chatbot</title>
     <!-- <script type="module" src="https://unpkg.com/wineater-bot@1.0.0/dist/wineater-chatbot.umd.js"></script> -->
-    <script>window.wineaterData = {CLIENT_TOKEN: 'K0ZzlrfT0z00J6dSAt8ZEIKWiUfypG1Tyb1ZGtgwuJaF8WZuRKlHfvEMCF9DyytZ', position: 'right-center'};</script>
-    <script type="module" src="./src/index.js"></script>
+    <script>window.wineaterData = {CLIENT_TOKEN: 'HeUw6IXuhvz6tRuXdPEGEbj3SGQ3Q2YtEc1Z8jd41Kg9LtyPb4Epu0to31SYIadG', position: 'right-center', TYPE: 'widget'};</script>
+    <script type="module" src="./dist/wineater-chatbot.umd.js"></script>
 </head>
 <body style="margin: 0;">
     <div id="widget-container"></div> <!-- Контейнер для виджета -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wineater-bot",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "",
   "main": "dist/index.js",
   "module": "src/index.js",

package/src/index.js

@@ -8,11 +8,11 @@ import translator from './js/i18n.js';
 import { shouldOpenChatAutomatically } from './js/auto-open.js';
 import { toggleChatWindow, closeChatWindow, openChatWindow } from './js/ui.js';
 
-const DEMO_TOKEN = 'tbMTFzLbWcXFgXK8SzyFHA6kIjelFcz5VQABVPbXdXh5XZJCDQH9BcVlrv3DF3kA';
+const DEMO_TOKEN = 'HeUw6IXuhvz6tRuXdPEGEbj3SGQ3Q2YtEc1Z8jd41Kg9LtyPb4Epu0to31SYIadG';
 
 class App {
     constructor() {
-        this.stores = ['climats', 'telckel', 'biobio', 'weinpoint', 'vinigrandi', 'ampely'];
+        this.stores = ['climats', 'telckel', 'biobio', 'weinpoint', 'vinigrandi', 'ampely', 'test'];
         this.tracker = new Tracker({ projectKey: "PA8j9fAi49i6g2QnvpNs", '__DISABLE_SECURE_MODE': true });
         this.position = window?.wineaterData?.POSITION || 'right-center';
         this.type = window?.wineaterData?.TYPE || 'chatbot';
@@ -37,8 +37,8 @@ class App {
     }
 
     async initTranslator() {
-        const storeName = this.store ? this.store.charAt(0).toUpperCase() + this.store.slice(1) : 'Climats';
-        await translator.fetchConfig(storeName || 'Climats');
+        const storeName = this.store ? this.store.charAt(0).toUpperCase() + this.store.slice(1) : 'Test';
+        await translator.fetchConfig(storeName || 'Test');
     }
 
     initCookies() {
@@ -65,7 +65,7 @@ class App {
       const chatbotHTML = `
           <div id="chatbot-container">
               <div id="chat-icon">
-                  <img src="https://landing-static.s3.eu-central-1.amazonaws.com/images/chat-icon.svg" alt="Chat Icon">
+                  <img src="https://czvgkhagwvmknscoerfy.supabase.co/storage/v1/object/public/static-media/chat-icon.svg" alt="Chat Icon">
                   <span>${buttonText}</span>
               </div>
               <div id="chat-window" class="hidden">
@@ -86,7 +86,7 @@ class App {
             <div id="powered-by">
               <a href="https://wineater.com" target="_blank">
                 <span>${translator.translate('poweredBy')}</span>
-                <img src="https://landing-static.s3.eu-central-1.amazonaws.com/images/logo.svg" alt="Wineater Logo" id="chatbot-logo">
+                <img src="https://czvgkhagwvmknscoerfy.supabase.co/storage/v1/object/public/static-media/logo.svg" alt="Wineater Logo" id="chatbot-logo">
               </a>
                     </div>
           </div>

package/src/js/api.js

@@ -1,7 +1,7 @@
 // api.js
 
-const stores = ['climats', 'telckel', 'biobio', 'weinpoint', 'vinigrandi', 'ampely'];
-const DEMO_TOKEN='bMTFzLbWcXFgXK8SzyFHA6kIjelFcz5VQABVPbXdXh5XZJCDQH9BcVlrv3DF3kA';
+const stores = ['climats', 'telckel', 'biobio', 'weinpoint', 'vinigrandi', 'ampely', 'test'];
+const DEMO_TOKEN='HeUw6IXuhvz6tRuXdPEGEbj3SGQ3Q2YtEc1Z8jd41Kg9LtyPb4Epu0to31SYIadG';
 
 export class Api {
     constructor(apiEndpoint) {
@@ -59,6 +59,33 @@ export class Api {
         }
     }
 
+    async getWineRecommendationsSearch(text) {
+        console.log(window.location.href);
+        try {
+            const response = await fetch(`${this.baseURL}dish/recommendations/search`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    'Authorization': `Bearer ${this.token}`
+                },
+                body: JSON.stringify({ text: text, store: this.store ? (this.store.toString().charAt(0).toUpperCase() + this.store.slice(1)) : undefined})
+            });
+
+            const data = await response.json();
+
+            if (!response.ok) {
+                // Providing more detailed error information
+                throw new Error(`API call failed with status ${response.status}: ${data.message || 'No additional error information'}`);
+            }
+
+            return data;
+        } catch (error) {
+            // Log and rethrow to allow consumer of the API to handle or display the error appropriately
+            console.error('Fetching wine recommendations failed:', error.message);
+            throw new Error(`Error in getWineRecommendations: ${error.message}`);
+        }
+    }
+
     async getPossibleDishesWithMeta(metaTitle, metaDescription) {
         try {
             const response = await fetch(`${this.baseURL}dish/possible_dishes`, {

package/src/js/styles.js

@@ -435,10 +435,14 @@ border-bottom-right-radius: 15px;
   justify-content: center;
   align-items: center;
   height: 0;
-    visibility: hidden;
+  visibility: hidden;
   background-color: white;
 }
 
+#loading-indicator .typing-indicator {
+visibility: visible;
+}
+
 .typing-indicator span {
   display: block;
   width: 8px;

package/src/js/widget.js

@@ -31,9 +31,10 @@ export class WineWidget {
                     <div class="filter-group">
                         <span class="filter-label">${translator.translate('priceRange')}:</span>
                         <div class="filter-buttons" id="price-buttons">
-                            <button data-value="<10"><$10</button>
-                            <button data-value="10-20">$10-$20</button>
-                            <button data-value=">20">>$20</button>
+                            <button data-value="< 500">< $500</button>
+                            <button data-value="500 - 1000">$500 - $1000</button>
+                            <button data-value="> 1000">> $1000</button>
+                            <button data-value=" " class="selected">Any</button>
                         </div>
                     </div>
                     <div class="filter-group">
@@ -42,6 +43,7 @@ export class WineWidget {
                             <button data-value="red">${translator.translate('red')}</button>
                             <button data-value="white">${translator.translate('white')}</button>
                             <button data-value="rose">${translator.translate('rose')}</button>
+                            <button data-value=" " class="selected">${translator.translate('Any')}</button>
                         </div>
                     </div>
                     <div class="filter-group">
@@ -50,19 +52,22 @@ export class WineWidget {
                             <button data-value="light">${translator.translate('light')}</button>
                             <button data-value="medium">${translator.translate('medium')}</button>
                             <button data-value="full">${translator.translate('full')}</button>
+                            <button data-value=" " class="selected">${translator.translate('Any')}</button>
                         </div>
                     </div>
                 </div>
                 <div id="powered-by-widget">
                     <a href="https://wineater.com" target="_blank">
                         <span>${translator.translate('poweredBy')}</span>
-                        <img src="https://landing-static.s3.eu-central-1.amazonaws.com/images/logo.svg" alt="Wineater Logo">
+                        <img src="https://czvgkhagwvmknscoerfy.supabase.co/storage/v1/object/public/static-media/logo.svg" alt="Wineater Logo">
                     </a>
                 </div>
             </div>
                 <div id="wine-widget-right">
                     <div id="loading-indicator" class="hidden">
-                        <img src="https://czvgkhagwvmknscoerfy.supabase.co/storage/v1/object/public/static-media/mascot.jpeg" alt="Loading" />
+                        <div id="typing-indicator" class="typing-indicator">
+                            <span></span><span></span><span></span>
+                        </div>
                     </div>
                     <div id="wine-placeholder"></div>
             </div>
@@ -92,29 +97,44 @@ export class WineWidget {
                 buttons.forEach(btn => btn.classList.remove('selected'));
                 e.target.classList.add('selected');
                 this.selectedFilters[filterKey] = e.target.dataset.value;
+                this.handleSearch();
             });
         });
     }
 
     async handleSearch() {
-        const query = document.getElementById('wine-search-input').value;
-
-        // Показать эффект исчезновения карточек
-        this.animateCardDisappearance();
-
-        // Показать индикатор загрузки
-
+        const query = 'wine for dish:' + document.getElementById('wine-search-input').value.trim() + ';';
     
         // Учитываем текущие выбранные фильтры
         const filters = this.selectedFilters;
-        
-        // Добавляем вывод информации о запросе
-        console.log('Searching for:', query);
+    
+        // Формируем органичную фразу с фильтрами
+        const filterPhrases = [];
+        if (filters.price) {
+            filterPhrases.push(`price: ${filters.price || 'any'};`);
+        }
+        if (filters.color) {
+            filterPhrases.push(`color: ${filters.color || 'any'}; `);
+        }
+        if (filters.intensity) {
+            filterPhrases.push(`intensity: ${filters.intensity || 'any'}; `);
+        }
+    
+        // Объединяем фильтры с основным запросом
+        const fullQuery = filterPhrases.length > 0 
+            ? `${query} ${filterPhrases.join(', ')}`
+            : query;
+    
+        // Логирование запроса
+        console.log('Searching for:', fullQuery);
         console.log('Applied filters:', filters);
     
+        // Показать эффект исчезновения карточек и индикатор загрузки
+        this.animateCardDisappearance();
+        
         try {
             // Вызываем API метод для получения рекомендаций
-            const results = await this.api.getWineRecommendations(query);
+            const results = await this.api.getWineRecommendationsSearch(fullQuery);
     
             // Проверяем, есть ли данные
             if (results && results.length > 0) {
@@ -207,7 +227,7 @@ export class WineWidget {
     }
 
     async loadInstantRecommendations() {
-        console.log('привет')
+        this.showLoadingIndicator();
         try {
             const recommendations = await this.api.getInstantRecommendations();
             this.displayResults(recommendations); // Обновляем отображение рекомендаций