@ozdao/prometheus-framework 0.2.134 → 0.2.135

package/src/modules/organizations/components/pages/OrganizationEdit.vue

@@ -39,6 +39,33 @@
     <BlockTags
       @tags-changed="newTags => organization.state.current.profile.tags = newTags"
       :tags="organization.state.current.profile.tags"
+      class="mn-b-small"
+    />
+
+    <h3 class="mn-b-small">Contacts</h3>
+    <Field 
+      v-model:field="organization.state.current.contacts.email"
+      label="Email"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.contacts.website"
+      label="Website"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.contacts.phone"
+      label="Phone"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
+    />
+    <Field 
+      v-model:field="organization.state.current.contacts.address"
+      label="Address"   
+      placeholder="" 
+      class="mn-b-thin bg-light pd-medium radius-small" 
     />
 
     <h3 class="mn-b-small">Socials</h3>
@@ -70,11 +97,12 @@
     />
     <Field 
       v-model:field="organization.state.current.socials.youtube"
-      label="Telegram"   
+      label="Youtube"   
       placeholder="" 
       class="mn-b-thin bg-light pd-medium radius-small" 
     />
    
+   
     <Button :submit="onSubmit" :callback="redirectTo" class="bg-main w-100 mn-b-thin">Save</Button>
     <!-- <Button :submit="onDelete" :callback="redirectDash" class="mn-b-thin bg-fourth">Delete</Button> -->
 

package/src/modules/spots/components/layouts/Spots.vue

@@ -56,7 +56,7 @@
 	import Breadcrumbs from '@pf/src/components/Breadcrumbs/Breadcrumbs.vue'
  	import Dropdown from "@pf/src/components/Dropdown/Dropdown.vue";
 
- 	import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
+ 	// import Filters from '@pf/src/modules/marketplace/components/sections/Filters.vue'
 
 
 	import * as globals from '@pf/src/modules/globals/store/globals';

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

@@ -155,7 +155,6 @@ import { useRoute, useRouter } from "vue-router";
 import Block from '@pf/src/components/Block/Block.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";
@@ -165,72 +164,28 @@ 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/users/components/blocks/CardUser.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);
 
-onMounted(() => {
-  // spots.state.spot.location = spots.state.spot.location
+onMounted(async () => {
+  await fetchData();
 })
 
 async function fetchData() {
-  if (route.params.spot) {
-    await memberships.actions.read(route.params.spot);
-  }
-  const users = ref(memberships.state.memberships);
 
   if (route.params.spot) await spots.actions.readOne(route.params.spot);
 
-}
-
-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);
+  const lng = spots.state.spot.location?.coordinates[0]
+  const lat = spots.state.spot.location?.coordinates[1]
 
-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;
+  spots.state.spot.location = {
+    lat: lat || 1,
+    lng: lng || 1
+  }
 }
 
 async function onSubmit() {

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

@@ -1,12 +1,12 @@
-module.exports = (mongoose) => {
+module.exports = (db) => {
   // Схема отдела
-  const spotSchema = new mongoose.Schema({
+  const spotSchema = new db.mongoose.Schema({
     owner: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'User', 
     },
     organization: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: db.mongoose.Schema.Types.ObjectId,
       ref: 'Organization',
     },
     profile: {
@@ -47,7 +47,7 @@ module.exports = (mongoose) => {
     members: [
       {
         user: {
-          type: mongoose.Schema.Types.ObjectId,
+          type: db.mongoose.Schema.Types.ObjectId,
           ref: 'User',
         },
         position: { 
@@ -58,7 +58,7 @@ module.exports = (mongoose) => {
     ],
     subspots: [
       {
-        type: mongoose.Schema.Types.ObjectId,
+        type: db.mongoose.Schema.Types.ObjectId,
         ref: 'Spot',
       },
     ],
@@ -69,7 +69,7 @@ module.exports = (mongoose) => {
   spotSchema.index({ location: '2dsphere' });
 
 
-  const Spot = mongoose.model('Spot', spotSchema);
+  const Spot = db.mongoose.model('Spot', spotSchema);
 
   return Spot
 }

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

@@ -3,70 +3,74 @@ import layoutSpots from '../components/layouts/Spots.vue'
 
 import * as validationAuth from '@pf/src/modules/middlewares/client/auth.validation.js';
 
-const spots = [
-  {
-    path: 'spots',
-    component: layoutEmpty,
-    meta: {
-      title: {
-        en: 'Spots',
-        ru: 'Места'
+const spots = {
+  path: 'spots',
+  component: layoutEmpty,
+  meta: {
+    title: {
+      en: 'Spots',
+      ru: 'Места'
+    },
+  },
+  children: [
+    {
+      path: ':country?',
+      component: layoutSpots,
+      meta: {
+        title: {
+          en: 'Spots',
+          ru: 'Места'
+        },
+        header_theme: 'dark',
+        footer_theme: 'dark'
       },
-      header_theme: 'dark',
-      footer_theme: 'dark'
+      children: [
+        {
+          path: ':state?',
+          name: 'Spots tate',
+          component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
+          children: [
+            {
+              path: ':city?',
+              name: 'Spots City',
+              component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
+            }
+          ]
+        }
+      ]
     },
-    children: [
-      {
-        path: ':country?',
-        component: layoutSpots,
-        children: [
-          {
-            path: ':state?',
-            name: 'Spots tate',
-            component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
-            children: [
-              {
-                path: ':city?',
-                name: 'Spots City',
-                component: () => import(/* webpackChunkName: 'Deliveries' */ '../components/pages/Map.vue'),
-              }
-            ]
-          }
-        ]
+    {
+      path: ':_id/spots/create',
+      name: 'Spot Creation',
+      meta: {
+        title: 'Создание точки',
       },
-      {
-        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'),
+      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'),
+    },
+  ]
+}
 
 export default spots;

package/src/modules/spots/spots.client.js

@@ -0,0 +1,43 @@
+// Store
+import * as storeSpots from './store/spots.js';
+// Router
+import routerSpots from './router/spots.js';
+// Views
+import Spots from './components/layouts/Spots.vue';
+import Spot from './components/pages/Spot.vue';
+import SpotEdit from './components/pages/SpotEdit.vue';
+import Map from './components/pages/Map.vue';
+// Importing blocks components
+import CardSpot from './components/blocks/CardSpot.vue';
+import SpotMemberModify from './components/blocks/SpotMemberModify.vue';
+import SpotSub from './components/blocks/SpotSub.vue';
+
+function initializeSpots(app, store, router) {
+  router.addRoute('Home', routerSpots);
+  store.addStore('spots', storeSpots);
+}
+
+const ModuleSpot = {
+  initialize: initializeSpots,
+  views: {
+    store: {
+      storeSpots
+    },
+    router: {
+      routerSpots
+    },
+    components: {
+      // Pages
+      Spots,
+      Spot,
+      SpotEdit,
+      Map,
+      // Blocks
+      CardSpot,
+      SpotMemberModify,
+      SpotSub,
+    }
+  }
+}
+
+export default ModuleSpot;

package/src/modules/spots/spots.server.js

@@ -0,0 +1,31 @@
+const ModelSpot = require('./models/spot.model.js');
+
+const RoutesSpot = require('./routes/spots.routes.js');
+
+const FactorySpot = require('./controllers/spots.controller.js');
+
+const CRUD = require('@pf/src/modules/globals/services/globals.crud');
+
+function initializeSpots(app, db, origins, publicPath) {
+  // Setup models in the database object
+  db.spot = ModelSpot(db);
+
+  // Setup routes if the app object is provided
+  if (app) {
+    RoutesSpot(app, db, origins, publicPath);
+  }
+}
+
+// Exporting controllers, routes, and models
+module.exports = {
+  initialize: initializeSpots,
+  models: {
+    ModelSpot,
+  },
+  routes: {
+    RoutesSpot,
+  },
+  controllers: {
+    FactorySpot
+  }
+};

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

@@ -1,113 +0,0 @@
-<template>
-  <div>
-    <div class="br-grey-transp-25 radius-small mn-b-small">
-      <Select 
-        :options="[
-          {name: 'Кафе',        value: 'cafe'}, 
-          {name: 'Бар',         value: 'bar'},
-          {name: 'Ресторан',    value: 'restaraunt'}, 
-          {name: 'Пиццерия',    value: 'pizzeria'},
-          {name: 'Ночной клуб', value: 'night-club'},
-          {name: 'Шаверма',     value: 'shaverma'},
-          {name: 'Кофейня',     value: 'coffee'} 
-        ]"
-        :prop="placeForm"
-        content="type" 
-        label="Тип"   
-        placeholder="Тип заведения" 
-        size="small"
-      />
-
-      <Field 
-        v-model:field="placeForm.name"     
-        label="Название"  
-        :validation="placeValidation" 
-        placeholder="Введите название места" 
-      />
-
-      <Field 
-        v-model:field="placeForm.address"     
-        label="Адрес"  
-        :validation="placeValidation" 
-        placeholder="Введите адрес места" 
-      />
-
-      <Field 
-        v-model:field="placeForm.phone"     
-        label="Телефон"  
-        :validation="placeValidation" 
-        placeholder="Введите телефон места" 
-      />
-    </div>
-
-    <button @click="submitForm" class="w-100 button bg-second t-white">
-      {{ props.place !== null ? "Редактировать заведение" : "Добавить заведение" }}
-    </button>
-  </div>
-</template>
-<script setup>
-import { ref } from 'vue';
-import Field from '@pf/src/components/Field/Field.vue';
-import Select from '@pf/src/components/Select/Select.vue';
-import * as inputsValidation from '@pf/src/modules/validations/client/inputs.validation';
-
-const props = defineProps({
-  isPopupOpen: Boolean,
-  place: Number,
-  places: Array,
-});
-
-const emits = defineEmits(['callback']);
-
-const placeForm = ref({
-  logo: '',
-  name: '',
-  address: '',
-});
-
-const placeValidation = ref(null);
-
-if (props.place !== null) {
-  placeForm.value = props.places[props.place];
-}
-
-async function submitForm() {
-  try {
-    await inputsValidation.validateInputs(
-      placeValidation,
-      inputsValidation.validateLength,
-      placeForm.value.name,
-      'Некорректное название'
-    );
-  } catch (error) {
-    throw new Error();
-  }
-
-  if (props.place !== null) {
-    props.places[props.place] = placeForm.value;
-    emits('callback');
-  } else {
-    props.places.push(placeForm.value);
-    emits('callback');
-  }
-}
-</script>
-
-
-<style scoped>
-.form-group {
-  margin-bottom: 1rem;
-}
-
-label {
-  display: block;
-  margin-bottom: 0.5rem;
-}
-
-input {
-  width: 100%;
-  padding: 0.5rem;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-}
-</style>

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

@@ -1,119 +0,0 @@
-<template>
-  <div>
-
-    <div class="br-grey-transp-25 radius-small mn-b-small">
-      <Select 
-        :options="[
-          {name: 'Кафе',        value: 'cafe'}, 
-          {name: 'Бар',         value: 'bar'},
-          {name: 'Ресторан',    value: 'restaraunt'}, 
-          {name: 'Пиццерия',    value: 'pizzeria'},
-          {name: 'Ночной клуб', value: 'night-club'},
-          {name: 'Шаверма',     value: 'shaverma'},
-          {name: 'Кофейня',     value: 'coffee'} 
-        ]"
-        :prop="placeForm"
-        content="type" 
-        label="Тип"   
-        placeholder="Тип заведения" 
-        size="small"
-      />
-
-      <Field 
-        v-model:field="placeForm.name"     
-        label="Название"  
-        :validation="placeValidation" 
-        placeholder="Введите название места" 
-       
-      />
-
-      <Field 
-        v-model:field="placeForm.address"     
-        label="Адрес"  
-        :validation="placeValidation" 
-        placeholder="Введите адрес места" 
-        
-      />
-
-      <Field 
-        v-model:field="placeForm.phone"     
-        label="Телефон"  
-        :validation="placeValidation" 
-        placeholder="Введите телефон места" 
-       
-      />
-    </div>
-
-    <button @click="submitForm" class="w-100 button bg-second t-white">
-      {{ props.place !== null ? "Редактировать заведение" : "Добавить заведение" }}
-    </button>
-  </div>
-</template>
-
-<script setup>
-import { ref, watch } from "vue";
-
-import * as inputsValidation from '@pf/src/modules/middlewares/client/inputs.validation'
-import Field from "@pf/src/components/Field/Field.vue";
-import Select from "@pf/src/components/Select/Select.vue";
-
-const props = defineProps({
-  isPopupOpen: Boolean,
-  place: Number,
-  places: Array,
-});
-
-const emits = defineEmits(['callback'])
-
-const placeForm = ref({
-  logo: "",
-  name: "",
-  address: "",
-});
-
-if (props.place !== null) {
-  placeForm.value = props.places[props.place]
-}
-
-
-const placeValidation = ref(null)
-
-async function submitForm() {
-  try {
-    await inputsValidation.validateInputs(
-      placeValidation, 
-      inputsValidation.validateLength, 
-      placeForm.value.name, 
-      'Некорректное название'
-    )
-  } catch (error) {
-    throw new Error
-  }
-
-   if (props.place !== null) {
-    props.places[props.place] = placeForm.value
-    emits("callback");
-  } else {
-    props.places.push(placeForm.value);
-    emits("callback");
-  }
-}
-</script>
-
-<style scoped>
-.form-group {
-  margin-bottom: 1rem;
-}
-
-label {
-  display: block;
-  margin-bottom: 0.5rem;
-}
-
-input {
-  width: 100%;
-  padding: 0.5rem;
-  border: 1px solid #ccc;
-  border-radius: 5px;
-}
-</style>