Skip to content

Commit

Permalink
Add changes from Danny's feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@samajammin
samajammin committed Jan 8, 2022
1 parent bc96411 commit 7b200ec
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 35 deletions.
4 changes: 2 additions & 2 deletions contracts/scripts/deployRound.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand All @@ -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/',
Expand Down
18 changes: 9 additions & 9 deletions contracts/scripts/deployTestRound.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand All @@ -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/',
Expand Down
20 changes: 13 additions & 7 deletions vue-app/src/plugins/round/criteria.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ const BASE_CRITERION: 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.',
},
]

/**
Expand All @@ -43,9 +37,21 @@ const BASE_CRITERION: 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',
Expand Down
36 changes: 19 additions & 17 deletions vue-app/src/views/Join.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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">
Expand Down

0 comments on commit 7b200ec

Please sign in to comment.