@@ -43,7 +62,7 @@ Vue.component('select2', {
mounted: function() {
let vm = this;
- $(this.$el).select2({ data: this.options })
+ $(this.$el).select2({data: this.options})
.val(this.value)
.trigger('change')
.on('change', function() {
@@ -53,13 +72,13 @@ Vue.component('select2', {
watch: {
value: function(value) {
if (value === undefined) {
- $(this.$el).empty().select2({ data: this.options });
+ $(this.$el).empty().select2({data: this.options});
} else if ([...value].sort().join(',') !== [...$(this.$el).val()].sort().join(',')) {
$(this.$el).val(value).trigger('change');
}
},
options: function(options) {
- $(this.$el).empty().select2({ data: options });
+ $(this.$el).empty().select2({data: options});
}
},
destroyed: function() {
@@ -124,3 +143,230 @@ Vue.component('qrcode', {
// }
}
});
+
+
+Vue.component('tribes-settings', {
+ delimiters: [ '[[', ']]' ],
+ props: ['tribe'],
+ data: function() {
+ return {
+ editorOptions: {
+ priority: {
+ modules: {
+ toolbar: [
+ [ 'bold', 'italic', 'underline' ],
+ [{ 'align': [] }],
+ [{ 'list': 'ordered'}, { 'list': 'bullet' }],
+ [ 'link', 'code-block' ],
+ ['clean']
+ ]
+ },
+ theme: 'snow',
+ placeholder: 'List out your tribe priorities to let contributors to know what they can request to work on'
+ },
+ description: {
+ modules: {
+ toolbar: [
+ [ 'bold', 'italic', 'underline' ],
+ [{ 'align': [] }],
+ [ 'link', 'code-block' ],
+ ['clean']
+ ]
+ },
+ theme: 'snow',
+ placeholder: 'Describe your tribe so that people can follow you.'
+ }
+ }
+ };
+ },
+ methods: {}
+});
+
+
+Vue.component('project-directory', {
+ delimiters: [ '[[', ']]' ],
+ props: ['tribe'],
+ methods: {
+ fetchProjects: function(newPage) {
+ let vm = this;
+
+ vm.isLoading = true;
+ vm.noResults = false;
+
+ if (newPage) {
+ vm.projectsPage = newPage;
+ }
+
+ vm.params.page = vm.projectsPage;
+
+ if (vm.hackathonId) {
+ vm.params.hackathon = hackathonId;
+ }
+
+ if (vm.sponsor) {
+ vm.params.sponsor = vm.sponsor;
+ }
+
+ if (vm.searchTerm) {
+ vm.params.search = vm.searchTerm;
+ } else {
+ delete vm.params['search'];
+ }
+
+ let searchParams = new URLSearchParams(vm.params);
+
+ let apiUrlProjects = `/api/v0.1/projects_fetch/?${searchParams.toString()}`;
+
+ var getProjects = fetchData(apiUrlProjects, 'GET');
+
+ $.when(getProjects).then(function(response) {
+ vm.hackathonProjects = [];
+ response.data.forEach(function(item) {
+ vm.hackathonProjects.push(item);
+ });
+
+ vm.projectsNumPages = response.num_pages;
+ vm.projectsHasNext = response.has_next;
+ vm.numProjects = response.count;
+ if (vm.projectsHasNext) {
+ vm.projectsPage = ++vm.projectsPage;
+
+ } else {
+ vm.projectsPage = 1;
+ }
+
+ if (vm.hackathonProjects.length) {
+ vm.noResults = false;
+ } else {
+ vm.noResults = true;
+ }
+ vm.isLoading = false;
+ });
+ },
+ searchProjects: function() {
+ let vm = this;
+
+ vm.hackathonProjects = [];
+
+ vm.fetchProjects(1);
+
+ }
+ },
+ data: function() {
+
+ return {
+ sponsor: this.tribe || null,
+ hackathonSponsors: document.hackathonSponsors || [],
+ hackathonProjects: document.hackathonProjects || [],
+ projectsPage: 1,
+ hackathonId: document.hackathon_id || null,
+ projectsNumPages: 0,
+ projectsHasNext: false,
+ numProjects: 0,
+ media_url,
+ searchTerm: null,
+ bottom: false,
+ params: {},
+ isFunder: false,
+ showModal: false,
+ showFilters: true,
+ skills: document.keywords || [],
+ selectedSkills: [],
+ noResults: false,
+ isLoading: true,
+ hideFilterButton: false
+ };
+ },
+ mounted() {
+ this.fetchProjects();
+ this.$watch('params', function(newVal, oldVal) {
+ this.searchProjects();
+ }, {
+ deep: true
+ });
+ },
+ created() {
+ // this.extractURLFilters();
+ },
+ beforeMount() {
+ window.addEventListener('scroll', () => {
+ this.bottom = this.bottomVisible();
+ }, false);
+ },
+ beforeDestroy() {
+ window.removeEventListener('scroll', () => {
+ this.bottom = this.bottomVisible();
+ });
+ }
+});
+
+
+Vue.component('suggested-profiles', {
+ props: ['profiles'],
+ template: `
`
+});
+
+
+Vue.component('suggested-profile', {
+ props: ['profile'],
+ data: function() {
+ return {
+ follow: this.profile.user_is_following || false,
+ follower_count: this.profile.followers_count || 0
+ };
+ },
+ computed: {
+ avatar_url: function() {
+ return `/dynamic/avatar/${this.profile.handle}`;
+ },
+ profile_url: function() {
+ return `/profile/${this.profile.handle}`;
+ }
+ },
+ methods: {
+ followTribe: function(handle, event) {
+ event.preventDefault();
+ let vm = this;
+
+ const url = `/tribe/${handle}/join/`;
+ const sendJoin = fetchData(url, 'POST', {}, {'X-CSRFToken': vm.csrf});
+
+ $.when(sendJoin).then((response) => {
+ if (response && response.is_member) {
+ vm.follow = true;
+ vm.follower_count += 1;
+ } else {
+ vm.follow = false;
+ vm.follower_count -= 1;
+ }
+ }).fail((error) => {
+ console.log(error);
+ });
+ }
+ },
+ template: `
+
+
+
+ {{profile.name}}
+ {{follower_count}} followers
+
+
+
+
+
+
+
+ `
+});
diff --git a/app/dashboard/migrations/0105_auto_20200430_1352.py b/app/dashboard/migrations/0105_auto_20200430_1352.py
new file mode 100644
index 00000000000..46ecf60f8ab
--- /dev/null
+++ b/app/dashboard/migrations/0105_auto_20200430_1352.py
@@ -0,0 +1,30 @@
+# Generated by Django 2.2.4 on 2020-04-30 13:52
+
+import app.utils
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dashboard', '0104_fundrequest'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='activity',
+ name='project',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='hackathon_projects', to='dashboard.HackathonProject'),
+ ),
+ migrations.AddField(
+ model_name='profile',
+ name='tribes_cover_image',
+ field=models.ImageField(blank=True, help_text='The Tribes Cover image.', null=True, upload_to=app.utils.get_upload_filename),
+ ),
+ migrations.AlterField(
+ model_name='activity',
+ name='activity_type',
+ field=models.CharField(blank=True, choices=[('wall_post', 'Wall Post'), ('status_update', 'Update status'), ('new_bounty', 'New Bounty'), ('start_work', 'Work Started'), ('stop_work', 'Work Stopped'), ('work_submitted', 'Work Submitted'), ('work_done', 'Work Done'), ('worker_approved', 'Worker Approved'), ('worker_rejected', 'Worker Rejected'), ('worker_applied', 'Worker Applied'), ('increased_bounty', 'Increased Funding'), ('killed_bounty', 'Canceled Bounty'), ('new_tip', 'New Tip'), ('receive_tip', 'Tip Received'), ('bounty_abandonment_escalation_to_mods', 'Escalated checkin from @gitcoinbot about bounty status'), ('bounty_abandonment_warning', 'Checkin from @gitcoinbot about bounty status'), ('bounty_removed_slashed_by_staff', 'Dinged and Removed from Bounty by Staff'), ('bounty_removed_by_staff', 'Removed from Bounty by Staff'), ('bounty_removed_by_funder', 'Removed from Bounty by Funder'), ('new_crowdfund', 'New Crowdfund Contribution'), ('new_grant', 'New Grant'), ('update_grant', 'Updated Grant'), ('killed_grant', 'Cancelled Grant'), ('negative_contribution', 'Negative Grant Contribution'), ('new_grant_contribution', 'Contributed to Grant'), ('new_grant_subscription', 'Subscribed to Grant'), ('killed_grant_contribution', 'Cancelled Grant Contribution'), ('new_kudos', 'New Kudos'), ('created_kudos', 'Created Kudos'), ('receive_kudos', 'Receive Kudos'), ('joined', 'Joined Gitcoin'), ('played_quest', 'Played Quest'), ('beat_quest', 'Beat Quest'), ('created_quest', 'Created Quest'), ('updated_avatar', 'Updated Avatar'), ('mini_clr_payout', 'Mini CLR Payout'), ('leaderboard_rank', 'Leaderboard Rank'), ('consolidated_leaderboard_rank', 'Consolidated Leaderboard Rank'), ('consolidated_mini_clr_payout', 'Consolidated CLR Payout'), ('hackathon_registration', 'Hackathon Registration'), ('new_hackathon_project', 'New Hackathon Project'), ('flagged_grant', 'Flagged Grant')], db_index=True, max_length=50),
+ ),
+ ]
diff --git a/app/dashboard/models.py b/app/dashboard/models.py
index 71671191b5d..d551d7e6061 100644
--- a/app/dashboard/models.py
+++ b/app/dashboard/models.py
@@ -66,6 +66,7 @@
from marketing.models import LeaderboardRank
from rest_framework import serializers
from web3 import Web3
+from bounty_requests.models import BountyRequest
from .notifications import maybe_market_to_github, maybe_market_to_slack, maybe_market_to_user_slack
from .signals import m2m_changed_interested
@@ -75,6 +76,7 @@
CROSS_CHAIN_STANDARD_BOUNTIES_OFFSET = 100000000
+
class BountyQuerySet(models.QuerySet):
"""Handle the manager queryset for Bounties."""
@@ -2101,6 +2103,7 @@ class Activity(SuperModel):
('consolidated_leaderboard_rank', 'Consolidated Leaderboard Rank'),
('consolidated_mini_clr_payout', 'Consolidated CLR Payout'),
('hackathon_registration', 'Hackathon Registration'),
+ ('new_hackathon_project', 'New Hackathon Project'),
('flagged_grant', 'Flagged Grant'),
]
@@ -2153,6 +2156,12 @@ class Activity(SuperModel):
on_delete=models.CASCADE,
blank=True, null=True
)
+ project = models.ForeignKey(
+ 'dashboard.HackathonProject',
+ related_name='hackathon_projects',
+ on_delete=models.CASCADE,
+ blank=True, null=True
+ )
created = models.DateTimeField(auto_now_add=True, blank=True, null=True, db_index=True)
activity_type = models.CharField(max_length=50, choices=ACTIVITY_TYPES, blank=True, db_index=True)
@@ -2646,6 +2655,13 @@ class Profile(SuperModel):
as_representation = JSONField(default=dict, blank=True)
tribe_priority = models.TextField(default='', blank=True, help_text=_('HTML rich description for what tribe priorities.'))
+ tribes_cover_image = models.ImageField(
+ upload_to=get_upload_filename,
+ null=True,
+ blank=True,
+ help_text=_('The Tribes Cover image.'),
+ )
+
is_org = models.BooleanField(
default=True,
help_text='Is this profile an org?',
@@ -2660,6 +2676,13 @@ class Profile(SuperModel):
objects = ProfileManager()
objects_full = ProfileQuerySet.as_manager()
+
+ @property
+ def suggested_bounties(self):
+ suggested_bounties = BountyRequest.objects.filter(tribe=self, status='o').order_by('created_on')
+
+ return suggested_bounties if suggested_bounties else []
+
@property
def subscribed_threads(self):
tips = Tip.objects.filter(Q(pk__in=self.received_tips.all()) | Q(pk__in=self.sent_tips.all())).filter(comments_priv__icontains="activity:").all()
diff --git a/app/dashboard/router.py b/app/dashboard/router.py
index 6fc303f86f2..8e2383d0036 100644
--- a/app/dashboard/router.py
+++ b/app/dashboard/router.py
@@ -29,8 +29,8 @@
from retail.helpers import get_ip
from .models import (
- Activity, Bounty, BountyFulfillment, BountyInvites, HackathonEvent, HackathonProject, Interest, Profile,
- ProfileSerializer, SearchHistory,
+ Activity, Bounty, BountyFulfillment, BountyInvites, BountyRequest, HackathonEvent, HackathonProject, Interest, Profile,
+ ProfileSerializer, SearchHistory, TribeMember,
)
logger = logging.getLogger(__name__)
@@ -210,7 +210,8 @@ class Meta:
'pk', 'url', 'title', 'experience_level', 'status', 'fulfillment_accepted_on', 'event',
'fulfillment_started_on', 'fulfillment_submitted_on', 'canceled_on', 'web3_created', 'bounty_owner_address',
'avatar_url', 'network', 'standard_bounties_id', 'github_org_name', 'interested', 'token_name', 'value_in_usdt',
- 'keywords', 'value_in_token', 'project_type', 'is_open', 'expires_date', 'latest_activity', 'token_address'
+ 'keywords', 'value_in_token', 'project_type', 'is_open', 'expires_date', 'latest_activity', 'token_address',
+ 'bounty_categories'
)
@@ -496,6 +497,52 @@ def get_queryset(self):
return queryset
+class TribesTeamSerializer(serializers.ModelSerializer):
+
+ user_is_following = serializers.SerializerMethodField(method_name='user_following')
+ followers_count = serializers.SerializerMethodField(method_name='follow_count')
+
+ def follow_count(self, instance):
+ return TribeMember.objects.filter(org=instance).exclude(status='rejected').exclude(profile__user=None).count()
+
+ def user_following(self, instance):
+ request = self.context.get('request')
+ user_profile = request.user.profile if request and request.user and hasattr(request.user, 'profile') else None
+ if user_profile:
+ return len(user_profile.tribe_members.filter(org__handle=instance.handle.lower())) > 0
+
+ class Meta:
+ model = Profile
+ fields = ('name', 'handle', 'avatar_url', 'followers_count', 'user_is_following')
+
+
+class BountyRequestSerializer(serializers.ModelSerializer):
+
+ requested_by = TribesTeamSerializer()
+
+ class Meta:
+ model = BountyRequest
+ fields = ('id', 'token_name', 'comment', 'github_url', 'title', 'requested_by', 'status')
+
+
+class TribesSerializer(serializers.ModelSerializer):
+ """Handle serializing the Profile object."""
+ active_bounties = BountySerializer(many=True)
+ team_or_none_if_timeout = TribesTeamSerializer(many=True, read_only=True)
+ suggested_bounties = BountyRequestSerializer(many=True)
+ tribes_cover_image = serializers.ImageField(allow_empty_file=True)
+
+ def __init__(self, *args, **kwargs):
+ super(TribesSerializer, self).__init__(*args, **kwargs)
+ # We pass the "upper serializer" context to the "nested one"
+ self.fields['team_or_none_if_timeout'].context.update(self.context)
+
+ class Meta:
+ model = Profile
+ """Define the profile serializer metadata."""
+ fields = ('profile_wallpaper', 'tribes_cover_image', 'name', 'linkedin_url', 'team_or_none_if_timeout', 'suggested_bounties', 'active_bounties', 'handle', 'tribe_description', 'avatar_url', 'follower_count', 'following_count', 'data', 'tribe_priority')
+
+
# Routers provide an easy way of automatically determining the URL conf.
router = routers.DefaultRouter()
router.register(r'bounties/slim', BountiesViewSetSlim)
diff --git a/app/dashboard/templates/dashboard/explorer.html b/app/dashboard/templates/dashboard/explorer.html
new file mode 100644
index 00000000000..4d6b406fb2d
--- /dev/null
+++ b/app/dashboard/templates/dashboard/explorer.html
@@ -0,0 +1,581 @@
+{% comment %}
+ Copyright (C) 2019 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 email_obfuscator add_url_schema avatar_tags %}
+
+
+
+
+ {% include 'shared/head.html' %}
+ {% include 'shared/cards.html' %}
+
+
+
+
+
+
+
+
+
+
+ {% include 'shared/tag_manager_2.html' %}
+
+
+
+
+
+ {% csrf_token %}
+ {% include 'shared/analytics.html' %}
+ {% include 'shared/footer_scripts.html' %}
+ {% include 'shared/footer.html' %}
+ {% include 'shared/messages.html' %}
+
+
+
+
+
+
diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html
index 87d401507f2..e94102d5051 100644
--- a/app/dashboard/templates/dashboard/index-vue.html
+++ b/app/dashboard/templates/dashboard/index-vue.html
@@ -475,7 +475,7 @@
[[ project.name ]]
-
+
@ [[ profile.handle ]]
@@ -712,7 +712,7 @@ 
${bounty.github_org_name}
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+