Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc improvements #497

Merged
merged 4 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contracts/scripts/deployRound.ts
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
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
4 changes: 2 additions & 2 deletions vue-app/src/components/CriteriaModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
9 changes: 4 additions & 5 deletions vue-app/src/components/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: '🏠' },
Expand All @@ -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>
Expand Down
35 changes: 16 additions & 19 deletions vue-app/src/plugins/round/criteria.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export interface Criterion {
description: string
}

const baseCriterion: Criterion[] = [
const BASE_CRITERION: Criterion[] = [
{
emoji: '🤲',
criterion: 'Free and open source',
Expand All @@ -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,
]
4 changes: 4 additions & 0 deletions vue-app/src/views/AboutContributors.vue
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions vue-app/src/views/AboutRecipients.vue
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
13 changes: 8 additions & 5 deletions vue-app/src/views/Join.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down