chore: sync develop and master

hypha-dao · Oct 27, 2023 · fe050cd · fe050cd
2 parents 38dc1bf + 26291dc
commit fe050cd
Show file tree

Hide file tree

Showing 13 changed files with 239 additions and 45 deletions.
diff --git a/src/components/dao/settings-plans-billing.vue b/src/components/dao/settings-plans-billing.vue
@@ -78,6 +78,7 @@ export default {
             $priceId: String!
             $redirectDomain: String!
             $successUrl: String!
+            $cancelUrl: String!
           ) {
             createCheckoutSession(
               daoId: $daoId
@@ -87,6 +88,7 @@ export default {
               priceId: $priceId
               redirectDomain: $redirectDomain
               successUrl: $successUrl
+              cancelUrl: $cancelUrl
             ) {
               id
               url
@@ -100,7 +102,8 @@ export default {
           daoUrl: this.daoSettings.url,
           priceId: id,
           redirectDomain: ORIGIN,
-          successUrl: `/${this.daoSettings.url}/configuration?tab=PLANS_AND_BILLING`
+          successUrl: `/${this.daoSettings.url}/configuration?tab=PLANS_AND_BILLING`,
+          cancelUrl: `/${this.daoSettings.url}/configuration?tab=PLANS_AND_BILLING`
         }
       })
 

diff --git a/src/components/navigation/left-navigation.vue b/src/components/navigation/left-navigation.vue
@@ -1,15 +1,45 @@
 <script>
 import { LEFT_NAVIGATION_TABS } from '~/const'
+import { mapGetters } from 'vuex'
+import gql from 'graphql-tag'
 
 const IconVotingWhite = require('~/assets/icons/voting-icon-white.svg')
 const IconVoting = require('~/assets/icons/voting-icon.svg')
 
+const ELECTIONS = `
+getDao(docId: $daoId) {
+  docId
+  ueElection {
+    docId
+  }
+}
+`
+
 export default {
   name: 'left-navigation',
   components: {
     DhoBtn: () => import('./dho-btn.vue')
   },
 
+  apollo: {
+    elections: {
+      query: gql`query electionsQuery ($daoId: String!) { ${ELECTIONS} }`,
+      update: data => data.getDao.ueElection.map(election => {
+        return {
+          id: election.docId
+        }
+      }),
+      variables () {
+        return {
+          daoId: this.selectedDao.docId
+        }
+      },
+      fetchPolicy: 'no-cache',
+      pollInterval: 1000,
+      skip () { return !this.selectedDao || !this.selectedDao.docId }
+    }
+  },
+
   props: {
     dho: {
       type: Object,
@@ -41,20 +71,25 @@ export default {
   },
 
   computed: {
+    ...mapGetters('dao', ['selectedDao']),
+    ...mapGetters('accounts', ['account', 'isAdmin']),
     activeTab () {
       if (this.$route.name === LEFT_NAVIGATION_TABS.DASHBOARD) return LEFT_NAVIGATION_TABS.DASHBOARD
       if (this.$route.path.includes(LEFT_NAVIGATION_TABS.PROPOSALS)) return LEFT_NAVIGATION_TABS.PROPOSALS
       if (this.$route.path.includes(LEFT_NAVIGATION_TABS.MEMBERS)) return LEFT_NAVIGATION_TABS.MEMBERS
-      if (this.$route.path.includes(LEFT_NAVIGATION_TABS.ELECTION)) return LEFT_NAVIGATION_TABS.ELECTION
       if (this.$route.path.includes(LEFT_NAVIGATION_TABS.ORGANIZATION)) return LEFT_NAVIGATION_TABS.ORGANIZATION
       if (this.$route.path.includes(LEFT_NAVIGATION_TABS.EXPLORE)) return LEFT_NAVIGATION_TABS.EXPLORE
+      if (this.$route.path.includes(LEFT_NAVIGATION_TABS.ELECTION)) return LEFT_NAVIGATION_TABS.ELECTION
       return null
     },
     disabledSelector () {
       if (!this.dhos) {
         return true
       }
       return false
+    },
+    hasElections () {
+      return this.elections?.length
     }
   },
 
@@ -97,7 +132,7 @@ export default {
             q-tooltip(anchor="center right" self="center left" :content-style="{ 'font-size': '1em' }") {{ $t('navigation.left-navigation.proposals') }}
           q-btn.q-ma-md(:class="{'active': activeTab=== LEFT_NAVIGATION_TABS.MEMBERS}" :flat="activeTab !== LEFT_NAVIGATION_TABS.MEMBERS" unelevated rounded padding="12px" icon="fas fa-users" size="sm" :color="activeTab === LEFT_NAVIGATION_TABS.MEMBERS ? 'primary' : 'disabled'" :to="{ name: LEFT_NAVIGATION_TABS.MEMBERS }")
             q-tooltip(anchor="center right" self="center left" :content-style="{ 'font-size': '1em' }") {{ $t('navigation.left-navigation.members') }}
-          q-btn.q-ma-md(:class="{'active': activeTab=== LEFT_NAVIGATION_TABS.ELECTION}" :flat="activeTab !== LEFT_NAVIGATION_TABS.ELECTION" unelevated rounded padding="12px" size="sm" :color="activeTab === LEFT_NAVIGATION_TABS.ELECTION ? 'primary' : 'disabled'" :to="{ name: LEFT_NAVIGATION_TABS.ELECTION }")
+          q-btn.q-ma-md(v-if="hasElections || isAdmin" :class="{'active': activeTab=== LEFT_NAVIGATION_TABS.ELECTION}" :flat="activeTab !== LEFT_NAVIGATION_TABS.ELECTION" unelevated rounded padding="12px" size="sm" :color="activeTab === LEFT_NAVIGATION_TABS.ELECTION ? 'primary' : 'disabled'" :to="{ name: LEFT_NAVIGATION_TABS.ELECTION }")
             img.no-active(:class="{ 'active-btn': activeTab=== LEFT_NAVIGATION_TABS.ELECTION }" :src="activeTab=== LEFT_NAVIGATION_TABS.ELECTION ? IconVotingWhite : IconVoting")
             q-tooltip(anchor="center right" self="center left" :content-style="{ 'font-size': '1em' }") {{ $t('navigation.left-navigation.election') }}
           q-btn.q-ma-md(:class="{'active': activeTab=== LEFT_NAVIGATION_TABS.ORGANIZATION}" :flat="activeTab !== LEFT_NAVIGATION_TABS.ORGANIZATION" unelevated rounded padding="12px" icon="fas fa-building" size="sm" :color="activeTab === LEFT_NAVIGATION_TABS.ORGANIZATION ? 'primary' : 'disabled'" :to="{ name: LEFT_NAVIGATION_TABS.ORGANIZATION }")

diff --git a/src/components/organization-asset/asset-card.vue b/src/components/organization-asset/asset-card.vue
@@ -99,6 +99,9 @@ export default {
     },
     buttonText () {
       return this.stylesForOwner ? this.$t('organization-asset.asset-card.applied') : this.$t('organization-asset.asset-card.apply')
+    },
+    isNotDelegate () {
+      return !this.asset.title.toLowerCase().includes('delegate')
     }
   },
 
@@ -182,7 +185,7 @@ widget.item.full-width(:class="{'mobile-item': isMobile, 'desktop-item': !isMobi
         q-avatar(size="30px" v-else-if="iconDetails && iconDetails.type === 'img'")
           img.icon-img(:src="iconDetails.name")
         ipfs-image-viewer(size="30px" :ipfsCid="iconDetails.cid" v-else-if="iconDetails && iconDetails.type === 'ipfs'")
-        .h-b2.text-underline(v-if="isBadge && stylesForOwner" @click="revokeBadge") {{ $t('organization-asset.asset-card.revoke') }}
+        .h-b2.text-underline(v-if="isBadge && stylesForOwner && isNotDelegate" @click="revokeBadge") {{ $t('organization-asset.asset-card.revoke') }}
       .row.q-my-xs
         .h-h5.text-weight-bold {{asset.title}}
       .row.q-my-xs
@@ -199,7 +202,7 @@ widget.item.full-width(:class="{'mobile-item': isMobile, 'desktop-item': !isMobi
         .profile-counter.bg-internal-bg(v-if="badgeHolders.length > 3") +
           | {{ badgeHolders.length - 3 }}
         .profile-counter.bg-internal-bg(v-else-if="!badgeHolders.length") {{ $t('organization-asset.asset-card.na') }}
-    q-btn.q-mt-md.text-white(v-if="isBadge" noCaps unelevated rounded color="primary" @click="onApply" :class="{ 'owner-button': stylesForOwner }") {{ buttonText }}
+    q-btn.q-mt-md.text-white(v-if="isBadge && isNotDelegate" noCaps unelevated rounded color="primary" @click="onApply" :class="{ 'owner-button': stylesForOwner }") {{ buttonText }}
 
 </template>
 

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -1469,7 +1469,7 @@
           "voteForYourself": "Vote for yourself",
           "reachConsensus": "Reach consensus",
           "thereAreThreeRounds": "There are three rounds and every participant has one vote. They can vote for themselves, as well. Votes can only be cast during the round and not after it ends.",
-          "thereAreThreeVoting": "There are three voting rounds and each one lasts 50 minutes. The entire process takes under 5 hours, making it quick and efficient.",
+          "thereAreThreeVoting": "There are few voting rounds and each one lasts 60 minutes. The entire process takes under 5 hours, making it quick and efficient.",
           "ifYouNeedMore": "If you need more information please check Eden Community guidelines and informative material",
           "visitEdenCommunity": "Visit Eden Community"
         },
@@ -1480,6 +1480,7 @@
            "hour":"hour",
            "mins":"mins",
            "min":"min",
+           "sec": "sec",
            "moreInformationAbout":"More information about UpVote Election",
            "here":"here",
            "signup":"Sign-up",
@@ -1491,9 +1492,18 @@
            "badges":"Badges",
            "members":"Members",
            "proposals":"Proposals",
-           "welcomeToHyphaEvolution":"Welcome to the Hypha evolution",
-           "atHyphaWere":"At Hypha, we’re co-creating solutions to build impactful organizations. We’ve evolved radical systems to architect the next generation of decentralized organizations. Let us guide you to reshape how you coordinate teams, ignite motivation, manage finances and foster effective communication towards a shared vision. Transform your dreams into a reality with Hypha!"
-        },
+           "participants": "Participants",
+           "treasury": "Treasury",
+           "timeLeftForSigningUp": "Time left for signing up",
+           "welcomeToHyphaEvolution": "Welcome to the Hypha evolution",
+           "atHyphaWere": "At Hypha, we’re co-creating solutions to build impactful organizations. We’ve evolved radical systems to architect the next generation of decentralized organizations. Let us guide you to reshape how you coordinate teams, ignite motivation, manage finances and foster effective communication towards a shared vision. Transform your dreams into a reality with Hypha!",
+           "learnMore": "Learn more",
+           "communityElectionsAreAbout": "Community elections are about to begin",
+           "weUseAFairAndInclusive": "We use a fair and inclusive voting mechanism to ensure diverse viewpoints. The voting process is quick and efficient. You are welcome to sign up to nominate yourself as a candidate.",
+           "start": "Schedule",
+           "startNewElections": "Schedule election now",
+           "joinAsADelegate": "Join as a delegate and contribute to the growth of the DAO"
+         },
         "members":{
            "becomeAMember":"Become a member",
            "registrationIsTemporarilyDisabled":"Registration is temporarily disabled",
@@ -1840,7 +1850,7 @@
       "uploadLink": "Upload link",
       "thisElectionProcessWillHelp": "This election process will help the community pick the best leaders to facilitate a better decision making process.",
       "thereAreThreeRounds": "There are three rounds and every participant has one vote. They can vote for themselves, as well. Votes can only be cast during the round and not after it ends.",
-      "thereAreThreeVoting": "There are three voting rounds and each one lasts 50 minutes. The entire process takes under 5 hours, making it quick and efficient.",
+      "thereAreThreeVoting": "There are three voting rounds and each one lasts 60 minutes. The entire process takes under 5 hours, making it quick and efficient.",
       "ifYouNeedMoreInformation": "If you need more information please check Eden Community guidelines and informative material",
       "applications": "Applications",
       "youCanViewTheMembersWho": "You can view the members who have signed up for the election below.",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -1464,7 +1464,7 @@
         "voteForYourself": "vota por ti mismo",
         "reachConsensus": "Llegar a un consenso",
         "thereAreThreeRounds": "Hay tres rondas y cada participante tiene un voto. ",
-        "thereAreThreeVoting": "Hay tres rondas de votación y cada una tiene una duración de 50 minutos. ",
+        "thereAreThreeVoting": "Hay tres rondas de votación y cada una tiene una duración de 60 minutos. Todo el proceso dura menos de 5 horas, lo que lo hace rápido y eficiente.",
         "ifYouNeedMore": "Si necesita más información, consulte las pautas y el material informativo de Eden Community.",
         "visitEdenCommunity": "Visita la comunidad del Edén"
       },
@@ -1475,6 +1475,10 @@
         "hour": "hora",
         "mins": "minutos",
         "min": "mín.",
+        "sec": "segundo",
+        "participants": "Participantes",
+        "treasury": "Tesorería",
+        "timeLeftForSigningUp": "Tiempo restante para registrarse",
         "moreInformationAbout": "Más información sobre la elección UpVote",
         "here": "aquí",
         "signup": "Inscribirse",
@@ -1487,7 +1491,13 @@
         "members": "Miembros",
         "proposals": "Propuestas",
         "welcomeToHyphaEvolution": "Bienvenidos a la evolución Hypha",
-        "atHyphaWere": "En Hypha, estamos co-creando soluciones para construir organizaciones impactantes. "
+        "atHyphaWere": "En Hypha, estamos co-creando soluciones para construir organizaciones impactantes. ",
+        "learnMore": "Aprende más",
+        "communityElectionsAreAbout": "Las elecciones comunitarias están a punto de comenzar",
+        "weUseAFairAndInclusive": "Utilizamos un mecanismo de votación justo e inclusivo para asegurar la diversidad de puntos de vista. El proceso de votación es rápido y eficiente. Le invitamos a inscribirse para nominarse a sí mismo como candidato.",
+        "start": "Comenzar",
+        "startNewElections": "Iniciar la elección ahora",
+        "joinAsADelegate": "Únete como delegado y contribuye al crecimiento de la DAO"
       },
       "members": {
         "becomeAMember": "Hazte miembro",
@@ -1885,7 +1895,24 @@
         "sec": "segundo",
         "castYourVote": "Emitir su voto",
         "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
-        "electionProcess": "Proceso electoral"
+        "electionProcess": "Proceso electoral",
+        "signUp": "Inscribirse",
+        "signUpForThisElection": "Regístrate para esta elección",
+        "telegramHandle": "Mango de telegrama",
+        "thanksForRegistering": "Gracias por registrarse para las elecciones.",
+        "theElectionIsAboutToStart": "Las elecciones están a punto de comenzar. ",
+        "learnMore": "Aprende más",
+        "left": "izquierda",
+        "youCanVote": "Puedes votar por un solo miembro en cada ronda. ",
+        "toNextRound": "a la siguiente ronda",
+        "wellDone": "¡Bien hecho! ",
+        "displacements": "Desplazamientos",
+        "goToMyBadges": "Ir a mis insignias",
+        "headChiefDelegate": "Jefe delegado jefe",
+        "chiefDelegate": "Jefe delegado",
+        "delegatel2": "Delegado Lev. ",
+        "delegatel1": "Delegado Lev. ",
+        "unsubscribe": "Darse de baja"
       },
       "steps": {
         "stepround1": {

diff --git a/src/locales/ko.json b/src/locales/ko.json
@@ -1464,7 +1464,7 @@
         "voteForYourself": "스스로 투표하세요",
         "reachConsensus": "합의에 도달",
         "thereAreThreeRounds": "총 3개의 라운드가 진행되며 모든 참가자는 1개의 투표권을 가집니다. ",
-        "thereAreThreeVoting": "세 번의 투표가 있으며 각 라운드는 50분 동안 진행됩니다. ",
+        "thereAreThreeVoting": "투표 횟수는 거의 없으며 각 라운드는 60분 동안 지속됩니다. 전체 프로세스는 5시간 미만이 소요되므로 빠르고 효율적입니다.",
         "ifYouNeedMore": "더 많은 정보가 필요하시면 Eden 커뮤니티 가이드라인과 정보자료를 확인해주세요",
         "visitEdenCommunity": "에덴 커뮤니티를 방문해보세요"
       },
@@ -1491,7 +1491,13 @@
         "members": "회원",
         "proposals": "제안",
         "welcomeToHyphaEvolution": "Hypha 진화에 오신 것을 환영합니다",
-        "atHyphaWere": "Hypha에서는 영향력 있는 조직을 구축하기 위한 솔루션을 공동 개발하고 있습니다. "
+        "atHyphaWere": "Hypha에서는 영향력 있는 조직을 구축하기 위한 솔루션을 공동 개발하고 있습니다. ",
+        "learnMore": "더 알아보기",
+        "communityElectionsAreAbout": "지역사회 선거가 곧 시작됩니다",
+        "weUseAFairAndInclusive": "우리는 다양한 관점을 보장하기 위해 공정하고 포용적인 투표 메커니즘을 사용합니다. 투표 절차는 빠르고 효율적입니다. 자신을 후보자로 지명하기 위해 등록하는 것을 환영합니다.",
+        "start": "시작",
+        "startNewElections": "지금 선거 시작",
+        "joinAsADelegate": "대표로 참여하여 DAO의 성장에 기여하세요."
       },
       "members": {
         "becomeAMember": "멤버가되다",

diff --git a/src/locales/pt.json b/src/locales/pt.json
@@ -1464,7 +1464,7 @@
         "voteForYourself": "Vote em você mesmo",
         "reachConsensus": "Alcançar consenso",
         "thereAreThreeRounds": "São três rodadas e cada participante tem um voto. ",
-        "thereAreThreeVoting": "São três rodadas de votação e cada uma dura 50 minutos. ",
+        "thereAreThreeVoting": "São poucas rodadas de votação e cada uma dura 60 minutos. Todo o processo leva menos de 5 horas, o que o torna rápido e eficiente.",
         "ifYouNeedMore": "Se precisar de mais informações, consulte as diretrizes da Comunidade Eden e o material informativo",
         "visitEdenCommunity": "Visite a Comunidade Éden"
       },
@@ -1491,7 +1491,13 @@
         "members": "Membros",
         "proposals": "Propostas",
         "welcomeToHyphaEvolution": "Bem-vindo à evolução Hypha",
-        "atHyphaWere": "Na Hypha, estamos co-criando soluções para construir organizações impactantes. "
+        "atHyphaWere": "Na Hypha, estamos co-criando soluções para construir organizações impactantes. ",
+        "learnMore": "Saber mais",
+        "communityElectionsAreAbout": "As eleições comunitárias estão prestes a começar",
+        "weUseAFairAndInclusive": "Usamos um mecanismo de votação justo e inclusivo para garantir pontos de vista diversos. O processo de votação é rápido e eficiente. Você está convidado a se inscrever para se nomear como candidato.",
+        "start": "Começar",
+        "startNewElections": "Iniciar eleição agora",
+        "joinAsADelegate": "Junte-se como delegado e contribua para o crescimento do DAO"
       },
       "members": {
         "becomeAMember": "Torne-se um membro",
@@ -1889,7 +1895,24 @@
         "sec": "segundo",
         "castYourVote": "Dê seu voto",
         "loremIpsumDolor": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed",
-        "electionProcess": "Processo eleitoral"
+        "electionProcess": "Processo eleitoral",
+        "signUp": "Inscrever-se",
+        "signUpForThisElection": "Inscreva-se nesta eleição",
+        "telegramHandle": "Identificador de telegrama",
+        "thanksForRegistering": "Obrigado por se registrar para a eleição",
+        "theElectionIsAboutToStart": "A eleição está prestes a começar. ",
+        "learnMore": "Saber mais",
+        "left": "esquerda",
+        "youCanVote": "Você pode votar em apenas um membro em cada rodada. ",
+        "toNextRound": "para a próxima rodada",
+        "wellDone": "Bom trabalho! ",
+        "displacements": "Deslocamentos",
+        "goToMyBadges": "Ir para meus emblemas",
+        "headChiefDelegate": "Delegado Chefe Chefe",
+        "chiefDelegate": "Delegado Chefe",
+        "delegatel2": "Delegado Lev. ",
+        "delegatel1": "Delegado Lev. ",
+        "unsubscribe": "Cancelar subscrição"
       },
       "steps": {
         "stepround1": {