@ozdao/martyrs 0.2.567 → 0.2.569

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/martyrs",
-  "version": "0.2.567",
+  "version": "0.2.569",
   "description": "Fullstack framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",

package/src/modules/core/views/components/layouts/Client.vue

@@ -176,12 +176,6 @@
 						  </router-view>
 						</Suspense>
 				  </div>
-
-				 	<component
-			      v-if="route.meta.player"
-			      class="z-index-2"
-			    	:is="route.meta.player"
-			    />
 			    
 			  	<transition @before-enter="scrollTop" name="scaleTransition" mode="out-in" appear>
 		        <component
@@ -193,10 +187,18 @@
 				      :location="route.meta.location"
 				    />
 			   	</transition>
+
+					<component
+			      v-if="route.meta.player"
+			      id="player-wrapper"
+			      class="z-index-2 "
+			    	:is="route.meta.player"
+			    />
 				</div>
 			</div>
 		</section>
 
+
 		<router-view  
 			name="defaultBottom"
 			v-slot="{ Component, route }" 
@@ -211,6 +213,8 @@
       class="z-index-2"
     	:is="route.meta.bottombar"
     />
+
+
 	</div>
 </template>
 
@@ -530,4 +534,6 @@
     transform: scale(0.95);
     > section,div { transform: translateZ(-30px);  transition: all 0.5s ease; }
   }
+
+
 </style>

package/src/modules/music/components/layouts/MusicBottomPlayer.vue

@@ -1,7 +1,6 @@
 <!-- components/layouts/MusicBottomPlayer.vue -->
 <template>
-  <div>
-    <MusicPlayer v-if="currentTrack && !showFullPlayer" class="pos-absolute pos-b-0 w-100" />
+    <MusicPlayer v-if="currentTrack && !showFullPlayer" class="pos-sticky pos-b-0 w-100" />
 
     <BottomSheet
       v-if="showFullPlayer"
@@ -10,7 +9,6 @@
     >
       <FullscreenPlayer />
     </BottomSheet>
-  </div>
 </template>
 
 <script setup>

package/src/modules/products/components/sections/SectionProduct.vue

@@ -41,7 +41,6 @@
 				class="pos-absolute pos-t-regular pos-r-regular i-medium t-transp"
 			/>
 
-			<h2 v-if="recommendation" class="t-main t-semi p-medium">{{t('airecommend')}}</h2>
 			<!-- Name -->
 			<h1 class="w-100 h1-product mn-b-small">{{ product.name }}</h1>
 			<!-- Price -->
@@ -51,9 +50,6 @@
 				<SelectElement v-if="sizes2.length > 0" :elements="sizes2" :selected="product.selectedSize" class="mn-r-medium" />
 			</div> -->
 			<!-- Description -->
-			<h3 v-if="recommendation" class="mn-b-semi">
-				{{ recommendation }}
-			</h3>
 
 			<Tab 
 				v-model:selected="tabProduct"
@@ -69,11 +65,11 @@
 				<transition name="slide-fade">
 
 					<div v-if="tabProduct === 'description'"  class="pd-medium radius-medium bg-light ">
-						<p v-if="product.description && !product.translations < 1 && !recommendation" class="w-100 t-transp">
+						<p v-if="product.description && !product.translations < 1" class="w-100 t-transp">
 							{{ product.description }}
 						</p>
 
-						<p v-if="product.translations && product.translations.length > 1 && !recommendation" class="w-100 t-transp">
+						<p v-if="product.translations && product.translations.length > 1" class="w-100 t-transp">
 							{{ t('description') }}
 						</p>
 					</div>
@@ -161,9 +157,6 @@ const props = defineProps({
   accesses: {
     type: Object,
 	  default: null
-  },
-  recommendation: {
-  	type: String
   }
 })
 

package/src/modules/products/controllers/products.controller.js

@@ -1,5 +1,3 @@
-import ChatGPT from '@martyrs/src/modules/integrations/openai/openai.globals.js';
-
 import queryProcessorCore from '@martyrs/src/modules/core/controllers/utils/queryProcessor.js';
 import queryProcessorProducts from '@martyrs/src/modules/products/controllers/queries/products.queries.js';
 
@@ -158,61 +156,12 @@ const controllerFactory = db => {
       res.status(500).send({ message: err.message });
     }
   };
-  
-  const getProductRecommendation = async (req, res) => {
-    const { mood } = req.body;
-    try {
-      const products = await Product.find({
-        status: 'published',
-      }).limit(40);
-      if (!products) {
-        console.log('no products');
-        return res.status(404).send({ message: 'Products not found.' });
-      }
-      const productsList = products
-        .map(p => {
-          const info = p.attributes || [];
-          const value0 = info[0] ? info[0].value : '';
-          const value1 = info[1] ? `(${info[1].value}%)` : '';
-          const value2 = info[2] ? `(${info[2].value})` : '';
-          return `${p._id}: ${p.name} (${value0}) ${value1} ${value2}`;
-        })
-        .join(', ');
-      
-      const prompt = `
-        1. When asked how the client wants to feel, they responded "${mood}".
-        2. Here is a list of products in our store: ${productsList}. 
-        3. Based on the attributes about the products (strain, THC content) and the user's desires, choose 1 product to recommend to the user.
-        4. The response should be in the language that the user used in mood (${mood}).
-        5. Please format your response as a JSON object '{"_id": "ID of the recommended product (it must correspond to one of the product IDs I sent)", "recommendationText": "Text explaining why this particular product"'. Write only the JSON object without any other text outside of it.
-      `;
-
-      // Specify a model explicitly
-      const result = await ChatGPT.createChatCompletion(prompt, {
-        model: 'gpt-4',
-        temperature: 0.8,
-        systemPrompt: 'You are a product recommendation specialist with expertise in matching customer needs to product attributes.'
-      });
-
-      const recommendedProduct = await Product.findById(result._id);
-      
-      if (!recommendedProduct) {
-        console.log(`No product found with _id: ${result._id}`);
-        return res.status(404).send({ message: 'Recommended product not found.' });
-      }
-      res.status(200).json({ product: recommendedProduct, recommendationText: result.recommendationText });
-    } catch (err) {
-      console.log(err);
-      res.status(500).send({ message: err });
-    }
-  };
 
   return {
     Create,
     Read,
     Update,
     Delete,
-    getProductRecommendation,
   };
 };
 export default controllerFactory;

package/src/modules/products/experiments/product-recommendation/README.md

@@ -0,0 +1,156 @@
+# Product Recommendation (Experiment)
+
+AI-powered product recommendation feature using OpenAI GPT-4.
+
+## Overview
+
+This experiment provides personalized product recommendations based on user mood/preferences using ChatGPT.
+
+## Features
+
+- AI-powered product selection based on user mood
+- Integration with OpenAI GPT-4
+- Custom recommendation page with mood input
+- Recommendation display in product details
+
+## Structure
+
+```
+experiments/product-recommendation/
+├── components/
+│   ├── ProductRecommmendation.vue    # Main recommendation page
+│   └── HeroRecommendation.vue        # Mood input component
+├── store/
+│   └── recommendation.store.js       # Store for recommendation state
+├── controllers/
+│   └── recommendation.controller.js  # Backend recommendation logic
+├── routes/
+│   └── recommendation.routes.js      # API endpoint
+├── router/
+│   └── recommendation.router.js      # Frontend routes
+└── README.md
+```
+
+## Requirements
+
+To use this experiment, you need:
+
+1. **OpenAI API Key** in your `.env` file:
+   ```
+   OPENAI_API_KEY=your-api-key-here
+   ```
+
+2. **OpenAI integration** at `/martyrs/src/modules/integrations/openai/openai.globals.js`
+
+## How to Enable
+
+### 1. Backend Setup
+
+Add to your `products.server.js`:
+
+```javascript
+import recommendationRoutes from './experiments/product-recommendation/routes/recommendation.routes.js';
+
+// In initialize function:
+recommendationRoutes(app, db);
+```
+
+### 2. Frontend Store
+
+Add to your `products.client.js`:
+
+```javascript
+import * as storeRecommendation from './experiments/product-recommendation/store/recommendation.store.js';
+
+// In initialize function:
+store.addStore('recommendation', storeRecommendation);
+```
+
+### 3. Frontend Routes
+
+Import and add routes from `./experiments/product-recommendation/router/recommendation.router.js`:
+
+```javascript
+import { recommendationRoutes } from './experiments/product-recommendation/router/recommendation.router.js';
+
+// Add to your routes:
+...recommendationRoutes.homeRoutes,
+...recommendationRoutes.organizationRoutes,
+```
+
+### 4. Component Exports
+
+Add to `products.client.js` exports:
+
+```javascript
+import HeroRecommendation from './experiments/product-recommendation/components/HeroRecommendation.vue';
+import ProductRecommendation from './experiments/product-recommendation/components/ProductRecommmendation.vue';
+
+export {
+  // ... other exports
+  HeroRecommendation,
+  ProductRecommendation,
+};
+```
+
+### 5. SectionProduct Integration (Optional)
+
+To show recommendations in product details, add to `SectionProduct.vue`:
+
+```vue
+<template>
+  <SectionProduct
+    :product="product"
+    :recommendation="recommendation.state.current.recommendation"
+  />
+</template>
+
+<script>
+import * as recommendation from '../experiments/product-recommendation/store/recommendation.store.js';
+</script>
+```
+
+And add prop to `SectionProduct.vue`:
+
+```javascript
+defineProps({
+  // ... other props
+  recommendation: {
+    type: String
+  }
+})
+```
+
+## Usage
+
+1. Navigate to `/products/recommendation`
+2. Enter your mood/preference
+3. Get AI-powered product recommendation
+4. View recommended product details
+
+## API Endpoint
+
+```
+POST /api/product/recommended
+Body: { mood: "your mood here" }
+Response: { product: {...}, recommendationText: "..." }
+```
+
+## Notes
+
+- Requires OpenAI API key and valid subscription
+- Uses GPT-4 model for better recommendations
+- Customize prompt in `recommendation.controller.js`
+- Product attributes (strain, THC content) are used for matching
+
+## Removed from Core
+
+This feature was moved to experiments to:
+- Remove OpenAI dependency from core products module
+- Make it optional for projects that don't need AI recommendations
+- Allow easier customization and experimentation
+- Reduce bundle size for projects without AI features
+
+## License
+
+Part of @ozdao/martyrs framework.

package/src/modules/products/experiments/product-recommendation/controllers/recommendation.controller.js

@@ -0,0 +1,59 @@
+import ChatGPT from '@martyrs/src/modules/integrations/openai/openai.globals.js';
+
+const controllerFactory = db => {
+  const Product = db.product;
+
+  const getProductRecommendation = async (req, res) => {
+    const { mood } = req.body;
+    try {
+      const products = await Product.find({
+        status: 'published',
+      }).limit(40);
+      if (!products) {
+        console.log('no products');
+        return res.status(404).send({ message: 'Products not found.' });
+      }
+      const productsList = products
+        .map(p => {
+          const info = p.attributes || [];
+          const value0 = info[0] ? info[0].value : '';
+          const value1 = info[1] ? `(${info[1].value}%)` : '';
+          const value2 = info[2] ? `(${info[2].value})` : '';
+          return `${p._id}: ${p.name} (${value0}) ${value1} ${value2}`;
+        })
+        .join(', ');
+
+      const prompt = `
+        1. When asked how the client wants to feel, they responded "${mood}".
+        2. Here is a list of products in our store: ${productsList}.
+        3. Based on the attributes about the products (strain, THC content) and the user's desires, choose 1 product to recommend to the user.
+        4. The response should be in the language that the user used in mood (${mood}).
+        5. Please format your response as a JSON object '{"_id": "ID of the recommended product (it must correspond to one of the product IDs I sent)", "recommendationText": "Text explaining why this particular product"'. Write only the JSON object without any other text outside of it.
+      `;
+
+      // Specify a model explicitly
+      const result = await ChatGPT.createChatCompletion(prompt, {
+        model: 'gpt-4',
+        temperature: 0.8,
+        systemPrompt: 'You are a product recommendation specialist with expertise in matching customer needs to product attributes.'
+      });
+
+      const recommendedProduct = await Product.findById(result._id);
+
+      if (!recommendedProduct) {
+        console.log(`No product found with _id: ${result._id}`);
+        return res.status(404).send({ message: 'Recommended product not found.' });
+      }
+      res.status(200).json({ product: recommendedProduct, recommendationText: result.recommendationText });
+    } catch (err) {
+      console.log(err);
+      res.status(500).send({ message: err });
+    }
+  };
+
+  return {
+    getProductRecommendation,
+  };
+};
+
+export default controllerFactory;

package/src/modules/products/experiments/product-recommendation/router/recommendation.router.js

@@ -0,0 +1,43 @@
+// Product Recommendation Routes
+// These routes can be added to products router if needed
+
+export const recommendationRoutes = {
+  // Home context routes
+  homeRoutes: [
+    {
+      path: 'recommendation',
+      name: 'ProductRecommmendation',
+      meta: {
+        title: {
+          en: 'Product Recommmendation',
+          ru: 'Рекомендации продукта',
+        },
+        header_theme: 'dark',
+        footer_theme: 'dark',
+      },
+      component: () => import(/* webpackChunkName: 'products-recommendation' */ '../components/ProductRecommmendation.vue'),
+      props: route => ({ mood: route.query.mood }),
+    },
+  ],
+
+  // Organization context routes
+  organizationRoutes: [
+    {
+      path: 'recommendation',
+      name: 'Organization_ProductRecommmendation',
+      meta: {
+        title: {
+          en: 'Product Recommmendation',
+          ru: 'Рекомендации продукта',
+        },
+        header_theme: 'dark',
+        footer_theme: 'dark',
+        context: 'organization',
+      },
+      component: () => import(/* webpackChunkName: 'products-recommendation' */ '../components/ProductRecommmendation.vue'),
+      props: route => ({ mood: route.query.mood }),
+    },
+  ],
+};
+
+export default recommendationRoutes;

package/src/modules/products/experiments/product-recommendation/routes/recommendation.routes.js

@@ -0,0 +1,10 @@
+import controllerFactory from '../controllers/recommendation.controller.js';
+
+const routesFactory = (app, db) => {
+  const controller = controllerFactory(db);
+
+  // Product recommendation endpoint
+  app.post('/api/product/recommended', controller.getProductRecommendation);
+};
+
+export default routesFactory;

package/src/modules/products/experiments/product-recommendation/store/recommendation.store.js

@@ -0,0 +1,38 @@
+import { reactive } from 'vue';
+import $axios from '@martyrs/src/modules/core/plugins/axios.js';
+
+const state = reactive({
+  current: {
+    recommendation: false,
+  },
+});
+
+const actions = {
+  async submitMood(presetMood = null) {
+    return $axios.post('/api/product/recommended', { mood: presetMood }).then(
+      response => {
+        state.current = response.data.product;
+        state.current.recommendation = response.data.recommendationText;
+        return Promise.resolve(response.data);
+      },
+      error => {
+        console.error('Recommendation error:', error);
+        return Promise.reject(error);
+      }
+    );
+  },
+};
+
+const mutations = {
+  resetRecommendation() {
+    state.current = {
+      recommendation: false,
+    };
+  },
+};
+
+export default {
+  state,
+  actions,
+  mutations,
+};

package/src/modules/products/products.client.js

@@ -19,7 +19,6 @@ import ProductImages from './components/blocks/ProductImages.vue';
 // Sections
 import EditVariants from './components/sections/EditVariants.vue';
 import FilterProducts from './components/sections/FilterProducts.vue';
-import HeroRecommendation from './components/sections/HeroRecommendation.vue';
 import ProductsPopular from './components/sections/ProductsPopular.vue';
 import SectionProduct from './components/sections/SectionProduct.vue';
 
@@ -28,7 +27,6 @@ import Price from './components/elements/Price.vue';
 // Pages
 import Product from './components/pages/Product.vue';
 import ProductEdit from './components/pages/ProductEdit.vue';
-import ProductRecommendation from './components/pages/ProductRecommmendation.vue';
 import Products from './components/pages/Products.vue';
 
 // Пример функции инициализации для модуля продуктов
@@ -69,14 +67,12 @@ const ModuleProducts = {
       CardPosition,
       // Sections
       SectionProduct,
-      HeroRecommendation,
       FilterProducts,
       EditVariants,
       ProductsPopular,
       // Pages
       Product,
       ProductEdit,
-      ProductRecommendation,
       Products,
       // Layouts
     },
@@ -89,7 +85,6 @@ export {
   CardProduct,
   EditVariants,
   FilterProducts,
-  HeroRecommendation,
   Image360,
   // Blocks
   ProductImages,
@@ -99,7 +94,6 @@ export {
   // Pages
   Product,
   ProductEdit,
-  ProductRecommendation,
   Products,
   // Sections
   SectionProduct,

package/src/modules/products/products.router.js

@@ -74,20 +74,6 @@ export function getRoutes(options = {}) {
           ],
           component: () => import(/* webpackChunkName: "products-edit" */ './components/pages/ProductEdit.vue'),
         },
-        {
-          path: 'recommendation',
-          name: 'ProductRecommmendation',
-          meta: {
-            title: {
-              en: 'Product Recommmendation',
-              ru: 'Рекомендации продукта',
-            },
-            header_theme: 'dark',
-            footer_theme: 'dark',
-          },
-          component: () => import(/* webpackChunkName: 'products-recommendation' */ './components/pages/ProductRecommmendation.vue'),
-          props: route => ({ mood: route.query.mood }),
-        },
       ],
     }
   });
@@ -162,21 +148,6 @@ export function getRoutes(options = {}) {
           ],
           component: () => import(/* webpackChunkName: "products-edit" */ './components/pages/ProductEdit.vue'),
         },
-        {
-          path: 'recommendation',
-          name: 'Organization_ProductRecommmendation',
-          meta: {
-            title: {
-              en: 'Product Recommmendation',
-              ru: 'Рекомендации продукта',
-            },
-            header_theme: 'dark',
-            footer_theme: 'dark',
-            context: 'organization',
-          },
-          component: () => import(/* webpackChunkName: 'products-recommendation' */ './components/pages/ProductRecommmendation.vue'),
-          props: route => ({ mood: route.query.mood }),
-        },
       ],
     }
   });

package/src/modules/products/router/products.router.js

@@ -81,20 +81,6 @@ export function getRoutes(options = {}) {
           beforeEnter: [validationAuth.requiresAuth],
           component: () => import(/* webpackChunkName: "products-edit" */ '../components/pages/ProductEdit.vue'),
         },
-        {
-          path: 'recommendation',
-          name: 'ProductRecommmendation',
-          meta: {
-            title: {
-              en: 'Product Recommmendation',
-              ru: 'Рекомендации продукта',
-            },
-            header_theme: 'dark',
-            footer_theme: 'dark',
-          },
-          component: () => import(/* webpackChunkName: 'products-recommendation' */ '../components/pages/ProductRecommmendation.vue'),
-          props: route => ({ mood: route.query.mood }),
-        },
       ],
     },
   });
@@ -275,20 +261,6 @@ export function getRoutes(options = {}) {
             ],
             component: () => import(/* webpackChunkName: "products-edit" */ '../components/pages/ProductEdit.vue'),
           },
-          {
-            path: 'recommendation',
-            name: 'ProductRecommmendation',
-            meta: {
-              title: {
-                en: 'Product Recommmendation',
-                ru: 'Рекомендации продукта',
-              },
-              header_theme: 'dark',
-              footer_theme: 'dark',
-            },
-            component: () => import(/* webpackChunkName: 'products-recommendation' */ '../components/pages/ProductRecommmendation.vue'),
-            props: route => ({ mood: route.query.mood }),
-          },
         ],
       },
     });

package/src/modules/products/routes/products.routes.js

@@ -9,6 +9,4 @@ export default (function (app, db, allowedOrigins) {
   app.post('/api/products/:_id', controller.Update);
   // (D) Delete product
   app.delete('/api/products/:_id', controller.Delete);
-  
-  app.post('/api/product/recommended', controller.getProductRecommendation);
 });

package/src/modules/products/store/products.js

@@ -12,7 +12,6 @@ import $axios from '@martyrs/src/modules/core/views/utils/axios-instance.js';
 const state = reactive({
   all: [],
   current: {
-    recommendation: false,
     category: [],
     status: 'draft',
     listing: 'sale',
@@ -132,20 +131,6 @@ const actions = {
     );
   },
 
-  async submitMood(presetMood = null) {
-    return $axios.post('/api/product/recommended', { mood: presetMood }).then(
-      response => {
-        state.current = response.data.product;
-        state.current.recommendation = response.data.recommendationText;
-        return Promise.resolve(response.data);
-      },
-      error => {
-        setError(error);
-        return Promise.reject(error);
-      }
-    );
-  },
-
   async fetchProducts() {
     return await $axios.get(`/api/products/read`).then(
       products => {
@@ -214,7 +199,6 @@ const mutations = {
   resetProduct(product) {
     state.current = {
       included: null,
-      recommendation: false,
       category: [],
       status: 'draft',
       attributes: [],