kredits/kredits-web
9
0
Fork 0
Code Issues 23 Pull Requests 1 Actions Releases 18 Activity

WIP Octanify the templates

Browse Source
This commit is contained in:
Basti
2020-05-10 10:27:43 +02:00
parent 4946b3311d
commit 2f4f350a93
15 changed files with 168 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/contributions/new.hbs
+3 -1
View File
@@ -6,7 +6,9 @@
</header>
<div class="content">
<AddContribution @contributors={{sortedContributors}} @attributes={{model.params}} @save={{action "save"}} />
<AddContribution @contributors={{this.sortedContributors}}
@attributes={{this.model.params}}
@save={{action "save"}} />
</div>
</section>
app/templates/contributions/resubmit.hbs
+4 -2
View File
@@ -2,11 +2,13 @@
<section id="add-contribution">
<header>
<h2>Re-submit contribution #{{model.id}}</h2>
<h2>Re-submit contribution #{{this.model.id}}</h2>
</header>
<div class="content">
<AddContribution @attributes={{attributes}} @contributors={{sortedContributors}} @save={{action "save"}} />
<AddContribution @attributes={{this.attributes}}
@contributors={{this.sortedContributors}}
@save={{action "save"}} />
</div>
</section>
app/templates/contributors/edit.hbs
+1 -1
View File
@@ -6,7 +6,7 @@
</header>
<div class="content">
<AddContributor @attributes={{attributes}} @save={{action "save"}} />
<AddContributor @attributes={{this.attributes}} @save={{action "save"}} />
</div>
</section>
app/templates/dashboard.hbs
+38 -18
View File
@@ -1,40 +1,43 @@
{{#if showIntroText}}
<div id="intro" class={{if showDetailsPane "with-details"}}>
{{#if this.showIntroText}}
<div id="intro" class={{if this.showDetailsPane "with-details"}}>
<h2>
Welcome to the contribution dashboard of the
<a href="https://kosmos.org" target="_blank" rel="noopener">Kosmos</a> project!
<a href="https://kosmos.org" target="_blank" rel="noreferrer noopener">Kosmos</a> project!
</h2>
<p>
If you want to learn more about what the numbers mean and how this works,
check out the
<a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noopener">Kredits documentation</a>.
<a href="https://wiki.kosmos.org/Kredits" target="_blank" rel="noreferrer noopener">Kredits documentation</a>.
If you want to start earning kredits for your contributions,
<LinkTo @route="signup">create a contributor profile</LinkTo>.
</p>
</div>
{{/if}}
<main id="dashboard" class={{if showDetailsPane "with-details"}}>
<main id="dashboard" class={{if this.showDetailsPane "with-details"}}>
<div id="stats">
<section id="people">
<header class="with-nav">
<h2>Contributors</h2>
{{#if kredits.hasAccounts}}
{{#if this.kredits.hasAccounts}}
<nav>
<LinkTo @route="contributors.new" @title="Add contributor profile" class="button small green">add</LinkTo>
</nav>
{{/if}}
</header>
<div class="content">
<ContributorList @contributorList={{kreditsToplist}} @showUnconfirmedKredits={{showUnconfirmedKredits}} @selectedContributorId={{selectedContributorId}} />
<ContributorList @contributorList={{this.kreditsToplist}}
@showUnconfirmedKredits={{this.showUnconfirmedKredits}}
@selectedContributorId={{this.selectedContributorId}} />
<p class="stats">
<span class="number">{{await kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
<span class="number">{{contributorsWithKredits.length}}</span> contributors
<span class="number">{{await this.kredits.totalKreditsEarned}}</span> kredits confirmed and issued to
<span class="number">{{this.contributorsWithKredits.length}}</span> contributors
</p>
<p class="stats">
<Input @type="checkbox" @id="hide-unnconfirmed-kredits" @checked={{showUnconfirmedKredits}} />
<Input @type="checkbox" @id="hide-unnconfirmed-kredits"
@checked={{this.showUnconfirmedKredits}} />
<label for="hide-unnconfirmed-kredits">Show unconfirmed kredits in toplist</label>
</p>
</div>
@@ -45,26 +48,36 @@
<h2>Contributions by type</h2>
</header>
<div class="content">
<ChartContributionsByType @contributions={{contributions}} />
<ChartContributionsByType @contributions={{this.contributions}} />
</div>
</section>
</div>
<div id="contributions">
{{#if contributionsUnconfirmed}}
{{#if this.contributionsUnconfirmed}}
<section id="contributions-unconfirmed">
<header class="with-nav">
<h2>Latest Contributions</h2>
<nav>
<button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
{{#if kredits.hasAccounts}}
<LinkTo @route="contributions.new" @title="Submit a contribution" class="button small green">add</LinkTo>
<button type="button"
onclick={{action "toggleQuickFilterUnconfirmed"}}
class="small {{if this.showQuickFilterUnconfirmed "active"}}">
filter
</button>
{{#if this.kredits.hasAccounts}}
<LinkTo @route="contributions.new"
@title="Submit a contribution"
class="button small green">add</LinkTo>
{{/if}}
</nav>
</header>
<div class="content">
{{!-- TODO: We need a better naming for kredits.hasAccounts --}}
<ContributionList @contributions={{contributionsUnconfirmedSorted}} @vetoContribution={{action "vetoContribution"}} @contractInteractionEnabled={{kredits.hasAccounts}} @selectedContributionId={{selectedContributionId}} @showQuickFilter={{showQuickFilterUnconfirmed}} />
<ContributionList @contributions={{this.contributionsUnconfirmedSorted}}
@vetoContribution={{action "vetoContribution"}}
@contractInteractionEnabled={{this.kredits.hasAccounts}}
@selectedContributionId={{this.selectedContributionId}}
@showQuickFilter={{this.showQuickFilterUnconfirmed}} />
</div>
</section>
{{/if}}
@@ -73,11 +86,18 @@
<header class="with-nav">
<h2>Confirmed Contributions</h2>
<nav>
<button {{action "toggleQuickFilterConfirmed"}} class="small {{if showQuickFilterConfirmed "active"}}">filter</button>
<button type="button"
onclick={{action "toggleQuickFilterConfirmed"}}
class="small {{if this.showQuickFilterConfirmed "active"}}">
filter
</button>
</nav>
</header>
<div class="content">
<ContributionList @contributions={{contributionsConfirmedSorted}} @vetoContribution={{action "vetoContribution"}} @selectedContributionId={{selectedContributionId}} @showQuickFilter={{showQuickFilterConfirmed}} />
<ContributionList @contributions={{this.contributionsConfirmedSorted}}
@vetoContribution={{action "vetoContribution"}}
@selectedContributionId={{this.selectedContributionId}}
@showQuickFilter={{this.showQuickFilterConfirmed}} />
</div>
</section>
</div>
app/templates/dashboard/contributions/show.hbs
+19 -19
View File
@@ -1,8 +1,8 @@
<section id="contribution-details" class={{if model.vetoed "vetoed"}}>
<section id="contribution-details" class={{if this.model.vetoed "vetoed"}}>
<header class="with-nav">
<h2>Contribution #{{model.id}}</h2>
<h2>Contribution #{{this.model.id}}</h2>
<nav>
<span class="amount">{{model.amount}}</span>&nbsp;
<span class="amount">{{this.model.amount}}</span>&nbsp;
<span class="symbol">₭S</span>
</nav>
</header>
@@ -10,29 +10,29 @@
<div class="content">
<p class="who-what-when">
<span class="contributor">
<UserAvatar @contributor={{model.contributor}} />
<LinkTo @route="dashboard.contributors.show" @model={{model.contributor}}>{{model.contributor.name}}</LinkTo>
<UserAvatar @contributor={{this.model.contributor}} />
<LinkTo @route="dashboard.contributors.show" @model={{this.model.contributor}}>{{this.model.contributor.name}}</LinkTo>
</span>
contributed
<span class="date" title={{model.iso8601Date}}>{{moment-from model.iso8601Date}}</span>:
<span class="date" title={{this.model.iso8601Date}}>{{moment-from this.model.iso8601Date}}</span>:
</p>
<h3>{{model.description}}</h3>
<h3>{{this.model.description}}</h3>
<p>
Kind: {{model.kind}}
<br>Status: {{contribution-status model}}
Kind: {{this.model.kind}}
<br>Status: {{contribution-status this.model}}
</p>
{{#if model.url}}
{{#if this.model.url}}
<p>
<a href={{model.url}}
title={{model.description}}
<a href={{this.model.url}}
title={{this.model.description}}
class="button"
target="_blank"
rel="noopener">
rel="noopener noreferrer">
Open URL
</a>
</p>
{{/if}}
{{#if model.vetoed}}
{{#if this.model.vetoed}}
<div class="hint vetoed">
<div class="icon">
<IconWarning />
@@ -42,7 +42,7 @@
kredits will be issued.
</p>
<p>
<LinkTo @route="contributions.resubmit" @model={{model}} class="button small green">Re-submit contribution …</LinkTo>
<LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small green">Re-submit contribution …</LinkTo>
</p>
</div>
{{/if}}
@@ -50,10 +50,10 @@
<div class="actions">
<p>
<LinkTo @route="contributions.resubmit" @model={{model}} class="button small">Copy & edit as new</LinkTo>
{{#if model.ipfsHash}}
<a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}"
class="button small" target="_blank" rel="noopener">
<LinkTo @route="contributions.resubmit" @model={{this.model}} class="button small">Copy & edit as new</LinkTo>
{{#if this.model.ipfsHash}}
<a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}"
class="button small" target="_blank" rel="noopener noreferrer">
Inspect IPFS data
</a>
{{/if}}
app/templates/dashboard/contributors/show.hbs
+12 -12
View File
@@ -1,21 +1,21 @@
<section id="contributor-profile">
<header>
<UserAvatar @contributor={{model}} @size="medium" />
<UserAvatar @contributor={{this.model}} @size="medium" />
</header>
<div class="content">
<h2>{{model.name}}</h2>
<p class="role">{{roleName}}</p>
<h2>{{this.model.name}}</h2>
<p class="role">{{this.roleName}}</p>
<ul class="external-accounts">
{{#each model.accounts as |account|}}
{{#each this.model.accounts as |account|}}
<li>
<ExternalAccountLink @account={{account}} />
<ExternalAccountLink @account={{this.account}} />
</li>
{{/each}}
{{#if model.url}}
{{#if this.model.url}}
<li>
<a href={{model.url}} target="_blank" rel="noopener" title="Website">
<a href={{this.model.url}} target="_blank" rel="noopener noreferrer" title="Website">
<span class="site">Web</span>
<IconWebGlobe />
</a>
@@ -24,18 +24,18 @@
</ul>
<div class="actions">
<p>
<LinkTo @route="contributions.new" @query={{hash contributorId=model.id}} class="button green">♥ Give kredits</LinkTo>
<LinkTo @route="contributions.new" @query={{hash contributorId=this.model.id}} class="button green">♥ Give kredits</LinkTo>
</p>
</div>
</div>
<div class="actions">
<p>
<a href="https://rinkeby.etherscan.io/address/{{model.account}}" class="button small" target="_blank" rel="noopener">Inspect Ethereum transactions</a>
{{#if model.ipfsHash}}
<a href="{{ipfsGatewayUrl}}/{{model.ipfsHash}}" class="button small" target="_blank" rel="noopener">Inspect IPFS profile</a>
<a href="https://rinkeby.etherscan.io/address/{{this.model.account}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect Ethereum transactions</a>
{{#if this.model.ipfsHash}}
<a href="{{this.ipfsGatewayUrl}}/{{this.model.ipfsHash}}" class="button small" target="_blank" rel="noopener noreferrer">Inspect IPFS profile</a>
{{/if}}
<LinkTo @route="contributors.edit" @model={{model}} class="button small">Edit profile</LinkTo>
<LinkTo @route="contributors.edit" @model={{this.model}} class="button small">Edit profile</LinkTo>
</p>
</div>
</section>
app/templates/signup/eth-account.hbs
+5 -4
View File
@@ -6,17 +6,18 @@
Kredits allow you to take part in project governance, and to earn rewards for
your contributions. For both, you will need an Ethereum wallet/account.
</p>
<form {{action "submit" on="submit"}}>
<form>
<p>
<label>
Ethereum account:<br>
<Input @type="text" @value={{ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if isValidEthAccount "valid" ""}} />
<Input @type="text" @value={{this.ethAddress}} placeholder="0xF18E631Ea191aE4ebE70046Fcb01a436554421BA4" class={{if this.isValidEthAccount "valid" ""}} />
</label>
</p>
</form>
<p class="actions">
<button disabled={{signupButtonDisabled}}
{{action "completeSignup"}}>
<button disabled={{this.signupButtonDisabled}}
{{on "click" this.completeSignup}}
type="button">
Complete my profile
</button>
</p>
app/templates/signup/index.hbs
+1 -1
View File
@@ -12,7 +12,7 @@
connecting one of the following accounts:
</p>
<p class="actions">
<button {{action "connectGithub"}} class="icon">
<button {{on "click" this.connectGithub}} class="icon" type="button">
<IconAccountGithubCom />
Connect GitHub
</button>