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

Fix/sponsors #7170

Merged
merged 12 commits into from
Aug 12, 2020
Merged

Fix/sponsors #7170

merged 12 commits into from
Aug 12, 2020

Conversation

zoek1
Copy link
Contributor

@zoek1 zoek1 commented Jul 31, 2020

Description
  • clicking on profile link should open in a new tab for the sponsor
  • As a hackathon sponsor when I click on the GitHub cat - the GitHub project should open in a new tab
  • As a hackathon sponsor when I click on the Project link, the link should not 404. It should open the project link iii a new tab.
  • As a hackathon sponsor when I hover over the prize values, nothing should happen. Please remove hover states
  • as a Hackathon sponsor when I mark a winner - the pay button should appear next to the winner column. Clicking pay takes the sponsor to the normal payout flow in a new tab. Once sponsor's transaction goes through, then the view should update as paid with date on the submission view. See mockup.
  • clicking chat icon opens the chat window but it's displaying 404. Chat doesn't open the conversation with that user.
  • As a hackathon sponsor when I click the name of my prize - the prize details should open in a new tab.

image

  • Change Submission column header to Projects
  • Organize projects by most recently submitted at the top
  • For projects that haven't been submitted give a light gray background #F3F3F3 and a note that says Not Submitted
  • On the Add Note - add hint text inside the input field "this note can only be viewed by you"

https://www.loom.com/share/3522b328cd434198a80cf9cdb84c8fec

Refers/Fixes

#7158

Testing

Copy link
Contributor

@PixelantDesign PixelantDesign left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we see a video @zoek1 ?
cc @thelostone-mc

@danlipert danlipert marked this pull request as draft August 3, 2020 12:10
@zoek1 zoek1 marked this pull request as ready for review August 4, 2020 11:45
@zoek1
Copy link
Contributor Author

zoek1 commented Aug 4, 2020

@frankchen07
Copy link
Contributor

from the short jam with @PixelantDesign & @vs77bb today:

  1. I think it's a little confusing with the dual locations above and below. Isn't it just submitted work, or do we want to see started and submitted work?

Screen Shot 2020-08-04 at 15 09 02

  1. Contacts and winners are nice, but it seems like it takes up alot of "space". Every row has a contact bubble - is there a way to coalesce some of those elements into the view somehow?

Screen Shot 2020-08-04 at 15 12 44

  1. I understand the note is personal right now, and is only viewed on this page, but it might not be explicit to someone who is using this page. Do we think it's absolutely necessary?

@frankchen07
Copy link
Contributor

#7176 addresses some of the comments above

@PixelantDesign
Copy link
Contributor

Looks great @zoek1! Could we make a few more updates?

  • Change Submission column header to Projects
  • Organize projects by most recently submitted at the top
  • For projects that haven't been submitted give a light gray background #F3F3F3 and a note that says Not Submitted
  • On the Add Note - add hint text inside the input field "this note can only be viewed by you"

Screen Shot 2020-08-05 at 11 16 01 AM

@thelostone-mc thelostone-mc marked this pull request as draft August 5, 2020 19:22
@thelostone-mc thelostone-mc changed the base branch from stable to master August 5, 2020 19:26
@zoek1 zoek1 marked this pull request as ready for review August 7, 2020 01:34
@codecov
Copy link

codecov bot commented Aug 7, 2020

Codecov Report

Merging #7170 into master will increase coverage by 0.00%.
The diff coverage is 7.69%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7170   +/-   ##
=======================================
  Coverage   26.18%   26.19%           
=======================================
  Files         297      297           
  Lines       29385    29405   +20     
  Branches     4342     4347    +5     
=======================================
+ Hits         7694     7702    +8     
- Misses      21415    21432   +17     
+ Partials      276      271    -5     
Impacted Files Coverage Δ
app/dashboard/views.py 10.34% <0.00%> (-0.04%) ⬇️
app/dashboard/models.py 48.65% <22.22%> (-0.09%) ⬇️
app/quests/views.py 16.22% <0.00%> (ø)
...rketing/management/commands/no_applicants_email.py 0.00% <0.00%> (ø)
...eting/management/commands/assemble_leaderboards.py 39.73% <0.00%> (ø)
app/dashboard/embed.py 31.60% <0.00%> (+3.44%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 93e740b...4ba1467. Read the comment docs.

[[ prize.total_submitted ]] / [[prize.total_projects]] Submitted
</span>
<span v-if="prize.paid" class="ml-5 gc-text-green"><span class="fas fa-check mr-2"></span>PAID</span>
<a v-else :href="`/issue/payout?pk=${prize.pk}`" class="ml-2 ml-xl-5 btn btn-outline-primary font-smaller-5">PAY</a>
<a v-else :href="`/issue/payout?pk=${prize.pk}`" class="ml-5 gc-text-blue">UNPAID</a>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this changed back ? Could we keep it to what it was

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PixelantDesign request me change this to the previous implmementation

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PixelantDesign waiting on confirmation ^

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What was the change y'all are referring to?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zoek1 looks like it was never supposed to be a link in the first place!
If that is the case -> this makes sense but you'll have to remove the

I leave it to you and alisa to decide if on clicking this label -> it behaves as an accordion

image

Copy link
Member

@thelostone-mc thelostone-mc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zoek1 looks like you sort of overwrote the HTML file while resolving the conflicts
Could you redo them just to add your changes ?

<i class="fas fa-angle-up"></i>
<b-button style="right: 0;top: -5px" class="position-absolute" v-if="prize.total_projects" v-b-toggle="`accordion-${prizeIndex}`" @click="togglePrize(prizeIndex)" variant="link">
<i class="fas fa-angle-up" v-if="!prize.open"></i>
<i class="fas fa-angle-down" v-else></i>
Copy link
Member

@thelostone-mc thelostone-mc Aug 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<i class="fas fa-angle-down" v-if="prize.open"></i>
<i class="fas fa-angle-up" v-else></i>

Copy link
Contributor

@PixelantDesign PixelantDesign left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The intention is to show an unpaid status. when user click it, it should just expand the row to see details.

The link was never intended to trigger payout flow. Not sure where that came from.

To make it even more we could show x/y Submitted Review Submission (this link will expand the accordian).

cc @thelostone-mc @zoek1

@zoek1
Copy link
Contributor Author

zoek1 commented Aug 10, 2020

Comments from @PixelantDesign to get in sync the desired aspect of the dashboard

  • the alignment is off on the $ value, make it closer to where it was
  • when there is a submission …..change pay to review submission - but not make it a link
  • review submission expands the rows
  • github link should be under the projext title.

image

@thelostone-mc thelostone-mc merged commit 477275e into gitcoinco:master Aug 12, 2020
@PixelantDesign
Copy link
Contributor

yayyyy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants