@ozdao/prometheus-framework 0.0.86 → 0.0.87

package/src/modules/events/components/pages/EditEvent.vue

@@ -1,146 +1,241 @@
 <template>
-	<div class="for-transition w-100">
-    
-    <div class="pd-b-zero pd-t-zero pd-thin">
-      <Breadcrumbs class="pd-medium bg-grey radius-big"/>
+  <article v-if="event" class="pd-thin">
+  	<div class="mn-thin radius-small w-100 h-10r bg-grey flex-center flex-column flex">
+     	<UploadImage 
+        v-model:photo="event.cover"
+        :uploadPath="'users/' +  auth.state.user._id + '/events'"
+        class="h-4r w-4r aspect-1x1 o-hidden mn-thin radius-extra" 
+      />
+      <h4>Upload Event Cover</h4>
     </div>
 
-    <div class="pd-thin">
-      <header class="flex-nowrap flex bg-grey pd-medium radius-big">
-        <h1 v-if="route.params.product" class="mn-r-auto">Edit Product</h1>
-        <h1 v-else class="mn-r-auto">Create Product</h1>
-
-        <section class="flex-nowrap flex pd-thin">
-          <Button :submit="onSubmit" :callback="redirectTo">Save Product</Button>
-        </section>
-
-      </header>
-    </div>
-
-    <div class="pd-b-zero pd-t-zero pd-thin cols-2 gap-thin">
-    	
-    	<div class="mn-thin bg-grey pd-medium o-hidden radius-big">
-    		<h3 class="mn-semi">Profile</h3>
-				<EditProductInfo 		
-					:product="products.state.current"
-				/>
-				<div class="mn-semi">
-					<h5>Categories</h5>
-					<Checkbox 
-						v-for="(category, index) in categories.state.all"
-	          :label="category.name"
-	          name="categories"
-	          :value="category.url"
-	          class="w-100 mn-t-small bg-white radius-small pd-small"
-	          :radio="products.state.current.category"
-	        />
+  	<Field 
+      v-model:field="event.name" 
+      placeholder="Event name" 
+      class="mn-thin w-100 bg-grey pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="event.description" 
+      type="textfield"  
+      placeholder="Enter short description" 
+      class="mn-thin w-100 bg-grey pd-medium radius-small" 
+    />
+
+		<h3 class="mn-small">Date</h3>
+    <Field 
+      v-model:field="event.date.start" 
+      label="Start"
+      type="datetime-local"  
+      placeholder="Not specified" 
+      class="mn-thin w-100 bg-grey pd-medium radius-small" 
+    />
+
+    <Field 
+      v-model:field="event.date.end" 
+      label="End"
+      type="datetime-local"  
+      placeholder="Not specified" 
+      class="mn-thin w-100 bg-grey pd-medium radius-small" 
+    />
+
+    <h3 class="mn-small">Description</h3>
+		<section v-if="event" class="w-100 bg-grey pd-big radius-big">
+      <Constructor 
+        :content="event.content"
+        @update="update => event.content = update"
+      />
+    </section>
+
+    <section v-if="event" class="pd-thin pos-fixed pos-l-0 pos-b-0 w-100 ">
+      <div class="pd-thin radius-big  bg-main w-100 flex-nowrap flex">
+        <a v-if="route.params.url" @click="onDelete()" class="mn-r-auto bg-red t-white t-black button">Delete</a>
+        <a @click="onDrafts()" class="mn-l-auto bg-white t-black button">To Drafts</a>
+        <a @click="openPublicationPopup()" class="mn-l-thin bg-black t-white button">Publish</a>
+      </div>
+    </section>
+
+    <Popup 
+      title="Добавить участника" 
+      @close-popup="closePublicationPopup" 
+      :isPopupOpen="isPublicationPopup"
+    >
+      <div class="w-m-66r t-left pd-big bg-white radius-big">
+        <h3 class="mn-small">Final Touches</h3>
+        
+        <BlockTags
+          @tags-changed="newTags => event.tags = newTags"
+          :tags="event.tags"
+        />
+
+        <h5 class="mn-thin">Add to public:</h5>
+        <SelectMulti
+          v-model="selectedOrganization"
+          :options="publics"
+          :multiple="false"
+          :taggable="false"
+          placeholder="Type to search or add tag"
+          label="name"
+          track-by="_id"
+          class="mn-medium bg-grey radius-medium pd-small"
+        />
+        <h5 v-if="selectedOrganization" class="mn-thin">Options:</h5>
+        <div v-if="selectedOrganization" class="mn-medium br-grey br-2px br-solid pd-small radius-big">
+          <Checkbox 
+            :label="'Hide Author'"
+            :radio="event.creator.hidden"
+            @update:radio="updateEvent => event.creator.hidden = updateEvent"
+            name="prices"
+            class="w-100"
+          />
         </div>
-				<EditParameters 		
-					:items="products.state.current.information"
-					title="Parameters"
-	        emptyMessage="No parameters"
-	        addButtonLabel="Add parameter"
-	        keyName="name"
-	        valueName="value"
-					@add-info="addInfo"
-					@delete-info="deleteInfo"
-				/>
-				<EditParameters 
-	        :items="products.state.current.localization"
-	        title="Localization" 
-	        emptyMessage="No localizations"
-	        addButtonLabel="Add localization"
-	        keyName="locale"
-	        valueName="text"
-					@add-info="addLocale"
-					@delete-info="deleteLocale"
-	      />
-				
-				
-			</div>
-
-			<div class="">
-				<div class="mn-thin bg-grey pd-medium o-hidden radius-big">
-					<h3 class="mn-semi">Images</h3>
-					<EditProductImages 
-						:product="products.state.current"
-					/>
-				</div>
-			</div>
-			
-		</div> 
-</div>
-	
+        <Button :submit="onSubmit" :callback="redirectTo" class="w-100 bg-black t-white">Publish</Button>
+      </div>
+    </Popup>
+  </article>
 </template>
 
 <script setup>
-	// Import libs
-	import { reactive, computed, onMounted, toRefs } from 'vue'
-	import { useRoute, useRouter } from 'vue-router'
-	// Import components
-	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
-
-	import Tab from "@pf/src/components/Tab/Tab.vue";
-	import Field from "@pf/src/components/Field/Field.vue";
-	import Select from "@pf/src/components/Select/Select.vue";
-	import Checkbox from "@pf/src/components/Checkbox/Checkbox.vue";
-	import Button from "@pf/src/components/Button/Button.vue";
-	import Popup from "@pf/src/components/Popup/Popup.vue";
-
-	import EditProductInfo from '@pf/src/modules/products/components/sections/EditProductInfo.vue';
-  import EditCategories  	from '@pf/src/modules/products/components/blocks/EditCategories.vue'
-  import EditParameters from '@pf/src/modules/products/components/sections/EditParameters.vue';
-  import EditProductImages from '@pf/src/modules/products/components/sections/EditProductImages.vue';
-  import EditModifications from '@pf/src/modules/products/components/sections/EditModifications.vue';
+import Textarea from '@pf/src/modules/constructor/components/elements/Textarea.vue';
+import Constructor from '@pf/src/modules/constructor/components/sections/Constructor.vue';
+
+import Popup from '@pf/src/components/Popup/Popup.vue';
+import Field         from '@pf/src/components/Field/Field.vue'
+import BlockTags from '@pf/src/components/FieldTags/BlockTags.vue';
+import Checkbox from '@pf/src/components/Checkbox/Checkbox.vue';
+import SelectMulti from '@pf/src/components/SelectMulti/SelectMulti.vue';
+import UploadImage   from '@pf/src/components/UploadImage/UploadImage.vue';
+import Button from '@pf/src/components/Button/Button.vue';   
+
+import { ref, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+import * as events from '@pf/src/modules/events/store/events.js';
+import * as auth from '@pf/src/modules/auth/store/auth';
+import * as organizations from '@pf/src/modules/organizations/store/organizations';
+
+const route = useRoute();
+const router = useRouter();
+
+let event = ref(null);
+let publics = ref(null);
+
+const selectedTags = ref([]);
+const selectedOrganization = ref(null);
+
+onMounted(async () =>{
   
-	// Accessing router and store
- 	import * as products from '@pf/src/modules/products/store/products';
-  import * as categories from '@pf/src/modules/products/store/categories';
+  if (route.params.url) {
+    const data = await events.read({ user: auth.state.user._id, url: route.params.url });
+    event.value = data.pop();
+  } else {
+    events.clean();
+    event.value = events.state.current;
+  }
+
+  if (!event.value.owner) event.value.owner = {
+    target: auth.state.user._id,
+    type: 'user'
+  }
+
+  if (!event.value.creator) event.value.creator = {
+    target: auth.state.user._id,
+    type: 'user',
+    hidden: false
+  }
+
+  if (event.value.owner.type === 'organization') selectedOrganization.value = {
+    _id: event.value.owner.target._id,
+    name: event.value.owner.target.profile.name,
+    photo: event.value.owner.target.profile.photo
+  }
+
+  const dataPublics = await organizations.actions.read({
+    user: auth.state.user._id,
+    postable: auth.state.user._id
+  })
+
+  publics.value = dataPublics.map(publicItem => ({
+    name: publicItem.profile.name,
+    _id: publicItem._id,
+    photo: publicItem.profile.photo
+  }));
+})
+
+const isPublicationPopup = ref(false)
+
+function openPublicationPopup() {
+  isPublicationPopup.value = true;
+}
+function closePublicationPopup() {
+  isPublicationPopup.value = false;
+}
+
+function onDrafts() {
+
+  if (selectedTags.value.length > 0) selectedTags.value.map(tag => (tag.text))
+
+  event.value.status = "draft"
+
+  if (route.params.url) {
+    events.update(event.value)
+      .then(response => {
+        router.push({ name: 'Event', params: { url: response.url } });
+      })
+      .catch(error => {
+        console.error(error);
+      })
+  } else {
+    events.create(event.value)
+      .then(response => {
+        router.push({ name: 'Event', params: { url: response.url } });
+      })
+      .catch(error => {
+        console.error(error);
+      })
+  }
+}
+
+function onDelete() {
+  if (confirm('Are you sure you want to delete this event?')) {
+    events.delete(event.value._id)
+      .then(response => {
+        router.push({ name: 'Drafts' });
+      })
+      .catch(error => {
+        console.error(error);
+      })
+  }
+}
+
+function onSubmit() {
+
+  if (selectedOrganization.value) event.value.owner = {
+    target: selectedOrganization.value._id,
+    type: 'organization'
+  }
 
-	const route = useRoute()
-	const router = useRouter()
+  if (!selectedOrganization.value) event.value.creator.hidden = false
+  if (!selectedOrganization.value) event.value.organization = event.value.creator
 
-  // Data prefetching
- 	await categories.actions.fetchCategories()
+  event.value.status = "published"
 
-  if (route.params.product) {
-	  await products.actions.read({ _id: route.params.product });
+  console.log(event.value)
+  if (route.params.url) {
+    events.update(event.value)
+      .then(response => {
+        router.push({ name: 'Blogevent', params: { url: response.url } });
+      })
+      .catch(error => {
+        console.log(error);
+      });
   } else {
-  	// await commit('products/clearProductState')
+    events.create(event.value)
+      .then(response => {
+        router.push({ name: 'Blogevent', params: { url: response.url } });
+      })
+      .catch(error => {
+        console.log(error);
+      });
   }
-  // Accessing state
-	function addInfo() {
-		products.state.current.information.push({name: '', value: ''});
-	}
-
-	function deleteInfo(index) {
-		products.state.current.information.splice(index, 1);
-	}
-
-	function addLocale() {
-		products.state.current.localization.push({locale: '', text: ''});
-	}
-
-	function deleteLocale(index) {
-		products.state.current.localization.splice(index, 1);
-	}
-	
-	function onSubmit() {
-		if (route.params.product) {
-			products.actions.update(route.params.product, products.state.current)
-		} else {
-			products.actions.create(route.params._id, products.state.current)
-		}
-	}
-
-	function redirectTo () {
-		router.push({name: 'ProductEdit', params: { _id: route.params._id, product: products.state.current._id } })
-	}
-</script>
-
-<style lang="scss">
-	.main-photo {
-		max-width: 50%;
-		img { width: 100%; }
-	}
-</style>
+}
+</script>

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

@@ -1,4 +1,4 @@
-<template>
+f<template>
   <section class="feed">
     <TransitionGroup tag="ul" name="fade" class="o-hidden bg-grey radius-big">
       <SkeletonEvent
@@ -68,6 +68,10 @@
       type: String,
       default: null
     },
+    creator: {
+      type: String,
+      default: null
+    },
     user: {
       type: [String, Number],
       default: null
@@ -107,6 +111,7 @@
         category: props.category,
         sortOrder: props.sortOrder,
         participant: props.participant,
+        creator: props.creator,
         user: props.user,
         date: props.selectedDate,
         owner: props.owner,
@@ -136,6 +141,7 @@
       sortOrder: props.sortOrder,
       user: props.user,
       owner: props.owner,
+      creator: props.creator,
       date: props.selectedDate,
       organization: props.organization,
       period: props.period,

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

@@ -107,6 +107,7 @@ const middlewareFactory = (db) => {
       ...(dateConditions.length > 0 ? [{ $and: dateConditions }] : []),
       ...(req.query.url ? [{ url: req.query.url }] : []),
       ...(req.query.owner ? [{ "owner.target": new ObjectId(req.query.owner) }] : []),
+      ...(req.query.creator ? [{ "creator.target": new ObjectId(req.query.creator) }] : []),
     ];
 
     const matchStage = matchConditions.length > 0 ? { $match: { $and: matchConditions } } : null;
@@ -219,6 +220,7 @@ const middlewareFactory = (db) => {
           url: 1,
           cover: 1,
           name: 1,
+          status: 1,
           description: 1,
           content: 1,
           owner: 1,
@@ -275,12 +277,18 @@ const middlewareFactory = (db) => {
 
   const create = async (req, res) => {
     try {
+
+      delete req.body._id;
+      req.body.url = req.body.name.toLowerCase().replace(/ /g, '-').replace(/[^\w-]+/g, '');
+
       const event = await Event.create(req.body);
+
       if (!event) {
         return res.status(404).send({ message: "Event is not created." });
       }
       res.status(200).send(event);
     } catch (err) {
+      console.log(err)
       return res.status(500).send({ message: err.message });
     }
   };
@@ -305,6 +313,7 @@ const middlewareFactory = (db) => {
       }
       res.status(200).send(event);
     } catch (err) {
+      console.log(err)
       return res.status(500).send({ message: err.message });
     }
   };

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

@@ -70,9 +70,10 @@ const controllerFactory = (db) => {
         return res.status(404).send({ errorCode: 'TICKET_NOT_FOUND' });
       }
 
-      await ticket.remove();
+      await Ticket.deleteOne({ _id: ticket._id });
       res.status(200).send(ticket);
     } catch (error) {
+        console.log(error)
       res.status(500).send({ errorCode: 'SERVER_ERROR' });
     }
   };

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

@@ -11,6 +11,12 @@ module.exports = (mongoose) => {
             type: String, 
             required: true 
         },
+        status: {
+            type: String,
+            enum: ['draft','published','removed'], 
+            default: 'draft',
+            required: true,
+        },
         description: { 
             type: String, 
             required: true 
@@ -45,6 +51,10 @@ module.exports = (mongoose) => {
             },
         },
         creator: {
+            hidden: {
+                type: Boolean,
+                required: true
+            },
             type: {
                 type: String,
                 required: true

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

@@ -27,12 +27,15 @@ const state = reactive({
   },
   current: {
     _id: "",
+    cover: "",
     url: "",
     status: "",
     name: "",
     tags: [],
-    owner: {},
-    date: "",
+    date: {
+      start: null,
+      false: null
+    },
     views: 0,
     content: [],
   }
@@ -77,6 +80,10 @@ async function read(options = {}) {
   if (options.owner) {
     options.params.owner = options.owner;
   }
+  // Creator
+  if (options.creator) {
+    options.params.creator = options.creator;
+  }
   // User
   if (options.user) {
     options.params.user = options.user;
@@ -156,30 +163,20 @@ function set(eventData, property) {
 function clean () {
   state.current = {
     _id: "",
+    cover: "",
     url: "",
     status: "",
     name: "",
     tags: [],
-    author: "",
-    owner: '',
-    date: "",
+    date: {
+      start: null,
+      false: null
+    },
     views: 0,
     content: []
   }
 }
 
-// Actions
-function blockAdd (block) {
-  const blockNew = {
-    order: state.project.content.length + 1,
-    type: block.type,
-    data: block.data,
-    class: block.class,
-    content: block.content
-  }
-  state.project.content.push(blockNew)
-}
-
 const history = []
 history.push(state) // push initial state
 
@@ -192,8 +189,7 @@ export {
   read,
   create,
   update,
+  remove,
   set,
   clean,
-  remove,
-  blockAdd
 }

package/src/modules/organizations/components/blocks/CardOrganization.vue

@@ -7,7 +7,7 @@
       <img 
         v-if="organization.profile.photo && organization.profile.photo.length > 0"
         :src="organization.profile.photo" 
-        class="h-4r w-4r radius-extra" 
+        class="h-4r w-4r radius-extra bg-main" 
       />
 
       <svg  v-else class="h-4r w-4r radius-extra" width="42" height="42" viewBox="0 0 42 42" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -50,8 +50,6 @@
       </div>
     </div>
 
-
-
     <div v-if="organization.products.length > 0" class="pd-medium">
       <div class="mn-small w-100 flex-nowrap flex flex-v-center pd-small bg-white radius-medium">
         <p class="t-black p-medium t-semi">

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

@@ -7,7 +7,7 @@
       		class="radius-big bg-grey pd-medium"
     	/>
     	
-	    <div v-else class="w-max flex-nowrap flex">
+	    <div v-else class="w-max gap-thin flex-nowrap flex">
 	    	<CardOrganization 
 	    		v-if="publics"
 	        	v-for="(organization,index) in publics" 
@@ -15,8 +15,7 @@
 		      	:organization="organization"
 		      	:user="auth.state.user"
 				@updateMembership="handleMembershipUpdate"
-				class="flex-child-shrink-0 flex-child"
-				:class="{'mn-r-small': index !== publics.length - 1}"
+				class="flex-child-1 flex-child w-100"
 		    />
 		</div>
 	</div>

package/src/modules/organizations/organizations.client.js

@@ -7,7 +7,6 @@ import Organizations from './components/pages/Organizations.vue';
 import DepartmentEdit from './components/pages/DepartmentEdit.vue';
 
 import CardOrganization from './components/blocks/CardOrganization.vue';
-import CardOrganizationSocial from './components/blocks/CardOrganizationSocial.vue';
 import EditArray from './components/blocks/EditArray.vue';
 import User from './components/blocks/User.vue';
 import Unit from './components/blocks/Unit.vue';
@@ -50,7 +49,6 @@ export {
   Organizations,
   DepartmentEdit,
   CardOrganization,
-  CardOrganizationSocial,
   EditArray,
   User,
   Unit,

package/src/modules/users/components/pages/ProfileEvents.vue

@@ -13,7 +13,7 @@
 	      	
 	      	<button 
 	      		v-if="auth.state.user._id === route.params._id"
-	      		@click="router.push({name: 'Create BlogPost'})" 
+	      		@click="router.push({name: 'Create Event'})" 
 	      		class="radius-100p i-big hover-scale-1 cursor-pointer t-white bg-second"
 	      	>
 	      		+
@@ -23,7 +23,7 @@
 		<Tab 
 			v-model:selected="tabOrganization"
 			:tabs="[
-				{ name: 'Owner', 	value: 'owner' },
+				{ name: 'My', 	value: 'owner' },
 				{ name: 'Participant', 	value: 'participant' },	
 			]"
 			class="mn-small o-hidden h5 radius-big bg-grey"
@@ -32,7 +32,7 @@
 		<Feed 
 			v-if="tabOrganization ==='owner'"
 	  		:user="auth.state.user._id"
-			:owner="route.params._id"
+			:creator="route.params._id"
 			:sortOrder="'asc'"
 		/>