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

[WIP] Grants #2393

Closed
wants to merge 359 commits into from
Closed
Changes from 6 commits
Commits
Show all changes
359 commits
Select commit Hold shift + click to select a range
30dbb9a
Fix isort in grants views
mbeacom Oct 16, 2018
8e762c5
grants/detail : refactor + design clean + responsive (#2482)
thelostone-mc Oct 16, 2018
9fe683c
Create Grant, Subscription & Approve functionality (#2418)
captnseagraves Oct 17, 2018
38d5f52
Merge branch 'master' into grants
mbeacom Oct 17, 2018
f7b94f2
Grants - Require login on some views and help_text on all model attrs…
Oct 17, 2018
6156d98
Grants team members and full transaction receipt (#2486)
Oct 17, 2018
99436c9
Adds metamask check in grant form (#2487)
SaptakS Oct 18, 2018
f447f15
cleaning up 'fund grant' view
captnseagraves Oct 17, 2018
813e892
'fund grant' view cleaned up
captnseagraves Oct 18, 2018
0bb5e58
remove new.js network log
captnseagraves Oct 18, 2018
f8c1107
grants/admin: base setup (#2484)
thelostone-mc Oct 18, 2018
30bf6ba
grants/fund : refactor
thelostone-mc Oct 18, 2018
9eb479a
Merge pull request #2490 from thelostone-mc/grants-fe
thelostone-mc Oct 18, 2018
e5950ed
decimals work in fund
captnseagraves Oct 19, 2018
48351e8
resolve merge
captnseagraves Oct 20, 2018
daf3257
approve() zero working. fixed picture bleed through on detail
captnseagraves Oct 20, 2018
7cb0ff8
cancelSubscription Contract funtion implemented. Was only using appro…
captnseagraves Oct 20, 2018
452b1fe
run linters
captnseagraves Oct 20, 2018
4641ea1
fix stickler errors
captnseagraves Oct 20, 2018
004be85
grant/detail: updated UI (#2499)
thelostone-mc Oct 20, 2018
0b2d924
period selection on grants/new is dynamic
captnseagraves Oct 20, 2018
36a326a
changes per review by mbeacom
captnseagraves Oct 20, 2018
6e2a908
period selection on grants/fund is dynamic. plus some dopy edits on f…
captnseagraves Oct 20, 2018
84c9b1e
resolve dynamic_periods merge
captnseagraves Oct 20, 2018
91bced5
remove network=testrpc
captnseagraves Oct 20, 2018
746c041
run linters
captnseagraves Oct 20, 2018
739eba4
Merge branch 'grants' into ks_work
captnseagraves Oct 20, 2018
6f3d9c9
grants/fund : populate token in dropdown
thelostone-mc Oct 20, 2018
00c0a89
routes refactored to be restful
captnseagraves Oct 20, 2018
606295d
clean up spacing and logs
captnseagraves Oct 21, 2018
7d8669a
add Goal <p> back to detail.html
captnseagraves Oct 21, 2018
06c0e35
WIP: Making aesthetic changes before logic.
Anish-Agnihotri Oct 21, 2018
07be084
Merge pull request #2502 from thelostone-mc/grants-fe
thelostone-mc Oct 22, 2018
318e8c4
Merge pull request #2503 from gitcoinco/restful_routes
captnseagraves Oct 22, 2018
a62d868
cleaned up subscription_cancel view
captnseagraves Oct 22, 2018
c3f2561
lint views.py
captnseagraves Oct 22, 2018
48794b9
Merge pull request #2511 from gitcoinco/cancel_view
captnseagraves Oct 22, 2018
9f0685d
Adding grants QS and referencing.
Anish-Agnihotri Oct 22, 2018
40bede7
address PR comments
captnseagraves Oct 22, 2018
b802437
Merge branch 'grants' into ks_work
captnseagraves Oct 22, 2018
3d424df
Implemented warning label on 'new' and 'fund' with style given by KO …
captnseagraves Oct 22, 2018
b28d559
move 'now' into subscription_cancel (#2513)
captnseagraves Oct 22, 2018
49dc6cf
changed 'supported by me' tab in grants/profile to display grants I s…
captnseagraves Oct 22, 2018
8fba38d
remove subscription from 'created by me' query and add sort to subs q…
captnseagraves Oct 22, 2018
cad76d2
Fixes web3 version conflicts in various parts
SaptakS Oct 22, 2018
a15f096
Merge pull request #2514 from gitcoinco/profile_subscriptions
thelostone-mc Oct 23, 2018
74d4b9d
minor css
thelostone-mc Oct 23, 2018
504e280
Merge pull request #2501 from gitcoinco/ks_work
thelostone-mc Oct 23, 2018
7dbd296
implemented dynamic token functionality
captnseagraves Oct 23, 2018
bfa0f54
resolve grants merge
captnseagraves Oct 23, 2018
c33538b
changed aplha warning copy at suggestion of KO
captnseagraves Oct 23, 2018
db5377f
Adds required to admin address
SaptakS Oct 24, 2018
ef07666
Merge branch 'grants' of github.com:gitcoinco/web into fix-web3-check
SaptakS Oct 24, 2018
5f000a9
Add metamask unlock error banners in funding and cancel page
SaptakS Oct 24, 2018
7e6aca0
update alpha banner
thelostone-mc Oct 24, 2018
521e3b8
Merge pull request #2509 from SaptakS/fix-web3-check
thelostone-mc Oct 24, 2018
12a2001
Merge pull request #2519 from gitcoinco/dynamic_tokens
captnseagraves Oct 24, 2018
85d0ff3
added fields to Contribution model
captnseagraves Oct 24, 2018
b8f7883
make migrations and resolve stickler errors
captnseagraves Oct 25, 2018
e97df52
fixing new and fund js files.
captnseagraves Oct 26, 2018
3cd85b8
js fixed, now working on bad redirect
captnseagraves Oct 26, 2018
43b5448
Adding final revised Grant Cancellation email.
Anish-Agnihotri Oct 27, 2018
c12c17e
Fixing alt and trans - grant cancellation.
Anish-Agnihotri Oct 27, 2018
fbeae9e
Adding final revised update notification email.
Anish-Agnihotri Oct 27, 2018
a862053
Fixing links + adding new_supporter email.
Anish-Agnihotri Oct 27, 2018
c3e141e
Adding subscription_terminated email.
Anish-Agnihotri Oct 27, 2018
54d68fd
Adding TODO's and img trans missed in last.
Anish-Agnihotri Oct 27, 2018
d15a854
Adding support cancellation email + fixes.
Anish-Agnihotri Oct 27, 2018
c26f39b
Adding final thank_you_for_supporting email.
Anish-Agnihotri Oct 27, 2018
ae13233
Revising changes to final files.
Anish-Agnihotri Oct 27, 2018
21f4fb6
css fix
thelostone-mc Oct 28, 2018
d5b200e
Merge pull request #2551 from thelostone-mc/x
thelostone-mc Oct 28, 2018
bff9e60
bad redirect fixed
captnseagraves Oct 28, 2018
b66e7c0
fixed period_seconds data
captnseagraves Nov 5, 2018
d3d4379
Merge pull request #2466 from anish-agnihotri2/revised-emails
captnseagraves Nov 5, 2018
aace1db
emailed rendered, but data broken.
captnseagraves Nov 6, 2018
e60720c
new_grant email mostly done. need to update refrence urls functionality.
captnseagraves Nov 6, 2018
6126635
Merge branch 'master' of github.com:gitcoinco/web
mbeacom Nov 6, 2018
29a13b3
Remove grants index stub view
mbeacom Nov 6, 2018
edc159e
Remove pgweb
mbeacom Nov 6, 2018
d38b895
new_grant email link urls working
captnseagraves Nov 6, 2018
e2de0e2
Pin on old compose version...
mbeacom Nov 6, 2018
a612980
Adjust migrations since rebase
mbeacom Nov 6, 2018
ba93b0b
added fields to Contribution model
captnseagraves Oct 24, 2018
b20bea4
make migrations and resolve stickler errors
captnseagraves Oct 25, 2018
bad82f1
fixing new and fund js files.
captnseagraves Oct 26, 2018
9c06952
js fixed, now working on bad redirect
captnseagraves Oct 26, 2018
7f15046
bad redirect fixed
captnseagraves Oct 28, 2018
158564e
fixed period_seconds data
captnseagraves Nov 5, 2018
b9b2e13
emailed rendered, but data broken.
captnseagraves Nov 6, 2018
d442b0f
new_grant email mostly done. need to update refrence urls functionality.
captnseagraves Nov 6, 2018
4a9190e
new_grant email link urls working
captnseagraves Nov 6, 2018
1d3e3a1
implementing user facing new_grant email
captnseagraves Nov 6, 2018
4f007cb
runnning into error on contract deployment. working through. merging …
captnseagraves Nov 6, 2018
421d0c3
resolving merge and mirgations errors
captnseagraves Nov 6, 2018
0c0ed34
getting state to match grants branch
captnseagraves Nov 7, 2018
fb757b4
remove extra migration
captnseagraves Nov 7, 2018
c83335e
Revert "Adjust migrations since rebase"
captnseagraves Nov 7, 2018
fb6890d
run migrations
captnseagraves Nov 7, 2018
c50442e
resolve conflict
captnseagraves Nov 7, 2018
ff27031
email sent on user action (with borken images), and contract deployme…
captnseagraves Nov 8, 2018
99bf709
resolve merge conflicts
captnseagraves Nov 8, 2018
7ef6ace
Merge pull request #2526 from gitcoinco/contribution_model
captnseagraves Nov 8, 2018
975842f
Merge pull request #2468 from anish-agnihotri2/trans_summ
captnseagraves Nov 8, 2018
7c7e5b2
new_supporter email admin view and user generated email working. imag…
captnseagraves Nov 8, 2018
4ffa21c
thank_you_for_supporting email admin view and user generated email wo…
captnseagraves Nov 8, 2018
8d5fdc3
support_cancellation admin view and user generated email created. Can…
captnseagraves Nov 8, 2018
c5f6da9
Merge branch 'grants' of https://github.com/gitcoinco/web into grants
captnseagraves Nov 8, 2018
8e023bc
add gasPrice to resolve rinkeby issues
captnseagraves Nov 8, 2018
3165399
minor fixes for PR
captnseagraves Nov 8, 2018
368d3fe
Merge pull request #2742 from gitcoinco/rinkeby_fixes
captnseagraves Nov 8, 2018
1c79929
Merge branch 'grants' of https://github.com/gitcoinco/web into grants
captnseagraves Nov 8, 2018
f298f12
resolve grants merge
captnseagraves Nov 8, 2018
7dcf230
grants: added quickstart
thelostone-mc Nov 9, 2018
9b0ca19
implemented search functionality via form
captnseagraves Nov 9, 2018
f0441f3
run linter
captnseagraves Nov 9, 2018
0144dc1
appease stickler
captnseagraves Nov 9, 2018
17d4f92
grants/profile: added placeholder when user has no activity
thelostone-mc Nov 10, 2018
1a397a0
fixing cancel_subscription functionality
captnseagraves Nov 12, 2018
8359ac2
fix cancel_subscription functionality
captnseagraves Nov 12, 2018
aa76f15
Merge pull request #2747 from thelostone-mc/grants-quickstart
thelostone-mc Nov 13, 2018
4b8e183
support_cancelled email sent on user action
captnseagraves Nov 13, 2018
b88dd7f
fund frequency data wired correctly
captnseagraves Nov 13, 2018
5d5c63d
Fix jumping into profile if not available in grants
mbeacom Nov 13, 2018
a3773a2
solve field change on submit
captnseagraves Nov 13, 2018
7e1ad6e
submit form
captnseagraves Nov 13, 2018
fa8589f
added muli fonts back
captnseagraves Nov 13, 2018
cae11d0
Merge branch 'grants' of https://github.com/gitcoinco/web into grants
captnseagraves Nov 13, 2018
4db1bcc
Merge branch 'grants' into ks_cancel_fixes
captnseagraves Nov 13, 2018
44553bb
Merge branch 'grants' into ks_search
captnseagraves Nov 13, 2018
9f4da56
Merge branch 'grants' into ks_emails
captnseagraves Nov 13, 2018
85a96af
Merge pull request #2776 from gitcoinco/ks_cancel_fixes
captnseagraves Nov 13, 2018
00a80a6
Merge branch 'grants' into ks_search
captnseagraves Nov 13, 2018
6b008b6
Merge pull request #2750 from gitcoinco/ks_search
captnseagraves Nov 13, 2018
74848b8
resolve conflicts
captnseagraves Nov 13, 2018
e7b5dfa
run linter. fix logs and spacing for PR.
captnseagraves Nov 13, 2018
748ab50
Ks details buttons (#2827)
captnseagraves Nov 14, 2018
34f6742
uncomment form.submit()
captnseagraves Nov 14, 2018
29eebce
Merge branch 'grants' into ks_emails
captnseagraves Nov 14, 2018
9fed040
qa : fixes
thelostone-mc Nov 14, 2018
55d31e2
cancel grant functionality implemented
captnseagraves Nov 14, 2018
cfa4755
appease stickler
captnseagraves Nov 14, 2018
bc34beb
Merge pull request #2806 from gitcoinco/ks_emails
captnseagraves Nov 14, 2018
d924de6
appease stickler
captnseagraves Nov 14, 2018
e53931a
ensure compiledSubscription is correct
captnseagraves Nov 14, 2018
50b8d95
Merge branch 'grants' into cancel_grant
captnseagraves Nov 14, 2018
032c25d
added feedback comments
thelostone-mc Nov 14, 2018
223a374
sort fucntionality working and index only showing active grants. need…
captnseagraves Nov 14, 2018
5a8bb90
- profile: show placeholder
thelostone-mc Nov 14, 2018
3c2b771
implementing grant_cancellation email
captnseagraves Nov 14, 2018
5fce377
Merge pull request #2828 from thelostone-mc/grants-fix
thelostone-mc Nov 15, 2018
bd0fac5
card: clickable + image (#2843)
thelostone-mc Nov 15, 2018
06c5460
inline -> bulk edit (#2846)
thelostone-mc Nov 15, 2018
242e048
Merge branch 'grants' into cancel_grant
captnseagraves Nov 15, 2018
2e4ea7e
Merge pull request #2831 from gitcoinco/cancel_grant
captnseagraves Nov 15, 2018
72f84ba
Cancel grant functionality and emails implemented.
captnseagraves Nov 15, 2018
09b4e82
Merge branch 'grants' into ks_emails
captnseagraves Nov 15, 2018
f16fe5f
Fix migrations
mbeacom Nov 15, 2018
8980007
run linters
captnseagraves Nov 15, 2018
00f1797
removed minutes and hours. removed admin from user detail view.
captnseagraves Nov 15, 2018
995b209
compliedSubscription to compiledSubscription. Fix on chain functional…
captnseagraves Nov 15, 2018
c70b6a8
more QA fixes
captnseagraves Nov 15, 2018
fa79577
reordered inputs and added tooltip for token approval limit
captnseagraves Nov 15, 2018
efa984b
run linters
captnseagraves Nov 16, 2018
e96db1a
Merge branch 'grants' into qa_fixes
captnseagraves Nov 16, 2018
d9249b3
Merge branch 'grants' into ks_emails
captnseagraves Nov 16, 2018
aceb821
appease stickler
captnseagraves Nov 16, 2018
404a522
grants/card: same size
thelostone-mc Nov 16, 2018
924c40f
Merge pull request #2856 from thelostone-mc/grants-fix
thelostone-mc Nov 16, 2018
b59a246
Merge pull request #2849 from gitcoinco/ks_emails
captnseagraves Nov 16, 2018
63e69b8
appease stickler #2
captnseagraves Nov 16, 2018
c77255d
Fix thank_you_for_supporting email template with no logo
mbeacom Nov 16, 2018
c6b9841
Remove logo from thank you for supporting text email
mbeacom Nov 16, 2018
3043fb9
grant/detail: revamp
thelostone-mc Nov 16, 2018
b293cfb
Merge pull request #2860 from thelostone-mc/grants-fix
captnseagraves Nov 16, 2018
9b8f557
Merge branch 'grants' into qa_fixes
captnseagraves Nov 16, 2018
d74fe45
resolve merge
captnseagraves Nov 16, 2018
8645191
change p tag to span
captnseagraves Nov 16, 2018
6ee503d
trying to appease stickler #3
captnseagraves Nov 16, 2018
4ad4285
resolve conflicts
captnseagraves Nov 16, 2018
70bafa0
change monthly_goal to be amount_goal
captnseagraves Nov 16, 2018
47f4119
commiting yapf changes
captnseagraves Nov 17, 2018
464feab
add isort back inro pre-hook config
captnseagraves Nov 17, 2018
f0f2517
Merge pull request #2853 from gitcoinco/qa_fixes
captnseagraves Nov 17, 2018
03cfc22
qa fixes
thelostone-mc Nov 19, 2018
79676d5
Merge pull request #2880 from thelostone-mc/grants-fix
thelostone-mc Nov 19, 2018
f8d9bfb
detail: css fixes
thelostone-mc Nov 19, 2018
30f5537
Merge pull request #2881 from thelostone-mc/grants-fix
thelostone-mc Nov 19, 2018
bad8c05
make default required periodSeconds 0 instead of 30 days and remove y…
captnseagraves Nov 19, 2018
bc39821
cancel_subscription functionality working
captnseagraves Nov 19, 2018
d68ea0c
min value of amount_goal in grants/new validation implemented
captnseagraves Nov 19, 2018
338aa16
rename input_name to input_title in grants/new to prevent chrome user…
captnseagraves Nov 19, 2018
bbebbe3
grants/details display long titles and urls, while remaining editable
captnseagraves Nov 19, 2018
8446d35
Qa fixes (#2889)
captnseagraves Nov 19, 2018
799713a
Merge branch 'grants' into qa_fixes
captnseagraves Nov 19, 2018
c451849
inactive subscriptions no longer showing in grants/details
captnseagraves Nov 19, 2018
f9ca1a2
milestones now refer to due dates and completion dates, instead of st…
captnseagraves Nov 19, 2018
e3ae0a9
saving raw frequency, frequency_unit, real_period_seconds, and token_…
captnseagraves Nov 20, 2018
b756d3b
smooth out typos in models and templates for previous commit. All wor…
captnseagraves Nov 20, 2018
a6f17c5
fix css height on detail page
thelostone-mc Nov 20, 2018
aba8e11
changed line length in forms.py and copy in details
captnseagraves Nov 20, 2018
30efda5
updating tooltip for grants
thelostone-mc Nov 20, 2018
1963db7
Merge pull request #2896 from gitcoinco/qa_fixes
captnseagraves Nov 20, 2018
12fbf0c
Adjust grants views/paths to use slug from title, add creator to team…
mbeacom Nov 20, 2018
3270bab
remove ETH and add Any Token to token drop downs. Also, ensure that u…
captnseagraves Nov 21, 2018
9ba8a7e
qa changes (#2910)
thelostone-mc Nov 21, 2018
1e8b04a
Update migrations
mbeacom Nov 21, 2018
2338563
update doc strings
thelostone-mc Nov 21, 2018
7dc3333
Add DRF serializers and base viewsets for grants
mbeacom Nov 21, 2018
66918a0
added label
thelostone-mc Nov 21, 2018
a600a63
Merge branch 'master' into grants
mbeacom Nov 21, 2018
9fa662d
css fixes
thelostone-mc Nov 22, 2018
c497823
rename grant/fund_grant.js to grant/fund.js
thelostone-mc Nov 22, 2018
bacc0ea
Fix new grants reverse name in the grants_nav.html
SaptakS Nov 26, 2018
dcf49a5
Merge pull request #2941 from SaptakS/fix/nav_new_grants
thelostone-mc Nov 26, 2018
f5c3fb8
Fix my grants reverse url
SaptakS Nov 26, 2018
27764e7
Merge pull request #2942 from SaptakS/fix_nav_grants
thelostone-mc Nov 26, 2018
958faf6
Remove the duplicate view and url for grants in dashboard
SaptakS Nov 26, 2018
64f428a
Merge pull request #2943 from SaptakS/remove_duplicate_url
thelostone-mc Nov 26, 2018
f0e8946
grants/fund : redesign
thelostone-mc Nov 22, 2018
9b4f7f7
grants/fund: added summary
thelostone-mc Nov 22, 2018
6db4463
grants: added metamask connect banner across new + fund + cancel
thelostone-mc Nov 24, 2018
c851a35
grant/fund : fixed variable not declared
thelostone-mc Nov 26, 2018
68affd3
lint fix
thelostone-mc Nov 26, 2018
1c5d869
Merge pull request #2921 from thelostone-mc/grants
thelostone-mc Nov 26, 2018
85b5029
Refactor landing poage for grants
SaptakS Nov 26, 2018
7afdd3d
css + grid fixes
thelostone-mc Nov 26, 2018
24e698b
Merge pull request #2944 from SaptakS/grant_landing_new
thelostone-mc Nov 26, 2018
1c85b75
css fixes
thelostone-mc Nov 26, 2018
1bab5e2
commented out conflicting lines in grants/migrations_005, and merged …
captnseagraves Nov 26, 2018
8410d0e
grant/cancel-contribute revamp
thelostone-mc Nov 26, 2018
dfd97b2
review feedback: DRY fund + cancel code
thelostone-mc Nov 26, 2018
7ec3641
qa fixes
thelostone-mc Nov 26, 2018
a30b60a
add pgweb
captnseagraves Nov 26, 2018
834f395
added metamask unlock fix
thelostone-mc Nov 26, 2018
b41fd07
Merge pull request #2946 from thelostone-mc/grants
thelostone-mc Nov 26, 2018
4546003
implemented contract versioning state variable.
captnseagraves Nov 26, 2018
ffa71b0
implementing data and propogating to web3 functionality
captnseagraves Nov 26, 2018
98489db
Merge branch 'ks_rebase_migration_fixes' into ks_contract_versioning
captnseagraves Nov 26, 2018
6855f95
add migrations for new field
captnseagraves Nov 26, 2018
278d5c8
fixed variable scoping
captnseagraves Nov 26, 2018
a406244
remove pgweb
captnseagraves Nov 26, 2018
6acef6e
resolve conflicts
captnseagraves Nov 26, 2018
59018a2
refactor to have function in grants/shared.js
captnseagraves Nov 26, 2018
eb21f08
remove console logs
captnseagraves Nov 26, 2018
22fe0d7
uncomment migration_005 function call
captnseagraves Nov 26, 2018
43f1360
fixed grants/nav
thelostone-mc Nov 27, 2018
4952473
Adjust grant admin.py based on model changes and merge migrations
mbeacom Nov 27, 2018
abc9c68
Merge pull request #2951 from gitcoinco/ks_contract_versioning
captnseagraves Nov 27, 2018
b6a3f05
remove duplicate migrations_merge
captnseagraves Nov 27, 2018
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
5 changes: 3 additions & 2 deletions app/assets/v2/css/grants/fund.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.admin_profile a {
color: #43484D;
.admin_profile a,
.grant-link a {
color: #0D0764;
}

#grants_form input {
Binary file removed app/assets/v2/images/bitmap.png
Binary file not shown.
Binary file added app/assets/v2/images/grants/logos/0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/v2/images/grants/logos/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/v2/images/grants/logos/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/v2/images/grants/logos/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/assets/v2/images/grants/logos/4.png
Binary file not shown.
37 changes: 37 additions & 0 deletions app/grants/templates/grants/banner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{% load static humanize i18n grants_extra %}

<div class="col-12 grant-banner py-5 row mx-0">
<div class="col-12 offset-md-2 col-md-3 py-4 banner-img">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
</div>
<div class="col-12 offset-sm-1 col-sm-10 col-md-4 ml-md-5 py-4 my-auto">
<h1 class="font-title-xl grant-title mb-3">
<a href="{{ grant.reference_url }}" target="_blank">{{ grant.title }}</a>
</h1>

<div class="admin_profile">
{% trans "by" %}
<a href="{% url 'profile' grant.admin_profile.handle %}">
{{ grant.admin_profile }}
</a>
</div>

<div class="grant__progress mt-4">
<div class="progress">
<div class="progress-bar" style="width:{{ grant.percent_completed }}%"></div>
</div>
<div class="progress-text mt-2">
<div class="row">
<div class="col-6">
<span>{{ grant.amount_received|floatformat:2|intcomma }} DAI</span>
<p>Current</p>
</div>
<div class="col-6 text-right">
<span>{{ grant.amount_goal|floatformat:2|intcomma }} DAI</span>
<p>Goal</p>
</div>
</div>
</div>
</div>
</div>
</div>
115 changes: 47 additions & 68 deletions app/grants/templates/grants/cancel.html
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@
<head>
{% include 'shared/head.html' %}
{% include 'shared/cards.html' %}
<link rel="stylesheet" href="{% static "v2/css/grants/fund.css" %}">
</head>
<body class="interior {{ active }} grant">
{% include 'shared/tag_manager_2.html' %}
@@ -35,87 +36,65 @@
</div>
</div>
</div>
<img src="{% static "v2/images/bitmap.png" %}" width="100%" />

<div class="alpha-warning font-caption">
<div>
{% trans "WARNING: Gitcoin Grants is in" %}
<span class="font-weight-bold">ALPHA</span>
{% trans "release." %}
</div>
<div>
{% trans "It has had inital audits done on it's smart contract and we are in the process of testing it holistically. Please, use caution and do not send high amounts of value." %}
</div>
</div>

<div class="row">
<div id="robot_error" class="hidden my-5">
<img src="{% static "v2/images/prime.png" %}">
</div>
</div>

<div id="grants_form">
<h2 class="my-5 text-center">
<div class="mb-2 font-title-lg">
{% trans "Cancel contribution for" %}
<a href="{{ grant.reference_url }}" target="_blank">
{{ grant.title }}
</a>
{% trans "Grant" %}
</div>
</h2>
<div class="row" id="grants_form">

<div class="container">
<div class="row mb-4">
<div class="col-6">
<div class="grant__progress mt-4 cancel">
<div class="progress">
<div class="progress-bar" style="width:{{ grant.percent_completed }}%"></div>
</div>
<div class="col-12 text-center mt-md-3">
<h2 class="font-title-lg my-4">{% trans "Cancel Contribution" %}</h2>
</div>

{% include 'grants/banner.html' %}

<div class="progress-text mt-2">
<div class="row">
<div class="col-6">
<span>{{ grant.amount_received }} ETH</span>
<p>Current</p>
</div>
<div class="col-6 text-right">
<span>{{ grant.amount_goal }} ETH</span>
<p>Goal</p>
</div>
</div>
</div>
</div>
<div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-5 mt-5 font-subheader mx-0 mx-md-auto row">

<div class="row dates">
<div class="col-6">
{% trans "Start date:" %} {{ subscription.created_on|date:"M d, Y" }}
</div>
<div class="col-6 text-right">
{% trans "Effective date of cancel:" %} {{ now|date:"M d, Y" }}
</div>
</div>
<div class="col-12 summary font-body my-4">
<p class="mb-2 font-weight-semibold">Summary</p>
<p>
<i class="fas fa-circle mr-2"></i>
{% trans "Your contribution will be cancelled from" %}
<span class="font-weight-semibold">{{ now|date:"M d, Y" }}</span>
</p>
</div>

<div class="row mt-4">
<div class="col-6">
<a href="{% url 'grants:details' grant.id grant.slug %}">
<button class="button button--cancel button--full">{% trans "Cancel" %}
</button>
</a>
</div>
<div class="col-6">
<form method="POST" id="js-cancelSubscription">
{% csrf_token %}
<button class="button button--primary button--full">{% trans "Cancel Contribution" %}
</button>
<input type="hidden" id="contract_address" name="contract_address" value="{{ grant.contract_address }}">
<input type="hidden" id="contract_version" name="contract_version" value="{{ grant.contract_version }}">
<input type="hidden" id="admin_address" name="admin_address" value="{{ grant.admin_address }}">
<input type="hidden" id="token_address" name="token_address" value="{{ subscription.token_address }}">
<input type="hidden" id="amount_per_period" name="amount_per_period" value="{{ subscription.amount_per_period }}">
<input type="hidden" id="real_period_seconds" name="real_period_seconds" value="{{ subscription.real_period_seconds }}">
<input type="hidden" id="signature" name="signature" value="{{ subscription.contributor_signature }}">
<input type="hidden" id="gas_price" name="gas_price" value="{{ subscription.gas_price }}">
</form>
</div>
</div>
</div>
<div class="col-12 my-4">
<form method="POST" id="js-cancelSubscription">
{% csrf_token %}
<button class="button button--primary button--warning button--full">{% trans "Cancel Contribution" %}
</button>
<input type="hidden" id="contract_address" name="contract_address" value="{{ grant.contract_address }}">
<input type="hidden" id="contract_version" name="contract_version" value="{{ grant.contract_version }}">
<input type="hidden" id="admin_address" name="admin_address" value="{{ grant.admin_address }}">
<input type="hidden" id="token_address" name="token_address" value="{{ subscription.token_address }}">
<input type="hidden" id="amount_per_period" name="amount_per_period" value="{{ subscription.amount_per_period }}">
<input type="hidden" id="real_period_seconds" name="real_period_seconds" value="{{ subscription.real_period_seconds }}">
<input type="hidden" id="signature" name="signature" value="{{ subscription.contributor_signature }}">
<input type="hidden" id="gas_price" name="gas_price" value="{{ subscription.gas_price }}">
</form>
</div>

<div class="col-6">
<p>
{{ grant.description }}
</p>
</div>
<div class="col-12 mt-3 mb-5 text-center grant-link font-body">
<a href="{% url 'grants:details' grant.id grant.slug %}">
{% trans "No I do not want to cancel my contribution" %}
</a>
</div>

</div>
</div>

2 changes: 1 addition & 1 deletion app/grants/templates/grants/card.html
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<div class="grant-item">
<a href="{% url 'grants:details' grant.id grant.slug %}">
<div class="grant-item__img">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3|add:1 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
</div>
<div class="grant-item__content py-4 px-3">
<h2 class="grant-item__title font-subheader"><a href="{% url 'grants:details' grant.id grant.slug %}">{{ grant.title|truncatechars:60 }}</a></h2>
17 changes: 9 additions & 8 deletions app/grants/templates/grants/detail.html
Original file line number Diff line number Diff line change
@@ -33,10 +33,10 @@
<div class="grant__header py-5">
<div class="container">
<div class="row">
<div class="grant-banner col-12 col-lg-6 col-xl-5 p-0 mb-5 my-md-auto">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3|add:1 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
<div class="grant-banner col-12 col-lg-6 pr-lg-5 p-0 mb-5 my-md-auto">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
</div>
<div class="col-12 col-lg-6 offset-xl-1 col-xl-5">
<div class="col-12 col-lg-6">
<div class="row">
<div class="col-12">
<div class="grant__specs">
@@ -156,6 +156,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
<div class="container py-5">
<div class="row">
<div class="col-12 col-md-6 pl-lg-0">
<p class="font-body sub-title">{% trans "Description" %}</p>
<p class="grant__description font-subheader pr-lg-4 mb-5">
{% if is_admin %}
<textarea id="form--input__description" class="p-0 mt-2 inline-edit" disabled>{{ grant.description }}</textarea>
@@ -170,7 +171,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
<div class="grant-item__member mb-4">
{% if is_admin %}
<div class="font-body">
<p class="font-body sub-title">Team Members</p>
<p class="font-body sub-title">{% trans "Team Members" %}</p>
<div class="form__select2">
<select id="grant-members" class="form__input" name="grant-members" name="members" multiple="multiple" disabled>
{% for team_member in grant.team_members.all %}
@@ -181,7 +182,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
</div>
{% else %}
{% if grant.team_members %}
<p class="font-body sub-title">Team Members ({{ grant.team_members.all|length }})</p>
<p class="font-body sub-title">{% trans "Team Members" %} ({{ grant.team_members.all|length }})</p>
<div class="grant-item__members font-body">
{% for team_member in grant.team_members.all %}
<div class="grant-item__member mr-4">
@@ -220,7 +221,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
<div class="update-milestone pt-4">
<div class="container mt-4">
<div class="row">
<div class="col-12 order-md-2 col-md-4">
<div class="col-12 order-md-2 col-md-6">
<p>
{% trans "Milestones" %}
{% if is_admin %}<a href="{% url 'grants:milestones' grant.id grant.slug %}" class="milestones-edit">{% trans "Edit Milestones" %}</a>{% endif %}
@@ -247,10 +248,10 @@ <h5 class="font-body mt-2 font-weight-semibold">
</div>
</div>

<div class="col-12 order-md-1 col-md-8 p-md-0">
<div class="col-12 order-md-1 col-md-6 p-md-0">
<div id="tabs">
<ul>
<li><a href="#all-updates">{% trans "Updates" %}</a></li>
<li><a href="#all-updates" class="pt-md-0">{% trans "Updates" %}</a></li>
</ul>
<div id="all-updates" class="p-0">
{% if is_admin %}
41 changes: 4 additions & 37 deletions app/grants/templates/grants/fund.html
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
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 static humanize i18n grants_extra %}
{% load static humanize i18n %}
<!DOCTYPE html>
<html lang="en">
<head>
@@ -56,44 +56,11 @@

<div class="row" id="grants_form">
<div class="col-12 text-center mt-md-3">
<h2 class="font-title-lg my-5">{% trans "Fund Grant" %}</h2>
<h2 class="font-title-lg my-4">{% trans "Fund Grant" %}</h2>
</div>
<div class="col-12 grant-banner py-5 row mx-0">
<div class="col-12 offset-md-2 col-md-3 py-4 banner-img">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3|add:1 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
</div>
<div class="col-12 col-md-4 offset-md-1 ml-md-5 py-4 my-auto">
<h1 class="font-title-xl grant-title mb-3">
<a href="{{ grant.reference_url }}" target="_blank">{{ grant.title }}</a>
</h1>

<div class="admin_profile">
{% trans "by" %}
<a href="{% url 'profile' grant.admin_profile.handle %}">
{{ grant.admin_profile }}
</a>
</div>

<div class="grant__progress mt-4">
<div class="progress">
<div class="progress-bar" style="width:{{ grant.percent_completed }}%"></div>
</div>
<div class="progress-text mt-2">
<div class="row">
<div class="col-6">
<span>{{ grant.amount_received|floatformat:2|intcomma }} DAI</span>
<p>Current</p>
</div>
<div class="col-6 text-right">
<span>{{ grant.amount_goal|floatformat:2|intcomma }} DAI</span>
<p>Goal</p>
</div>
</div>
</div>
</div>

</div>
</div>
{% include 'grants/banner.html' %}

<div class="col-12 offset-md-2 col-md-10 offset-lg-3 col-lg-6 mt-5 font-subheader mx-0 mx-md-auto row">
<p class="col-12 font-weight-semibold my-4">
{{ grant.admin_profile }} {% trans "is accepting contributions in "%}
2 changes: 1 addition & 1 deletion app/grants/templates/grants/index.html
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ <h1 class="font-title-xl">{% trans 'Provide sustainable funding for Open Source
{% blocktrans %}
Gitcoin Grants, powered by the <a target="_blank" rel="noopener noreferrer" href="http://1337alliance.com/">EIP 1337 standard</a>
, are a fast, easy and secure way to provide recurring token contributions to your favorite OSS maintainers. <br/><br/>
Show your appreciation for maintainers in your dependancy tree with a Gitcoin Grant today.
Show your appreciation for maintainers in your dependency tree with a Gitcoin Grant today.
{% endblocktrans %}
</p>
<a class="btn btn-gc-blue" href="{% url 'grants:new' %}">
2 changes: 1 addition & 1 deletion app/retail/templates/emails/grants/new_grant.html
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ <h1>{% trans "New Grant Created" %}</h1>

<hr>

<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3|add:1 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}" alt="grant logo" width="25%" >
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}" alt="grant logo" width="25%" >

<p class="grant-email-name">{{ grant.title }}</p>
<p class="grant-email-subtitle">{{ grant.description }}</p>
Original file line number Diff line number Diff line change
@@ -114,7 +114,7 @@ <h2 style="text-transform: none;">{% trans "The world of open source is a better
<hr>
<div class="grantInfo">
<a href="{% url 'grants:details' grant.id grant.slug %}">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3|add:1 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}" width="50" height="50" />
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}" width="50" height="50" />
</a>
<br>
<a class="grantInfoName" href="{% url 'grants:details' grant.id grant.slug %}">