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.

Sign up for GitHub

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

Jump to bottom

Add intro, fix topbar on mobile, fix filter button #166

Merged
merged 3 commits into from
Nov 27, 2019
Merged

Add intro, fix topbar on mobile, fix filter button #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a4db6d
Do not require account for filtering contributions
raucao Nov 27, 2019
42304a8
Fix account panel breaking out of topbar on mobile
raucao Nov 27, 2019
47b7a65
Add intro text for new users
raucao Nov 27, 2019
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
2 changes: 1 addition & 1 deletion app/components/topbar-account-panel/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<span class="core-flag">(core)</span>
{{/if}}
{{else}}
Anonymous
<span class="anonymous">Anonymous</span>
<button {{action "signup"}} class="small">Sign up</button>
{{#if showConnectButton}}
<button {{action "connectAccount"}} class="small green">Connect account</button>
Expand Down
4 changes: 4 additions & 0 deletions app/controllers/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ export default Controller.extend({
showQuickFilterUnconfirmed: false,
showQuickFilterConfirmed: false,

showIntroText: computed('kredits.{hasAccounts,currentUser}', function(){
return (!this.kredits.hasAccounts || !this.kredits.currentUser);
}),

actions: {

vetoContribution (contributionId) {
Expand Down
5 changes: 0 additions & 5 deletions app/styles/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,3 @@ $red: #fb6868;
$primary-color: $blue;

$body-text-color: #fff;

#topbar {
background-color: rgba(255, 0, 255, .2);
}

34 changes: 34 additions & 0 deletions app/styles/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,40 @@ main {
}
}

#intro {
padding: 2rem;
background-color: rgba(0,0,0,.2);
font-size: 1.6rem;

@include media-max(small) {
padding: 2rem 1rem;
font-size: 1.4rem;
}

h2 {
font-size: inherit;
margin-bottom: 1em;
}

p {
margin-bottom: 1em;
line-height: 1.5em;
font-size: 1.2rem;

&:last-child {
margin-bottom: 0;
}
}

a {
text-decoration: none;

&:hover, &:active {
text-decoration: underline;
}
}
}

@media (min-width: 550px) {
main {
&#dashboard {
Expand Down
6 changes: 6 additions & 0 deletions app/styles/components/_topbar-account-panel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@ header#topbar section#user-account {
margin-left: 0.6rem;
}

@include media-max(small) {
.anonymous {
display: none;
}
}

}
26 changes: 21 additions & 5 deletions app/templates/dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
{{#if showIntroText}}
<div id="intro">
<h2>
Welcome to the contribution dashboard of the
<a href="https://kosmos.org" target="_blank" rel="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>.
If you want to start earning kredits for your contributions,
{{link-to "create a contributor profile" "signup"}}.
</p>
</div>
{{/if}}

<main id="dashboard" class={{if showDetailsPane "with-details"}}>

<div id="stats">
Expand Down Expand Up @@ -41,12 +57,12 @@
<section id="contributions-unconfirmed">
<header class="with-nav">
<h2>Latest Contributions</h2>
{{#if kredits.hasAccounts}}
<nav>
<button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
<nav>
<button {{action "toggleQuickFilterUnconfirmed"}} class="small {{if showQuickFilterUnconfirmed "active"}}">filter</button>
{{#if kredits.hasAccounts}}
{{link-to "add" "contributions.new" title="Submit a contribution" class="button small green"}}
</nav>
{{/if}}
{{/if}}
</nav>
</header>
<div class="content">
{{!-- TODO: We need a better naming for kredits.hasAccounts --}}
Expand Down