@ozdao/prometheus-framework 0.0.78 → 0.0.80

package/dist/users.client.js

@@ -1,12 +1,12 @@
 import { openBlock as o, createElementBlock as _, renderSlot as z, createElementVNode as r, defineComponent as L, h as w, resolveComponent as I, createBlock as b, withCtx as c, createTextVNode as N, createCommentVNode as y, reactive as B, onMounted as j, unref as a, toDisplayString as $, Fragment as O, renderList as R, normalizeClass as F, createVNode as n, ref as H, withAsyncContext as T } from "vue";
-import { _ as M, a as A, s as p, F as g, b as G } from "./auth-84680727.mjs";
-import { B as D, m as Y } from "./ButtonFollow-6bbf3e24.mjs";
-import { I as q, _ as J } from "./UploadImage-b1acc48f.mjs";
-import { P as K } from "./PlaceholderUserpic-4fe04ec9.mjs";
+import { _ as M, a as A, s as p, F as g, b as G } from "./auth-18f80fef.mjs";
+import { B as D, m as Y } from "./ButtonFollow-0d83a04a.mjs";
+import { I as q, _ as J } from "./UploadImage-34bc4a3f.mjs";
+import { P as K } from "./PlaceholderUserpic-1a6cf257.mjs";
 import { useRoute as Z, useRouter as E } from "vue-router";
 import "./Tab.vue_vue_type_style_index_0_lang-4ed993c7.mjs";
 import "./inputs.validation-5732152a.mjs";
-import "./auth.validation-2d33e8c7.mjs";
+import "./auth.validation-6bccabd6.mjs";
 import "./globals-f538c0ef.mjs";
 import "vue-i18n";
 const Q = { class: "mobile-menu-section mn-semi pd-r-zero pd-t-thin pd-b-thin pd-medium bg-grey radius-medium" }, U = {
@@ -502,7 +502,7 @@ const ze = { class: "pd-medium for-transition w-100" }, Le = /* @__PURE__ */ r("
   },
   component: () => import(
     /* webpackChunkName: "profile" */
-    "./ProfileBlogposts-55037a06.mjs"
+    "./ProfileBlogposts-65a7a5e0.mjs"
   )
 }, {
   path: "profile/:_id/comments",
@@ -515,7 +515,7 @@ const ze = { class: "pd-medium for-transition w-100" }, Le = /* @__PURE__ */ r("
   },
   component: () => import(
     /* webpackChunkName: "profile" */
-    "./ProfileComments-66651060.mjs"
+    "./ProfileComments-5884d09f.mjs"
   )
 }, {
   path: "profile/:_id/edit",
@@ -535,7 +535,7 @@ const ze = { class: "pd-medium for-transition w-100" }, Le = /* @__PURE__ */ r("
   },
   component: () => import(
     /* webpackChunkName: "profile" */
-    "./ProfileEvents-ddaf8fba.mjs"
+    "./ProfileEvents-85a88674.mjs"
   )
 }, {
   path: "profile/:_id/likes",
@@ -548,7 +548,7 @@ const ze = { class: "pd-medium for-transition w-100" }, Le = /* @__PURE__ */ r("
   },
   component: () => import(
     /* webpackChunkName: "profile" */
-    "./ProfileLikes-7f965631.mjs"
+    "./ProfileLikes-4a57f637.mjs"
   )
 }, {
   path: "profile/:_id/organizations",
@@ -561,7 +561,7 @@ const ze = { class: "pd-medium for-transition w-100" }, Le = /* @__PURE__ */ r("
   },
   component: () => import(
     /* webpackChunkName: "profile" */
-    "./ProfileOrganizations-e4fd2b05.mjs"
+    "./ProfileOrganizations-5d681498.mjs"
   )
 }];
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ozdao/prometheus-framework",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "description": "Web3 Framework focused on user experience and ease of development.",
   "author": "OZ DAO <hello@ozdao.dev>",
   "license": "GPL-3.0-or-later",
@@ -114,8 +114,8 @@
       "require": "./dist/files.client.cjs"
     },
     "./modules/files/server": {
-      "import": "./dist/files.server.js",
-      "require": "./dist/files.server.cjs"
+      "import": "./dist/files.server.mjs",
+      "require": "./dist/files.server.js"
     }
   },
   "browser": {

package/src/modules/community/components/elements/ImageUpload.vue

@@ -38,23 +38,25 @@ function updateBlock(updatedBlock) {
 
 async function onFileChange(e) {
   let file = e.target.files[0];
+
+  console.log(file)
   let formData = new FormData();
+  let uploadPath = 'unsorted'
 
   formData.append("file", file);
-
+  console.log(formData.has("file"));
   try {
     const $axios = axios.create({baseURL: process.env.API_URL, withCredentials: true}) 
 
-    console.log(formData)
-    console.log( process.env.API_URL)
-    let response = await $axios.post("/api/upload/image", formData, {
+    let response = await $axios.post(`/api/upload/file?folderName=${encodeURIComponent(uploadPath)}`, formData, {
       headers: {
         "Content-Type": "multipart/form-data"
       }
     });
     imageUrl.value = response.data.filepath;
+    console.log(imageUrl.value)
     emit('input', imageUrl.value);
-    emit('updateBlock', props.prop, imageUrl.value);
+    emit('updateBlock', props.prop, { content: imageUrl.value });
   } catch (error) {
     console.error(error);
   }

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

@@ -35,7 +35,7 @@
 			<component
 				v-if="blogpost && blogpost.content"
 				v-for="(block, index) in blogpost.content"
-				:is="getComponent(block.type.name)"
+				:is="ComponentMap[block.type]"
 				:key="index"
 				:index="index"
 				:component="block"
@@ -99,25 +99,22 @@
 		isLoading.value = false;
 	});
 
-	const options = [
-		{name: 'Textarea', 	value: 'p'},
-		{name: 'H2', 			value: 'h2'},
-		{name: 'Caption', 		value: 'caption'},
-		{name: 'ImageUpload', 	value: Image}
-	]
-
-	function getComponent(blockTypeName) {
-  		return options.find(option => option.name === blockTypeName)?.value;
-	}
+	const ComponentMap = {
+	  'Textarea': 'p',
+	  'H2': 'h2',
+	  'Bullets': 'p',
+	  'Caption': 'p',
+	  'ImageUpload': Image
+	};
 
 	function getBlockProps(block) {
-		if (block.type.name === 'Textarea') {
+		if (block.type === 'Textarea') {
 			return { innerHTML: block.content };
-		} else if (block.type.name === 'H2') {
+		} else if (block.type === 'H2') {
 			return { innerHTML: block.content };
-		} else if (block.type.name === 'Caption') {
+		} else if (block.type === 'Caption') {
 			return { innerHTML: block.content };
-		} else if (block.type.name === 'ImageUpload') {
+		} else if (block.type === 'ImageUpload') {
 			return { src: block.content };
 		}
 		return {};

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

@@ -2,10 +2,16 @@
   <article 
     class="pd-big"
   >
+
     <div 
       v-if="post" 
       class="cols-2 gap-thin"
     >
+
+      {{ post.owner }}
+      {{ post.creator }}
+
+
       <section 
         class="w-100 bg-grey pd-big radius-big"
       >
@@ -126,7 +132,14 @@ onMounted(async () =>{
     post.value = blog.state.current;
   }
 
-  post.value.owner = auth.state.user._id;
+  post.value.owner = {
+    target: auth.state.user._id,
+    type: 'user'
+  }
+  post.value.creator = {
+    target: auth.state.user._id,
+    type: 'user'
+  }
 })
 
 

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

@@ -209,7 +209,8 @@ const controllerFactory = (db) => {
       url: req.body.name.toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g, ''),
       name: req.body.name,
       tags: req.body.tags ? req.body.tags : ['All'],
-      owner: user._id,
+      owner: req.body.owner,
+      creator: req.body.creator,
       content: req.body.content,
       views: 1
     };

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

@@ -85,9 +85,13 @@ const controllerFactory = (db, publicPath) => {
   };
 
   const uploadFileController = async (req, res, next) => {
-    const folderName = req.query.folderName; // получаем folderName из параметров запроса
+
+    const folderName = req.query.folderName ? req.query.folderName : 'unsorted'; // получаем folderName из параметров запроса
     const upload = multer({ storage: createStorage(folderName, publicPath) }).single('file');
 
+    console.log(folderName)
+    console.log(req.files)
+
     upload(req, res, function(err) {
       if (err instanceof multer.MulterError) {
           console.log(err)

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

@@ -10,6 +10,8 @@ module.exports = function(app, db, origins, publicPath) {
     
     const origin = req.headers.origin;
     
+    console.log(origin)
+
     if (origins.includes(origin)) {
       res.setHeader('Access-Control-Allow-Origin', origin);
     }
@@ -21,7 +23,7 @@ module.exports = function(app, db, origins, publicPath) {
   
   app.post(
     "/api/upload/image",
-    controller.uploadImageController
+    controller.uploadFileController
   );
 
   app.post(