Merge pull request #497 from ethereum/misc-improvements

Misc improvements
clrfund · Jan 10, 2022 · cd65208 · cd65208
2 parents e9472a5 + c4fc161
commit cd65208
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 42 deletions.
diff --git a/contracts/scripts/deployRound.ts b/contracts/scripts/deployRound.ts
@@ -132,7 +132,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -153,7 +153,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',

diff --git a/contracts/scripts/deployTestRound.ts b/contracts/scripts/deployTestRound.ts
@@ -110,7 +110,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -131,7 +131,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -151,7 +151,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -171,7 +171,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -190,7 +190,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -210,7 +210,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -229,7 +229,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -249,7 +249,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',
@@ -268,7 +268,7 @@ async function main() {
     teamName: 'metadata.teamName',
     teamDescription: 'metadata.teamDescription',
     githubUrl: 'https://github.com/',
-    radicleUrl: 'https://radicle.com/',
+    radicleUrl: 'https://radicle.xyz/',
     websiteUrl: 'https://website.com/',
     twitterUrl: 'https://twitter.com/',
     discordUrl: 'https://discord.com/',

diff --git a/vue-app/src/components/CriteriaModal.vue b/vue-app/src/components/CriteriaModal.vue
@@ -11,8 +11,8 @@
           </div>
         </div>
         <p>
-          For this pilot round, {{ operator }} members will remove any projects
-          that don't meet the round criteria. So read carefully! In later rounds
+          The registry admin ({{ operator }}) will remove any projects that
+          don't meet the round criteria. So read carefully! In later rounds
           we're hoping that this review process can be done by the community.
         </p>
         <div class="content">

diff --git a/vue-app/src/components/NavBar.vue b/vue-app/src/components/NavBar.vue
@@ -17,8 +17,7 @@
           class="dropdown-btn"
           src="@/assets/help.svg"
         />
-        <div id="myHelpDropdown" class="button-menu" v-if="showHelpDowndown">
-          <div class="dropdown-title">Help</div>
+        <div id="myHelpDropdown" class="button-menu" v-if="showHelpDropdown">
           <div
             v-for="({ to, text, emoji }, idx) of dropdownItems"
             :key="idx"
@@ -57,7 +56,7 @@ import ClickOutside from '@/directives/ClickOutside'
 })
 export default class NavBar extends Vue {
   @Prop() inApp
-  showHelpDowndown = false
+  showHelpDropdown = false
   profileImageUrl: string | null = null
   dropdownItems: { to?: string; text: string; emoji: string }[] = [
     { to: '/', text: 'Home', emoji: '🏠' },
@@ -83,11 +82,11 @@ export default class NavBar extends Vue {
   }
 
   closeHelpDropdown(): void {
-    this.showHelpDowndown = false
+    this.showHelpDropdown = false
   }
 
   toggleHelpDropdown(): void {
-    this.showHelpDowndown = !this.showHelpDowndown
+    this.showHelpDropdown = !this.showHelpDropdown
   }
 }
 </script>

diff --git a/vue-app/src/plugins/round/criteria.ts b/vue-app/src/plugins/round/criteria.ts
@@ -4,7 +4,7 @@ export interface Criterion {
   description: string
 }
 
-const baseCriterion: Criterion[] = [
+const BASE_CRITERION: Criterion[] = [
   {
     emoji: '🤲',
     criterion: 'Free and open source',
@@ -29,29 +29,26 @@ const baseCriterion: Criterion[] = [
     description:
       'The project must be yours or you must have permission from the project owner.',
   },
-  {
-    emoji: '💻',
-    criterion: 'No clients',
-    description:
-      'Client teams are so important but this round of funding is focused on supporting other parts of the ecosystem.',
-  },
 ]
 
 /**
  * Add any round-specific criteria here
  */
 const ADDITIONAL_CRITERION: Criterion[] = [
-  {
-    emoji: '💰',
-    criterion: 'Related to Ethereum upgrades and staking',
-    description: 'Your project must support Ethereum staking/validating.',
-  },
-  {
-    emoji: '💻',
-    criterion: 'No clients',
-    description:
-      'Client teams are so important but this round of funding is focused on supporting other parts of the ecosystem.',
-  },
+  // {
+  //   emoji: '💰',
+  //   criterion: 'Related to Ethereum upgrades and staking',
+  //   description: 'Your project must support Ethereum staking/validating.',
+  // },
+  // {
+  //   emoji: '💻',
+  //   criterion: 'No clients',
+  //   description:
+  //     'Client teams are so important but this round of funding is focused on supporting other parts of the ecosystem.',
+  // },
 ]
 
-export const criteria: Criterion[] = [...baseCriterion, ...ADDITIONAL_CRITERION]
+export const criteria: Criterion[] = [
+  ...BASE_CRITERION,
+  ...ADDITIONAL_CRITERION,
+]
diff --git a/vue-app/src/views/AboutContributors.vue b/vue-app/src/views/AboutContributors.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="about">
     <h1 class="content-heading">Contributor guide</h1>
+    <p>
+      An overview of how things work as a contributor so you can learn what to
+      expect throughout the duration of a funding round.
+    </p>
     <h2>Get funds on {{ chain.label }}</h2>
     <p>
       You'll need some {{ chain.currency }} on {{ chain.label }} in order to

diff --git a/vue-app/src/views/AboutRecipients.vue b/vue-app/src/views/AboutRecipients.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="about">
     <h1 class="content-heading">Recipient guide</h1>
+    <p>
+      An overview of how things work as a recipient so you can learn what to
+      expect throughout the duration of a funding round.
+    </p>
     <div v-if="chain.bridge">
       <h2>Get funds on {{ chain.label }}</h2>
       <p>

diff --git a/vue-app/src/views/Join.vue b/vue-app/src/views/Join.vue
@@ -44,7 +44,9 @@
             <h2 class="step-title">About the project</h2>
             <div class="inputs">
               <div class="form-background">
-                <label for="project-name" class="input-label">Name</label>
+                <label for="project-name" class="input-label"
+                  >Project name</label
+                >
                 <input
                   id="project-name"
                   type="text"
@@ -233,8 +235,9 @@
                   >Ethereum address</label
                 >
                 <p class="input-description">
-                  This doesn’t have to be the same address as the one you use to
-                  send your application.
+                  The destination address for donations, which you'll use to
+                  claim funds. This doesn't have to be the same address as the
+                  one you use to send your application transaction.
                 </p>
                 <input
                   id="fund-address"
@@ -339,7 +342,7 @@
               </div>
               <div class="form-background">
                 <label for="team-desc" class="input-label"
-                  >Description (optional)</label
+                  >Team description (optional)</label
                 >
                 <p class="input-description">
                   If different to project description. Markdown supported.
@@ -394,7 +397,7 @@
                 <input
                   id="links-radicle"
                   type="link"
-                  placeholder="example: https://radicle.com/ethereum/clrfund"
+                  placeholder="example: https://radicle.xyz/ethereum/clrfund"
                   v-model.lazy="$v.form.links.radicle.$model"
                   :class="{
                     input: true,