@ozdao/martyrs 0.2.428 → 0.2.430

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

@@ -1,6 +1,52 @@
+const queryProcessorGlobals = require('@martyrs/src/modules/globals/controllers/utils/queryProcessor');
+
+
 const controllerFactory = (db) => {
   const Spot = db.spot;
 
+  const read = async (req, res) => {
+  
+    let stages = [
+      ...queryProcessorGlobals.getBasicOptions(
+        req.query
+      ), 
+      // Tags
+      ...queryProcessorGlobals.getTagsOptions(req.query.tags), 
+      // For creator
+      queryProcessorGlobals.getCreatorUserLookupStage(), 
+      queryProcessorGlobals.getCreatorOrganizationLookupStage(),
+      queryProcessorGlobals.getCreatorCustomerLookupStage(),
+      // For owner
+      queryProcessorGlobals.getOwnerUserLookupStage(),
+      queryProcessorGlobals.getOwnerOrganizationLookupStage(),
+      queryProcessorGlobals.getAddFieldsCreatorOwnerStage(),
+      queryProcessorGlobals.removeTempPropeties(),
+      // Pagination
+      ...queryProcessorGlobals.getSortingOptions(
+        req.query.sortParam,
+        req.query.sortOrder,
+      ),
+      ...queryProcessorGlobals.getPaginationOptions(
+        req.query.skip,
+        req.query.limit
+      )
+    ];
+
+    try {
+      const spots = await Spot.aggregate(stages);
+
+      if (!spots) {
+        return res.status(404).send({ errorCode: "SPOTS_NOT_FOUND", message: "Spots not found." });
+      }
+
+      res.status(200).send(spots);
+
+    } catch (err) {
+      console.log(err);
+      res.status(500).send({ errorCode: "GET_SPOTS_FAILED", message: "Error occurred while fetching spots.", error: err });
+    }
+};
+
   const readOne = (req, res) => {
     Spot.findOne({_id: req.params._id})
       .then(spot => {
@@ -14,19 +60,6 @@ const controllerFactory = (db) => {
       });
   };
 
-  const read = (req, res) => {
-    Spot.find({ organization: req.params._id })
-      .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({
@@ -69,8 +102,8 @@ const controllerFactory = (db) => {
   };
 
   return {
-    readOne,
     read,
+    readOne,
     create,
     update,
     delete: deleteSpot

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

@@ -4,9 +4,8 @@ const controllerFactory = require("../controllers/spots.controller");
 module.exports = function(app, db) {
   const controller = controllerFactory(db);
 
-  // Get organization spots by _id
-  app.get("/api/spots/:_id", controller.read);
-
+  app.get("/api/spots", controller.read);
+  
   // Get spot by _id
   app.get("/api/spots/get/:_id", controller.readOne);
 

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

@@ -46,16 +46,16 @@ const actions = {
       setError(error);
     }
   },
-  async read(organizationId) {
+  async read(options) {
     try {
-      const response = await $axios.get(`/api/spots/${organizationId}`);
-
+      const response = await $axios.get(`/api/spots`, { params: options });
       state.spots = response.data;
-      return response.data
+      return response.data;
     } catch (error) {
       setError(error);
     }
   },
+
   async create(organizationId, spot) {
     try {
       const response = await $axios.post(`/api/spots/${organizationId}/create`, spot);

package/src/styles/base/shadow_transitions_hover_refactor.scss

@@ -13,6 +13,7 @@ body {
 	.hover-bg-white {&:hover {background: rgb(var(--white), 1);; } }
 	.hover-bg-black {&:hover {background: rgb(var(--black), 1);; } }
 	.hover-bg-light {&:hover {background: rgb(var(--light), 1);; } }
+	.hover-bg-dark {&:hover {background: rgb(var(--dark), 1);; } }
 
 
 	.hover-fill-main {&:hover {fill: rgb(var(--main)); } }

package/src/modules/landing/components/sections/HowToBuyWDR.vue

@@ -1,130 +0,0 @@
-<template>
-  <section id="howtoget" class="cols-2 gap-thin">
-    <div class="pd-big bg-main radius-medium">
-      <h2 class="mn-b-small">{{ t('buyTokenTitle') }}</h2>
-      <p class="mn-b-semi p-big t-transp">{{ t('description') }}</p>
-      <h3 class="mn-b-small">{{ t('purchaseDetailsTitle') }}</h3>
-      <ol class="mn-b-big">
-        <li class="mn-b-small radius-small bg-black-transp-5 pd-small">{{ t('step1') }}</li>
-        <li class="mn-b-small radius-small bg-black-transp-5 pd-small">{{ t('step2') }}</li>
-        <li class="mn-b-small radius-small bg-black-transp-5 pd-small">{{ t('step3') }}</li>
-        <li class="mn-b-small radius-small bg-black-transp-5 pd-small">{{ t('step4') }}</li>
-      </ol>
-     
-    
-        <h4 class="mn-b-small">{{ t('privateRoundTitle') }}</h4>
-
-        {{ t('privateRoundText1') }}
-        <a>hello@weeder.delivery</a>
-        {{ t('privateRoundText2') }}
-    </div>
-
-    <div class="flex-column pd-big flex-nowrap flex h-100 bg-light radius-medium o-hidden coming-soon">
-      <div class="
-        w-100 h-100
-        rainbow
-        flex-v-center flex-h-center
-        flex-column flex 
-        pd-big mn-b-medium
-        radius-medium o-hidden"
-      >
-        <img loading="lazy" class="mn-b-small" src="/logo/logo-disabled.png">
-        <p class="t-semi uppercase">{{ t('comingSoon') }}</p>
-      </div>
-      <p class="mn-b-small">
-        To add WDT, you need to install MetaMask. Please install it if you haven't already.
-      </p>
-      <ConnectMetamask class="w-100" />
-    </div>
-  </section>
-</template>
-
-<script setup>
-import { useI18n } from 'vue-i18n';
-
-import ConnectMetamask from '@martyrs/src/modules/wallet/views/components/elements/ConnectMetamask.vue'
-
-const text = {
-  messages: {
-    en: {
-      howToBuyTitle: 'How To Buy WDT?',
-      description:
-        'Weeder Token is a revolutionary cryptocurrency designed for the cannabis industry. With Weeder Token, you can easily buy, sell and trade cannabis products around the world.',
-      purchaseDetailsTitle: 'Purchasing details:',
-      step1: 'Create a cryptocurrency wallet that supports ERC20 tokens.',
-      step2: 'Buy Ethereum (ETH) or any other supported cryptocurrency.',
-      step3: 'Transfer your ETH or other cryptocurrency to your wallet.',
-      step4: 'Visit our token sale platform (coming soon) and follow the instructions to purchase WDT tokens.',
-      privateRoundTitle: 'Interested in a private round?',
-      privateRoundText1: 'If you want to participate in a private round, please email us at',
-      privateRoundText2: 'and we will get back to you with more information.',
-      buyTokenTitle: 'Buy Weeder Token',
-      comingSoon: 'Here will be UI for exchange WDT',
-    },
-    ru: {
-      howToBuyTitle: 'Как купить WDT?',
-      description:
-        'Weeder Token - это революционная криптовалюта, разработанная для индустрии каннабиса. С Weeder Token вы можете легко покупать, продавать и обменивать продукты каннабиса по всему миру.',
-      purchaseDetailsTitle: 'Процесс покупки:',
-      step1: '1. Создайте криптовалютный кошелек, поддерживающий токены ERC20.',
-      step2: '2. Купите Ethereum (ETH) или другую поддерживаемую криптовалюту.',
-      step3: '3. Переведите свои ETH или другую криптовалюту на свой кошелек.',
-      step4: '4. Посетите нашу платформу продажи токенов (скоро будет доступна) и следуйте инструкциям для покупки токенов WDT.',
-      privateRoundTitle: 'Хотите участвовать в приватном раунде?',
-      privateRoundText1: 'Если вы хотите участвовать в приватном раунде, пожалуйста, напишите нам на почту',
-      privateRoundText2: 'и мы свяжемся с вами с дополнительной информацией.',
-      buyTokenTitle: 'Купить Weeder Token',
-      comingSoon: 'Здесь будет интерфейс для обмена WDT',
-    },
-  }
-}
-
-const { t } = useI18n(text);
-</script>
-
-<style lang="scss" scoped>
-.weeder-token {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  padding: 20px;
-  max-width: 800px;
-  margin: auto;
-}
-
-.content {
-  flex: 1;
-  margin-right: 20px;
-}
-
-.purchase-form {
-  flex: 1;
-}
-
-.rainbow {
-  position: relative;
-  z-index: 0;
-  padding: 2rem;
-  
-  &::before {
-    content: '';
-    position: absolute;
-    z-index: -2;
-    left: -50%;
-    top: -50%;
-    width: 200%;
-    height: 200%;
-    background-color: #399953;
-    background-repeat: no-repeat;
-    background-size: 50% 50%, 50% 50%;
-    background-position: 0 0, 100% 0, 100% 100%, 0 100%;
-      background-image: 
-        linear-gradient(#00ff88, #fff), 
-        linear-gradient(#00ff88, #fff), 
-        linear-gradient(white, white), 
-         linear-gradient(white, #fff);
-    animation: rotate 4s linear infinite;
-  }
-}
-
-</style>

package/src/modules/landing/components/sections/WhatIsWDRSection.vue

@@ -1,116 +0,0 @@
-<template>
-  <section id="howtobuy" class="section">
-
-    <div class="mn-b-big t-center title">
-      <h2 class="mn-b-small">{{t('title')}}</h2>
-      <p class="w-m-60r mn-b-big mn-auto t-transp p-big">
-        {{t('subtitle')}}
-      </p>
-    </div>
-
-    <div class="cols-3 gap-thin">
-
-      <div class="w-100 pd-medium bg-light radius-medium">
-        <img loading="lazy" class="radius-medium bg-light h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step1.png"> 
-        <h3 class="mn-b-medium">{{t('steps.step1.headline')}}</h3>
-        <p class="t-transp">{{t('steps.step1.text')}}</p>
-      </div>
-
-      <div class="w-100 pd-medium bg-light radius-medium">
-        <img loading="lazy" class="radius-medium bg-light  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step2.png"> 
-        <h3 class="mn-b-medium">{{t('steps.step2.headline')}}</h3>
-        <p class="t-transp">{{t('steps.step2.text')}}</p>
-      </div>
-
-      <div class="w-100 pd-medium bg-light radius-medium">
-        <img loading="lazy" class="radius-medium bg-light  h-max-20r object-fit-cover w-100 mn-b-medium" src="@/assets/images/howitworks/step3.png">
-        <h3 class="mn-b-medium">{{t('steps.step3.headline')}}</h3>
-        <p class="t-transp">{{t('steps.step3.text')}}</p>
-      </div>
-      
-    </div>
-
-  </section>
-</template>
-
-
-<script setup>
- import { useI18n }    from 'vue-i18n'
-    
-  const text = {
-    messages: {
-      en: {
-        title: 'What is Weeder Token?',
-        subtitle: 'WDT – the foundation of the Weeder community. It serves as a currency, a DAO instrument, and for many other purposes:',
-        steps: {
-          step1: {
-            headline: 'Currency',
-            text: 'WDT can be used as a digital currency within the Weeder ecosystem, allowing users to purchase products such as cannabis, advertising spaces, and other premium features on the platform.',
-          },
-          step2: {
-            headline: 'Instument',
-            text: 'As a DAO (Decentralized Autonomous Organization) instrument, WDT enables community governance and decision-making, allowing token holders to propose, discuss, and vote on various initiatives and developments within the Weeder ecosystem.',
-          },
-          step3: {
-            headline: 'Invesment',
-            text: 'Holding WDT tokens can provide potential investment returns as the Weeder ecosystem grows and gains value. Additionally, WDT serves for dividend distribution – those who stake their tokens earn income from the platform.',
-          },
-        }
-      },
-      ru: {
-        title: 'Что такое Weeder Token?',
-        subtitle: 'WDT – основа сообщества Weeder. Он выступает в качестве валюты, инструмента DAO и многих других целей:',
-        steps: {
-          step1: {
-            headline: 'Валюта',
-            text: 'WDT можно использовать как цифровую валюту в экосистеме Weeder, позволяя пользователям покупать товары, такие как марихуана, рекламные места и другие премиальные возможности на платформе.',
-          },
-          step2: {
-            headline: 'Инструмент',
-            text: 'В качестве инструмента DAO (Децентрализованной Автономной Организации), WDT позволяет управлять сообществом и принимать решения, давая держателям токенов возможность предлагать, обсуждать и голосовать за различные инициативы и развитие в рамках экосистемы Weeder.',
-          },
-          step3: {
-            headline: 'Инвестиции',
-            text: 'Хранение токенов WDT может обеспечить потенциальный инвестиционный доход по мере роста и увеличения стоимости экосистемы Weeder. Кроме того, WDT служит для распределения дивидендов – те, кто стейкают свои токены, получают доход с платформы.',
-          },
-      }
-    }
-  }
-}
-
-const { t } = useI18n(text)
-</script>
-
-<style lang="scss">
-
-#grid2 {
-  transition: 500ms;
-  display: grid;
-  grid-template-columns: 1fr 1fr 1fr;
-  gap: 3px;
-  background: crimson;
-}
-
-:where(.left, .center, .right) {
-  background: navajowhite;
-  transition: 300ms;
-}
-
-:where(.left, .center, .right):hover {
-  background: crimson;
-}
-
-#grid2:has(.left:hover) {
-  grid-template-columns: 2fr 0.5fr 0.5fr;
-  padding: 3rem;
-}
-
-#grid2:has(.center:hover) {
-  grid-template-columns: 0.5fr 2fr 0.5fr;
-  padding: 3rem;
-}
-#grid2:has(.right:hover) {
-  grid-template-columns: 0.5fr 0.5fr 2fr;
-  padding: 3rem;
-}
-</style>