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

Dashboard work started #5074

Merged
merged 7 commits into from
Aug 29, 2019
Merged

Dashboard work started #5074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c5580a2
fix query dupe, add keywords, add started query
octavioamu Aug 27, 2019
569bc82
error handling, remove worker
octavioamu Aug 27, 2019
58768f7
uncomment dashboard button
octavioamu Aug 27, 2019
f99772b
add worker started html
octavioamu Aug 27, 2019
24bab0b
fix msg
octavioamu Aug 27, 2019
ec89abf
Merge branch 'master' into dashboard-started
octavioamu Aug 29, 2019
c2c2125
change dir files
octavioamu Aug 29, 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
29 changes: 28 additions & 1 deletion app/assets/v2/js/board.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,34 @@ Vue.mixin({
vm.disabledBtn = '';
}
},
removeWorker(key, bountyPk, profileId, obj, section) {
let vm = this;
let url = `/actions/bounty/${bountyPk}/interest/${profileId}/uninterested/`;

vm.disabledBtn = key;
if (window.confirm('Do you want to stop contributor work on this bounty?')) {
let postStartpWork = fetchData (url, 'POST');

$.when(postStartpWork).then(response => {
vm[obj][section].splice(key, 1);
vm.disabledBtn = '';
_alert({ message: gettext('Contributor removed from bounty.') }, 'success');
}, error => {
vm.disabledBtn = '';
let msg = error.responseJSON.error || 'got an error. please try again, or contact [email protected]';

_alert({ message: gettext(msg) }, 'error');
});
} else {
vm.disabledBtn = '';
}
},
checkData(persona) {
let vm = this;

if (!Object.keys(vm.bounties).length && persona === 'funder') {
vm.fetchBounties('open');
vm.fetchBounties('started');
vm.fetchBounties('submitted');
vm.fetchBounties('expired');
}
Expand Down Expand Up @@ -138,12 +161,14 @@ if (document.getElementById('gc-board')) {
expiredBounties: [],
contributors: [],
contributorBounties: contributorBounties,
expandedGroup: {'submitted': [], 'open': []},
expandedGroup: {'submitted': [], 'open': [], 'started': []},
disabledBtn: false,
authProfile: authProfile,
isLoading: {
'open': true,
'openContrib': true,
'started': true,
'startedContrib': true,
'submitted': true,
'submittedContrib': true,
'expired': true,
Expand All @@ -154,6 +179,8 @@ if (document.getElementById('gc-board')) {
error: {
'open': '',
'openContrib': '',
'started': '',
'startedContrib': '',
'submitted': '',
'submittedContrib': '',
'expired': '',
Expand Down
465 changes: 0 additions & 465 deletions app/dashboard/templates/board.html
View file
Open in desktop

This file was deleted.

189 changes: 189 additions & 0 deletions app/dashboard/templates/board/contributor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
{% comment %}
Copyright (C) 2019 Gitcoin Core

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.

You should have received a copy of the GNU Affero General Public License
along with this program. If not,see
<http://www.gnu.org/licenses/>.
{% endcomment %}
{% load i18n static add_url_schema avatar_tags %}

<div class="tab-pane fade " id="nav-contributor" role="tabpanel" aria-labelledby="nav-contributor-tab">
<header class="container position-relative">
<div class="row mb-2">
<div class="col-12">
<div class="bg-white rounded d-flex p-3 font-smaller-3">

<div class="my-3 mx-4 head-number">
<span class="head-number_title">BOUNTIES IN PROGRESS</span>
<span class="head-number_value">[[ contributorBounties.work_in_progress ? contributorBounties.work_in_progress.length : '0' ]]</span>
</div>
<div class="my-3 mx-4 head-number">
<span class="head-number_title">BOUNTIES APPLIED
</span>
<span class="head-number_value">[[ contributorBounties.interested ? contributorBounties.interested.length : '0' ]]</span>
</div>
<div class="my-3 mx-4 head-number">
<span class="head-number_title">WORK SUBMITTED</span>
<span class="head-number_value">[[ contributorBounties.work_submitted ? contributorBounties.work_submitted.length : '0' ]]</span>
</div>
</div>
</div>
</div>
</header>
<section class="container">
<div class="row">
<div class="col-12">
<div class="bg-white rounded border my-4">
<div class="p-4 border-bottom font-weight-bold" v-if="contributorBounties.work_in_progress">[[ contributorBounties.work_in_progress.length ]] [[ 'Bount' | pluralize(contributorBounties.work_in_progress.length, 'y', 'ies') ]] in Progress</div>

<ul class="list-unstyled list-bounty">
<li v-for="(bounty, key) in contributorBounties.work_in_progress" :key="bounty.id" class="position-relative font-smaller-1 mt-3 p-3 list-bounty-item">
<span class="fa-stack mr-2">
<i class="fas fa-circle fa-stack-2x text-danger"></i>
<i class="fas fa-user fa-stack-1x fa-inverse"></i>
</span>
<span class="font-weight-bold">You are currently working on this bounty
</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" title="View bounty details" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
</div>
</div>
<div>
<a target="_blank" :href="`/issue/fulfill?pk=${bounty.id}`" title="Submit work" class="btn btn-sm btn-gc-blue m-2">Submit Work</a>
<button @click="stopWork(key, bounty.id, authProfile, 'contributorBounties', 'work_in_progress')" class="btn btn-sm btn-outline-gc-blue m-2" title="Stop work" :disabled="key === disabledBtn">Stop Work</button>
</div>
</div>
</li>
<li class="text-center my-5" :class="{'d-none': isLoading.work_in_progress || contributorBounties.work_in_progress && contributorBounties.work_in_progress.length > 0}" v-cloak>
<img src="{% static 'v2/images/zero-bounties.svg' %}" alt="" width="197" height="169">
<h4 class="h5 font-weight-semibold my-3">
You are not working in any bounty yet.
</h4>
<p class="text-black-70"><a href="{% url 'explorer' %}">Find a bounty</a> or check out our <a href="{% url 'how_it_works' 'contributor' %}">Contributors Guide</a> to start doing bounties! </p>
<p class="text-black-70">Have any question? Chat with us on <a href="{% url 'slack' %}">Slack</a>!</p>
<a href="{% url 'explorer' %}" title="Find bounty" class="btn btn-gc-blue">Find a Bounty</a>
</li>
</ul>
<loading-screen v-if="isLoading.work_in_progress"></loading-screen>
</div>
</div>
</div>
</section>

<section class="container">
<div class="row">
<div class="col-12">
<div class="bg-white rounded border my-4">
<div class="p-4 border-bottom font-weight-bold" v-if="contributorBounties.interested">[[ contributorBounties.interested.length ]] [[ 'Bount' | pluralize(contributorBounties.interested.length, 'y', 'ies') ]] Applied
</div>

<ul class="list-unstyled list-bounty">
<li v-for="(bounty, key) in contributorBounties.interested" :key="bounty.id" class="position-relative font-smaller-1 mt-3 p-3 list-bounty-item">
<span class="fa-stack mr-2">
<i class="fas fa-circle fa-stack-2x green"></i>
<i class="fas fa-user fa-stack-1x fa-inverse"></i>
</span>
<span class="font-weight-bold">You are awaiting approval
</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
</div>
</div>
<div>
<button @click="stopWork(key, bounty.id, authProfile, 'contributorBounties', 'interested')" class="btn btn-sm btn-outline-gc-blue m-2" :disabled="key === disabledBtn">Stop Work</button>
</div>
</div>
</li>
<li class="text-center my-5" :class="{'d-none': isLoading.interested || contributorBounties.interested && contributorBounties.interested.length > 0}" v-cloak>
<p>[[ error.interested || 'You are not waiting approval to work in any bounty.' ]]</p>
</li>
</ul>
<loading-screen v-if="isLoading.interested"></loading-screen>
</div>
</div>
</div>
</section>

<section class="container">
<div class="row">
<div class="col-12">
<div class="bg-white rounded border my-4">
<div class="p-4 border-bottom font-weight-bold" v-if="contributorBounties.work_submitted">[[ contributorBounties.work_submitted.length ]] Work Submitted</div>

<ul class="list-unstyled list-bounty">
<li v-for="(bounty, key) in contributorBounties.work_submitted" :key="bounty.id" class="position-relative font-smaller-1 mt-3 p-3 list-bounty-item">
<span class="fa-stack mr-2">
<i class="fas fa-circle fa-stack-2x light-blue"></i>
<i class="fas fa-user fa-stack-1x fa-inverse"></i>
</span>
<span class="font-weight-bold">You are awaiting payment
</span>
<div class="d-flex flex-column flex-lg-row justify-content-between border p-3 my-2 ml-5 rounded">
<div class="list-bounty-item_content my-auto">
<div class="d-flex flex-column flex-md-row">
<img :src="bounty.avatar_url" alt="" width="60" height="60" class="rounded-circle flex-shrink-0 m-auto list-bounty-item_logo">
<div class="d-flex flex-column w-100 ml-md-3">
<a :href="bounty.absolute_url" title="View bounty details" class="text-truncate mb-2 text-dark">[[ bounty.title ]]</a>
<div class="d-flex flex-column flex-md-row justify-content-between font-smaller-2">
<template v-if="bounty.project_type">
<span class="my-1">[[ bounty.project_type ]]</span> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<template v-if="bounty.expires_date">
<time :datetime="[[ bounty.expires_date ]]" class="my-1" :title="[[ bounty.expires_date ]]">Expires [[ bounty.expires_date | moment ]]</time> <span class="d-md-block d-none mx-2 my-auto">&bull;</span>
</template>
<span class="my-1">[[ bounty.value_true ]] [[ bounty.token_name ]] ([[ bounty.value_in_usd ]] USD)</span>
<a :href="bounty.absolute_url" title="View bounty details" class="mx-md-2 my-1"><i class="fas fa-eye"></i> View Issue Details</a>
<a :href="bounty.github_url" class="mx-md-2 my-1" target="_blank"><i class="fab fa-github"></i> View Github</a>
</div>
</div>
</div>
</div>
</div>
</li>
<li class="text-center my-5" :class="{'d-none': isLoading.work_submitted || contributorBounties.work_submitted && contributorBounties.work_submitted.length > 0}" v-cloak>
<p>[[ error.work_submitted || "You don't have any submittion awaiting payment." ]]</p>
</li>
</ul>
<loading-screen v-if="isLoading.work_submitted"></loading-screen>
</div>
</div>
</div>
</section>
</div>
Loading