@ozdao/prometheus-framework 0.2.35 → 0.2.37

package/src/modules/organizations/components/sections/DetailsTab.vue

@@ -68,13 +68,13 @@
 	    	</h1>
 
 	        <p class="mn-b-medium p-big">
-		     	<Text :text="organization.profile.description ? organization.profile.description : ''" :maxLen="240" />
+		     	<Text :text="organization.profile.description || ''" :maxLen="240" />
 	      	</p>  
 
 
 	        
 	    <Chips 
-      	v-if="organization.profile.tags.length > 0" 
+      	v-if="organization.profile?.tags?.length > 0" 
       	:chips="organization.profile.tags"
       	class="mn-b-semi"
      	/>

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

@@ -41,7 +41,7 @@
             :value="price.value"
             class="w-100 mn-t-small bg-white radius-small pd-small"
             :radio="marketplace.state.filter.prices"
-          @update:radio="event => marketplace.state.filter.prices = event"
+            @update:radio="event => marketplace.state.filter.prices = event"
           />
         </template>
       </Spoiler>
@@ -49,13 +49,12 @@
       <hr class="mn-b-small">
 
       <!-- Delivery Filter -->
-      <Spoiler 
+     <!--  <Spoiler 
         class="radius-small o-hidden br-1px br-solid br-grey mn-b-small"
         :status="false"
       >
         <template #header>
           <p class="cursor-pointer  mn-r-auto t-medium p-big">Delivery</p>
-          <!-- SVG Icon -->
         </template>
         <template #content>
           <Checkbox 
@@ -70,7 +69,7 @@
         </template>
       </Spoiler>
 
-      <hr class="mn-b-semi">
+      <hr class="mn-b-semi"> -->
 
       <!-- Reset filter -->
       <button @click="resetFilters" class="bg-main w-100 button">{{ t('filters.reset') }}</button>

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

@@ -302,11 +302,38 @@
 
 			</div>
 
-      <div class="w-100 h-100 pos-absolute pos-t-0 pos-r-0 z-index-0">
+      <div class="w-100 h-100 flex flex-center pos-absolute pos-t-0 pos-r-0 z-index-0">
+      	
+      	  <div style="background-image: url(/spiral.jpg)" class="spiral"></div>
       	<!-- <canvas id="glcanvas" class="w-100 h-100"></canvas> -->
       </div>
 
 		</div>
 
 	</section>
-</template>
+</template>
+
+<style>
+.spiral {
+	
+  background-size: cover;
+  width: 100rem;
+  height: 100rem;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  opacity: 0.03;
+  transform: translate(-50%, -50%) rotate(0deg);
+  transform-origin: center center;
+  animation: spin 5s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: translate(-50%, -50%) rotate(0deg);
+  }
+  100% {
+    transform: translate(-50%, -50%) rotate(360deg);
+  }
+}
+</style>

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

@@ -84,27 +84,32 @@
 
 			<!-- Actions -->
 			<div class="max-w-33rem mobile-w-100 t-white gap-small cols-2">
-				<button 
+				<Button
+					:submit="a => addToCart(product)" 
 					:disabled="validateToCard(product)" 
-					@click="addToCart(product)" 
+					:text="{
+						success: ' ✔ Added',
+						error: 'error'
+					}"
 					class="w-100 mn-r-small bg-main button"
-				>
-					{{ t('addtoorder') }}
-				</button>
+				> 
+						{{ t('addtoorder') }}
+				</Button>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script setup>
+import Button 				from '@pf/src/components/Button/Button.vue'
+import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
+import PlaceholderImage from '@pf/src/modules/icons/placeholders/PlaceholderImage.vue'
+
 import Images360 	from '@pf/src/modules/products/components/blocks/Images360.vue'
 import ImagesThumbnails from "@pf/src/modules/products/components/blocks/ImagesThumbnails.vue";
 
-import IconEdit from '@pf/src/modules/icons/navigation/IconEdit.vue'
-	
 import THC from '@pf/src/modules/products/components/elements/THC.vue'
 import Price from '@pf/src/modules/products/components/elements/Price.vue'
-import PlaceholderImage from '@pf/src/modules/icons/placeholders/PlaceholderImage.vue'
 // import SelectElement 	from '@/components/elements/SelectElement.vue'
 
 import { computed } from 'vue'
@@ -164,6 +169,6 @@ function addToCart(product) {
 		shopcart.state.positions = []
 		shopcart.state.organization = product.organization
 	}
-  shopcart.actions.addProductToCart(product)
+  shopcart.actions.addProductToCart(product, product.organization)
 }
 </script>

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

@@ -63,21 +63,29 @@ const controllerFactory = (db) => {
       const prices = req.query.prices?.split(',') || [];
 
       console.log(prices)
-      console.log(req.query.prices)
-
       if (prices.length) {
-        query.price = { 
-          $or: prices.map(priceRange => {
-            if (priceRange.startsWith('<')) return { $lt: parseInt(priceRange.slice(1))  }
-            if (priceRange.startsWith('>')) return { $gt: parseInt(priceRange.slice(1))  }
-            
-            const [min, max] = priceRange.split('-').map(Number)
-            
-            return { $gte: min, $lte: max }
-          })
+        const priceConditions = prices.map(priceRange => {
+          if (priceRange.startsWith('<')) {
+            return { price: { $lt: parseInt(priceRange.slice(1)) } };
+          }
+          if (priceRange.startsWith('>')) {
+            return { price: { $gt: parseInt(priceRange.slice(1)) } };
+          }
+          
+          const [min, max] = priceRange.split('-').map(Number);
+
+          return { price: { $gte: min, $lte: max } };
+        });
+
+        console.log(priceConditions)
+        if (priceConditions.length) {
+          query = {
+            ...query,
+            ...{ $or: priceConditions }
+          }
         }
       }
-
+      
       // Handle pagination and sorting
       options.skip = parseInt(req.query.skip) || 0;
       options.limit = parseInt(req.query.limit) || 10;
@@ -262,12 +270,13 @@ const controllerFactory = (db) => {
       `).join(', ');
 
       const prompt = `
-        1. На вопрос как клиент хочет себя почувствовать - он ответил "${mood}". 
-        2. Вот список товаров в нашем магазине: ${productsList}. 
-        3. На основе информации о товарах (сорт, количество THC) и желания пользователя выбери 1 товар который порекомендовать пользователю.
-        4. Ответ должен быть на языке который пользователь использовал в ${mood}.
-        5. Пожалуйста, форматируйте ваш ответ в виде json объекта '{"_id": "_id рекомендтованого товара (он должен соответсовать одному из _id товаров, которые я прислал ","recommendationText": Текст почему именно этот товар'. Напишите только json объект без какого либо еще текста вне него.
+        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 information 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.
       `
+
       
       console.log(prompt)
       

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

@@ -13,22 +13,22 @@ module.exports = function(app, db, allowedOrigins) {
   });
   // (C) Create product
   app.post(
-    "/products/create",
+    "/api/products/create",
     controller.Create
   );
   // (R) Read products
   app.get(
-    "/products/read",
+    "/api/products/read",
     controller.Read
   );
   // (U) Update product
   app.post(
-    "/products/:_id",
+    "/api/products/:_id",
     controller.Update
   );
   // (D) Delete product
   app.delete(
-    "/products/:_id",
+    "/api/products/:_id",
     controller.Delete
   );
   // Get products
@@ -42,12 +42,12 @@ module.exports = function(app, db, allowedOrigins) {
   // );
   // // Get recommendation
   app.post(
-    "/product/recommended",
+    "/api/product/recommended",
     controller.getProductRecommendation
   );
   // // Get product
   app.get(
-    "/products/:_id",
+    "/api/products/:_id",
     controller.getProduct
   );
 };

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

@@ -41,7 +41,7 @@ const actions = {
       ...product,
       organization: organization
     }
-    return await $axios.post("/products/create", newProduct).then(
+    return await $axios.post("/api/products/create", newProduct).then(
       (response) => {
         set(response.data, 'current')
         return Promise.resolve(response.data);
@@ -99,7 +99,7 @@ const actions = {
 
       console.log(query)
     try {
-      const response = await $axios.get('/products/read', { params: query });
+      const response = await $axios.get('/api/products/read', { params: query });
       
       if (options._id) {
         state.current = {...response.data[0]}; 
@@ -115,7 +115,7 @@ const actions = {
   },
 
   async update(_id, product) {
-    return await $axios.post("/products/" + _id, product).then(
+    return await $axios.post("/api/products/" + _id, product).then(
       (response) => {
         return Promise.resolve(response.data);
       },
@@ -127,7 +127,7 @@ const actions = {
   },
 
   async deleteProduct(_id) {
-    return await $axios.delete("/products/" + _id).then(
+    return await $axios.delete("/api/products/" + _id).then(
       (response) => {
         return Promise.resolve(response.data);
       },
@@ -140,7 +140,7 @@ const actions = {
 
   async submitMood(presetMood = null) {
     console.log(presetMood)
-    return $axios.post('/product/recommended', {mood: presetMood}).then(
+    return $axios.post('/api/product/recommended', {mood: presetMood}).then(
       response => {
         state.current = response.data.product
         state.current.recommendation = response.data.recommendationText
@@ -154,7 +154,7 @@ const actions = {
   },
   
   async fetchProducts() {
-    return await $axios.get(`/products/read`).then(
+    return await $axios.get(`/api/products/read`).then(
       products => {
         state.all = products.data;
         return Promise.resolve(products.data);
@@ -167,7 +167,7 @@ const actions = {
   },
 
   async fetchProductsPopular() {
-    return await $axios.get(`/products/popular`).then(
+    return await $axios.get(`/api/products/popular`).then(
       (products) => {
         state.popular = products.data;
         return Promise.resolve(products.data);
@@ -180,7 +180,7 @@ const actions = {
   },
 
   async fetchProductsPublished() {
-    return await $axios.get(`/products`).then(
+    return await $axios.get(`/api/products`).then(
       products => {
         let publishedProduct = products.data.filter(function (product, index) {
           return product.status !== "unpublished";
@@ -205,7 +205,7 @@ const actions = {
 
   async fetchProduct(_id) {
    try {
-      const response = await $axios.get("/products/" + _id);
+      const response = await $axios.get("/api/products/" + _id);
 
       console.log(response)
       state.current = response.data[0]; 
@@ -217,7 +217,7 @@ const actions = {
   },
 
   async fetchProductPopular() {
-    return await $axios.get(`/products`).then(
+    return await $axios.get(`/api/products`).then(
       (products) => {
         state.all = products.data.slice(1, 5);
         return Promise.resolve(products.data.slice(1, 5));

package/src/styles/config.scss

@@ -156,6 +156,9 @@ $variables: (
 
 $rem: (
   '50r': 50rem,
+  '45r': 45rem,
+  '40r': 40rem,
+  '35r': 35rem,
   '30r': 30rem,
   '20r': 20rem,
   '15r': 15rem,
@@ -189,6 +192,7 @@ $percent: (
   '70': 70%,
   '66': 66%,
   '50': 50%,
+  '45': 45%,
   '40': 40%,
   '33': 33%,
   '25': 25%,
@@ -223,12 +227,15 @@ body {
 	@include generate-utility-classes('h-max', 'max-height',	null, $combined);
 	@include generate-utility-classes('h-min', 'min-height',	null, $combined);
 
+	@include generate-utility-classes('w-max', 'max-width',	null, $combined);
+	@include generate-utility-classes('w-min', 'min-width',	null, $combined);
+
 	@include generate-utility-classes('radius', 'border-radius',	null, $combined);
 
 	@include generate-utility-classes('radius-tl', 'border-top-left-radius',	null, $combined);
-	@include generate-utility-classes('radius-br', 'border-top-right-radius-radius',	null, $combined);
-	@include generate-utility-classes('radius-tr', 'border-bottom-right-radius',	null, $combined);
-	@include generate-utility-classes('radius-bl', 'border-bottom-left-radius-radius',	null, $combined);
+	@include generate-utility-classes('radius-br', 'border-bottom-right-radius',	null, $combined);
+	@include generate-utility-classes('radius-tr', 'border-top-right-radius',	null, $combined);
+	@include generate-utility-classes('radius-bl', 'border-bottom-left-radius',	null, $combined);
 	
 	@include generate-bg-classes('bg-main', 	'main');
 	@include generate-bg-classes('bg-second',	'second');