@ozdao/prometheus-framework 0.1.38 → 0.1.40

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

@@ -75,17 +75,29 @@
 			<p v-if="product.localization && product.localization.length > 1 && !recommendation" class="w-100  mn-medium t-transp">
 				{{ t('description') }}
 			</p>
-			<div class="cols-2 w-100 gap-small mn-semi">
-				<div v-if="product.information.length > 0" v-for="information in product.information" class="w-100 pd-small radius-small bg-white product-information">
+
+			<div 
+				class="cols-2 w-100 gap-small mn-semi"
+			>
+				<div 
+					v-if="product.information.length > 0" 
+					v-for="information in product.information" 
+					class="w-100 pd-small radius-small bg-white product-information"
+				>
 					<p class="t-demi">{{ information.name }}</p>
 					<p>{{ information.value }}</p>
 				</div>
 			</div>
+
 			<!-- Actions -->
 			<div class="max-w-33rem mobile-w-100 t-white gap-small cols-2">
-				<button :disabled="validateToCard(product)" @click="addToCart(product)" class="w-100 mn-r-small bg-main button">{{ t('addtoorder') }}</button>
-				<!-- <button @click="store.commit('toggleBackCall')" class="w-100 button-grey button">{{ t('fastorder') }}</button> -->
-				<!-- <AddToFavorites :product="product" /> -->
+				<button 
+					:disabled="validateToCard(product)" 
+					@click="addToCart(product)" 
+					class="w-100 mn-r-small bg-main button"
+				>
+					{{ t('addtoorder') }}
+				</button>
 			</div>
 		</div>
 	</div>

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

@@ -1,4 +1,12 @@
 const {v1: uuidv1, v4: uuidv4, } = require('uuid');
+
+const fetch = require('node-fetch')
+const path = require('path');
+
+const OpenAI = require("openai");
+
+const openai = new OpenAI();
+
 // Factory
 const controllerFactory = (db) => {
   const Product = db.product;
@@ -190,6 +198,80 @@ const controllerFactory = (db) => {
       console.log(products)
     }); 
   };
+  const getProductRecommendation = async (req, res) => {
+    const { mood } = req.body;
+
+    try {
+      const products = await Product.find({
+        status: 'published',
+        popularity: { $gt: 10 },
+      }).limit(40);
+
+      if (!products) {
+        console.log('no products')
+        return res.status(404).send({ message: "Products not found." });
+      }
+
+      const productsList = products.map(p => `
+        ${p._id}: 
+        ${p.name} 
+        (${p.information[0].value}) 
+        (${p.information[1].value}%)  
+        (${p.information[2].value})
+      `).join(', ');
+
+      const prompt = `
+        1. На вопрос как клиент хочет себя почувствовать - он ответил "${mood}". 
+        2. Вот список товаров в нашем магазине: ${productsList}. 
+        3. На основе информации о товарах (сорт, количество THC) и желания пользователя выбери 1 товар который порекомендовать пользователю.
+        4. Ответ должен быть на языке который пользователь использовал в ${mood}.
+        5. Пожалуйста, форматируйте ваш ответ в виде json объекта '{"_id": "_id рекомендтованого товара (он должен соответсовать одному из _id товаров, которые я прислал ","recommendationText": Текст почему именно этот товар'. Напишите только json объект без какого либо еще текста вне него.
+      `
+      
+      console.log(prompt)
+      
+      let response;
+      let result;
+
+      while (true) {
+        try {
+          response = await openai.chat.completions.create({
+            model: "gpt-4",
+            messages: [{role: "user", content: prompt}],
+          }); 
+
+          console.log(response)
+
+          result = JSON.parse(response.choices[0].message.content);
+          break;
+        } catch (err) {
+          if (err instanceof SyntaxError) {
+            console.log("Received invalid JSON, retrying...");
+          } else {
+            console.log(err);
+            res.status(500).send({ message: err });
+            return;
+          }
+        }
+      }
+
+      console.log(result._id)
+      console.log(result.recommendationText)
+
+      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 });
+    }
+  };
+  
   const getProductsPopular = (req, res) => {
     Product.find({
       status: 'published',
@@ -305,6 +387,7 @@ const controllerFactory = (db) => {
     getProducts,
     getProductsPopular,
     getProduct,
+    getProductRecommendation
   };
 };
 

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

@@ -1,6 +1,6 @@
 const controllerFactory = require("../controllers/products.controller");
 
-module.exports = function(app, db) {
+module.exports = function(app, db, allowedOrigins) {
   const controller = controllerFactory(db);
   
   app.use(function(req, res, next) {
@@ -41,10 +41,10 @@ module.exports = function(app, db) {
   //   controller.getProductsPopular
   // );
   // // Get recommendation
-  // app.post(
-  //   "/product/recommended",
-  //   controller.getProductRecommendation
-  // );
+  app.post(
+    "/product/recommended",
+    controller.getProductRecommendation
+  );
   // // Get product
   // app.get(
   //   "/products/:_id",

package/src/modules/spots/components/layouts/Spots.vue

@@ -16,13 +16,13 @@
 				      	<h2 class="t-left">
 				      		<span class="">Weed in </span>
 
-				      		<span @click="a => { store.globals.state.isLocationPopupOpen = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-main">
+				      		<span @click="a => { globals.state.isLocationPopupOpen = true }" v-if="localPosition.city || localPosition.state || localPosition.country" class="t-semi t-main">
 			      				<span v-if="localPosition.city">{{localPosition.city}}, </span>
 			      				<span v-if="localPosition.state">{{localPosition.state}}, </span>
 			      				<span v-if="localPosition.country">{{localPosition.country}}</span>
 				      		</span>
 
-				      		<span v-else @click="a => { store.globals.state.isLocationPopupOpen = true }"  class="t-semi t-main">
+				      		<span v-else @click="a => { globals.state.isLocationPopupOpen = true }"  class="t-semi t-main">
  										The World
 				      		</span>
 				      	</h2>
@@ -43,7 +43,7 @@
 			          name="categories"
 			          :value="category.url"
 			          class="w-100 mn-t-small mn-small bg-white radius-small pd-small"
-			          :radio="store.marketplace.state.filter.categories"
+			          :radio="marketplace.state.filter.categories"
 			        />
 			       </Dropdown>
 
@@ -54,7 +54,7 @@
 			          name="prices"
 			          :value="price.value"
 			          class="w-100 mn-t-small bg-white radius-small pd-small"
-			          :radio="store.marketplace.state.filter.prices"
+			          :radio="marketplace.state.filter.prices"
 			        />
 			       </Dropdown>
 
@@ -65,7 +65,7 @@
 			          name="prices"
 			          :value="delivery.value"
 			          class="w-100 mn-t-small bg-white radius-small pd-small"
-			          :radio="store.marketplace.state.filter.delivery"
+			          :radio="marketplace.state.filter.delivery"
 			        />
 			       </Dropdown>
 						<!-- Reset filter -->
@@ -124,13 +124,18 @@
 	import Footer from '@pf/src/components/Footer/Footer.vue'
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
+
+	import * as globals from '@pf/src/modules/globals/store/globals';
+	import * as categories from '@pf/src/modules/products/store/categories';
+	import * as marketplace from '@pf/src/modules/marketplace/store/marketplace';
+
 	// Accessing router and store
 	const route = useRoute()
 	const router = useRouter()
 
 
 	// Accessing state
-	const categories = computed(() => store.categories.state.all)
+	const categories2 = computed(() => categories.state.all)
 
 	const delivery = [
     { label: 'Pickup',					value: 'pickup' },
@@ -179,15 +184,15 @@
 		    delivery: query.delivery ? query.delivery.split(',') : [],
 		    // Продолжайте этот паттерн для остальных полей фильтра
 		  };
-		  store.marketplace.state.filter = newFilterValue;
+		  marketplace.state.filter = newFilterValue;
 		}
 
 
 		// Data fetching
-		await store.categories.actions.fetchCategories()
+		await categories.actions.fetchCategories()
 	})
 
-	watch(() => store.marketplace.state.filter, (newFilterValue, oldFilterValue) => {
+	watch(() => marketplace.state.filter, (newFilterValue, oldFilterValue) => {
 	  // Переводим фильтр в формат query
 	  const query = { ...route.query };
 
@@ -218,7 +223,7 @@
 	    .replace(/[^a-z0-9-]/g, ''); // Удаление всех символов, которые не являются буквами, цифрами или дефисами
 	}
 
-	watch(() => store.globals.state.position, (newPosition) => {
+	watch(() => globals.state.position, (newPosition) => {
 	  // get the current route
 	  const currentRoute = { ...router.currentRoute.value };
 	  
@@ -299,7 +304,7 @@
     }
   }
 
- 	store.categories.state.all.forEach( category => {
+ 	categories.state.all.forEach( category => {
   	category.localization.forEach( localization => {
     	text.messages[localization.locale].categories.push(localization.text)
   	})

package/src/modules/spots/components/pages/Map.vue

@@ -5,14 +5,16 @@
 <script setup>
 import { onMounted, watch, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router'
+
 import { state, actions } from '@pf/src/modules/organizations/store/organizations'
 
+import * as globals from '@pf/src/modules/globals/store/globals';
+
 let map = ref(null);
 let markers = ref([]);
 
 const router = useRouter();
 const route = useRoute();
-const store = useStore()
 
 let skip = ref(0);
 let limit = ref(50);
@@ -22,18 +24,18 @@ const props = defineProps({
 });
 
 onMounted(async () => {
-  let lat = parseFloat(route.query.lat || store.globals.state.position.location.lat || '0');
-  let lng = parseFloat(route.query.lng || store.globals.state.position.location.lng || '0');
+  let lat = parseFloat(route.query.lat || globals.state.position.location.lat || '0');
+  let lng = parseFloat(route.query.lng || globals.state.position.location.lng || '0');
 
   let zoomLevel;
 
-    if (route.params.location || store.globals.state.position.location) {
+    if (route.params.location || globals.state.position.location) {
       zoomLevel = 13; // Уровень детализации для координат
-    } else if (route.params.country || store.globals.state.position.country) {
+    } else if (route.params.country || globals.state.position.country) {
       zoomLevel = 10; // Уровень детализации для города
-    } else if (route.params.state || store.globals.state.position.state) {
+    } else if (route.params.state || globals.state.position.state) {
       zoomLevel = 8;  // Уровень детализации для штата
-    } else if (route.params.city || store.globals.state.position.city) {
+    } else if (route.params.city || globals.state.position.city) {
       zoomLevel = 5;  // Уровень детализации для страны
     } else {
       zoomLevel = 2;  // Дефолтный уровень зума

package/src/modules/users/components/pages/Profile.vue

@@ -173,28 +173,38 @@
 			</Menu>
 
 			<Menu class="mn-regular bg-grey">
+
 			  <MenuItem @click="router.push({name: 'User Events', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconEvents class="i-semi" :icon="true"/> 
 			    <span>Events</span>
 			  </MenuItem> 
+
 			  <MenuItem @click="router.push({name: 'User Organizations', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconGroups class="i-semi" :icon="true"/>
 			    <span>Groups</span>
 			  </MenuItem>
+
 			 	<MenuItem @click="router.push({name: 'User Blogposts', params: {_id: route.params._id}})" class="cursor-pointer">
 			 		<IconCommunity class="i-semi" :icon="true"/>
 			    <span>Posts</span>
 			  </MenuItem> 
 			</Menu>
-<!-- 
-			<Menu>
-			  <MenuItem @click="router.push({name: 'User Comments', params: {_id: route.params._id}})" class="cursor-pointer">
+
+
+
+			<Menu class="mn-regular bg-grey">
+				<MenuItem @click="router.push({name: 'User Wallet', params: {_id: route.params._id}})" class="cursor-pointer">
+			    <IconGroups class="i-semi" :icon="true"/>
+			    <span>Wallet</span>
+			  </MenuItem>
+			  
+			  <!-- <MenuItem @click="router.push({name: 'User Comments', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Comments</span>
 			  </MenuItem>
 			  <MenuItem @click="router.push({name: 'User Likes', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Likes</span>
-			  </MenuItem>
-			</Menu> -->
+			  </MenuItem> -->
+			</Menu>
 
 			<Menu 
 				v-if="auth.state.user._id === route.params._id"

package/src/modules/users/router/users.js

@@ -54,6 +54,16 @@ const users = [{
       }
     },
   component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileOrganizations.vue'),
+},{
+  path: 'profile/:_id/wallet',
+  name: 'User Wallet',
+   meta: {
+      title: {
+        en: 'Wallet',
+        ru: 'Кошелек'
+      }
+    },
+  component: () => import(/* webpackChunkName: "profile" */ '@pf/src/modules/wallet/components/pages/Wallet.vue'),
 }
 // ,{
 //   path: 'profile/:_id/likes',

package/src/modules/wallet/components/pages/Wallet.vue

@@ -1,50 +1,126 @@
 <template>
-  <section class="section">
-    <h1 class="">Wallet</h1>
-    <p class="mn-big p-big">Earn Weeder Token Crypto with buying our weed, use it as money when buying our products or withdraw and trade</p>
-
-    <div class="cols-3">
-      <div class="pd-medium radius-medium br-1px br-solid br-grey-transp">
-        <h3 class="mn-small">You own: 0.14% of Weeder</h3>
-        <p class="t-main t-semi mn-small">0.0032 WDT</p>
-        <button class="w-100 bg-main button">Get More</button>
+  <section class="pd-big">
+    <h1 class="mn-small">
+      Your Wallet
+    </h1>
+
+    <p class="mn-semi p-big">
+      Earn Weeder Token Crypto with buying our weed, use it as money when buying our products or withdraw and trade
+    </p>
+
+    <div class="mn-semi flex-nowrap flex gap-thin">
+      <div 
+        v-if="!account"
+        class="w-100 pd-medium radius-medium t-center bg-grey"
+      >
+        <h3 class="mn-small">Make first order and start earning Weeder Token </h3>
+        <!-- <p class="w-max-25r p-big t-transp mn-small">You can also connect a wallet in advance, to which you can withdraw your earned OZET</p> -->
+        <button class="mn-l-auto mn-r-auto bg-main button">Explore marketplace</button>
       </div>
 
-      <div class="pd-medium radius-medium br-1px br-solid br-grey-transp">
-        <h3 class="mn-small">You own: 0.14% of Weeder</h3>
-        <p class="t-main t-semi mn-small">0.0032 WDT</p>
+      <div 
+        v-if="account"
+        class="w-100 pd-medium radius-medium bg-grey"
+      >
+        <p class="h4 mn-thin">You own: </p>
+        <h3 class="mn-small">0.14% of Weeder</h3>
+        <!-- <p class="p-big mn-small">0.0032 WDT</p> -->
         <button class="w-100 bg-main button">Get More</button>
       </div>
 
-      <div class="pd-medium radius-medium br-1px br-solid br-grey-transp">
-        <h3 class="mn-small">You own: 0.14% of Weeder</h3>
-        <p class="t-main t-semi mn-small">0.0032 WDT</p>
+      <div 
+        v-if="account"
+        class="w-100 pd-medium radius-medium bg-grey"
+      >
+         <p class="h4 mn-thin">You earn: </p>
+        <h3 class="mn-small">245.43 WDT</h3>
+        <!-- <p class="p-big mn-small">0.0032 WDT</p> -->
         <button class="w-100 bg-main button">Get More</button>
       </div>
+
+      <div class="w-50 bg-black radius-semi pd-medium t-white">
+        <p class="h4 mn-thin">Your Metamask</p>
+        
+        <div v-if="account" class="mn-small pd-small br-solid br-1px br-white-transp-10 radius-small">
+          {{account}}
+        </div>
+
+        <p v-if="!account"  class="p-medium t-transp mn-small">Connect Metamask to withdrawal your earnings.</p>
+
+        <button 
+          v-if="!account" 
+          @click="connectWallet"
+          class="w-100 button"
+        >
+          Connect Wallet
+        </button>
+
+        <button 
+          v-if="account" 
+          @click="disconnectWallet"
+          class="w-100 bg-red button"
+        >
+          Disonnect Wallet
+        </button>
+
+      </div>
     </div>
+
+
+    <h3
+      class="mn-small"
+    >
+      Incomes
+    </h3>
+
+    <section class="cols-4 gap-thin">
+      <div 
+        class="pd-medium radius-medium bg-grey"
+        v-for="income in [{
+          balance: 34,
+          type: 'income',
+          reason: 'order',
+          target: 'ef34dsdase4389snjnu (_id)'
+        },{
+          balance: 25,
+          type: 'income',
+          reason: 'post',
+          target: 'ef34dsdase4389snjnu (_id)'
+        },{
+          balance: 17,
+          type: 'income',
+          reason: 'comment',
+          target: 'ef34dsdase4389snjnu (_id)'
+        },{
+          balance: 43,
+          type: 'event',
+          reason: 'order',
+          target: 'ef34dsdase4389snjnu (_id)'
+        }]"
+      >
+        <h3 class="mn-small">+ {{income.balance}} WDT</h3>
+        <p class="p-small mn-small">For {{income.reason}} {{income.target}}</p>
+      </div>
+    </section>
+
+
   </section>
 </template>
 
 
 <script setup>
-import { computed, onMounted,reactive, ref,toRefs  } from 'vue'
 import Web3 from 'web3'
 
+import { computed, onMounted,reactive, ref,toRefs  } from 'vue'
 
 import { useRoute,useRouter } from 'vue-router'
-import { useStore } from '@/store';
-
-const store = useStore()
 
 const route = useRoute()
 
-let account = ref(null) 
 let connected = ref(false);
 
 const web3 = new Web3(Web3.givenProvider || 'http://localhost:8080');
-const accounts = await web3.eth.requestAccounts();
-
-account = accounts[0];
+const account = ref(null)
 /////////////////////////////
 // METHODS
 /////////////////////////////
@@ -58,6 +134,11 @@ function connect() {
   }
 }
 
+async function connectWallet () {
+  const accounts = await web3.eth.requestAccounts();
+
+  account.value = accounts[0];
+}
 /////////////////////////////
 // MOUNTED
 /////////////////////////////