From 0744ed792d76e7a0399e8b4cc9c6606c0693130d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Angel=20Gordi=C3=A1n?= Date: Wed, 7 Oct 2020 05:45:17 -0500 Subject: [PATCH] Add participants pre hack (#7545) * Add participants pre hack style * Remove dummy text * Validate hackathon id exists to fetch user projects * Remove extra css * Remove validation to display participants before the hackathon start Co-authored-by: Abdulhakeem Adetunji Mustapha --- .../components/participant-card-pre-hack.html | 72 ++++++++++ .../components/participant-card.html | 121 +++++++++++++++++ .../templates/dashboard/index-vue.html | 123 ++---------------- app/dashboard/views.py | 31 ++++- 4 files changed, 234 insertions(+), 113 deletions(-) create mode 100644 app/dashboard/templates/dashboard/components/participant-card-pre-hack.html create mode 100644 app/dashboard/templates/dashboard/components/participant-card.html diff --git a/app/dashboard/templates/dashboard/components/participant-card-pre-hack.html b/app/dashboard/templates/dashboard/components/participant-card-pre-hack.html new file mode 100644 index 00000000000..8d5be4052be --- /dev/null +++ b/app/dashboard/templates/dashboard/components/participant-card-pre-hack.html @@ -0,0 +1,72 @@ +{% comment %} + Copyright (C) 2020 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +{% endcomment %} +{% load i18n static %} +
+
+ + ${user.handle} Avatar + +
+
+ + ${user.handle} Avatar + +
+ [[ user.name || user.handle ]] @[[user.handle]] + + verify badget + +
+ + [[ user.country ]] + +
+
+

[[ user.desc ]]

+
+ Why am I here? +

[[ user.intro ]]

+
+
+ Projects +
+ + [[ user.project_name ]] + Not started + Currently building a project + Looking for team members + Looking for a project +
+
+
+ Skills +
+ +
+
+
+
+ + Chat + +
+
+
+ diff --git a/app/dashboard/templates/dashboard/components/participant-card.html b/app/dashboard/templates/dashboard/components/participant-card.html new file mode 100644 index 00000000000..cdc840e811e --- /dev/null +++ b/app/dashboard/templates/dashboard/components/participant-card.html @@ -0,0 +1,121 @@ +{% comment %} + Copyright (C) 2020 Gitcoin Core + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +{% endcomment %} +{% load i18n static %} +
+
+ +
+ + + Fund Bounty + +
+ + + View profile + +
+ + ${user.handle} Avatar + +
+ [[ user.name || user.handle ]] + + verify badget + +
+ + @[[ user.handle ]] + +
+ + ([[ user.avg_rating.total_rating ]] ratings) +
+ + + + +
+
+ +
+
+ Looking for team members +
+
+
+ Looking for a project +
+
+ + Chat + +
+ +
+
+ diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html index 03da57a9245..9e505c70808 100644 --- a/app/dashboard/templates/dashboard/index-vue.html +++ b/app/dashboard/templates/dashboard/index-vue.html @@ -307,7 +307,7 @@

Hackathon Coming Soon!

-
+
@@ -336,14 +336,14 @@

- + - +
@@ -428,117 +428,22 @@

-
-
+
+
nothing found

No users found

-
-
-
- -
- - - Fund Bounty - -
- - - View profile - -
- - ${user.handle} Avatar - -
- [[ user.name || user.handle ]] - - verify badget - -
- - @[[ user.handle ]] - -
- - ([[ user.avg_rating.total_rating ]] ratings) -
- - - - -
-
- -
-
- Looking for team members -
-
-
- Looking for a project -
-
- - Chat - -
- -
+ {% if hackathon.start_date|timesince <= "1 min" %} +
+ {% include 'dashboard/components/participant-card-pre-hack.html' %}
-
- + {% else %} +
+ {% include 'dashboard/components/participant-card.html' %} +
+ {% endif %} +
diff --git a/app/dashboard/views.py b/app/dashboard/views.py index ee16a8f0b1d..b47ef1a176b 100644 --- a/app/dashboard/views.py +++ b/app/dashboard/views.py @@ -1143,10 +1143,13 @@ def previous_worked(): this_page = Profile.objects_full.filter(pk__in=[ele.pk for ele in this_page]).order_by('-follower_count', 'id') else: - try: - profile_list = profile_list.order_by(order_by, '-earnings_count', 'id') - except profile_list.FieldError: - profile_list = profile_list.order_by('-earnings_count', 'id') + if hackathon_id: + profile_list = profile_list.order_by('-hackathon_registration__created_on', 'id') + else: + try: + profile_list = profile_list.order_by(order_by, '-earnings_count', 'id') + except profile_list.FieldError: + profile_list = profile_list.order_by('-earnings_count', 'id') profile_list = profile_list.values_list('pk', flat=True) all_pages = Paginator(profile_list, limit) @@ -1176,6 +1179,7 @@ def previous_worked(): follower_count = followers.count() profile_json['follower_count'] = follower_count + profile_json['desc'] = user.desc if hackathon_id: registration = HackathonRegistration.objects.filter(hackathon_id=hackathon_id, registrant=user).last() @@ -1183,6 +1187,25 @@ def previous_worked(): profile_json['looking_team_members'] = registration.looking_team_members profile_json['looking_project'] = registration.looking_project + activity = Activity.objects.filter( + profile=user, + hackathonevent_id=hackathon_id, + activity_type='hackathon_new_hacker', + ) + + if activity.exists(): + profile_json['intro'] = activity.metadata['intro_text'] + + if hackathon_id and user: + project = HackathonProject.objects.filter(hackathon_id=hackathon_id, profiles=user).first() + if project: + profile_json['project_name'] = project.name + profile_json['project_logo'] = project.logo.url if project.logo else '' + + if user.data.get('location', ''): + profile_json['country'] = user.data.get('location', '') + + if user.is_org: profile_dict = user.__dict__ profile_json['count_bounties_on_repo'] = profile_dict.get('as_dict').get('count_bounties_on_repo')