Merge pull request #490 from ethereum/staking-copy

Add staking-specific copy
clrfund · Jan 10, 2022 · ff5fdbd · ff5fdbd
2 parents b56ff09 + 7b200ec
commit ff5fdbd
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 50 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/NavBar.vue b/vue-app/src/components/NavBar.vue
@@ -18,7 +18,6 @@
           src="@/assets/help.svg"
         />
         <div id="myHelpDropdown" class="button-menu" v-if="showHelpDowndown">
-          <div class="dropdown-title">Help</div>
           <div
             v-for="({ to, text, emoji }, idx) of dropdownItems"
             :key="idx"

diff --git a/vue-app/src/components/RoundInformation.vue b/vue-app/src/components/RoundInformation.vue
@@ -7,7 +7,7 @@
       <template v-if="currentRound">
         <div class="round">
           <div class="round-title-bar">
-            <h2 class="round-title">CLR.fund</h2>
+            <h2 class="round-title">Ethereum Staking CLR</h2>
             <v-popover class="verified-container">
               <div class="verified">
                 <img src="@/assets/verified.svg" />

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,12 +29,6 @@ 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.',
-  },
 ]
 
 /**
@@ -43,9 +37,21 @@ const baseCriterion: Criterion[] = [
 const ADDITIONAL_CRITERION: Criterion[] = [
   {
     emoji: '💰',
-    criterion: 'Related to Ethereum upgrades and staking',
+    criterion: 'Related to Ethereum 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: 'No pools',
+    description:
+      'No pools directly, but useful infrastructure and tooling built by pools can be supported.',
+  },
   {
     emoji: '🆔',
     criterion: 'KYC',
@@ -54,4 +60,7 @@ const ADDITIONAL_CRITERION: Criterion[] = [
   },
 ]
 
-export const criteria: Criterion[] = [...baseCriterion, ...ADDITIONAL_CRITERION]
+export const criteria: Criterion[] = [
+  ...BASE_CRITERION,
+  ...ADDITIONAL_CRITERION,
+]
diff --git a/vue-app/src/router/index.ts b/vue-app/src/router/index.ts
@@ -35,7 +35,7 @@ const routes = [
     name: 'landing',
     component: Landing,
     meta: {
-      title: 'Clr.fund',
+      title: 'Ethereum Staking CLR',
     },
   },
   {

diff --git a/vue-app/src/views/Join.vue b/vue-app/src/views/Join.vue
@@ -13,7 +13,7 @@
         :saveFormData="saveFormData"
       />
       <div class="title-area">
-        <h1>Join the round</h1>
+        <h1>Join the staking round</h1>
         <div v-if="currentStep === 5">
           <div class="toggle-tabs-desktop">
             <p
@@ -134,43 +134,44 @@
                 </label>
                 <form class="radio-row" id="category-radio">
                   <input
-                    id="category-content"
+                    id="tooling"
                     type="radio"
                     name="project-category"
-                    value="Content"
+                    value="Tooling"
                     v-model="$v.form.project.category.$model"
                     :class="{
                       input: true,
                       invalid: $v.form.project.category.$error,
                     }"
                   />
-                  <label for="category-content" class="radio-btn"
-                    >Content</label
-                  >
+                  <label for="tooling" class="radio-btn">Tools</label>
                   <input
-                    id="research"
+                    id="category-content"
                     type="radio"
                     name="project-category"
-                    value="Research"
+                    value="Content"
                     v-model="$v.form.project.category.$model"
                     :class="{
                       input: true,
                       invalid: $v.form.project.category.$error,
                     }"
                   />
-                  <label for="research" class="radio-btn">Research</label>
+                  <label for="category-content" class="radio-btn"
+                    >Content</label
+                  >
                   <input
-                    id="tooling"
+                    id="research"
                     type="radio"
                     name="project-category"
-                    value="Tooling"
+                    value="Research"
                     v-model="$v.form.project.category.$model"
                     :class="{
                       input: true,
                       invalid: $v.form.project.category.$error,
                     }"
                   />
-                  <label for="tooling" class="radio-btn">Tooling</label>
+                  <label for="research" class="radio-btn">Research</label>
+
                   <input
                     id="data"
                     type="radio"
@@ -233,8 +234,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 +341,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 +396,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,
@@ -453,7 +455,7 @@
                 </p>
               </div>
               <div class="form-background">
-                <label for="links-discord" class="input-label">Discord</label>
+                <label for="links-discord" class="input-label">Chat</label>
                 <input
                   id="links-discord"
                   type="link"
@@ -522,7 +524,7 @@
                   /></links>
                 </div>
                 <div class="summary">
-                  <h4 class="read-only-title">Name</h4>
+                  <h4 class="read-only-title">Project name</h4>
                   <div class="data">{{ form.project.name }}</div>
                 </div>
                 <div class="summary">

diff --git a/vue-app/src/views/JoinLanding.vue b/vue-app/src/views/JoinLanding.vue
@@ -58,7 +58,7 @@
     </div>
 
     <div class="content" v-else-if="$store.state.currentRound">
-      <h1>Join the funding round</h1>
+      <h1>Join the staking funding round</h1>
       <div class="subtitle">
         We’ll need some information about your project and a
         <strong>{{ formatAmount(deposit) }} {{ depositToken }}</strong> security
@@ -108,7 +108,7 @@
     </div>
 
     <div class="content" v-else-if="$store.getters.isRoundJoinPhase">
-      <h1>Join the next funding round</h1>
+      <h1>Join the next staking funding round</h1>
       <div class="subtitle">
         We’ll need some information about your project and a
         <strong>{{ formatAmount(deposit) }} {{ depositToken }}</strong> security

diff --git a/vue-app/src/views/Landing.vue b/vue-app/src/views/Landing.vue
@@ -9,7 +9,7 @@
         </div>
         <div>
           <div class="hero-content">
-            <h1>Send your favorite projects to the moon!</h1>
+            <h1>Send your favorite Ethereum staking projects to the moon!</h1>
             <div id="subtitle" class="subtitle">
               Every project you contribute to gets a portion of extra funding.
             </div>
@@ -28,10 +28,10 @@
             "
           >
             <div class="column">
-              <h2>Join the funding round</h2>
+              <h2>Join the staking funding round</h2>
               <p>
                 Add your project to the next funding round. If you're working on
-                anything related to public goods, you can join in.
+                anything related to staking, you can join in.
               </p>
               <div class="button-group">
                 <links to="/join" class="btn-primary w100">Add project</links>
@@ -55,8 +55,8 @@
         <div id="how-it-works-content">
           <h2>Every donation is amplified by the matching pool.</h2>
           <p>
-            This fundraiser rewards projects with the most unique demand, not
-            just those with the wealthiest backers.
+            This fundraiser rewards staking projects with the most unique
+            demand, not just those with the wealthiest backers.
           </p>
           <image-responsive
             title="wormhole"

diff --git a/vue-app/src/views/TransactionSuccess.vue b/vue-app/src/views/TransactionSuccess.vue
@@ -38,8 +38,8 @@
             v-else-if="$route.params.type === 'contribution'"
             class="contributed-content"
           >
-            Thanks for contributing to the Ethereum ecosystem. If you change
-            your mind, you have
+            Thanks for contributing to the Ethereum staking ecosystem. If you
+            change your mind, you have
             <time-left
               valueClass="contributed-content-bold"
               unitClass="contributed-content-bold"