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

bounty: added progress bar #764

Merged
merged 4 commits into from
Apr 6, 2018
Merged

bounty: added progress bar #764

merged 4 commits into from
Apr 6, 2018

Conversation

thelostone-mc
Copy link
Member

Description
  • Added progress bar for expiring time
  • Refactored a bit

x

Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
  • css
  • js

@thelostone-mc
Copy link
Member Author

@PixelantDesign As promised ^_^ (Used green instead of blue, we can change it back to blue -> if you want that )

@codecov
Copy link

codecov bot commented Apr 2, 2018 •
edited
Loading

Codecov Report

Merging #764 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #764   +/-   ##
=======================================
  Coverage   34.33%   34.33%           
=======================================
  Files          99       99           
  Lines        5767     5767           
  Branches      674      674           
=======================================
  Hits         1980     1980           
  Misses       3702     3702           
  Partials       85       85

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 1012cb5...29599ff. Read the comment docs.

@thelostone-mc
Copy link
Member Author

Mobile needed some breathing space! Missed that :P

screen shot 2018-04-02 at 4 23 38 pm

mkosowsk
mkosowsk reviewed Apr 2, 2018
View reviewed changes
app/assets/v2/js/pages/bounty_details.js Outdated

if (new Date(val) < new Date()) {
var percent = 100 * (
Copy link

Choose a reason for hiding this comment

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

Please forgive the nitpick, but would something like percentCompleted be a bit more explicit? 😛

Copy link
Member Author

Choose a reason for hiding this comment

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

how did I that miss 😅

percentCompleted or something better ? 🤔
It signifies the time left % , help me out here

Copy link
Member Author

Choose a reason for hiding this comment

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

@mkosowsk kept it as expiringInPercentage.
fixing this before @mbeacom sees this and judges me :P

Copy link

Choose a reason for hiding this comment

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

:)

Copy link
Contributor

Choose a reason for hiding this comment

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

🤷‍♂️ No judgement here!

@mkosowsk
Copy link

mkosowsk commented Apr 2, 2018

Raised a super minor naming nitpick but this LGTM 👍🏻 Didn't test tho

mbeacom
mbeacom reviewed Apr 2, 2018
View reviewed changes
app/assets/v2/js/pages/bounty_details.js Outdated
@@ -165,11 +165,11 @@ var callbacks = {
expires_date = new Date(val);
now = new Date(result['now']);

var percent = 100 * (
var expiringInPercentage = 100 * (
Copy link
Contributor

Choose a reason for hiding this comment

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

👨‍⚖️

Copy link

Choose a reason for hiding this comment

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

😍

@mbeacom mbeacom added design-help frontend This needs frontend expertise. labels Apr 2, 2018
mbeacom
mbeacom approved these changes Apr 4, 2018
View reviewed changes
Copy link
Contributor

@mbeacom mbeacom left a comment

Choose a reason for hiding this comment

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

code lgtm - @PixelantDesign Are you good with this?

@mbeacom
Copy link
Contributor

mbeacom commented Apr 4, 2018

@thelostone-mc Would you mind resolving the stylelint errors?

@thelostone-mc
Copy link
Member Author

@mbeacom Done!

@thelostone-mc
Copy link
Member Author

Pixelant [2:18 PM]
hi thanks

#764
for that one i told him we dont need a bar for expired time
we should remove the bar and just show when it was finished

Taken care of!

x

@mbeacom @PixelantDesign

@thelostone-mc
Copy link
Member Author

@mbeacom conflicts resolved

@mbeacom mbeacom merged commit 038af49 into gitcoinco:master Apr 6, 2018
@thelostone-mc thelostone-mc deleted the progress branch April 7, 2018 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkosowsk mkosowsk mkosowsk left review comments

@PixelantDesign PixelantDesign PixelantDesign approved these changes

@mbeacom mbeacom mbeacom approved these changes

Assignees
No one assigned
Labels
frontend This needs frontend expertise.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@thelostone-mc @mkosowsk @mbeacom @PixelantDesign