@ozdao/prometheus-framework 0.2.39 → 0.2.41

package/src/modules/payments/controller/payments.tinkoff.controller.js

@@ -0,0 +1,242 @@
+
+var jwt = require("jsonwebtoken");
+var axios = require('axios');
+var bcrypt = require("bcryptjs");
+var crypto = require('crypto');
+const { v4: uuidv4 } = require('uuid');
+
+var TerminalKey = process.env.TINKOFF_TERMINAL_KEY;
+var TerminalPassword = process.env.TINKOFF_TERMINAL_PASSWORD;
+
+const controllerFactory = (db) => {
+  const Payment = db.payment;
+  const Order = db.order;
+
+  const getAll = (req, res) => {
+    Payment.find({}).sort({'createdAt': 'desc'}).exec((err, paymentes) => {
+      // If error
+      if (err) {return res.status(500).send({ message: err }); }
+      // If not found
+      if (!paymentes) {return res.status(404).send({ message: "Paymentes not found." }); }
+      // If succes
+      res.status(200).send(paymentes);
+    });
+  };
+
+  const create = (req, res) => {
+    console.log(req.body)
+    Payment.create({
+      type: req.body.type,
+      order: req.body.order, 
+      positions: req.body.positions
+    }, (err, payment) => {
+      if (err) {return res.status(500).send({ message: err }); }
+      if (!payment) {return res.status(404).send({ message: "Something wrong when updating product. (with files)" }); }
+      res.status(200).send(payment);
+    })
+  };
+
+  const get = (req, res) => {
+    Payment.findOne({ _id: req.params._id }).exec((err, payment) => {
+      // If error
+      if (err) {return res.status(500).send({ message: err }); }
+      // If not found
+      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
+      // If succes
+      res.status(200).send(payment);
+    });
+  };
+
+  const update = (req, res) => {
+
+    Payment.findOneAndUpdate({ PaymentId: req.params._id }, req.body, { new: true, upsert: true}).exec((err, payment) => {
+      // If error
+      if (err) {return res.status(500).send({ message: err }); }
+      // If not found
+      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
+      // If succes
+      res.status(200).send(payment);
+    });
+  };
+
+  const deletePayment = (req, res) => {
+    Payment.findOneAndDelete({_id: req.params._id}, (err, payment) => {
+      if (err) {return res.status(500).send({ message: err }); }
+      if (!payment) {return res.status(404).send({ message: "Something wrong when deleting payment." }); }
+      res.status(200).send(payment);
+    })
+  };
+
+  function createToken (request) {
+    request = Object.entries(request).map(function(key) {
+      return { [key[0]]: key[1] }
+      })
+      request.push({Password: TerminalPassword})
+      request.sort(function(a, b){
+      if(Object.keys(a)[0] < Object.keys(b)[0]) { return -1; }
+      if(Object.keys(a)[0] > Object.keys(b)[0]) { return 1; }
+      return 0;
+        })
+    const requestContacted = request.map(function(key) {
+      return Object.values(key)[0]
+     }).join("")
+
+    const hash = crypto.createHash('sha256').update(requestContacted).digest('hex');
+
+    return hash
+  } 
+  const newpayment = (req, res) => {
+    // Data for payment init
+    console.log(req.body.phone);
+    // Send request to Tinkoff
+    axios.post('https://securepay.tinkoff.ru/v2/Init', {
+      TerminalKey: TerminalKey,
+      Amount: '350000',
+      OrderId: req.body._id,
+      Recurrent: 'y',
+      PayType: "О",
+      CustomerKey: req.body.phone,
+      Description: 'Оплата в интернет-магазине',
+      Data: {
+        phone: req.body.phone,
+      },
+      // SuccessURL: 'http://tandem.ohmybike.ru/rent/' + OrderId,
+      // FailURL: 'http://tandem.ohmybike.ru/account'
+      // SuccessURL: 'http://localhost:8082/rent/' + OrderId,
+      // FailURL: 'http://localhost:8082/account'
+    }).then(function(response) {
+        const payment = new Payment(response.data);
+        payment.save((err, payment) => {
+          if (err) {
+            res.status(500).send({ message: err });
+            return;
+          }
+
+          payment.save(err => {
+            if (err) {
+              res.status(500).send({ message: err });
+              return;
+            }
+            res.send(response.data);
+          });
+        })
+    }).catch(function(error) {
+      res.send(error);
+    })
+
+  };
+  const setpayment = (req, res) => {
+    // Data for payment
+    const payment = new Payment({
+      OrderId: req.body.OrderId,
+      Success: req.body.Success,
+      Status: req.body.Status,
+      PaymentId: req.body.PaymentId,
+      ErrorCode: req.body.ErrorCode,
+      Message: req.body.Message,
+      Details: req.body.Details
+    });
+    // Wright to db
+    console.log(payment)
+
+    payment.save((err, payment) => {
+      if (err) {
+        res.status(500).send({ message: err });
+        return;
+      }
+
+      payment.save(err => {
+        if (err) {
+          res.status(500).send({ message: err });
+          return;
+        }
+
+        res.send({ message: "Payment was created successfully!" });
+      });
+    })
+  };
+  const getstatus = (req, res) => {
+    console.log(req.body.order)
+    Payment.findOne({    
+      OrderId: req.body.order
+    })
+    .sort({createdAt: -1})
+    .exec((err, payment) => {
+      if (err) {
+        res.status(500).send({ message: err });
+        return;
+      }
+      if (!payment) {
+        return res.status(404).send({ message: "Payment Not found." });
+      }
+
+     
+      if (payment.Status === 'CONFIRMED') {
+        console.log(payment.Status)
+        console.log(req.body.order)
+         Order.findOneAndUpdate({ _id: req.body.order, status: 'Подтвержден' }, {$set: {status: "Ожидает отправки"}},{ new: true}).catch(function(error) {
+        res.status(500).send(error);
+      });
+      }
+
+      axios.post('https://securepay.tinkoff.ru/v2/GetState', {
+        TerminalKey: TerminalKey,
+        PaymentId: payment.PaymentId,
+        Token: createToken({TerminalKey: TerminalKey, PaymentId: payment.PaymentId})
+      }).then(function(response) {
+        payment.Status = response.data.Status
+        payment.save()
+        res.send(response.data);
+      }).catch(function(error) {
+        res.status(500).send(error);
+      });
+    });
+  };
+
+  const addcustomer = (req, res) => {
+    console.log(req.body)
+
+    axios.post('https://securepay.tinkoff.ru/v2/AddCustomer', {
+      TerminalKey: TerminalKey,
+      CustomerKey: req.body,
+      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
+    })
+    .then(function(response) {
+      res.send(response.data);
+    })
+    .catch(function(error) {
+      res.status(500).send(error);
+    });
+  }
+
+  const getcustomercards = (req, res) => {
+    axios.post('https://securepay.tinkoff.ru/v2/GetCardList', {
+      TerminalKey: TerminalKey,
+      CustomerKey: req.body.phone,
+      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
+    })
+    .then(function(response) {
+      console.log(response.data)
+      res.send(response.data);
+    })
+    .catch(function(error) {
+      res.status(500).send(error);
+    });
+  }
+
+  return {
+    getAll,
+    create,
+    get,
+    update,
+    delete: deletePayment,  
+    createToken,
+    newpayment,
+    setpayment,
+    getstatus,
+    addcustomer,
+    getcustomercards
+  };
+};
+
+module.exports = controllerFactory;

package/src/modules/payments/models/payment.model.js

@@ -0,0 +1,22 @@
+module.exports = (db) => {
+  
+  const PaymentSchema = new db.mongoose.Schema({
+    creator: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User', 
+    },
+    owner: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User', 
+    }
+  }, {
+    timestamps: { 
+      currentTime: () => Date.now() 
+    }
+  });
+
+  const Payment = db.mongoose.model("Payment", PaymentSchema);
+
+  return Payment;
+};
+

package/src/modules/payments/routes/payments.routes.js

@@ -12,42 +12,21 @@ module.exports = function(app, db) {
     next();
   });
 
-  app.post(
-    "/payment/newpayment",
-    controller.newpayment,
-  );
-  app.post(
-    "/payment/getstatus",
-    controller.getstatus
-  );
-  app.post(
-    "/payment/addcustomer",
-    controller.addcustomer
-  );
-  app.post(
-    "/payment/getcustomercards",
-    controller.getcustomercards
-  );
   
-  app.get(
+  app.post(
     "/payments",
-    controller.getAll
+    controller.create
   );
-  
+
   app.get(
     "/payments/:_id",
-    controller.get
+    controller.read
   );
 
    app.post(
     "/payments/:_id",
     controller.update
   );
-
-  app.post(
-    "/payments",
-    controller.create
-  );
   
   app.delete(
     "/payments/:_id",

package/src/modules/payments/routes/payments.tinkoff.routes.js

@@ -0,0 +1,58 @@
+// Factories
+const controllerFactory = require("../controllers/payments.controller");
+// Middlewares
+const middlewareFactory = require('@pf/src/modules/middlewares/server');
+// Routes
+module.exports = function(app, db) {
+  const controller = controllerFactory(db);
+  const { verifySignUp, verifyUser } = middlewareFactory(db);
+
+  app.use(function(req, res, next) {
+    res.header("Access-Control-Allow-Headers", "Access-Control-Allow-Origin: *", "x-access-token, Origin, Content-Type, Accept");
+    next();
+  });
+
+  app.post(
+    "/payment/newpayment",
+    controller.newpayment,
+  );
+  app.post(
+    "/payment/getstatus",
+    controller.getstatus
+  );
+  app.post(
+    "/payment/addcustomer",
+    controller.addcustomer
+  );
+  app.post(
+    "/payment/getcustomercards",
+    controller.getcustomercards
+  );
+  
+  app.get(
+    "/payments",
+    controller.getAll
+  );
+  
+  app.get(
+    "/payments/:_id",
+    controller.get
+  );
+
+   app.post(
+    "/payments/:_id",
+    controller.update
+  );
+
+  app.post(
+    "/payments",
+    controller.create
+  );
+  
+  app.delete(
+    "/payments/:_id",
+    controller.delete
+  );
+
+};
+

package/src/modules/products/components/pages/Product.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
 		<!-- <Breadcrumbs class="bg-grey radius-big pd-small"/> -->
-		<SectionProduct v-if="product" :product="product" class="pos-relative"/>
+		{{product.quantity}}
+		<SectionProduct v-if="product" :product="product" :user="auth.state.user" class="pos-relative"/>
 
 		<PopularProducts />
 	</div>
@@ -22,6 +23,7 @@
 	import { useI18n }    from 'vue-i18n'
   import { useMeta } from 'vue-meta'
 
+  import * as auth from '@pf/src/modules/auth/store/auth';
  	import * as products from '@pf/src/modules/products/store/products';
   import * as categories from '@pf/src/modules/products/store/categories';
 

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

@@ -13,8 +13,8 @@
 	const text = {
     messages: {
       "en": {
-		    "title": "Unlock Your Perfect High <br><b class='t-main'> with AI Budtender</b>",
-		    "description": "Say goodbye to endless browsing. Just tell us what you're want, and Weeder will find your ideal match.",
+		    "title": "Increase Your High <br><b class='t-main'>Boosted by AI Budtender</b>",
+		    "description": "Just tell us what you're want, and Weeder will find your ideal match.",
 		    "placeholderTexts": [
 		    	'Lowest THC, please!',
 		    	'Something with banana flavors?',
@@ -66,164 +66,7 @@
 		await products.actions.submitMood(moodToSend);
 	}
 
-	onMounted(() => {
-  //   const canvas = document.getElementById('glcanvas');
-  //   const gl = canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
-
-  //   const vsSource = `
-	//     attribute vec4 aVertexPosition;
-	//     void main() {
-	//       gl_Position = aVertexPosition;
-	//     }
-	// 	`;
-
-	// 	// Fragment shader (your GLSL code goes here)
-	// 	const fsSource = `
-	//     precision mediump float;
-
-	// 		const float PI = 3.14159265358979323846264;
-	// 		const float TWOPI = PI * 2.0;
-	// 		const vec4 WHITE = vec4(0.05, 0.05, 0.05, 1); // Для цвета F6F9F7
-	// 		const vec4 BLACK = vec4(0.0, 0.0, 0.0, 1); // Для цвета EBF2ED
-
-	// 		const int MAX_RINGS = 30;
-	// 		const float RING_DISTANCE = 0.03;
-	// 		const float WAVE_COUNT = 60.0;
-	// 		const float WAVE_DEPTH = 0.08;
-
-	// 		uniform float iTime;
-	// 		uniform vec2 iResolution;
-
-	// 		void main() {
-	// 		    float rot = mod(iTime * 0.6, TWOPI);
-	// 		    vec2 fragCoord = gl_FragCoord.xy;
-	// 		    vec2 pos = vec2(fragCoord.x / iResolution.x, fragCoord.y / iResolution.y);
-	// 		    pos = vec2(3.0 * (pos.x - 0.5), 3.0 * (pos.y - 0.4));
-	// 		    float x = pos.x;
-	// 		    float y = pos.y;
-
-	// 		    bool black = false;
-	// 		    float prevRingDist = RING_DISTANCE;
-	// 		    for (int i = 0; i < MAX_RINGS; i++) {
-	// 		        vec2 center = vec2(0.0, 0.7 - RING_DISTANCE * float(i) * 1.2);
-	// 		        float radius = 0.5 + RING_DISTANCE / (pow(float(i + 5), 1.1) * 0.006);
-	// 		        float dist = distance(center, pos);
-	// 		        dist = pow(dist, 0.3);
-	// 		        float ringDist = abs(dist - radius);
-	// 		        if (ringDist < RING_DISTANCE * prevRingDist * 7.0) {
-	// 		            float angle = atan(y - center.y, x - center.x);
-	// 		            float thickness = 1.1 * abs(dist - radius) / prevRingDist;
-	// 		            float depthFactor = WAVE_DEPTH * sin((angle + rot * radius) * WAVE_COUNT);
-	// 		            if (dist > radius) {
-	// 		                black = (thickness < RING_DISTANCE * 5.0 - depthFactor * 2.0);
-	// 		            } else {
-	// 		                black = (thickness < RING_DISTANCE * 5.0 + depthFactor);
-	// 		            }
-	// 		            break;
-	// 		        }
-	// 		        if (dist > radius) break;
-	// 		        prevRingDist = ringDist;
-	// 		    }
-
-	// 		    gl_FragColor = black ? BLACK : WHITE;
-	// 		}
-
-	// 	`;
-
-	// 	function compileShader(gl, type, source) {
-	// 	    const shader = gl.createShader(type);
-	// 	    gl.shaderSource(shader, source);
-	// 	    gl.compileShader(shader);
-
-	// 	    // Check for compilation errors
-	// 	    if (!gl.getShaderParameter(shader, gl.COMPILE_STATUS)) {
-	// 	        alert('An error occurred compiling the shaders: ' + gl.getShaderInfoLog(shader));
-	// 	        gl.deleteShader(shader);
-	// 	        return null;
-	// 	    }
-
-	// 	    return shader;
-	// 	}
-
-	// 	const vertexShader = compileShader(gl, gl.VERTEX_SHADER, vsSource);
-	// 	const fragmentShader = compileShader(gl, gl.FRAGMENT_SHADER, fsSource);
-
-	// 	// Create the shader program
-	// 	const shaderProgram = gl.createProgram();
-
-	// 	gl.attachShader(shaderProgram, vertexShader);
-	// 	gl.attachShader(shaderProgram, fragmentShader);
-	// 	gl.linkProgram(shaderProgram);
-
-	// 	// Check for linking errors
-	// 	if (!gl.getProgramParameter(shaderProgram, gl.LINK_STATUS)) {
-	// 	    alert('Unable to initialize the shader program: ' + gl.getProgramInfoLog(shaderProgram));
-	// 	}
-
-	// 	function resizeCanvasToDisplaySize(canvas) {
-  //       const width = canvas.clientWidth * window.devicePixelRatio;
-  //       const height = canvas.clientHeight * window.devicePixelRatio;
-  //       if (canvas.width !== width || canvas.height !== height) {
-  //           canvas.width = width;
-  //           canvas.height = height;
-  //           return true; // размер изменился
-  //       }
-  //       return false; // размер не изменился
-  //   }
-
-
-	// 	function render() {
-	// 	 if (resizeCanvasToDisplaySize(gl.canvas)) {
-  //       gl.viewport(0, 0, gl.canvas.width, gl.canvas.height);
-  //     }
-	//     gl.clearColor(0.0, 0.0, 0.0, 1.0); // Clear to black, fully opaque
-	//     gl.clearDepth(1.0);                 // Clear everything
-	//     gl.enable(gl.DEPTH_TEST);           // Enable depth testing
-	//     gl.depthFunc(gl.LEQUAL);            // Near things obscure far things
-
-	//     // Clear the canvas before we start drawing on it
-	//     gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
-
-	//     // Set the shader program
-	//     gl.useProgram(shaderProgram);
-
-	//     // Set up geometry, attributes, uniforms here
-	//     // Create a buffer for the square's positions
-	//     const positionBuffer = gl.createBuffer();
-	//     gl.bindBuffer(gl.ARRAY_BUFFER, positionBuffer);
-
-	//     // Now create an array of positions for the square
-	//     const positions = [
-	//         -1.0,  1.0,
-	//         1.0,  1.0,
-	//         -1.0, -1.0,
-	//         1.0, -1.0,
-	//     ];
-
-	//     // Pass the positions to WebGL
-	//     gl.bufferData(gl.ARRAY_BUFFER, new Float32Array(positions), gl.STATIC_DRAW);
-
-	//     // Tell WebGL how to pull out the positions from the position buffer
-	//     const vertexPosition = gl.getAttribLocation(shaderProgram, 'aVertexPosition');
-	//     gl.vertexAttribPointer(vertexPosition, 2, gl.FLOAT, false, 0, 0);
-	//     gl.enableVertexAttribArray(vertexPosition);
-
-	//     // Set the shader uniforms
-	//     var timeUniformLocation = gl.getUniformLocation(shaderProgram, 'iTime');
-	//     var resolutionUniformLocation = gl.getUniformLocation(shaderProgram, 'iResolution');
-
-	//     gl.uniform1f(timeUniformLocation, performance.now() / 3000.0);
-	//     gl.uniform2f(resolutionUniformLocation, gl.canvas.width, gl.canvas.height);
-
-	//     // Draw the scene
-	//     gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
-
-	//     // Call render again on the next frame
-	//     requestAnimationFrame(render);
-	// 	}
-	// requestAnimationFrame(render);
-
-});
+	
 </script>
 
 <template>
@@ -233,7 +76,7 @@
 	>
 
 		<div 
-			class="pd-big bg-black t-white pos-relative radius-big o-hidden "
+			class="pd-big bg-black t-white pos-relative radius-extra o-hidden "
 		>
 			<div class="flex-column flex-center flex t-center pos-relative z-index-1">
 				
@@ -243,13 +86,11 @@
 				/>
 
 				<p 
-					style="max-width: 40rem;"
-					class="mn-b-big p-big t-medium t-transp" 
+					class="mn-b-big p-big t-transp" 
 					v-html="t('description')"
 				/>
 				
 				<FieldBig 
-					style="max-width: 60rem;"
 					:input="mood" 
 			    :typingSpeed="100"
 			    :loopTyping="true"
@@ -258,11 +99,11 @@
 			    :action="t('action')"
 			    @update:input="mood = $event"
 			    @action="router.push({name: 'Product Recommmendation', query: {mood: mood}})"
-					class="mn-b-big pd-big bg-black-transp-50 bg-blur-thin w-100"
+					class="mn-b-big pd-big bg-black-transp-50 bg-blur-thin w-100 w-max-40r"
 				/>
 
 				<p 
-					class="w-m-60r t-medium t-transp mn-b-semi p-medium" 
+					class="w-m-60r t-transp mn-b-semi p-medium" 
 					v-html="t('subdescription')"
 				/>
 
@@ -275,7 +116,7 @@
 						class="
 							uppercase 
 							pd-thin
-							t-semi
+							t-medium
 							flex-center
 							flex-column
 							flex-nowrap
@@ -303,9 +144,7 @@
 			</div>
 
       <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 style="background-image: url(/spiral.jpg)" class="spiral"></div>
       </div>
 
 		</div>

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

@@ -1,7 +1,7 @@
 <template>
 	<section id="main-menu" class="pd-thin pos-relative">
 		<h2 class="w-m-60r mn-auto pd-t-big pd-b-big t-center">
-			Find Extraordinary <span class="t-main t-semi">Cannabis Flowers</span> and <span class="t-main t-semi">Accessories</span> to Enhance Your Smoking Experience
+			Weed and Accessories to <br><b>Enhance Your Smoking Experience</b> 
 		</h2>
 
 		<transition name="fade" mode="out-in"  appear>
@@ -38,7 +38,7 @@
 							<img 
 								v-if="category.url !== 'buds'"
 								:src="'/icons/categories/' + category.url + '.svg'"
-								class="i-extra mn-l-auto"
+								class="i-extra t-transp mn-l-auto"
 							>
 						
 						</div>
@@ -49,9 +49,9 @@
 						
 						<button 
 							v-if="category.url === 'buds'"
-			        class="mn-t-small br-2px br-solid hover-bg-main br-main t-black button-small button"
+			        class="mn-t-small radius-extra hover-bg-black t-medium t-black bg-main hover-t-white button-small button"
 			      >
-			        <span class="t-black">Check {{countProduct.count}} products →</span>
+			        <span>Check {{countProduct.count}} products →</span>
 			      </button>
 
 					</div>

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

@@ -2,12 +2,12 @@
 <div id="popularProducts" class="pd-thin">
 	<div class="bg-grey radius-big pd-t-big pd-b-big">
 
-		<h2 class="mn-b-semi t-center ">{{t('title')}}</h2>
+		<h2 class="mn-b-semi t-center " v-html="t('title')"/>
 		
 		<div class="embla" ref="emblaNode">
 		 	<div class="embla__container">
 		   
-		    <div class="embla__slide pd-thin" v-for="(value, key, index) in productsState" :key="key">
+		    <div class="embla__slide pd-nano" v-for="(value, key, index) in productsState" :key="key">
 		    	<transition name="fade" mode="out-in" appear>
 						<div 
 							v-if="!value.name" 
@@ -57,7 +57,7 @@
  	const text = {
     messages: {
       en: {
-      	title: 'Explore Hot Products 🔥',
+      	title: '<b>Best Sellers 🔥</b>',
       	subtitle: 'We attach great importance to high quality and customer satisfaction'
       },
       ru: {

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

@@ -123,6 +123,9 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  user: {
+    type: String,
+  },
   recommendation: {
   	type: String
   }