@ozdao/prometheus-framework 0.1.35 → 0.1.37

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

@@ -0,0 +1,319 @@
+<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>
+
+        <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">
+    
+      <div class="flex-stretch flex-column flex">  
+
+        <div class="mn-thin bg-grey pd-medium o-hidden radius-big">
+          <h3 class="mn-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="w-100 flex-child-grow-1 flex-child ">
+              <Field 
+                v-model:field="spots.state.spot.profile.name"     
+                label="Name"  
+                placeholder="Spot Name" 
+                class="mn-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>
+          </div>
+        </div>
+
+        <div class="bg-grey pd-medium o-hidden radius-big">
+          <h3 class="mn-semi">Details</h3>
+          
+          <p class="p-medium mn-small">Please the available delivery options:</p>
+          <div class="mn-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-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>
+
+      <div class="bg-grey pd-medium o-hidden radius-big">
+        <h3 class="mn-semi">Location</h3>
+        <Address
+          :apiKey="GOOGLE_MAPS_API_KEY" 
+          :address="spots.state.spot.address" 
+          :location="spots.state.spot.location"     
+          label="Address"    
+          placeholder="Enter delivery address"  
+          class="
+            bg-white radius-small pd-small mn-small
+          "
+          @update:location="newLocation => {
+            spots.state.spot.location = newLocation;
+          }"
+          @update:address="newAddress => {
+            spots.state.spot.address = newAddress;
+          }"
+        />
+
+        <p class="mn-small p-medium">Or choose on map:</p>
+
+        <LocationMarker 
+          :address="spots.state.spot.address" 
+          :location="spots.state.spot.location" 
+          :apiKey="GOOGLE_MAPS_API_KEY" 
+          class="radius-big o-hidden"
+          @update:location="newLocation => {
+            spots.state.spot.location = newLocation;
+          }"
+          @update:address="newAddress => {
+            spots.state.spot.address = newAddress;
+          }"
+        />
+
+      </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-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-small>
+        <li v-if="spots.state.spot.members.length < 1">В отделе еще нет участников</li>
+        <User 
+          class="bg-grey o-hidden radius-small mn-thin" 
+          v-for="(member, index) in spots.state.spot.members" 
+          :key="index" 
+          :user="member.user" 
+          :position="member.position" 
+          @click="openMemberPopup(index)"
+        />
+      </ul>
+
+
+      <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-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-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-thin" 
+            :spot="subspot" 
+              @click="openSpotPopup(index)"
+            />
+        </ul> 
+
+      
+    </div> -->
+  </div>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import Cookies from "js-cookie";
+import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
+import UploadImage from '@pf/src/components/UploadImage/UploadImage.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 Address from "@pf/src/components/Address/Address.vue";
+import LocationMarker from "@pf/src/components/LocationMarker/LocationMarker.vue";
+import Button from "@pf/src/components/Button/Button.vue";
+import Popup from "@pf/src/components/Popup/Popup.vue";
+
+import EditArray from "@pf/src/modules/organizations/components/blocks/EditArray.vue";
+import SpotSub from "@pf/src/modules/spots/components/blocks/SpotSub.vue";
+import SpotMemberModify from "@pf/src/modules/spots/components/blocks/SpotMemberModify.vue";
+// import SpotSubSpotModify from "@pf/src/modules/spots/components/blocks/SpotSubSpotModify.vue";
+import User from '@pf/src/modules/organizations/components/blocks/User.vue';
+
+import * as spots from "@pf/src/modules/spots/store/spots";
+import * as memberships from "@pf/src/modules/organizations/store/memberships";
+
+const router = useRouter();
+const route = useRoute();
+const tabOrganization = ref("details");
+const showAddNew = ref(false);
+
+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();
+
+const members = ref(spots.state.spot.members);
+
+const isOpenAddMemberPopup = ref(false);
+const selectedMember = ref(null);
+
+function openMemberPopup(member) {
+  isOpenAddMemberPopup.value = true;
+  if (typeof member === "number") selectedMember.value = member;
+}
+
+function closeMemberPopup() {
+  isOpenAddMemberPopup.value = false;
+  selectedMember.value = null;
+}
+
+const isOpenSpotPopup = ref(false);
+const selectedSpot = ref(null);
+
+function openSpotPopup(spot) {
+  isOpenSpotPopup.value = true;
+  if (typeof spot === "number") selectedSpot.value = spot;
+}
+
+function closeSpotPopup() {
+  isOpenSpotPopup.value = false;
+  selectedSpot.value = null;
+}
+
+async function onSubmit() {
+  if (route.params.spot) {
+    await spots.actions.update(
+      route.params._id,
+      spots.state.spot
+    );
+  }
+  if (!route.params.spot) {
+    await spots.actions.create(
+      route.params._id,
+      spots.state.spot
+    );
+  }
+}
+
+function redirectTo() {
+  router.replace({ name: "Spot", params: { _id: route.params._id, spot: spots.state.spot._id } });
+}
+
+async function onDelete() {
+  await spots.actions.delete(
+    route.params._id,
+    spots.state.spot
+  );
+}
+
+function redirectDash() {
+  router.replace({ name: "Organization" });
+}
+</script>
+
+<style scoped>
+  @import "vue-select/dist/vue-select.css";
+</style>

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

@@ -0,0 +1,64 @@
+<template>
+  <transition name="slide-fade">
+    <div>
+      <EmptyState
+        v-if="FirstLevelSpots.length < 1"
+        title="You don't have any spots yet."
+        description="Add spots to your hub."
+        action="Add spot"
+        :callback="() => $router.push(`/spots/${props.organization._id}/spots/create`)"
+      />
+
+      <div>
+        <CardSpot
+          v-for="(spot, index) in FirstLevelSpots"
+          :key="index"
+          :spot="spot"
+          :organization="organization"
+          class="radius-big bg-grey mn-thin"
+        />
+        <button
+          v-if="FirstLevelSpots.length > 0 && auth.state.user._id === organization.owner"
+          @click="$router.push(`/spots/${props.organization._id}/spots/create`)"
+          class="mn-thin button w-100"
+        >
+          Add spot
+        </button>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+import Tab from '@pf/src/components/Tab/Tab.vue';
+import EmptyState from '@pf/src/modules/organizations/components/blocks/EmptyState.vue';
+import CardSpot from '@pf/src/modules/spots/components/blocks/CardSpot.vue';
+import { state as spotState, actions as spotActions } from '@pf/src/modules/spots/store/spots';
+import * as auth from '@pf/src/modules/auth/store/auth'
+
+const props = defineProps({
+  organization: Object,
+  units: Array,
+  memberships: Array
+});
+
+const tabStructure = ref('spots');
+
+await spotActions.read(props.organization._id);
+
+const FirstLevelSpots = computed(() => {
+  const spots = spotState.spots;
+
+  const subspotIds = spots.flatMap(spot =>
+    spot.subspots.map(subspot => subspot._id)
+  );
+
+  return spots.filter(spot =>
+    !subspotIds.includes(spot._id)
+  );
+});
+</script>
+
+<style scoped>
+</style>

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

@@ -0,0 +1,83 @@
+const controllerFactory = (db) => {
+  const Spot = db.spot;
+
+  const readOne = (req, res) => {
+    Spot.findOne({_id: req.params._id})
+      .populate('members.user')
+      .populate('subspots')
+      .then(spot => {
+        if (!spot) {
+          return res.status(404).send({ message: "Отдел не найден" });
+        }
+        res.send(spot);
+      })
+      .catch(err => {
+        res.status(500).send({ message: err.message });
+      });
+  };
+
+  const read = (req, res) => {
+    Spot.find({ organization: req.params._id })
+      .populate('members.user')
+      .populate('subspots')
+      .then(spots => {
+        if (!spots) {
+          return res.status(404).send({ message: "Spots not found" });
+        }
+        res.send(spots);
+      })
+      .catch(err => {
+        res.status(500).send({ message: err.message });
+      });
+  };
+
+  const create = async (req, res) => {
+    try {
+      const newSpot = new Spot({
+        ...req.body,
+        organization: req.params._id
+      });
+
+      const data = await newSpot.save();
+      res.send(data);
+    } catch (err) {
+      res.status(500).send({ message: err.message });
+    }
+  };
+
+  const update = (req, res) => {
+    Spot.findOneAndUpdate({ _id: req.body._id}, req.body, { new: true })
+      .then(spot => {
+        if (!spot) {
+          return res.status(404).send({ message: "Spot not found" });
+        }
+        res.send(spot);
+      })
+      .catch(err => {
+        res.status(500).send({ message: err.message });
+      });
+  };
+
+  const deleteSpot = (req, res) => {
+    Spot.findOneAndRemove({ _id: req.body._id, organization: req.params._id })
+      .then(spot => {
+        if (!spot) {
+          return res.status(404).send({ message: "Spot not found" });
+        }
+        res.send({ message: "Spot deleted successfully" });
+      })
+      .catch(err => {
+        res.status(500).send({ message: err.message });
+      });
+  };
+
+  return {
+    readOne,
+    read,
+    create,
+    update,
+    delete: deleteSpot
+  };
+};
+
+module.exports = controllerFactory;

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

@@ -0,0 +1,72 @@
+module.exports = (mongoose) => {
+  // Схема отдела
+  const spotSchema = new mongoose.Schema({
+    owner: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'User', 
+    },
+    organization: {
+      type: mongoose.Schema.Types.ObjectId,
+      ref: 'Organization',
+    },
+    profile: {
+      photo:        { type: String },
+      name:         { type: String, required: true },
+      description:  { type: String },
+      categories:   [String]
+    },
+    // Working hours
+    address: String,
+    // Position on map
+    location: {
+      lat: Number,
+      lng: Number,
+      type: {
+        type: String,
+        enum: ['Point'], // 'location.type' must be 'Point'
+        required: true
+      },
+      coordinates: {
+        type: [Number],
+        required: true
+      }
+    },
+    worktime: [{
+      day: String,
+      time: {
+        start: String,
+        end: String
+      }
+    }],
+    // Marketplace options
+    delivery: [String],
+    payment: [String],
+    members: [
+      {
+        user: {
+          type: mongoose.Schema.Types.ObjectId,
+          ref: 'User',
+        },
+        position: { 
+          type: String, 
+          default: 'Member' 
+        },
+      },
+    ],
+    subspots: [
+      {
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'Spot',
+      },
+    ],
+  });
+
+  spotSchema.index({ organization: 1 })
+
+  spotSchema.index({ location: '2dsphere' });
+
+
+  const Spot = mongoose.model('Spot', spotSchema);
+
+  return Spot
+}

package/src/modules/spots/router/spots.js

@@ -1,6 +1,8 @@
 import layoutEmpty from '@pf/src/modules/globals/components/layouts/Empty.vue'
 import layoutSpots from '../components/layouts/Spots.vue'
 
+import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
+
 const spots = [
   {
     path: 'spots',
@@ -29,7 +31,38 @@ const spots = [
             ]
           }
         ]
-      }
+      },
+      {
+        path: ':_id/spots/create',
+        name: 'Spot Creation',
+        meta: {
+          title: 'Создание отдела',
+        },
+        beforeEnter: [
+          validationAuth.requiresAuth,
+        ],
+        component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
+      }, {
+        path: ':_id/spots/:deparment',
+        name: 'Spot',
+        meta: {
+          title: 'Отдел',
+        },
+        beforeEnter: [
+          validationAuth.requiresAuth,
+        ],
+        component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/Spot.vue'),
+      }, {
+        path: ':_id/spots/:spot/edit',
+        name: 'Spot Edit',
+        meta: {
+          title: 'Редактирование отдела',
+        },
+        beforeEnter: [
+          validationAuth.requiresAuth,
+        ],
+        component: () => import(/* webpackChunkName: "spot" */ '@pf/src/modules/spots/components/pages/SpotEdit.vue'),
+      },
     ]
   }
 ];

package/src/modules/spots/routes/spots.routes.js

@@ -0,0 +1,31 @@
+// Factories
+const controllerFactory = require("../controllers/spots.controller");
+// Routes
+module.exports = function(app, db) {
+  const controller = controllerFactory(db);
+
+  app.use(function(req, res, next) {
+    res.header(
+      "Access-Control-Allow-Headers",
+      "Access-Control-Allow-Origin",
+      "x-access-token, Origin, Content-Type, Accept"
+    );
+    next();
+  });
+
+  // Get organization spots by _id
+  app.get("/api/spots/:_id", controller.read);
+
+  // Get spot by _id
+  app.get("/api/spots/get/:_id", controller.readOne);
+
+  // Add organization spot
+  app.post("/api/spots/:_id/create", controller.create);
+
+  // Update organization spot
+  app.post("/api/spots/:_id/update", controller.update);
+
+  // Delete organization spot
+  app.delete("/api/spots/:_id/delete", controller.delete);
+
+};