@ozdao/prometheus-framework 0.2.29 → 0.2.31

package/src/modules/spots/components/pages/SpotEdit.vue

@@ -1,111 +1,98 @@
 <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"/>
-    </div>
-
-    <div class="pd-thin">
-      <header class="flex-nowrap flex bg-grey pd-medium radius-big">
-        <h1 v-if="route.params.spot" class="mn-r-auto">Edit Spot</h1>
-        <h1 v-else class="mn-r-auto">Create Spot</h1>
+  <div class="for-transition w-100 cols-1 pd-thin gap-thin">
 
-        <section class="flex-nowrap flex pd-thin">
-          <Button :submit="onSubmit" :callback="redirectTo">Save Spot</Button>
-        </section>
 
-      </header>
-    </div>
-
-    <div class="pd-b-zero pd-t-zero pd-thin cols-2 gap-thin">
+    <Block class="flex-nowrap flex-v-center flex">
+      
+      <h1 class="mn-r-auto">
+        {{ route.params.spot ? spots.state.spot.profile.name : 'Create Spot' }}
+      </h1>
+
+      <Button 
+        :submit="onSubmit" 
+        :callback="redirectTo"
+        class="bg-main"
+      >
+        Save Spot
+      </Button>
+    </Block>
     
-      <div class="flex-stretch flex-column flex">  
 
-        <div class="mn-b-thin bg-grey pd-medium o-hidden radius-big">
-          <h3 class="mn-b-semi">Profile</h3>
-          
-          <div class="radius-small flex-nowrap flex">
-            <UploadImage 
-               v-model:photo="spots.state.spot.profile.photo"
-              :uploadPath="'organizations/' + spots.state.spot.name + '/avatars'"
-              class="w-8r aspect-1x1 o-hidden mn-r-small radius-extra" 
+    <div class="cols-2 gap-thin">
+    
+      <Block
+        title="Profile"
+        class="mn-b-semi"
+      >
+
+
+
+        <div class="gap-small mn-b-small cols-2-fit-content">
+          <UploadImage 
+             v-model:photo="spots.state.spot.profile.photo"
+            :uploadPath="'organizations/' + spots.state.spot.name + '/avatars'"
+            class="aspect-1x1 w-8r o-hidden radius-extra" 
+          />
+
+          <div class="w-100">
+            <Field 
+              v-model:field="spots.state.spot.profile.name"     
+              label="Name"  
+              placeholder="Spot Name" 
+              class="mn-b-small bg-white radius-small pd-medium"
+              :validation="organizationName" 
             />
-            <div class="w-100 flex-child-grow-1 flex-child ">
-              <Field 
-                v-model:field="spots.state.spot.profile.name"     
-                label="Name"  
-                placeholder="Spot Name" 
-                class="mn-b-small bg-white radius-small pd-medium"
-                :validation="organizationName" 
-              />
-              <Field 
-                v-model:field="spots.state.spot.profile.description"     
-                label="Description"  
-                placeholder="Spot description (max 120 symbols)" 
-                class="bg-white radius-small pd-medium"
-                :validation="organizationName" 
-              />  
-            </div>
+            <Field 
+              v-model:field="spots.state.spot.profile.description"     
+              label="Description"  
+              placeholder="Spot description (max 120 symbols)" 
+              class="bg-white radius-small pd-medium"
+              :validation="organizationName" 
+            />  
           </div>
         </div>
 
-        <div class="bg-grey pd-medium o-hidden radius-big">
-          <h3 class="mn-b-semi">Details</h3>
+        <Select 
+          v-model:select="spots.state.spot.status"
+          label="Status"
+          :options="[
+            'unpublished', 
+            'published',
+            'archivied'
+          ]"
+          placeholder="Display product"
+          class="pos-relative w-100 mn-b-small bg-white radius-small pd-medium"
+        />
           
-          <p class="p-medium mn-b-small">Please the available delivery options:</p>
-          <div class="mn-b-medium flex-nowrap flex">
-            <Checkbox 
-                label="Pickup"
-                name="Delivery"
-                value="pickup"
-                class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="spots.state.spot.delivery"
-              />
-              <Checkbox 
-                label="Delivery"
-                name="Delivery"
-                value="courier"
-                 class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="spots.state.spot.delivery"
-              />
-              <Checkbox 
-                label="Post"
-                name="Delivery"
-                value="post"
-                 class="w-100 bg-white radius-small pd-small"
-                :radio="spots.state.spot.delivery"
-              />
-          </div>
+        <p class="p-medium mn-b-small">Please the available delivery options:</p>
+
+        <Checkbox 
+          v-for="option in ['pickup','courier','post']"
+          :label="option"
+          name="Delivery"
+          :value="option"
+          class="w-100 mn-b-small bg-white radius-small pd-small"
+          :radio="spots.state.spot.delivery"
+          @update:radio="event => spots.state.spot.delivery = event"
+        />
 
-          <p class="p-medium mn-b-small">Please select the available payment methods:</p>
-          <div class="flex-nowrap flex">
-            <Checkbox 
-                label="Cash"
-                name="Payment"
-                value="cash"
-                class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="spots.state.spot.payment"
-              />
-              <Checkbox 
-                label="Bank Transfer"
-                name="Payment"
-                value="bank"
-                 class="w-100 mn-r-small bg-white radius-small pd-small"
-                :radio="spots.state.spot.payment"
-              />
-              <Checkbox 
-                label="Crypto"
-                name="Payment"
-                value="crypto"
-                 class="w-100 bg-white radius-small pd-small"
-                :radio="spots.state.spot.payment"
-              />
-          </div>
-        </div>
-      </div>
+        <p class="p-medium mn-b-small">Please select the available payment methods:</p>
+     
+        <Checkbox 
+          v-for="option in ['cash','bank transfer','crypto']"
+          :label="option"
+          name="Payment"
+          :value="option"
+          class="w-100 mn-b-small bg-white radius-small pd-small"
+          :radio="spots.state.spot.payment"
+          @update:radio="event => spots.state.spot.payment = event"
+        />
+      </Block>
 
-      <div class="bg-grey pd-medium o-hidden radius-big">
-        <h3 class="mn-b-semi">Location</h3>
+      <Block
+        title="Location"
+        class="pos-relative"
+      >
         <Address
           :apiKey="GOOGLE_MAPS_API_KEY" 
           :address="spots.state.spot.address" 
@@ -113,7 +100,7 @@
           label="Address"    
           placeholder="Enter delivery address"  
           class="
-            bg-white radius-small pd-small mn-b-small
+            bg-white pd-small radius-tl-medium radius-tr-medium 
           "
           @update:location="newLocation => {
             spots.state.spot.location = newLocation;
@@ -122,14 +109,13 @@
             spots.state.spot.address = newAddress;
           }"
         />
-
-        <p class="mn-b-small p-medium">Or choose on map:</p>
-
         <LocationMarker 
+         :apiKey="GOOGLE_MAPS_API_KEY" 
+
           :address="spots.state.spot.address" 
           :location="spots.state.spot.location" 
-          :apiKey="GOOGLE_MAPS_API_KEY" 
-          class="radius-big o-hidden"
+         
+          class="h-20r mn-b-small radius-bl-medium radius-br-medium  o-hidden"
           @update:location="newLocation => {
             spots.state.spot.location = newLocation;
           }"
@@ -137,86 +123,36 @@
             spots.state.spot.address = newAddress;
           }"
         />
+        <p class="mn-b-small p-medium">Options:</p>
+        <Checkbox 
+          :label="'Hide address'"
+          name="address"
+          class="w-100 mn-r-small bg-white radius-small pd-small"
+          :radio="spots.state.spot.position?.hide"
+          @update:radio="event => spots.state.spot.position.hide = event"
 
-      </div>
-    </div>
-
-    <section class="flex-nowrap flex pd-thin">
-      <Button :submit="onDelete" :callback="redirectToDash" class="bg-grey">Delete Spot</Button>
-    </section>
-    
-
-
-    <!-- <div id="dash" class="pd-medium bg-white">
-     
-
-      <div class="mn-b-regular  flex-v-center flex-nowrap flex">
-        <h3 class="mn-r-small">Команда</h3>
-        <div>
-          <a  class="t-main h5" @click="openMemberPopup()">+</a>
-        </div>
-      </div>
-
-      <Popup title="Добавить участника" @close-popup="closeMemberPopup" :isPopupOpen="isOpenAddMemberPopup">
-        <SpotMemberModify 
-          :members="spots.state.spot.members" 
-          :member="selectedMember" 
-          :users="users"
-          @callback="closeMemberPopup"
-        />
-      </Popup>
-
-
-      <ul class=mn-b-small>
-        <li v-if="spots.state.spot.members.length < 1">В отделе еще нет участников</li>
-        <User 
-          class="bg-grey o-hidden radius-small mn-b-thin" 
-          v-for="(member, index) in spots.state.spot.members" 
-          :key="index" 
-          :user="member.user" 
-          :position="member.position" 
-          @click="openMemberPopup(index)"
         />
-      </ul>
 
+        <Field 
+          v-model:field="spots.state.spot.minorder"     
+          label="Min.order"  
+          placeholder="Enter minimum order value" 
+          class="bg-white radius-small pd-medium"
+          :validation="organizationName" 
+        />  
 
-      <Popup title="Добавить подотдел" @close-popup="closeSpotPopup" :isPopupOpen="isOpenSpotPopup">
-        <SpotSubSpotModify 
-          :spots="spots.state.spot.subspots" 
-          :spot="selectedSpot" 
-          :mainspot="spots.state.spot"
-          :allspots="spots.state.spots"
-          @callback="closeSpotPopup"
-        />
-      </Popup>
-    
-      <div class="mn-b-regular  flex-v-center flex-nowrap flex">
-        <h3 class="mn-r-small">Подотделы </h3>
-        <div>
-          <a  class="t-main h5" @click="openSpotPopup()">+</a>
-        </div>
-      </div>
-
-        <ul class="mn-b-small">
-          <li v-if="spots.state.spot.subspots.length < 1">В отделе еще нет подотделов</li>
-          <SpotSub  
-            v-for="(subspot, index) in spots.state.spot.subspots" 
-            :key="index" class="bg-grey o-hidden radius-small mn-b-thin" 
-            :spot="subspot" 
-              @click="openSpotPopup(index)"
-            />
-        </ul> 
+      </Block>
+    </div>
 
-      
-    </div> -->
+    <Button :submit="onDelete" :callback="redirectToDash" class="w-100 bg-grey">Delete Spot</Button>
   </div>
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import Cookies from "js-cookie";
-import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
+
+import Block from '@pf/src/components/Block/Block.vue';
 import UploadImage from '@pf/src/components/UploadImage/UploadImage.vue';
 
 
@@ -243,17 +179,31 @@ const route = useRoute();
 const tabOrganization = ref("details");
 const showAddNew = ref(false);
 
+onMounted(() => {
+  // spots.state.spot.location = spots.state.spot.location
+})
+
 async function fetchData() {
   if (route.params.spot) {
     await memberships.actions.read(route.params.spot);
   }
   const users = ref(memberships.state.memberships);
 
-  await spots.actions.read(route.params._id);
   if (route.params.spot) await spots.actions.readOne(route.params.spot);
+
 }
 
-fetchData();
+await fetchData();
+
+// const [ lng, lat ] = spots.state.spot.location?.coordinates
+
+const lng = spots.state.spot.location?.coordinates[0]
+const lat = spots.state.spot.location?.coordinates[1]
+
+spots.state.spot.location = {
+  lat: lat || 1,
+  lng: lng || 1
+}
 
 const members = ref(spots.state.spot.members);
 
@@ -284,6 +234,13 @@ function closeSpotPopup() {
 }
 
 async function onSubmit() {
+
+  spots.state.spot.location = {
+    type: 'Point',
+    coordinates: [spots.state.spot.location.lng, spots.state.spot.location.lat]
+  }
+
+
   if (route.params.spot) {
     await spots.actions.update(
       route.params._id,

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

@@ -41,6 +41,7 @@ const controllerFactory = (db) => {
       const data = await newSpot.save();
       res.send(data);
     } catch (err) {
+      console.log(err)
       res.status(500).send({ message: err.message });
     }
   };

package/src/modules/spots/models/spot.model.js

@@ -15,15 +15,18 @@ module.exports = (mongoose) => {
       description:  { type: String },
       categories:   [String]
     },
+    minorder: { type: Number },
+    position: {
+      hide: { type: Boolean}
+    },
     // Working hours
     address: String,
     // Position on map
     location: {
-      lat: Number,
-      lng: Number,
       type: {
         type: String,
-        enum: ['Point'], // 'location.type' must be 'Point'
+        enum: ['Point'], 
+        default: 'Point',
         required: true
       },
       coordinates: {

package/src/modules/spots/store/spots.js

@@ -13,18 +13,24 @@ $axios.defaults.withCredentials = true
 const state = reactive({
   spots: [],
   spot: {
+    status: 'unpublished',
     organization: '',
+
     profile: {
       photo: '',
       name: '',
       description: '',
       categories: [],
     },
-    address: '',
-    location: {
-      lat: null,
-      lng: null,
+    position: {
+      address: undefined,
+      location: undefined,
+      hide: false
     },
+
+    address: undefined,
+    location: undefined,
+
     worktime: [],
     delivery: [],
     payment: [],
@@ -37,58 +43,46 @@ const state = reactive({
 // Methods
 const actions = {
   async readOne(spotID) {
-    await $axios
-      .get(`/api/spots/get/${spotID}`)
-      .then(response => {
-        state.spot = response.data;
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.get(`/api/spots/get/${spotID}`);
+
+      state.spot = response.data;
+    } catch (error) {
+      setError(error);
+    }
   },
   async read(organizationId) {
-    await $axios
-      .get(`/api/spots/${organizationId}`)
-      .then(response => {
-        console.log('Response:', response);
-        state.spots = response.data;
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.get(`/api/spots/${organizationId}`);
+
+      state.spots = response.data;
+      return response.data
+    } catch (error) {
+      setError(error);
+    }
   },
   async create(organizationId, spot) {
-    await $axios
-      .post(`/api/spots/${organizationId}/create`, spot)
-      .then(response => {
-        state.error = null;
-        state.spot = response.data;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      const response = await $axios.post(`/api/spots/${organizationId}/create`, spot);
+      
+      state.spot = response.data;
+    } catch (error) {
+      setError(error);
+    }
   },
   async update(organizationId, spot) {
-    await $axios
-      .post(`/api/spots/${organizationId}/update`, spot)
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      await $axios.post(`/api/spots/${organizationId}/update`, spot);
+    } catch (error) {
+      setError(error);
+    }
   },
   async delete(organizationId, spotId) {
-    await $axios
-      .delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } })
-      .then(() => {
-        state.error = null;
-      })
-      .catch(error => {
-        setError(error)
-      });
+    try {
+      await $axios.delete(`/api/spots/${organizationId}/delete`, { data: { _id: spotId } });
+    } catch (error) {
+      setError(error);
+    }
   },
 };
 

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

@@ -24,7 +24,7 @@
 
 			<section 
 
-				class="flex-center flex flex-column t-center w-100 mn-b-semi radius-medium pd-medium bg-grey"
+				class="flex-center pos-relative flex flex-column t-center w-100 mn-b-semi radius-medium pd-medium bg-grey"
 			>
 
 				<Dropdown 
@@ -73,7 +73,7 @@
 							_id: auth.state.user._id
 						}
 					})" 
-					class="pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
+					class="cursor-pointer pos-absolute pos-t-regular pos-r-regular i-regular t-transp"
 				/>
 
 				<img 
@@ -152,25 +152,7 @@
 
 			</section>
 			
-			<Menu 
-				v-if="(auth.state.access.roles && auth.state.user._id === route.params._id) && (auth.state.access.roles.includes('ROLE_MODERATOR') || auth.state.access.roles.includes('ROLE_ADMIN'))"
-				class="mn-b-regular bg-black t-white"
-			>
-			  <MenuItem 
-			  	@click="router.push({
-			  		name: 'Backoffice', 
-			  		params: {
-			  			_id: route.params._id
-			  		}
-			  	})" 
-			  	class="cursor-pointer"
-			  	theme="white"
-			  >
-			    <span>
-			    	Backoffice
-			    </span>
-			  </MenuItem> 
-			</Menu>
+			
 
 			<Menu class="mn-b-regular bg-grey">
 
@@ -187,19 +169,15 @@
 			 	<MenuItem @click="router.push({name: 'User Blogposts', params: {_id: route.params._id}})" class="cursor-pointer">
 			 		<IconCommunity class="i-semi" :icon="true"/>
 			    <span>Posts</span>
-			  </MenuItem> 
+			  </MenuItem>
 			</Menu>
 
-
-
-			<!-- <Menu class="mn-b-regular bg-grey">
+			<Menu class="mn-b-regular bg-grey">
 				<MenuItem @click="router.push({name: 'User Wallet', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <IconGroups class="i-semi" :icon="true"/>
 			    <span>Wallet</span>
 			  </MenuItem>
-			</Menu> -->
-
-
+			</Menu>
 			  
 			  <!-- <MenuItem @click="router.push({name: 'User Comments', params: {_id: route.params._id}})" class="cursor-pointer">
 			    <span>Comments</span>

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

@@ -7,7 +7,7 @@
 	      		@click="$router.push({
 	      			name: 'Create BlogPost'
 	      		})" 
-	      		class="radius-100p i-big hover-scale-1 cursor-pointer t-white bg-second">
+	      		class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
 	      			+
 	      	</button>
 		</header>

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

@@ -19,7 +19,7 @@
       :validation="organizationName" 
     />
 
-    <p class="mn-b-semi">Your username will be used for URL of profile like thecommunephuket/users/username</p>
+    <p class="mn-b-semi">Your username will be used for URL of profile like {{API_URL}}/users/username</p>
     <!--  -->
     <h3 class="mn-b-small">Profile</h3>
 

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

@@ -14,7 +14,7 @@
 	      	<button 
 	      		v-if="auth.state.user._id === route.params._id"
 	      		@click="router.push({name: 'Create Event'})" 
-	      		class="radius-100p i-big hover-scale-1 cursor-pointer t-white bg-second"
+	      		class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second"
 	      	>
 	      		+
 	      	</button>

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

@@ -7,7 +7,7 @@
 	      		@click="$router.push({
 	      			name: 'Create Organization'
 	      		})" 
-	      		class="radius-100p i-big hover-scale-1 cursor-pointer t-white bg-second">
+	      		class="radius-100 i-big hover-scale-1 cursor-pointer t-white bg-second">
 	      			+
 	      	</button>
 		</header>

package/src/modules/users/router/users.js

@@ -53,7 +53,7 @@ const users = [{
         ru: 'Группы'
       }
     },
-  component: () => import(/* webpackChunkName: "profile" */ '../components/pages/ProfileOrganizations.vue'),
+  component: () => import(/* webpackChunkName: "profile" */ '@pf/src/modules/organizations/components/pages/Organizations.vue'),
 },{
   path: 'profile/:_id/wallet',
   name: 'User Wallet',