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

bring back old view for ETH #6228

Merged
merged 76 commits into from
Mar 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
86513a3
add details vue
octavioamu Feb 27, 2020
179a1f8
optimize bounty_details view
thelostone-mc Feb 27, 2020
a76ca3f
bounty/details -> bounty/details2
thelostone-mc Feb 27, 2020
5f992b0
fixup issue
thelostone-mc Feb 27, 2020
2f4f6e3
Merge remote-tracking branch 'upstream/master' into new-bounty-detail
thelostone-mc Feb 27, 2020
ff2ddc0
Merge remote-tracking branch 'upstream/master' into xx
thelostone-mc Feb 27, 2020
5c92c37
add activity
octavioamu Feb 27, 2020
be81ba4
update viewset for bounty details
thelostone-mc Feb 27, 2020
3a6dd78
Merge branch 'new-bounty-detail' of github.com:gitcoinco/web into new…
thelostone-mc Feb 27, 2020
94f1288
update activity section
thelostone-mc Feb 27, 2020
965c795
add activities
octavioamu Feb 28, 2020
c95caf3
add qrcode
octavioamu Feb 28, 2020
838b27e
qrcode formating
octavioamu Feb 28, 2020
6d103b4
remove scroll on nav + added funder section
thelostone-mc Feb 28, 2020
006388b
add if check
thelostone-mc Feb 28, 2020
c3d4169
api: refactor + new endpoint for ETC payout
thelostone-mc Feb 28, 2020
82be765
minor fix
thelostone-mc Feb 28, 2020
b5086e9
Merge pull request #6094 from gitcoinco/etc-fulfill
octavioamu Feb 28, 2020
cd34b92
add btn logic
octavioamu Feb 28, 2020
6953d28
update serializer
thelostone-mc Feb 28, 2020
d890d72
Merge branch 'new-bounty-detail' of github.com:gitcoinco/web into new…
thelostone-mc Feb 28, 2020
5096cbc
fix incorrect check
thelostone-mc Feb 28, 2020
8e4c832
missing migration
octavioamu Feb 28, 2020
20a816b
add more state checkers
octavioamu Feb 29, 2020
25330c8
wire up API endpoint
thelostone-mc Feb 29, 2020
c41bd70
minor fixes
thelostone-mc Feb 29, 2020
3df0ca3
port modals
octavioamu Feb 29, 2020
f97d672
pre cleanup
octavioamu Feb 29, 2020
646c2bd
2 bind data way
octavioamu Feb 29, 2020
5dbacbe
fixed up backend API to test
thelostone-mc Mar 1, 2020
683c8ed
resolve conflicts
thelostone-mc Mar 1, 2020
f5080c2
BE + FE wiring for payout
thelostone-mc Mar 1, 2020
cfa983a
str -> float
thelostone-mc Mar 2, 2020
149bd3b
fix typo
octavioamu Mar 2, 2020
39f1955
uncomment explorer code
octavioamu Mar 2, 2020
2ebff2d
resolved conflicts
thelostone-mc Mar 9, 2020
41f0b77
add admin helper buttons
thelostone-mc Mar 10, 2020
278ee60
fixes
thelostone-mc Mar 10, 2020
9fa0e75
fix staff options
octavioamu Mar 10, 2020
30501b9
fix stylelint
octavioamu Mar 11, 2020
1f6726c
add client side checks to fulfillment
thelostone-mc Mar 11, 2020
55efb0f
Merge remote-tracking branch 'upstream/new-bounty-detail' into new-bo…
thelostone-mc Mar 11, 2020
cd2b76a
add ability to close bounty
thelostone-mc Mar 11, 2020
a55b860
fix ff support
octavioamu Mar 11, 2020
1ff39b7
Merge branch 'master' into new-bounty-detail
octavioamu Mar 11, 2020
3c14067
fix migrations
octavioamu Mar 11, 2020
482f2e8
Fix sync model
octavioamu Mar 12, 2020
a0cc708
add sync
octavioamu Mar 13, 2020
65d08cb
Merge branch 'master' into new-bounty-detail
octavioamu Mar 13, 2020
1be2ac6
Merge branch 'master' into new-bounty-detail
octavioamu Mar 13, 2020
d2a08cb
fix web3connect in bounty create flow
thelostone-mc Mar 13, 2020
712d5fb
5s -> 1s
thelostone-mc Mar 13, 2020
b6abead
remove extra div
thelostone-mc Mar 13, 2020
b5592ef
Merge pull request #6221 from thelostone-mc/new-bounty-detail
thelostone-mc Mar 13, 2020
c3a51be
add activity
octavioamu Mar 13, 2020
6e71560
fix update boutny details for ETC
thelostone-mc Mar 14, 2020
b1b78de
fixed up activity for bounty increased
thelostone-mc Mar 14, 2020
dae67eb
wire in stop work
thelostone-mc Mar 14, 2020
37b5716
fix ETH network in sync post
danlipert Mar 14, 2020
945478e
fix up start work on bounties
thelostone-mc Mar 14, 2020
973496f
minor fixes
thelostone-mc Mar 14, 2020
923cfc4
bring back old view for ETH
thelostone-mc Mar 14, 2020
ffb67ce
add projects to new bounty details
danlipert Mar 14, 2020
4baff19
fix qr code modal and render
danlipert Mar 14, 2020
cd55ef5
add block explorer links for etc payout
danlipert Mar 14, 2020
09369ef
from new-bounty-detail
octavioamu Mar 15, 2020
457694b
fix loading rhombus position
octavioamu Mar 15, 2020
fa05bcf
a buncha fixes OAD
danlipert Mar 15, 2020
e925db0
fix payout button
danlipert Mar 15, 2020
2ce59e8
fix payout button for funder
danlipert Mar 15, 2020
0079281
fix payout
danlipert Mar 15, 2020
831701b
hide stop work button if user has submitted
thelostone-mc Mar 16, 2020
8c39d4e
clean up payout for ETC
thelostone-mc Mar 16, 2020
1b05098
fix up warning box
thelostone-mc Mar 16, 2020
2dbbd5e
Merge remote-tracking branch 'upstream/master' into fail_safe
thelostone-mc Mar 16, 2020
aedc8bc
fix migration conflicts
thelostone-mc Mar 16, 2020
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
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ app/assets/v2/js/ethereumjs-accounts.js
app/assets/onepager/js/tx.js
app/assets/onepager/js/bignumber.js

app/assets/v2/js/lib/emoji-button.js
app/assets/v2/js/lib/emoji-button.js
app/assets/v2/js/lib/vue.js
app/assets/v2/js/lib/qrcode.js
2 changes: 1 addition & 1 deletion app/app/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def preprocess(request):
'github_handle': request.user.username if user_is_authenticated else False,
'email': request.user.email if user_is_authenticated else False,
'name': request.user.get_full_name() if user_is_authenticated else False,
'last_chat_status': request.user.profile.last_chat_status if user_is_authenticated else False,
'last_chat_status': request.user.profile.last_chat_status if (hasattr(request.user, 'profile') and user_is_authenticated) else False,
'raven_js_version': settings.RAVEN_JS_VERSION,
'raven_js_dsn': settings.SENTRY_JS_DSN,
'release': settings.RELEASE,
Expand Down
3 changes: 2 additions & 1 deletion app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
url('^api/v1/bounty/create', dashboard.views.create_bounty_v1, name='create_bounty_v1'),
url('^api/v1/bounty/cancel', dashboard.views.cancel_bounty_v1, name='cancel_bounty_v1'),
url('^api/v1/bounty/fulfill', dashboard.views.fulfill_bounty_v1, name='fulfill_bounty_v1'),
path('api/v1/bounty/<int:bounty_id>/close', dashboard.views.close_bounty_v1, name='close_bounty_v1'),
path('api/v1/bounty/payout/<int:fulfillment_id>', dashboard.views.payout_bounty_v1, name='payout_bounty_v1'),
re_path(r'.*api/v0.1/chat/presence$', chat.views.chat_presence, name='chat_presence'),

# inbox
Expand Down Expand Up @@ -371,7 +373,6 @@

# sync methods
url(r'^sync/web3/?', dashboard.views.sync_web3, name='sync_web3'),
url(r'^sync/etc/?', dashboard.views.sync_etc, name='sync_etc'),
url(r'^sync/get_amount/?', dashboard.helpers.amount, name='helpers_amount'),
re_path(r'^sync/get_issue_details/?', dashboard.helpers.issue_details, name='helpers_issue_details'),

Expand Down
4 changes: 2 additions & 2 deletions app/assets/v2/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ a {
margin-left: 0;
}

.interior .container-fluid {
/* .interior .container-fluid {
padding-left: 0;
padding-right: 0;
}
} */

.with-grey-background .body {
background-color: #eee !important;
Expand Down
113 changes: 63 additions & 50 deletions app/assets/v2/css/bounty.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ body {
text-transform: capitalize;
}

.avatar {
width: 50px;
height: 50px;
margin: 0px auto;
border-radius: 50px;
margin-top: 0px;
}

.invite-user .avatar {
width: 5.5rem;
height: 5.5rem;
Expand Down Expand Up @@ -71,19 +79,11 @@ body {
font-style: italic;
}

.bounty_details .avatar {
width: 50px;
height: 50px;
margin: 0px auto;
border-radius: 50px;
margin-top: 0px;
}

.bounty_details .avatar.Azure-Samples {
border-radius: 0px;
}

#avatar_url .avatar {
.avatar-big {
width: 80px;
height: 80px;
}
Expand Down Expand Up @@ -170,8 +170,9 @@ body {
color: #3E00FF;
}

#issue_description {
.issue_description {
color: #000000;
font-size: 14px;
}

.bounty-subheading {
Expand All @@ -185,7 +186,7 @@ body {

.bounty-info-heading {
color: #0D0764;
font-weight: 600;
font-weight: 500;
text-transform: capitalize;
}

Expand Down Expand Up @@ -270,11 +271,6 @@ body {
font-weight: bold;
}

#bounty_reserved_for a {
margin-left: 5px;
font-weight: bold;
}

.bounty-actions {
display: inherit;
}
Expand Down Expand Up @@ -380,19 +376,6 @@ a.btn {
transform: none;
}

#bounty_reserved_for img {
vertical-align: top;
margin-left: 3px;
margin-top: -2px;
}

#btn-white img {
position: absolute;
width: 1.313rem;
top: 0.4375rem;
right: 0.4375rem;
}

.comment {
border-left: 1px solid #979797;
padding-right: 20px;
Expand Down Expand Up @@ -439,6 +422,38 @@ a.btn {
margin-bottom: 2em;
}

.issue_description img {
max-height: 30rem;
max-width: 100%;
cursor: zoom-in;
display: block;
margin-top: 1rem;
margin-bottom: 1rem;
}

.issue_description h1,
.issue_description h2,
.issue_description h3,
.issue_description h4,
.issue_description h5,
.issue_description h6 {
letter-spacing: 1px;
font-size: 16px;
margin-top: 15px;
text-transform: none;
}

#bounty_reserved_for img {
vertical-align: top;
margin-left: 3px;
margin-top: -2px;
}

#bounty_reserved_for a {
margin-left: 5px;
font-weight: bold;
}

#funder_notif_info:empty {
display: none;
}
Expand All @@ -460,27 +475,6 @@ a.btn {
top: -2px;
}

#bounty_details #issue_description img {
max-height: 30rem;
max-width: 30rem;
cursor: pointer;
display: block;
margin-top: 1rem;
margin-bottom: 1rem;
}

#bounty_details #issue_description h1,
#bounty_details #issue_description h2,
#bounty_details #issue_description h3,
#bounty_details #issue_description h4,
#bounty_details #issue_description h5,
#bounty_details #issue_description h6 {
letter-spacing: 1px;
font-size: 16px;
margin-top: 15px;
text-transform: none;
}

#started_owners_username,
#fulfilled_owners_username,
#submitted_owners_username {
Expand Down Expand Up @@ -752,6 +746,21 @@ a.btn {
padding: 0 25px;
}

.payout-input-amount-container input {
border-top: none;
border-left: none;
border-right: none;
max-width: 5rem;
outline: none;
color: #03B16B;
}

.payout-input-amount-container input::-webkit-outer-spin-button,
.payout-input-amount-container input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}

@media (max-width: 575.98px) {

#timer {
Expand Down Expand Up @@ -856,3 +865,7 @@ a.btn {
0% { transform: translateY(0); }
100% { transform: translateY(-3rem); }
}

.qrcode {
display: inline-block;
}
Loading