@ozdao/prometheus-framework 0.2.222 → 0.2.224

package/src/modules/community/components/pages/BlogPost.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="pd-thin">
+  <section>
     <TransitionGroup tag="ul" name="fade" class="o-hidden bg-light radius-big">
       <SkeletonBlogpost
         v-if="isLoading"
@@ -17,136 +17,138 @@
       />
     </transition>
 
-
-		  
-
     <TransitionGroup tag="ul" name="fade" class="container">
     	  <!-- <button @click="share" >
 			    Поделиться
 			  </button>
 			   -->
-    	<CardBlogpost 
-        v-if="!isLoading && blogpost"
-        @click="$router.push({name: 'Blogpost', params: {url: blogpost.url}})" 
-        :blogpost="blogpost" 
-        :user="auth.state.user._id"
-        :type="'blogpostPage'"
-        :hideTitle="true"
-        class="mn-b-medium"
-      >
-
-	      <Viewer
-	        v-if="blogpost && blogpost.content"
-	        :content="blogpost.content"
-	      />
-
-				<a v-if="blogpost.source" :href="blogpost.source" target="_blank" class="mn-b-semi d-block w-max radius-big pd-thin bg-black t-white">
-					Check Source 🔗
-				</a>
-			
-    </CardBlogpost>
-
-   	<h3 class="mn-b-small">Recommended Communities</h3>
-		<Publics 
-			class="mn-b-small"
-		/>
-
-    <Comments 
-      v-if="!isLoading && blogpost" 
-      :type="'blogpost'" 
-      :target="blogpost._id" 
-      :owner="auth.state.user._id"
-    />
+      	<CardBlogpost 
+          v-if="!isLoading && blogpost"
+          @click="$router.push({name: 'Blogpost', params: {url: blogpost.url}})" 
+          :blogpost="blogpost" 
+          :user="auth.state.user._id"
+          :type="'blogpostPage'"
+          :hideTitle="true"
+          class="mn-b-thin"
+        >
+
+  	      <Viewer
+  	        v-if="blogpost && blogpost.content"
+  	        :content="blogpost.content"
+  	      />
+
+  				<a v-if="blogpost.source" :href="blogpost.source" target="_blank" class="mn-b-semi d-block w-max radius-big pd-thin bg-black t-white">
+  					Check Source 🔗
+  				</a>
+  			
+      </CardBlogpost>
+
+     	<!-- <h3 class="mn-b-small">Recommended Communities</h3>
+  		<Publics 
+  			class="mn-b-small"
+  		/> -->
+
+      <Comments 
+        v-if="!isLoading && blogpost" 
+        :type="'blogpost'" 
+        :target="blogpost._id" 
+        :owner="auth.state.user._id"
+        class="bg-light radius-big pd-medium"
+      />
       
-  </TransitionGroup>  
+    </TransitionGroup>  
   
   </section>
 </template>
 
 <script setup>
-	import { ref, onMounted, computed } from 'vue';
-	import { useHead } from '@unhead/vue'
-
-
-	import Loader from '@pf/src/components/Loader/Loader.vue';
-	import EmptyState from '@pf/src/components/EmptyState/EmptyState.vue';
-
-	import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
-	import SkeletonBlogpost from '@pf/src/modules/icons/skeletons/SkeletonBlogpost.vue'
-	import Publics  		from '@pf/src/modules/organizations/components/sections/Publics.vue'
-	import Comments from '@pf/src/modules/community/components/sections/Comments.vue';
-
-	import Viewer from '@pf/src/modules/constructor/components/sections/Viewer.vue';
-
-	import * as blog from '@pf/src/modules/community/store/blogposts.js';
-	import * as auth from '@pf/src/modules/auth/views/store/auth';
-	  
-	import { useRoute } from 'vue-router';
-
-	const route = useRoute();
-
-	const blogpost = ref(null);
-	const isLoading = ref(true);
-
-	const canShare = ref(false);
-
-	onMounted(() => {
-	  canShare.value = !!navigator.share;
-	});
-
-	const share = async () => {
-	  if (!canShare.value) return;
-
-	  console.log('share')
-	  try {
-	    await navigator.share({
-	      title: 'Заголовок вашего контента',
-	      text: 'Описание вашего контента',
-	      // url: window.location.href,
-	    });
-	    console.log('Контент успешно отправлен');
-	  } catch (error) {
-	    console.error('Ошибка при отправке:', error);
-	  }
-	};
-
-	// onMounted(async () => {
-		isLoading.value = true;
-
-		// NOTE: You might need to change the method here to fetch blogposts
-		const data = await blog.read({ user: auth.state.user._id, url: route.params.url });
-
-		blogpost.value = data[0];
-		isLoading.value = false;
-	// });
-
-	 const firstImage = computed(() => {
-	  return blogpost.value?.content.find(block => block.type === 'ImageUpload');
-	});
-
-	const firstText = computed(() => {
-	  return blogpost.value?.content.find(block => 
-	    block.type === 'Textarea' && block.class !== 'h2'
-	  );
-	});
-
-	 const metadata = computed(() => {return {
-      title: blogpost.value?.name,
-      description: firstText.value?.content.slice(0,120),
-      meta: [
-        { hid: 'description', name: 'description', content: firstText.value?.content.slice(0,120) },
-        // { hid: 'keywords', name: 'keywords', content: t('meta.keywords') },
-        { hid: 'og:title', property: 'og:title', content: blogpost.value?.name },
-        { hid: 'og:description', property: 'og:description', content: firstText.value?.content.slice(0,120) },
-        { hid: 'og:image', property: 'og:image', content: firstImage.value?.content ? process.env.FILE_SERVER_URL + firstImage.value?.content : process.env.FILE_SERVER_URL + '/favicon/cover.jpg' },
-        // { hid: 'og:url', property: 'og:url', content: current_url.value },
-        { hid: 'twitter:title', name: 'twitter:title', content:  blogpost.value?.name },
-        { hid: 'twitter:description', name: 'twitter:description', content: firstText.value?.content.slice(0,120) },
-        { hid: 'twitter:image', name: 'twitter:image', content: firstImage.value?.content ? process.env.FILE_SERVER_URL + firstImage.value?.content : process.env.FILE_SERVER_URL + '/favicon/cover.jpg' },
-        { hid: 'twitter:card', name: 'twitter:card', content: process.env.FILE_SERVER_URL + '/favicon/cover.jpg' },
-      ],
-    }});
-useHead(metadata.value)
+import { ref, onMounted, computed, onServerPrefetch, watch } from 'vue';
+import { useHead } from '@unhead/vue'
+import Loader from '@pf/src/components/Loader/Loader.vue';
+import EmptyState from '@pf/src/components/EmptyState/EmptyState.vue';
+import CardBlogpost from '@pf/src/modules/community/components/blocks/CardBlogpost.vue';
+import SkeletonBlogpost from '@pf/src/modules/icons/skeletons/SkeletonBlogpost.vue'
+import Publics from '@pf/src/modules/organizations/components/sections/Publics.vue'
+import Comments from '@pf/src/modules/community/components/sections/Comments.vue';
+import Viewer from '@pf/src/modules/constructor/components/sections/Viewer.vue';
+import * as blog from '@pf/src/modules/community/store/blogposts.js';
+import * as auth from '@pf/src/modules/auth/views/store/auth';
+  
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
+const blogpost = computed(() => blog.state.current);
+const isLoading = ref(false);
+const canShare = ref(false);
+const error = ref(null);
+
+async function fetchBlogpost() {
+  try {
+    isLoading.value = true;
+    const data = await blog.read({ user: auth.state.user?._id, url: route.params.url });
+    blogpost.value = data[0];
+    // Обновляем состояние хранилища
+    blog.state.current = data[0];
+  } catch (err) {
+    error.value = err;
+    console.error('Error fetching blogpost:', err);
+  } finally {
+    isLoading.value = false;
+  }
+}
+
+onServerPrefetch(async() => {
+	await fetchBlogpost()
+});
+
+onMounted(async() => {
+  if (!blogpost.value || blogpost.value.url !== route.params.url) {
+    await fetchBlogpost();
+  }
+  canShare.value = !!navigator.share;
+});
+
+
+const share = async () => {
+  if (!canShare.value) return;
+  try {
+    await navigator.share({
+      title: blogpost.value.name,
+      text: firstText.value?.content.slice(0, 120) || 'Check out this blog post!',
+      url: window.location.href,
+    });
+    console.log('Content shared successfully');
+  } catch (error) {
+    console.error('Error sharing:', error);
+  }
+};
+
+const firstImage = computed(() => {
+  return blogpost.value?.content?.find(block => block.type === 'ImageUpload');
+});
+
+const firstText = computed(() => {
+  return blogpost.value?.content?.find(block => 
+    block.type === 'Textarea' && block.class !== 'h2'
+  );
+});
+
+const metadata = computed(() => ({
+  title: blogpost.value?.name,
+  description: firstText.value?.content.slice(0, 120),
+  meta: [
+    { hid: 'description', name: 'description', content: firstText.value?.content.slice(0, 120) },
+    { hid: 'og:title', property: 'og:title', content: blogpost.value?.name },
+    { hid: 'og:description', property: 'og:description', content: firstText.value?.content.slice(0, 120) },
+    { hid: 'og:image', property: 'og:image', content: firstImage.value?.content ? `${process.env.FILE_SERVER_URL}${firstImage.value.content}` : `${process.env.FILE_SERVER_URL}/favicon/cover.jpg` },
+    { hid: 'twitter:title', name: 'twitter:title', content: blogpost.value?.name },
+    { hid: 'twitter:description', name: 'twitter:description', content: firstText.value?.content.slice(0, 120) },
+    { hid: 'twitter:image', name: 'twitter:image', content: firstImage.value?.content ? `${process.env.FILE_SERVER_URL}${firstImage.value.content}` : `${process.env.FILE_SERVER_URL}/favicon/cover.jpg` },
+    { hid: 'twitter:card', name: 'twitter:card', content: 'summary_large_image' },
+  ],
+}));
+
+useHead(metadata);
 </script>
 
 <style lang="scss">

package/src/modules/community/components/pages/CreateBlogPost.vue

@@ -122,7 +122,7 @@ onMounted(async () =>{
     limit: 100
   })
 
-    publics.value = dataPublics.map(publicItem => ({
+  publics.value = dataPublics.map(publicItem => ({
     name: publicItem.profile.name,
     _id: publicItem._id,
     photo: publicItem.profile.photo

package/src/modules/community/components/sections/Comments.vue

@@ -1,15 +1,15 @@
 <template>
   <div id="comments">
-    <div>
+    <div class="mn-b-medium">
       <h3 class="mn-b-small">{{ comments.length }} comments</h3>
 
-      <div @click="$router.push({name: 'Sign In'})" class="pd-big cursor-pointer mn-b-small section bg-black t-white flex-center flex radius-big" v-if="!owner">
+      <div @click="$router.push({name: 'Sign In'})" class="pd-big cursor-pointer mn-b-small bg-black t-white flex-center flex radius-big" v-if="!owner">
         <p class="t-semi uppercase">Please log in to leave a comment.</p>
       </div>
 
       <div class="mn-b-small" v-if="owner">
-        <form @submit.prevent="submitComment" class="bg-light radius-big pd-medium">
-          <textarea v-model="commentContent" placeholder="Enter your comment" class="pd-small p-big w-100 radius-small mn-r-small"></textarea>
+        <form @submit.prevent="submitComment" class="bg-white radius-medium pd-small">
+          <textarea v-model="commentContent" placeholder="Enter your comment" class="p-big w-100 radius-small mn-r-small"></textarea>
           <button type="submit" class="mn-l-auto bg-main button">Send</button>
         </form>
       </div>
@@ -24,7 +24,7 @@
         :owner="owner"
         @reply="handleReply"
         @load-more="loadMoreChildren"
-        class="comment mn-b-small radius-big pd-medium bg-light"
+        class="comment mn-b-small radius-big bg-light"
       />
   </div>
 </template>

package/src/modules/community/controllers/blog.controller.js

@@ -11,7 +11,7 @@ const controllerFactory = (db) => {
 	const Membership = db.membership;
 
 	const read = async (req, res) => {
-
+		console.log(req.query)
 		let stages = [];
 
 		stages = [

package/src/modules/community/router/blogposts.js

@@ -29,46 +29,45 @@ const community = [
         title_hide: true
       },
       component: () => import(/* webpackChunkName: 'Blog' */ '../components/pages/Blog.vue')
-    }]
-  },{
-    path: 'community/posts/create',
-    name: 'Create BlogPost',
-    meta: {
-      title: {
-        en: 'Create Post',
-        ru: 'Создать Пост'
+    },{
+      path: 'posts/create',
+      name: 'Create BlogPost',
+      meta: {
+        title: {
+          en: 'Create Post',
+          ru: 'Создать Пост'
+        },
       },
-    },
-    beforeEnter: [
-      validationAuth.requiresAuth,
-    ],
-    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
-  },{
-    path: 'community/posts/:url',
-    name: 'BlogPost',
-    meta: {
-      title: {
-        en: 'Post',
-        ru: 'Пост'
-      }
-    },
-    component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue')
-  },{
-    path: 'community/posts/:url/edit',
-    name: 'Edit BlogPost',
-     meta: {
-      title: {
-        en: 'Edit Post',
-        ru: 'Редактировать пост'
+      // beforeEnter: [
+      //   validationAuth.requiresAuth,
+      // ],
+      component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
+    },{
+      path: 'posts/:url',
+      name: 'BlogPost',
+      meta: {
+        title: {
+          en: 'Post',
+          ru: 'Пост'
+        }
       },
-    },
-    beforeEnter: [
-      validationAuth.requiresAuth,
-      validationOwnership.requiresEditAccess
-    ],
-    component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
-  }
-
+      component: () => import(/* webpackChunkName: 'BlogPost' */ '../components/pages/BlogPost.vue')
+    },{
+      path: 'posts/:url/edit',
+      name: 'Edit BlogPost',
+       meta: {
+        title: {
+          en: 'Edit Post',
+          ru: 'Редактировать пост'
+        },
+      },
+      beforeEnter: [
+        validationAuth.requiresAuth,
+        validationOwnership.requiresEditAccess
+      ],
+      component: () => import(/* webpackChunkName: 'CreateBlogPost' */ '../components/pages/CreateBlogPost.vue')
+    }]
+  },
 ];
 
 export default community;

package/src/modules/community/routes/blog.routes.js

@@ -3,10 +3,13 @@ const controllerFactory = require("../controllers/blog.controller");
 const middlewareFactoryAuth = require('@pf/src/modules/auth/controllers/middlewares');
 const middlewareFactoryCommunity = require('../middlewares/server');
 
+const middlewareFactoryAccesses = require('@pf/src/modules/organizations/middlewares/verifyAccesses')
+
 module.exports = function(app, db, origins) {
   const controller = controllerFactory(db);
 
   const { authJwt } = middlewareFactoryAuth(db);
+  const { verifyAccess, handleAccessResult } = middlewareFactoryAccesses(db)
   const { verifyBlogpost } = middlewareFactoryCommunity(db);
 
   app.get(
@@ -17,6 +20,7 @@ module.exports = function(app, db, origins) {
   app.post(
     "/api/blog/create",
     [
+      authJwt.verifyToken(),
       verifyBlogpost.checkNameNotEmpty,
       verifyBlogpost.checkBlogpostExistOrNot,
     ],

package/src/modules/community/store/blogposts.js

@@ -1,11 +1,9 @@
-// Dependencies
-import axios from 'axios';
-// Setup Axios
-const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 // Vue modules
 import { reactive, ref, computed, toRefs, watch  } from "vue";
+// Axios
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 // Globals
-import { setError }   from '@pf/src/modules/globals/views/store/globals'
+import { setError } from '@pf/src/modules/globals/views/store/globals'
 // State
 const state = reactive({
   all: [],
@@ -35,18 +33,7 @@ const state = reactive({
       value: 'creator'
     }]
   },
-  current: {
-    _id: "",
-    url: "",
-    status: "",
-    name: "",
-    tags: [],
-    owner: {},
-    source: null,
-    date: "",
-    views: 0,
-    content: [],
-  }
+  current: null
 });
 
 async function read(options = {}) {
@@ -98,12 +85,17 @@ async function read(options = {}) {
   options.params.limit = options.limit || 10;
 
   try {
+    console.log('params is', options.params)
     const response = await $axios.get('/api/blog/read', { params: options.params });
     
     if (options.url) {
-      set(response.data, 'current')
+      if (response.data && response.data.length > 0) {
+        state.current = response.data[0];
+      } else {
+        state.current = null;
+      }
     } else {
-      set(response.data, 'all')
+      state.all = response.data;
     }
     
     return Promise.resolve(response.data);

package/src/modules/community/store/reactions.js

@@ -1,6 +1,3 @@
-// Dependencies
-import axios from 'axios';
-
 // Vue modules
 import { reactive, watch } from "vue";
 
@@ -8,10 +5,7 @@ import { reactive, watch } from "vue";
 import { setError } from '@pf/src/modules/globals/views/store/globals';
 
 // Setup Axios
-const $axios = axios.create({
-  baseURL: process.env.API_URL,
-  withCredentials: true
-});
+import $axios from '@pf/src/modules/globals/views/utils/axios-instance.js';
 
 // State
 const state = reactive({

package/src/modules/events/components/elements/ButtonCheck.vue

@@ -1,34 +1,30 @@
 <template>
   <div>
-    <Button :submit="openPublicationPopup" class="bg-main button-small radius-extra button">
+    <Button :submit="startScan" class="bg-main button-small radius-extra button">
       Check Tickets
     </Button>
-
-    <Popup title="Добавить участника" @close-popup="closePublicationPopup" :isPopupOpen="isPublicationPopup"
-      class="w-max-30r h-max-30r t-left pd-big bg-white radius-big">
+    <Popup
+      title="Scan QR Code"
+      @close-popup="closePublicationPopup"
+      :isPopupOpen="isPublicationPopup"
+      class="w-max-30r h-max-30r t-left pd-big bg-white radius-big"
+    >
       <h3 class="mn-b-small">Scan QR Code</h3>
-
       <div class="h-max">
-        <QrcodeStream :track="paintBoundingBox" @detect="onDetect" @error="onError"></QrcodeStream>
+        <!-- Scanning will be handled by Capacitor, so we don't need a visual component here -->
       </div>
     </Popup>
   </div>
 </template>
 
 <script setup>
-// Deps
 import { ref } from 'vue'
-import { QrcodeStream } from 'vue-qrcode-reader'
-
-// In components
+import { BarcodeScanner } from '@capacitor-mlkit/barcode-scanning'
 import Popup from '@pf/src/components/Popup/Popup.vue'
 import Button from '@pf/src/components/Button/Button.vue'
-
-// Methods 
 import * as tickets from '@pf/src/modules/events/store/tickets'
 
-const emits = defineEmits('qrcodecheck')
-
+const emits = defineEmits(['qrcodecheck'])
 const isPublicationPopup = ref(false)
 const error = ref('')
 
@@ -40,67 +36,41 @@ function closePublicationPopup() {
   isPublicationPopup.value = false
 }
 
-const result = ref(null)
-
-async function onDetect(detectedCodes) {
-  result.value = detectedCodes.map((code) => code.rawValue)
-
+async function startScan() {
+  openPublicationPopup()
+  
   try {
-    const qrcode = result.value[0] || ''
-
-    if (!qrcode) {
-      throw new Error('Troubles with qrcode reading');
+    await BarcodeScanner.isSupported()
+    const { barcodes } = await BarcodeScanner.scan()
+    
+    if (barcodes.length > 0) {
+      await processBarcode(barcodes[0].rawValue)
+    } else {
+      throw new Error('No barcode detected')
     }
-
-    const response = await tickets.actions.update({
-      _id: qrcode,
-      status: 'used',
-      check: true
-    })
-
-    alert("Ticket checked. And it's all right!");
   } catch (e) {
-    alert(`Ticket is not found, already used or deactivated!`);
-  }
-
-  emits('qrcodecheck')
-}
-
-function onError(err) {
-  error.value = `[${err.name}]: `
-
-  if (err.name === 'NotAllowedError') {
-    error.value += 'you need to grant camera access permission'
-  } else if (err.name === 'NotFoundError') {
-    error.value += 'no camera on this device'
-  } else if (err.name === 'NotSupportedError') {
-    error.value += 'secure context required (HTTPS, localhost)'
-  } else if (err.name === 'NotReadableError') {
-    error.value += 'is the camera already in use?'
-  } else if (err.name === 'OverconstrainedError') {
-    error.value += 'installed cameras are not suitable'
-  } else if (err.name === 'StreamApiNotSupportedError') {
-    error.value += 'Stream API is not supported in this browser'
-  } else if (err.name === 'InsecureContextError') {
-    error.value += 'Camera access is only permitted in secure context. Use HTTPS or localhost rather than HTTP.'
-  } else {
-    error.value += err.message
+    error.value = e.message
+    alert(`Error: ${error.value}`)
+  } finally {
+    closePublicationPopup()
   }
 }
 
-function paintBoundingBox(detectedCodes, ctx) {
-  for (const detectedCode of detectedCodes) {
-    const {
-      boundingBox: { x, y, width, height }
-    } = detectedCode
-
-    ctx.lineWidth = 2
-    ctx.strokeStyle = '#007bff'
-    ctx.strokeRect(x, y, width, height)
+async function processBarcode(qrcode) {
+  try {
+    if (!qrcode) {
+      throw new Error('Troubles with qrcode reading')
+    }
+    const response = await tickets.actions.update({ _id: qrcode, status: 'used', check: true })
+    alert("Ticket checked. And it's all right!")
+  } catch (e) {
+    alert(`Ticket is not found, already used or deactivated!`)
+  } finally {
+    emits('qrcodecheck')
   }
 }
 </script>
 
 <style scoped>
 /* Existing styles can stay unchanged */
-</style>
+</style>