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

Clr backend #5192

Merged
merged 42 commits into from
Sep 20, 2019
Merged

Clr backend #5192

merged 42 commits into from
Sep 20, 2019

Conversation

danlipert
Copy link
Contributor

@danlipert danlipert commented Sep 13, 2019

Description
  • mocked up UI on grant card + fund page
  • disccuss + understand formula calculation
  • implment clr matching code
  • wire in BE
Refers/Fixes

#3663

Testing

Mocks : Fund Page + Grant Card

@danlipert danlipert mentioned this pull request Sep 13, 2019
4 tasks
@codecov
Copy link

codecov bot commented Sep 13, 2019

Codecov Report

Merging #5192 into master will decrease coverage by 13.07%.
The diff coverage is 30%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #5192       +/-   ##
===========================================
- Coverage   30.82%   17.74%   -13.08%     
===========================================
  Files         221      210       -11     
  Lines       17785    18405      +620     
  Branches     2455     2677      +222     
===========================================
- Hits         5482     3266     -2216     
- Misses      12077    15104     +3027     
+ Partials      226       35      -191
Impacted Files Coverage Δ
app/grants/models.py 49.71% <30%> (-10.12%) ⬇️
app/kudos/forms.py 0% <0%> (-100%) ⬇️
app/grants/serializers.py 0% <0%> (-100%) ⬇️
app/avatar/serializers.py 0% <0%> (-100%) ⬇️
app/grants/urls.py 0% <0%> (-100%) ⬇️
app/inbox/urls.py 0% <0%> (-100%) ⬇️
app/avatar/urls.py 0% <0%> (-100%) ⬇️
app/grants/forms.py 0% <0%> (-100%) ⬇️
app/avatar/router.py 0% <0%> (-90.91%) ⬇️
app/app/urls.py 0% <0%> (-89.37%) ⬇️
... and 81 more

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 4c239a0...e1032d7. Read the comment docs.

@codecov
Copy link

codecov bot commented Sep 13, 2019

Codecov Report

Merging #5192 into master will decrease coverage by 0.23%.
The diff coverage is 2.61%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5192      +/-   ##
==========================================
- Coverage   30.78%   30.54%   -0.24%     
==========================================
  Files         221      223       +2     
  Lines       17943    18095     +152     
  Branches     2491     2527      +36     
==========================================
+ Hits         5524     5528       +4     
- Misses      12189    12334     +145     
- Partials      230      233       +3
Impacted Files Coverage Δ
app/grants/admin.py 43.37% <ø> (ø) ⬆️
app/app/urls.py 89.36% <ø> (ø) ⬆️
app/grants/management/commands/estimate_clr.py 0% <0%> (ø)
app/grants/clr.py 0% <0%> (ø)
app/grants/views.py 14.74% <100%> (+0.63%) ⬆️
app/grants/models.py 59.02% <50%> (+0.11%) ⬆️
app/dashboard/views.py 14.1% <0%> (ø) ⬆️
...rketing/management/commands/no_applicants_email.py 0% <0%> (ø) ⬆️

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 5f3cca5...1991165. Read the comment docs.

@danlipert danlipert marked this pull request as ready for review September 19, 2019 12:56
@@ -146,22 +153,101 @@
bottom: -1.2rem;
}

.nav{
.nav {
Copy link
Contributor

Choose a reason for hiding this comment

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

user text-center calls instead of overwriting the framework

text-align: center;
}
.nav-link{

.nav-link {
Copy link
Contributor

Choose a reason for hiding this comment

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

extend core class don't overwrite

border-right: 1px solid black;
border-top: 1px solid black;
border-left: 1px solid black;
margin-right: 10px;
}
.nav-link:visited{

.nav-link:visited {
Copy link
Contributor

Choose a reason for hiding this comment

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

extend core class don't overwrite

color: black;
}
.nav-item.active{

.nav-item.active {
Copy link
Contributor

Choose a reason for hiding this comment

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

extend core class don't overwrite

app/assets/v2/css/grants/fund.css Show resolved Hide resolved
@@ -23,7 +30,7 @@ $(document).ready(function() {

updateSummary();

$('.nav-item').click(function(e) {
$('#grants_form .nav-item').click(function(e) {
Copy link
Contributor

Choose a reason for hiding this comment

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

this kind of rules will be a problem when we start creating a bundle js since we are not going to control this being loaded in other areas, use custom classes or data attr

Copy link
Member

Choose a reason for hiding this comment

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

agreed this would need to be fixed in a follow up PR to use what the tabs we already have
It's creating random weird bugs in css cause of that

cc @owocki

octavioamu
octavioamu previously approved these changes Sep 19, 2019
@@ -40,7 +40,7 @@ <h2 class="grant-item__title font-subheader"><a href="{% url 'grants:details' gr
{% if clr_active %}
<div class="clr position-absolute text-center">
<h2 class="font-caption font-weight-bold my-0 p-1">
CLR MATCH <span id="clr-grant-match">{{ grant.clr_prediction_curve.0}}</span> DAI
CLR MATCH <span id="clr-grant-match">{{ grant.clr_prediction_curve.0.1|floatformat:2 }}</span> DAI
Copy link
Member

Choose a reason for hiding this comment

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

oh noice

thelostone-mc
thelostone-mc previously approved these changes Sep 19, 2019
thelostone-mc
thelostone-mc previously approved these changes Sep 20, 2019
@octavioamu octavioamu merged commit 286c164 into master Sep 20, 2019
@thelostone-mc thelostone-mc deleted the clr-backend branch June 27, 2020 00:45
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.

4 participants