chore: sync develop and master

hypha-dao · Nov 10, 2023 · a6efac9 · a6efac9
2 parents 0616a8b + da866db
commit a6efac9
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 54 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "author": "Max <[email protected]>",
   "license": "Apache-2.0",
   "scripts": {
-    "dev": "quasar dev -m spa",
+    "dev": "export NODE_OPTIONS=--openssl-legacy-provider && quasar dev -m spa",
     "dev:eos": "env-cmd -f ./config/eos-testnet.env quasar dev -m spa",
     "prod:telos": "env-cmd -f ./config/telos-mainnet.env quasar dev -m spa",
     "prod:eos": "env-cmd -f ./config/eos-mainnet.env quasar dev -m spa",

diff --git a/src/components/login/register-user-with-captcha-view.vue b/src/components/login/register-user-with-captcha-view.vue
@@ -115,7 +115,8 @@ export default {
       },
       showLoadingModal: false,
       progress: 0,
-      daoCreated: false
+      daoCreated: false,
+      skipEmailStep: false
     }
   },
   async mounted() {
@@ -136,7 +137,7 @@ export default {
       return this.form.title && this.form.description && this.form.logo
     },
     canPublish() {
-      return this.canNextStep && this.form.email && this.form.affiliate
+      return this.canNextStep
     }
   },
   watch: {
@@ -294,6 +295,10 @@ export default {
     backCreateStep() {
       this.steps.create.insideSteps.identity = true
       this.steps.create.insideSteps.publish = false
+    },
+    clearEmailFields() {
+      this.form.email = ''
+      this.form.affiliate = ''
     }
   }
 }
@@ -395,17 +400,18 @@ export default {
               div.full-width.justify-between(:class="{ 'col': !$q.screen.gt.md, 'row': $q.screen.gt.md, 'q-mt-xl': $q.screen.gt.md, 'q-mt-xs': !$q.screen.gt.md }")
                 .col.q-mr-sm(:class="{ 'full-width q-mt-md': !$q.screen.gt.md }")
                   label.h-label {{ $t('pages.onboarding.email') }}
-                  q-input.q-mt-xs.rounded-border(:rules="[rules.required, rules.min(3)]" dense lazy-rules="ondemand" outlined :placeholder="$t('pages.onboarding.email')" ref="email" v-model="form.email")
+                  q-input.q-mt-xs.rounded-border(:disable="skipEmailStep" :rules="[rules.required, rules.min(3)]" dense lazy-rules="ondemand" outlined :placeholder="$t('pages.onboarding.email')" ref="email" v-model="form.email")
                 .col(:class="{ 'full-width q-mt-md': !$q.screen.gt.md }")
                   label.h-label {{ $t('pages.onboarding.affiliate') }}
-                  q-input.q-mt-xs.rounded-border(:rules="[rules.required, rules.min(3)]" dense lazy-rules="ondemand" outlined :placeholder="$t('pages.onboarding.affiliate')" ref="affiliate" v-model="form.affiliate")
+                  q-input.q-mt-xs.rounded-border(:disable="skipEmailStep" :rules="[rules.required, rules.min(3)]" dense lazy-rules="ondemand" outlined :placeholder="$t('pages.onboarding.affiliate')" ref="affiliate" v-model="form.affiliate")
               .row.full-width.justify-between(:class="{ 'bottom-padding': !$q.screen.gt.md }")
                 .col.q-mr-sm
                   q-input.rounded-border.bg-internal-bg(dense disable outlined v-model="account")
                 .col
                   q-input.rounded-border.bg-internal-bg(dense disable outlined v-model="form.title")
               nav.row.justify-end.q-mt-xl.q-gutter-xs
-                q-btn.q-px-xl(:disable="canPublish" v-if="$q.screen.gt.md" @click="onSubmit" color="primary" :label="$t('login.register-user-with-captcha-view.publishYourDao')" no-caps rounded unelevated)
+                q-btn.q-px-xl(:disable="!!form.email || !!form.affiliate" @click="skipEmailStep = true, clearEmailFields()" v-if="$q.screen.gt.md && !skipEmailStep" color="primary" :label="$t('login.register-user-with-captcha-view.skipForNow')" no-caps rounded unelevated outline)
+                q-btn.q-px-xl(:disable="canPublish && !skipEmailStep" v-if="$q.screen.gt.md" @click="onSubmit" color="primary" :label="$t('login.register-user-with-captcha-view.publishYourDao')" no-caps rounded unelevated)
         #form5.flex.items-center.justify-center.no-wrap(v-show="step === this.steps.loading.name")
           q-dialog(v-if="$q.screen.gt.md" :value="showLoadingModal" persistent)
             widget.bg-white.q-pa-xxxl.width-auto.col-auto.full-width(:style="'border-radius: 25px; box-shadow: 0px 0px 26px 0px rgba(0, 0, 41, 0.2); max-width: 1180px;'")

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -870,7 +870,8 @@
         "next": "Next",
         "daoIndentity": "DAO Identity",
         "toBeThere": "To be there for you as your DAO grows, we'd love to stay in touch. Rest assured, we'll only use your email for DAO-related communication and won't share it with anyone else. Your privacy to important to us!",
-        "connectWithUs": "Connect with us, Optional Step:"
+        "connectWithUs": "Connect with us, Optional Step:",
+        "skipForNow": "Skip for now"
      },
      "welcome-view":{
         "youNeedAn":"Log in with your Hypha account",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -865,7 +865,8 @@
       "next": "Próximo",
       "daoIndentity": "Identidad DAO",
       "toBeThere": "Para estar ahí para usted a medida que crece su DAO, nos encantaría permanecer en contacto. ",
-      "connectWithUs": "Conéctate con nosotros, Paso Opcional:"
+      "connectWithUs": "Conéctate con nosotros, Paso Opcional:",
+      "skipForNow": "Saltar por ahora"
     },
     "welcome-view": {
       "youNeedAn": "Necesita una cuenta Hypha para interactuar con Hypha Ecosystem y crear una DAO.",

diff --git a/src/locales/ko.json b/src/locales/ko.json
@@ -865,7 +865,8 @@
       "next": "다음",
       "daoIndentity": "DAO 아이덴티티",
       "toBeThere": "귀하의 DAO가 성장함에 따라 귀하와 함께 할 수 있도록 우리는 계속 연락하고 싶습니다. ",
-      "connectWithUs": "우리에게 연락하세요. 선택 단계:"
+      "connectWithUs": "우리에게 연락하세요. 선택 단계:",
+      "skipForNow": "일단은 스킵"
     },
     "welcome-view": {
       "youNeedAn": "Hypha 생태계와 상호작용하고 DAO를 생성하려면 Hypha 계정이 필요합니다.",

diff --git a/src/locales/pt.json b/src/locales/pt.json
@@ -865,7 +865,8 @@
       "next": "Próximo",
       "daoIndentity": "Identidade DAO",
       "toBeThere": "Para estar ao seu lado à medida que seu DAO cresce, adoraríamos manter contato. ",
-      "connectWithUs": "Conecte-se conosco, etapa opcional:"
+      "connectWithUs": "Conecte-se conosco, etapa opcional:",
+      "skipForNow": "Pular por enquanto"
     },
     "welcome-view": {
       "youNeedAn": "Você precisa de uma conta Hypha para interagir com o ecossistema Hypha e criar um DAO.",

diff --git a/src/locales/sr.json b/src/locales/sr.json
@@ -865,7 +865,8 @@
       "next": "Следећи",
       "daoIndentity": "ДАО Идентити",
       "toBeThere": "Да бисмо били уз вас док ваш ДАО расте, волели бисмо да останемо у контакту. ",
-      "connectWithUs": "Повежите се са нама, опциони корак:"
+      "connectWithUs": "Повежите се са нама, опциони корак:",
+      "skipForNow": "Прескочи ово за сада"
     },
     "welcome-view": {
       "youNeedAn": "Потребан вам је Хипха налог да бисте комуницирали са Хипха екосистемом и креирали ДАО.",

diff --git a/src/locales/zh.json b/src/locales/zh.json
@@ -865,7 +865,8 @@
       "next": "下一个",
       "daoIndentity": "DAO身份",
       "toBeThere": "随着您的 DAO 不断发展，我们很乐意与您保持联系。",
-      "connectWithUs": "与我们联系，可选步骤："
+      "connectWithUs": "与我们联系，可选步骤：",
+      "skipForNow": "暫時跳過"
     },
     "welcome-view": {
       "youNeedAn": "您需要一个 Hypha 帐户才能与 Hypha 生态系统交互并创建 DAO。",

diff --git a/src/store/proposals/index.js b/src/store/proposals/index.js
@@ -588,7 +588,6 @@ export default {
                 { label: 'description', value: ['string', draft.description] },
                 { label: 'url', value: ['string', draft.url] },
                 { label: 'name', value: ['string', ''] },
-                ...(draft.circle ? [{ label: 'parent_circle', value: ['int64', draft.circle.value] }] : []),
                 ...(draft.masterPolicy ? [{ label: 'master_policy', value: ['int64', draft.masterPolicy.value] }] : [])
               ]
               proposalType = 'policy'
@@ -847,7 +846,6 @@ export default {
               { label: 'description', value: ['string', draft.description] },
               { label: 'url', value: ['string', draft.url] },
               { label: 'name', value: ['string', ''] },
-              ...(draft.circle ? [{ label: 'parent_circle', value: ['int64', draft.circle.value] }] : []),
               ...(draft.masterPolicy ? [{ label: 'master_policy', value: ['int64', draft.masterPolicy.value] }] : [])
             ]
             break