@ozdao/prometheus-framework 0.2.31 → 0.2.33

package/src/modules/events/components/sections/SectionLineup.vue

@@ -0,0 +1,42 @@
+<template>
+	  <div class="br-1px bg-blur-extra br-solid br-white-transp-20  radius-big o-hidden pos-relative">
+	  	<h3 class="t-center w-100 pd-small br-b br-white-transp-20 br-solid">{{content?.title || 'Event Program'}}</h3>
+
+    	<div 
+    		v-if="content?.lineup"
+    		v-for="(event, index) in content.lineup"
+    		:class="{'br-solid br-b br-white-transp-10': index < content.lineup.length - 1}" 
+    		class="flex-column flex-h-center t-center pd-medium flex w-100 gap-zero"
+    	>
+    	
+    	 	<h5 class="t-main t-nye204 mn-b-small">
+					{{event.djs}}
+		    </h5>
+		    
+		    <h4 class="t-unna t-nye204 mn-b-thin">
+					{{event.name}}
+		    </h4>
+		    	<span class="t-semi mn-b-thin mn-l-auto mn-r-auto pd-thin radius-extra br-solid br-2px br-main t-main w-max">
+					{{event.time}}
+				</span>
+		    
+				<p class="p-medium t-transp">
+					{{event.description}}
+				</p>
+    	</div>
+	  </div>
+</template>
+
+
+<script setup>
+	import { useI18n } from 'vue-i18n'
+
+	const props = defineProps({
+		content: {
+			type: Object
+		}
+	})
+</script>
+
+<style lang="scss">
+</style>

package/src/modules/events/components/sections/SectionMainGuest.vue

@@ -0,0 +1,104 @@
+<template>
+
+  	<div id="mainguest" class="o-hidden bg-black t-white pos-relative radius-big gap-zero pos-relative cols-2">
+
+	    <div class="pd-big pos-relative flex-column flex w-100 h-100 gap-zero">
+				 <Socials
+		    	:telegram="content?.socials?.telegram"
+	     		:facebook="content?.socials?.facebook"
+	     		:instagram="content?.socials?.instagram"
+	     		:twitter="content?.socials?.twitter"
+	     		class="mn-b-semi"
+		    />
+
+	    	<h2 class="mn-b-big">
+					{{content?.title}}
+		    </h2>
+
+		    <p class="p-medium" v-html="content?.description"/>
+		    <slot></slot>
+		    <iframe class="radius-big o-hidden mn-t-medium" v-if="content?.soundcloud" width="100%" height="200" scrolling="no" frameborder="no" allow="autoplay"
+					:src="`https://w.soundcloud.com/player/?url=https%3A//soundcloud.com/${content.soundcloud}
+					&color=%23ff5500&auto_play=false&hide_related=false
+					&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true`">
+					</iframe>
+		    <iframe 
+		    	v-if="content?.spotify" 
+		    	:src="`https://open.spotify.com/embed/track/${content?.spotify}?utm_source=generator`" 
+		    	width="100%" 
+		    	height="152" 
+		    	frameBorder="0" 
+		    	allowfullscreen="" 
+		    	allow="autoplay; clipboard-write; encrypted-media; fullscreen; picture-in-picture" 
+		    	loading="lazy"
+		    	class="mn-t-big"
+		    ></iframe>
+	    </div>
+
+	    <div style="min-height: 20rem;" class="o-hidden pos-relative">
+				<video 
+					:src="content?.video" 
+					itemprop="video" 
+					type="video/mp4"
+					ref="videoElement"  
+					class="pos-absolute pos-t-0 pos-l-0 w-100 h-100 object-fit-cover" 
+					preload autoplay muted loop playsinlineclass playsinline></video>
+	    </div>
+
+  	</div>
+</template>
+
+
+<script setup>
+	import { useI18n } from 'vue-i18n'
+
+	import { ref, onMounted } from 'vue';
+
+	import { Socials } from '@ozdao/prometheus-framework/modules/organizations/client'	
+
+	const props = defineProps({
+		content: {
+			type: Object
+		}
+	})
+
+	const videoElement = ref(null)
+	let isPlaying = false;
+
+	function	checkAndPlayVideo() {
+    // Initializing values
+
+		// On video playing toggle values
+		videoElement.value.onplaying = function() {
+		  isPlaying = true;
+		};
+
+		// On video pause toggle values
+		videoElement.value.onpause = function() {
+		  isPlaying = false;
+		};	
+  }
+
+  // Play video function
+	async function playVid() {      
+    if (videoElement.value.paused && !isPlaying) {
+      return videoElement.value.play();
+    }
+	} 
+  
+	onMounted(() => {
+		checkAndPlayVideo()
+		playVid()
+	})
+
+</script>
+
+<style lang="scss">
+	 @media screen and (max-width: 1025px) {
+	 	#mainguest {
+	 		> div:first-of-type {
+	 			order: 2;
+	 		}
+	 	}
+	 }
+</style>

package/src/modules/events/components/sections/SectionPreviousEvents.vue

@@ -0,0 +1,119 @@
+<template>
+
+	<div class="cols-2 gap-big pos-relative ">
+		 <div class="cols-1 gap-small ">
+		  <a v-if="options?.link" @click="clickBuyTicket()" href="#"  class="bg-main flex-child-grow-1  flex-child-shrink-0 flex-child-basis-auto o-hidden  radius-big pd-big flex-center flex-column flex w-100 gap-zero">
+		  	<img class="w-100" :src="content?.ticket">
+
+	    	<a class="t-white bg-black pd-l-medium pd-b-thin pd-t-thin pd-r-small h4 radius-extra uppercase t-nye204">
+	    		<!-- SOLD OUT -->
+					{{t('nye2024.buyticket')}}
+		    </a>
+		    
+		  </a>
+
+		  <p class="pd-small radius-big bg-second flex flex-center gap-small p-medium t-medium t-white">
+	    	<span>For extra payment options contact</span> 
+  			<a class="t-black bg-white radius-extra pd-thin" href="https://t.me/thecommunebar" target="_blank">@thecommunebar</a>
+  		</p>
+  	</div>
+
+		<div class="br-solid br-1px br-white-transp-10 o-hidden radius-big bg-black ">
+			<video style="max-height: 20rem; object-fit: cover;" ref="videoElement"  class="pos-t-0 pos-l-0 w-100 h-auto" preload autoplay muted loop playsinlineclass playsinline src="/videos/nms.mp4" itemprop="video" type="video/mp4" ></video>
+
+
+	    <div class="pd-big flex-column flex w-100 h-100 gap-zero">
+	    	<h3 class="t-unna t-nye204 mn-b-small">
+					{{t('nye2024.title')}}
+		    </h3>
+		    
+		    <p class="p-medium t-transp mn-b-big">
+		    	{{t('nye2024.description')}}
+		    </p>
+
+		    <div class="flex-nowrap flex gap-thin">
+		    	<a href="https://www.instagram.com/thecommune.phuket/" 	target="_blank" class="pd-l-medium pd-r-medium pd-t-small pd-b-small t-black radius-extra uppercase t-medium bg-white">
+		    		{{t('nye2024.checkinblog')}}
+		    	</a>
+		    </div>
+	    </div>
+	  </div>
+
+	 
+	</div>
+</template>
+
+
+<script setup>
+	import { ref, onMounted } from 'vue'
+	import { useI18n } from 'vue-i18n'
+
+
+	const props = defineProps({
+		content: {
+			type: Object
+		},
+		options: {
+			type: Object
+		}
+	})
+
+
+	
+	const { t } = useI18n({ 
+		messages: {
+		  en:{
+		    "nye2024":{
+		      "title":"Explore our exclusive party archive",
+		      "titleTicket":"Are you ready?",
+		      "description":"Experience the ultimate party vibe at The Commune! Elevate your evening with distinctive and exhilarating activities, ensuring an unforgettable time. Dive into the excitement and make every moment special.",
+		      "checkinblog":"CHECK IN INSTAGRAM",
+		      "buyticket": "Buy Ticket Now →"
+		    }
+		  }
+		}
+	})
+
+	const videoElement = ref(null)
+
+	var isPlaying = false;
+
+	function	checkAndPlayVideo() {
+    // Initializing values
+
+		// On video playing toggle values
+		videoElement.value.onplaying = function() {
+		  isPlaying = true;
+		};
+
+		// On video pause toggle values
+		videoElement.value.onpause = function() {
+		  isPlaying = false;
+		};	
+  }
+
+  // Play video function
+	async function playVid() {      
+    if (videoElement.value.paused && !isPlaying) {
+      return videoElement.value.play();
+    }
+	} 
+
+	function clickBuyTicket () {
+		gtag('event', 'buy_ticket', {
+	    'event_category': 'conversion',
+	    'event_label': 'Buy Ticket'
+	  });
+
+	  window.open(props.options?.link);
+
+	}
+  
+	onMounted(() => {
+		checkAndPlayVideo()
+		playVid()
+	})
+</script>
+
+<style lang="scss">
+</style>

package/src/modules/events/components/sections/SectionSpecialGuests.vue

@@ -0,0 +1,47 @@
+<template>
+
+  	<div class="o-hidden bg-black-transp-15 bg-blur-extra t-white pos-relative radius-big gap-zero pos-relative">
+  		<!-- <h3>Event Crew</h3> -->
+  		<h3 class="t-center w-100 pd-small br-b br-white-transp-20 br-solid">{{content?.title}}</h3>
+	   	
+	   	<div style="max-height: 100%"  class="cols-1 gap-semi">
+		    <div class="pd-medium br-solid" :class="{'br-solid br-b br-white-transp-10': index < content?.guests.length - 1}" v-for="(item, index) in content?.guests">
+			    <div class="o-hidden mn-b-semi bg-black radius-big h-4r w-4r  pos-relative">
+			    	<img class="w-100 h-100 object-fit-cover" :src='item.photo'>
+			    </div>
+
+		    	<h4 class="d-block uppercase mn-b-small t-semi">{{item.name}}</h4>
+		    	<span class="t-semi mn-b-small d-block uppercase t-main">{{item.time}}</span>
+
+		    	<p class="t-transp  mn-b-semi p-medium">{{item.description}}</p>
+
+		    	<Socials
+		    		v-if="item?.socials"
+			    	:telegram="item?.socials?.telegram"
+		     		:facebook="item?.socials?.facebook"
+		     		:instagram="item?.socials?.instagram"
+		     		:twitter="item?.socials?.twitter"
+			    />
+
+		   
+				</div>
+	    </div>
+  	</div>
+</template>
+
+
+<script setup>
+	import { useI18n } from 'vue-i18n'
+
+	import { Socials } from '@ozdao/prometheus-framework/modules/organizations/client'
+
+	const props = defineProps({
+		content: {
+			type: Object
+		}
+	})
+
+</script>
+
+<style lang="scss">
+</style>

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

@@ -90,6 +90,7 @@ const middlewareFactory = (db) => {
   };
 
   const update = async (req, res) => {
+    console.log(req.body)
     try {
       const event = await Event.findOneAndUpdate({ url: req.body.url }, { $set: req.body }, { new: true }).exec();
       if (!event) {

package/src/modules/events/controllers/utils/queryProcessor.js

@@ -180,6 +180,8 @@ function getProjectStage() {
       date: 1,
       numberOfTickets: 1,
       participantsPhotos: 1,
+      special: 1,
+      specialData: 1,
       hasTicket: 1,
       tickets: 1,
       createdAt: 1

package/src/modules/events/models/event.model.js

@@ -28,6 +28,34 @@ module.exports = (db) => {
             end: { 
                 type: Date, 
             }
+        },
+        specialData: {
+            type: Object,
+            default: () => ({
+                subtitle: 'NMS Presents', 
+                ticketPrice: '499',
+                ticketImage: null,
+                ticketLinkStripe: null,
+                video: null,
+                guests: [],
+                guestVideo: null,
+                guestTitle: null,
+                guestDescription: null,
+                guestFacebook: null,
+                guestInstagram: null,
+                guestTelegram: null,
+                guestTwitter: null,
+                guestSoundcloud: null,
+                guestSpotify: null,
+                logos: [],
+                lineup: [],
+                lineupBackground: null
+            })
+        },
+        // Adding special boolean property
+        special: {
+            type: Boolean,
+            default: false
         }
     }, {
         timestamps: { 

package/src/modules/events/store/events.js

@@ -27,6 +27,10 @@ const state = reactive({
   },
   current: {
     _id: "",
+    special: false,
+    specialData: {
+      subtitle: null
+    },
     cover: "",
     url: "",
     status: "",

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

@@ -3,6 +3,9 @@ const path = require('path');
 const controllerFactory = (db, publicPath) => {
 
   const uploadMultipleFileController = async (req, res, next) => {
+    console.log('uploadMultipleFileController called');
+    console.log("Files received:", req.files ? req.files.length : 0); // Лог
+
     if (!req.files || req.files.length === 0) {
       return res.status(400).send({ message: 'No files uploaded.' });
     }

package/src/modules/files/middlewares/server/middlewareBusboy.js

@@ -1,8 +1,6 @@
-// middlewareFactory.js
 const sharp = require('sharp');
 const fs = require('fs');
 const fsp = require('fs/promises');
-const os = require('os');
 const path = require('path');
 const busboy = require('busboy');
 
@@ -11,127 +9,144 @@ const createThumbnail = async (originalPath) => {
     path.dirname(originalPath),
     'thumbnail_' + path.basename(originalPath)
   );
+  
   try {
+    const metadata = await sharp(originalPath).metadata();
+
+    const resizeOptions = {};
+
+    if (metadata.width > 800) {
+      resizeOptions.width = 800; 
+    } 
+
     await sharp(originalPath)
-      .rotate() 
-      .resize({ width: 800 })
+      .rotate()
+      .resize(resizeOptions)
       .toFile(thumbnailPath);
   } catch (error) {
     console.error("Error creating thumbnail:", error);
+    throw error; 
   }
 };
 
 
-const middlewareFactory = (db, publicPath) => {
-
-  const generatePreviewMiddleware = async (req, res, next) => {
-    const files = req.file ? [req.file] : req.files;
-
-    try {
-      await Promise.all(files.map(file => createThumbnail(file)));
-    } catch (error) {
-      console.error('Error generating previews:', error);
+const handleFileUpload = (req, res, next, publicPath, { folderNameDefault = 'unsorted', maxSize = 10 * 1024 * 1024, allowedTypes = null }) => {
+  console.log('handleFileUpload middleware called');
+  console.log('Options:' + folderNameDefault + maxSize + allowedTypes);
+
+  let folderName = req.query.folderName || folderNameDefault;
+  folderName = decodeURIComponent(folderName);
+  folderName = folderName.startsWith('/') ? folderName : '/' + folderName;
+  const filePath = path.join(publicPath, folderName);
+  let files = [];
+  let filesWrongSize = [];
+  let filesWrongType = [];
+  let fileProcessingPromises = []; // Массив для отслеживания промисов обработки файлов
+
+  const bb = busboy({
+    headers: req.headers,
+    limits: { fileSize: maxSize },
+  });
+
+  bb.on('file', (name, file, info) => {
+    console.log(`Received file: ${info.filename}, Type: ${info.mimeType}`);
+
+    const isValidType = !allowedTypes || allowedTypes.includes(info.mimeType);
+    if (!isValidType) {
+      console.log(`File of wrong type: ${info.filename}`);
+      filesWrongType.push(info.filename);
+      file.resume();
+      return;
     }
-    next();
-  };
-  
-  const uploadMultipleFilesMiddleware = (req, res, next) => {
-    let folderName = req.query.folderName || 'unsorted';
 
-    if (!folderName.startsWith('/')) {
-      folderName = '/' + folderName;
-    }
-    
-    let files = [];
-    let filesWrongSize = [];
-    let filesWrongType = [];
-
-    let filePath = path.join(publicPath, folderName);
-    let filePromise;
-
-    try {
-      const bb = busboy({
-        headers: req.headers,
-        limits: {
-          fileSize: 10*1024*1024
-        }
-      });
-
-      bb.on('error', err => {
-        next(err);
-      });
-
-      let fileFullPath
-
-      bb.on('file', (name, file, info) => {
-        if(info.filename.length > 0) { 
-          file.resume();
-        }
-
-        if(info.mimeType != 'image/png' && info.mimeType != 'image/jpeg' && info.mimeType != 'image/gif') {
-          filesWrongType.push(info.filename);
-          file.resume();
-        }
+    const fileName = `${Math.floor(Math.random() * 10000)}-${info.filename}`;
+    const fileFullPath = path.join(filePath, fileName);
 
-        let fileName = `${Math.floor(Math.random() * 10000)}-${info.filename}`;
-
-        fileFullPath = path.join(filePath, fileName);
-        fileRelativePath = path.join(folderName, fileName);
-
-        filePromise = new Promise((resolve, reject) => {
-          const writeStream = fs.createWriteStream(fileFullPath).on('error', reject).on('finish', resolve);
-          file.on('error', reject);
-          file.pipe(writeStream);
+    const fileProcess = fsp.mkdir(path.dirname(fileFullPath), { recursive: true })
+      .then(() => new Promise((resolve, reject) => {
+        const stream = file.pipe(fs.createWriteStream(fileFullPath));
+        stream.on('finish', () => {
+          files.push(path.relative(publicPath, fileFullPath));
+          resolve(); // This line replaces the thumbnail creation process
         });
-
-        files.push(fileFullPath)
-
-        file.on('limit', () => {
-          filesWrongSize.push(info.filename);
-         
-          fsp.unlink(fileFullPath);
-
-          const index = files.indexOf(fileFullPath);
-
-          if (index !== -1) {
-            files.splice(index, 1);
+        stream.on('error', reject);
+      }));
+
+
+    fileProcessingPromises.push(fileProcess);
+
+    file.on('limit', () => {
+      filesWrongSize.push(info.filename);
+      fsp.unlink(fileFullPath).catch(err => console.error(`Error deleting oversized file: ${err.message}`));
+    });
+  });
+
+  bb.on('finish', () => {
+    Promise.all(fileProcessingPromises)
+      .then(() => {
+        console.log(`Upload finished. Files: ${files.length}, Wrong Size: ${filesWrongSize.length}, Wrong Type: ${filesWrongType.length}`);
+        req.files = files;
+        if (files.length === 0 && (filesWrongSize.length > 0 || filesWrongType.length > 0)) {
+          let errorMessage = 'No files uploaded.';
+          if (filesWrongSize.length > 0) {
+            errorMessage += ' Some files were too large.';
           }
-
-          file.resume();
-        });
-
-      });
-
-      bb.on('close', async () => {
-        try {
-          if (!filePromise) {
-            res.status(400).json({ message: `Uploaded file '${name}' is missing` });
-            return;
+          if (filesWrongType.length > 0) {
+            errorMessage += ' Some files were of an unsupported type.';
           }
+          return res.status(400).json({ message: errorMessage });
+        }
+        next();
+      })
+      .catch((error) => {
+        console.error('Failed processing one or more files', error);
+        res.status(500).json({ message: 'Error processing files' });
+      });
+  });
 
-          await filePromise
+  req.pipe(bb);
+};
 
-          req.files = files
 
-          next()
-        } catch (err) {
-          next(err);
+const middlewareFactory = (db, publicPath) => {
+  const generatePreviewMiddleware = async (req, res, next) => {
+    const files = req.files; 
+    try {
+      await Promise.all(files.map(file => createThumbnail(path.join(publicPath, file))));
+    } catch (error) {
+      console.error('Error generating previews:', error);
+      return res.status(500).json({ message: 'Internal server error while generating previews.' });
+    }
+    next();
+  };
 
-        } finally {
-          bb.removeAllListeners();
-        }
-      });
+  const uploadFilesMiddleware = (req, res, next) => {
+    const allowedTypes = [
+      'image/png',
+      'image/jpeg',
+      'image/jpg',
+      'image/gif',
+      'application/pdf',
+      'image/svg+xml',
+      'video/mp4',
+      'video/quicktime', // MOV
+      'video/webm'
+    ];
+
+
+    handleFileUpload(req, res, next, publicPath, { folderNameDefault: 'unsorted', maxSize: 10 * 1024 * 1024, allowedTypes });
+  };
 
-      req.pipe(bb);
-    } catch (err) {
-      res.status(400).json({ message: `Could not retrieve file from request - ${err.message}`});
-    }
+  const uploadImagesMiddleware = (req, res, next) => {
+    const allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
+    handleFileUpload(req, res, next, publicPath, { folderNameDefault: 'unsorted', maxSize: 10 * 1024 * 1024, allowedTypes });
   };
 
-  return {  
-    uploadMultipleFilesMiddleware,
+  return {
+    uploadImagesMiddleware,
+    uploadFilesMiddleware,
     generatePreviewMiddleware
   };
 };
 
-module.exports = middlewareFactory;
+module.exports = middlewareFactory;

package/src/modules/files/routes/files.routes.js

@@ -27,7 +27,7 @@ module.exports = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/image",
     [
-      middlewareBusboy.uploadMultipleFilesMiddleware,
+      middlewareBusboy.uploadImagesMiddleware,
       middlewareBusboy.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController
@@ -36,8 +36,7 @@ module.exports = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/file",
     [
-      middlewareBusboy.uploadMultipleFilesMiddleware,
-      middlewareBusboy.generatePreviewMiddleware
+      middlewareBusboy.uploadFilesMiddleware,
     ],
     controller.uploadMultipleFileController
   );
@@ -45,7 +44,7 @@ module.exports = function(app, db, origins, publicPath) {
   app.post(
     "/api/upload/multiple",
     [
-      middlewareBusboy.uploadMultipleFilesMiddleware,
+      middlewareBusboy.uploadImagesMiddleware,
       middlewareBusboy.generatePreviewMiddleware
     ],
     controller.uploadMultipleFileController

package/src/modules/globals/globals.server.js

@@ -7,7 +7,6 @@ const parseCookie = require('./utils/parseCookie.js');
 
 // Exporting middlewares and utils
 module.exports = {
-  middlewareFactory,
   sitemap,
   mailing,
   parseCookie