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

Dashboard #4588

Merged
merged 51 commits into from
Jul 31, 2019
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3db853a
begining of dashboard
octavioamu Jun 6, 2019
1ac38ef
remove reverse test for dashboard
octavioamu Jun 6, 2019
99fcc8e
add fetch
octavioamu Jun 6, 2019
63d6c77
add fields
octavioamu Jun 7, 2019
28b404e
change query
octavioamu Jun 8, 2019
ae76015
add interest
octavioamu Jun 11, 2019
209dacd
change query
octavioamu Jun 12, 2019
943fa31
Merge branch 'master' into dashboard
octavioamu Jun 12, 2019
b18a199
initial bounty lists and details
danlipert Jul 4, 2019
a0b7112
add expires_date
danlipert Jul 4, 2019
e65e56c
add interest profiles
danlipert Jul 5, 2019
8d347f3
add fulfillments
danlipert Jul 5, 2019
864d022
add else case
danlipert Jul 5, 2019
0bcdafe
fix bugs, add metadata
danlipert Jul 8, 2019
5dcc27c
fix typos
danlipert Jul 8, 2019
b51435c
Merge branch 'master' into dashboard-backend
danlipert Jul 8, 2019
6a9c52f
Merge branch 'master' into dashboard
octavioamu Jul 15, 2019
71362bf
Merge branch 'dashboard' of github.com:gitcoinco/web into dashboard
octavioamu Jul 15, 2019
8a48f01
Merge branch 'dashboard-backend' into dashboard
octavioamu Jul 15, 2019
661a987
add style
octavioamu Jul 16, 2019
8fbed4b
ui changes
octavioamu Jul 16, 2019
8417a5d
add actions
octavioamu Jul 17, 2019
616e583
wip
danlipert Jul 17, 2019
859500b
Merge branch 'master' into dashboard
octavioamu Jul 18, 2019
a0164d0
remove scripts
octavioamu Jul 18, 2019
297c03e
split into 3 endpoints with count
danlipert Jul 19, 2019
2a94c33
Merge branch 'dashboard-backend' of github.com:gitcoinco/web into das…
danlipert Jul 19, 2019
df6e9a1
Merge branch 'master' into dashboard-backend
octavioamu Jul 21, 2019
e8ef029
add requests and styles
octavioamu Jul 21, 2019
8c001a2
Merge branch 'dashboard-backend' into dashboard
octavioamu Jul 21, 2019
a432474
add be values
octavioamu Jul 21, 2019
22cac2c
lint
octavioamu Jul 21, 2019
62bf5cb
Merge branch 'master' into dashboard
octavioamu Jul 21, 2019
71d5d9e
Merge branch 'master' of github.com:gitcoinco/web into dashboard
octavioamu Jul 21, 2019
0d0834f
Merge branch 'dashboard' of github.com:gitcoinco/web into dashboard
octavioamu Jul 21, 2019
b286617
remove separated app
octavioamu Jul 21, 2019
5b273ea
add empty state
octavioamu Jul 23, 2019
60b2683
cleanup
octavioamu Jul 24, 2019
8ecde89
change copy
octavioamu Jul 24, 2019
24a8ec9
add link to dashboard
octavioamu Jul 24, 2019
919067c
add contributor dashboard
octavioamu Jul 26, 2019
65263c9
add contributor actions
octavioamu Jul 29, 2019
16aebf7
add loading
octavioamu Jul 29, 2019
14d50af
add contrib loading
octavioamu Jul 29, 2019
4fdbfbf
lint fixes
octavioamu Jul 29, 2019
bd1cb6f
default to funder
octavioamu Jul 29, 2019
a29b0e7
owocki feedback
octavioamu Jul 29, 2019
db1f71d
mobile love
octavioamu Jul 30, 2019
130132b
add pending interest
octavioamu Jul 30, 2019
d907448
remove comments
octavioamu Jul 31, 2019
3550cfa
Merge branch 'master' into dashboard
danlipert Jul 31, 2019
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
9 changes: 0 additions & 9 deletions app/app/tests/test_app_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,6 @@ def test_faucet_resolve(self):
self.assertEqual(resolve('/faucet').view_name, 'faucet')
self.assertEqual(resolve('/faucet/').view_name, 'faucet')

def test_dashboard_reverse(self):
"""Test the dashboard url and check the reverse."""
self.assertEqual(reverse('dashboard'), '/dashboard')

def test_dashboard_resolve(self):
"""Test the dashboard url and check the resolution."""
self.assertEqual(resolve('/dashboard').view_name, 'dashboard')
self.assertEqual(resolve('/dashboard/').view_name, 'dashboard')

def test_explorer_reverse(self):
"""Test the explorer url and check the reverse."""
self.assertEqual(reverse('explorer'), '/explorer')
Expand Down
11 changes: 10 additions & 1 deletion app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@
# inbox
path('inbox/', include('inbox.urls', namespace='inbox')),

# board
path('dashboard/', dashboard.views.board, name='dashboard'),

# kudos
path('kudos/', kudos.views.about, name='kudos_main'),
path('kudos/about/', kudos.views.about, name='kudos_about'),
Expand Down Expand Up @@ -132,9 +135,15 @@
re_path(r'^onboard/(?P<flow>\w+)/$', dashboard.views.onboard, name='onboard'),
re_path(r'^onboard/contributor/avatar/?$', dashboard.views.onboard_avatar, name='onboard_avatar'),
url(r'^postcomment/', dashboard.views.post_comment, name='post_comment'),
url(r'^dashboard/?', dashboard.views.dashboard, name='dashboard'),
url(r'^explorer/?', dashboard.views.dashboard, name='explorer'),

# Funder dashboard
path('funder_dashboard/<str:bounty_type>/', dashboard.views.funder_dashboard, name='funder_dashboard'),
path('funder_dashboard/bounties/<int:bounty_id>/', dashboard.views.funder_dashboard_bounty_info, name='funder_dashboard_bounty_info'),

# Contributor dashboard
path('contributor_dashboard/<str:bounty_type>/', dashboard.views.contributor_dashboard, name='contributor_dashboard'),

# Hackathon static page
url(r'^hackathon/ethhack2019', dashboard.views.ethhack, name='ethhack_2019'),
url(r'^hackathon/beyondblocks', dashboard.views.beyond_blocks_2019, name='beyond_blocks_2019'),
Expand Down
95 changes: 95 additions & 0 deletions app/assets/v2/css/board.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
.line-deco:after {
content: '';
position: absolute;
top: 4em;
border: 1px solid #F5F6F6;
bottom: 2em;
left: 2.25em;
}

.list-bounty {
max-height: 100vh;
overflow-y: auto;
padding: 0;
position: relative;
z-index: 1;
background: #fff no-repeat;
background-image: -webkit-radial-gradient(50% 0, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)), -webkit-radial-gradient(50% 100%, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
background-image: -moz-radial-gradient(50% 0, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)), -moz-radial-gradient(50% 100%, farthest-side, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
background-image: radial-gradient(farthest-side at 50% 0, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0)), radial-gradient(farthest-side at 50% 100%, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0));
background-position: 0 0, 0 100%;
background-size: 100% 14px;
}

.list-bounty:before,
.list-bounty:after {
content: "";
position: relative;
z-index: -1;
display: block;
height: 30px;
margin: 0 0 -30px;
background: -webkit-linear-gradient(top, #fff, #fff 30%, rgba(255, 255, 255, 0));
background: -moz-linear-gradient(top, #fff, #fff 30%, rgba(255, 255, 255, 0));
background: linear-gradient(to bottom, #fff, #fff 30%, rgba(255, 255, 255, 0));
}

.list-bounty:after {
margin: -30px 0 0;
background: -webkit-linear-gradient(top, rgba(255, 255, 255, 0), #fff 70%, #fff);
background: -moz-linear-gradient(top, rgba(255, 255, 255, 0), #fff 70%, #fff);
background: linear-gradient(to bottom, rgba(255, 255, 255, 0), #fff 70%, #fff);
}

.list-bounty-item + .list-bounty-item {
border-top: 1px solid #dee2e6;
}

.comment-plan {
color: #666666;
white-space: pre-line;
max-height: 100px;
overflow: hidden;
overflow-y: auto;
background: #F5F6F6;
padding: 1em;
margin-top: 1em;
border-radius: 5px;
}

.head-number {
text-align: center;
}
.head-number_title {
font-size: 12px;
color: #666666;
letter-spacing: 1.5px;
}

.head-number_value {
color: var(--gc-purple);
font-weight: 700;
display: block;
font-size: 2rem;
}

.light-blue {
color: #008EFF;
}

.list-bounty-item_content {
width: 100%;
}

@media (min-width: 768px) {
.list-bounty-item_logo {
width: 40px;
height: 40px;
}
}

@media (min-width: 992px) {
.list-bounty-item_content {
width: 75%;
}
}
130 changes: 130 additions & 0 deletions app/assets/v2/css/vue-loader.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
/* loading */
.rhombus-spinner {
height: 65px;
width: 65px;
position: relative;
transform: rotate(45deg);
margin: auto;
color: #25E899;
}

.rhombus-spinner .rhombus {
height: calc(65px / 7.5);
width: calc(65px / 7.5);
animation-duration: 2000ms;
top: calc(65px / 2.3077);
left: calc(65px / 2.3077);
border-radius: 30px;
background-color: currentColor;
position: absolute;
animation-iteration-count: infinite;
}

.rhombus-spinner .rhombus:nth-child(2n+0) {
margin-right: 0;
}

.rhombus-spinner .rhombus.child-1 {
animation-name: rhombus-spinner-animation-child-1;
animation-delay: calc(100ms * 1);
}

.rhombus-spinner .rhombus.child-2 {
animation-name: rhombus-spinner-animation-child-2;
animation-delay: calc(100ms * 2);
}

.rhombus-spinner .rhombus.child-3 {
animation-name: rhombus-spinner-animation-child-3;
animation-delay: calc(100ms * 3);
}

.rhombus-spinner .rhombus.child-4 {
animation-name: rhombus-spinner-animation-child-4;
animation-delay: calc(100ms * 4);
}

.rhombus-spinner .rhombus.child-5 {
animation-name: rhombus-spinner-animation-child-5;
animation-delay: calc(100ms * 5);
}

.rhombus-spinner .rhombus.child-6 {
animation-name: rhombus-spinner-animation-child-6;
animation-delay: calc(100ms * 6);
}

.rhombus-spinner .rhombus.child-7 {
animation-name: rhombus-spinner-animation-child-7;
animation-delay: calc(100ms * 7);
}

.rhombus-spinner .rhombus.child-8 {
animation-name: rhombus-spinner-animation-child-8;
animation-delay: calc(100ms * 8);
}

.rhombus-spinner .rhombus.big {
height: calc(65px / 3);
width: calc(65px / 3);
top: calc(65px / 3);
left: calc(65px / 3);
background-color: #3E00FF;
animation: rhombus-spinner-animation-child-big 2s infinite;
animation-duration: 2000ms;
animation-delay: 0.5s;
}

@keyframes rhombus-spinner-animation-child-1 {
50% {
transform: translate(-325%, -325%);
}
}

@keyframes rhombus-spinner-animation-child-2 {
50% {
transform: translate(0, -325%);
}
}

@keyframes rhombus-spinner-animation-child-3 {
50% {
transform: translate(325%, -325%);
}
}

@keyframes rhombus-spinner-animation-child-4 {
50% {
transform: translate(325%, 0);
}
}

@keyframes rhombus-spinner-animation-child-5 {
50% {
transform: translate(325%, 325%);
}
}

@keyframes rhombus-spinner-animation-child-6 {
50% {
transform: translate(0, 325%);
}
}

@keyframes rhombus-spinner-animation-child-7 {
50% {
transform: translate(-325%, 325%);
}
}

@keyframes rhombus-spinner-animation-child-8 {
50% {
transform: translate(-325%, 0);
}
}

@keyframes rhombus-spinner-animation-child-big {
50% {
transform: scale(0.5);
}
}
1 change: 1 addition & 0 deletions app/assets/v2/images/zero-bounties.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading