Following section #6301

cupOJoseph · 2020-03-26T04:58:10Z

Description

New tab on use profile for followers.

Refers/Fixes

Testing

Tested:
New Follow tab on profile, url addition for following and follower subtabs, inline follow buttons, grid of users, also following list, email and chat buttons, hidden email when None

codecov · 2020-03-26T05:03:57Z

Codecov Report

Merging #6301 into master will increase coverage by 0.01%.
The diff coverage is 25.00%.

@@            Coverage Diff             @@
##           master    #6301      +/-   ##
==========================================
+ Coverage   27.07%   27.08%   +0.01%     
==========================================
  Files         291      291              
  Lines       26682    26702      +20     
  Branches     3948     3951       +3     
==========================================
+ Hits         7223     7232       +9     
- Misses      19192    19203      +11     
  Partials      267      267

Impacted Files	Coverage Δ
app/dashboard/views.py	`11.20% <0.00%> (-0.04%)`	⬇️
app/dashboard/models.py	`49.75% <44.44%> (-0.04%)`	⬇️
app/retail/emails.py	`22.34% <0.00%> (ø)`
app/dashboard/sync/etc.py	`14.63% <0.00%> (ø)`
app/grants/management/commands/migrate_grant.py	`0.00% <0.00%> (ø)`
app/dashboard/embed.py	`31.60% <0.00%> (+3.44%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 570abd3...1dccfb9. Read the comment docs.

octavioamu · 2020-04-01T04:51:06Z

Nice, Is this working? Asking because says "is not working yet"

cupOJoseph · 2020-04-02T15:06:58Z

It will compile, but missing some of the features

I'm using mailto:{{user.profile.data.email}} for the email buttons in the list, but they are always returning the email as None. I need to fix that, working on it now.

Also, the following button color seems inconsistent in the design. asking Alisa now.

octavioamu · 2020-04-02T16:03:25Z

cool, send some screenshots here or video so we can check. Thanks man!

cupOJoseph · 2020-04-05T13:24:53Z

@octavioamu should be good to go now.

cupOJoseph

Which master did this pull from?, I dont see if it made any changes

cupOJoseph · 2020-04-06T14:15:43Z

Just made an update to hide email button when no email is there, and fix blue follow button not working

cupOJoseph · 2020-04-06T14:16:39Z

@octavioamu can we have this reviewed when you get a chance? thanks

danlipert

@jschiarizzi we need to remove the email button - we can't be exposing user emails like this. If we want user-to-user messaging, we need to just use chat. CC: @PixelantDesign @owocki

cupOJoseph · 2020-04-07T15:28:59Z

Okay, that was what was asked for. I thought that icon was already used in gitcoin profiles, but it turns out that is an invite link to this "https://gitcoin.co/users?invite=jschiarizzi"
Maybe we can replace it with that?

cupOJoseph

@danlipert here is the change you requested. No email, instead replaced with the invite to bounty button, like is on the top of a profile.

cupOJoseph · 2020-04-14T15:05:26Z

@danlipert Just a friendly reminder that this is ready for a review again.

PixelantDesign · 2020-04-15T17:31:39Z

yay! excited for this!

octavioamu

left some comments

octavioamu · 2020-04-21T22:25:28Z

app/assets/v2/js/pages/join_tribe.js

+    $(elem).mouseenter(function(e) {
+      if ($(elem).hasClass('btn-outline-gc-green')) {
+        $(elem).addClass('btn-gc-outline-red').text('Unfollow');
+        $(elem).removeClass('btn-outline-gc-green');
+      }
+    }).mouseleave(function(e) {
+      if ($(elem).hasClass('btn-gc-outline-red')) {
+        $(elem).removeClass('btn-gc-outline-red');
+        $(elem).addClass('btn-outline-gc-green').text('Following');
+      }
+    });
+
+    $(elem).focus(function(e) {
+      if ($(elem).hasClass('btn-outline-gc-green')) {
+        $(elem).addClass('btn-gc-outline-red').text('Unfollow');
+        $(elem).removeClass('btn-outline-gc-green');
+      }
+    }).focusout(function(e) {
+      if ($(elem).hasClass('btn-gc-outline-red')) {
+        $(elem).removeClass('btn-gc-outline-red');
+        $(elem).addClass('btn-outline-gc-green').text('Following');
+      }
+    });


you should use multiple event to be more DRY .on( "mouseenter focus", fnc ...

octavioamu · 2020-04-21T22:27:42Z

app/dashboard/models.py

@@ -4896,3 +4896,18 @@ class TribeMember(SuperModel):
        max_length=20,
        blank=True
    )
+
+    @property
+    def mutual_follow(self):


tribesmembers is used for users following but also for orgs tribes seems this will show tribes orgs as following

This is a handy method for Tribe Members, this method will be used as predicate to know if the current pair (org, profile) follow mutually.

octavioamu · 2020-04-21T22:33:22Z

app/dashboard/models.py

+    @property
+    def mutual_follow(self):
+        return TribeMember.objects.filter(profile=self.org, org=self.profile).exists()
+
+    @property
+    def mutual_follower(self):
+        tribe_following = TribeMember.objects.filter(profile=self.profile).values('org')
+        return TribeMember.objects.filter(org=self.org, profile__in=tribe_following).exclude(profile=self.profile)
+
+    @property
+    def mutual_following(self):
+        tribe_following = TribeMember.objects.filter(org=self.profile).values('profile')
+        print(tribe_following)
+        return TribeMember.objects.filter(org__in=tribe_following, profile=self.org)


not sure about this logic, if you already have those who already following you why not better cross both and have the result to avoid many queries?
Also I see a missing print there

Whats the missing print? Is there a rule for printing objects here we have to follow?

done, only one query is executed on each of these methods using a subquery

octavioamu · 2020-04-21T22:35:21Z

app/dashboard/templates/profiles/tab_follow.html

+        <div class="mb-0 mt-1 col-5 d-flex flex-row align-items-center">
+        <div class="mr-5"  style="height: fit-content">
+          <button class="btn btn-outline-gc-blue btn-sm flex-grow-1 font-smaller-5 position-relative quick-link" data-openchat="{{user.profile}}">
+            <i class="fas fa-comment-dots" data-placement="bottom" data-toggle="tooltip" data-html="true"


lets move the tooltip to the button to show it on all the button hover not just the icon

octavioamu · 2020-04-21T22:39:26Z

app/dashboard/templates/profiles/tab_follow.html

+            {% if followers|length == 2 %}
+                <div style="width: 60px" class="d-flex flex-row align-items-center">
+                    <img class="rounded-circle" style="height: 25px; width: 25px; margin-right: -12px " src="/dynamic/avatar/{{ followers.0.profile.handle }}" alt="">
+                    <img class="rounded-circle" style="height: 25px; width: 25px;" src="/dynamic/avatar/{{ followers.1.profile.handle }}" alt="">
+                </div>
+                <p class="text-muted font-smaller-4 my-0">Followed by {{ followers.0.profile.handle  }} and {{ followers.1.profile.handle }}</p>
+            {% endif %}
+            {% if followers|length >= 3 %}
+                <div style="width: 60px" class="d-flex flex-row align-items-center">
+                    <img class="rounded-circle" style="height: 25px; width: 25px; margin-right: -12px" src="/dynamic/avatar/{{ followers.0.profile.handle }}" alt="">
+                    <img class="rounded-circle" style="height: 25px; width: 25px; margin-right: -12px" src="/dynamic/avatar/{{ followers.1.profile.handle }}" alt="">
+                    <img class="rounded-circle" style="height: 25px; width: 25px;" src="/dynamic/avatar/{{ followers.2.profile.handle }}" alt="">
+                </div>
+                <p class="text-muted font-smaller-4 my-0">Followed by {{ followers.0.profile.handle  }}, {{ followers.1.profile.handle }} and {{ followers|length|add:-2}} others you follow</p>
+            {% endif %}
+          {% endwith %}


lets move this logic to a loop instead and limit the looping to be more DRY

I'm not sure this would be better as a loop

octavioamu · 2020-04-21T22:42:25Z

app/dashboard/templates/profiles/tab_follow.html

+    setInterval(function(){
+      if($ && $('.load-more').length && $(".load-more").isInViewport()){
+        $('.load-more').click();
+      }
+    }, 1000);


how this work? doesn't seems to be any ajax request handling this and if checking each second to click the button? Or I am missing something?

borrowed from a different tab, I think tab_kudos.html. Possibly didn't connect it, will check that.

octavioamu · 2020-04-21T22:44:57Z

app/dashboard/views.py


+    print(f'===== TRIBES COUNT: {TribeMember.objects.filter(org=request.user.profile)}')


missing print

octavioamu · 2020-04-21T22:46:20Z

app/dashboard/views.py

+        context['org_kudos'] = profile.get_org_kudos
+        owned_kudos = profile.get_my_kudos.order_by('id', order_by)
+        sent_kudos = profile.get_sent_kudos.order_by('id', order_by)
+        kudos_limit = 8
+        context['kudos'] = owned_kudos[0:kudos_limit]
+        context['sent_kudos'] = sent_kudos[0:kudos_limit]
+        context['kudos_count'] = owned_kudos.count()
+        context['sent_kudos_count'] = sent_kudos.count()


why this context here instead on the general context? shouldn't be here the follow data you need only for that tab?

octavioamu · 2020-04-21T22:54:21Z

app/assets/v2/js/pages/join_tribe.js

@@ -83,3 +83,59 @@ const tribeLeader = () => {
 };

 tribeLeader();
+
+const newManageTribe = () => {


this file is loaded in many pleases probably is better to move it to his own file or even loaded on that page only.

could we omit this at this moment? i'll move this in another PR due i'll be working this weeks on tribes functionality.

octavioamu · 2020-04-21T22:57:09Z

app/assets/v2/js/pages/join_tribe.js

+    $(elem).on('click', function(e) {
+      if (!document.contxt.github_handle) {
+        e.preventDefault();
+        _alert('Please login first.', 'error');
+        return;
+      }
+
+      $(elem).attr('disabled', true);
+      e.preventDefault();
+      const tribe = $(elem).data('tribe');
+      const url = `/tribe/${tribe}/join/`;
+      const sendJoin = fetchData (url, 'POST', {}, {'X-CSRFToken': $("input[name='csrfmiddlewaretoken']").val()});
+
+      $.when(sendJoin).then(function(response) {
+        $(elem).attr('disabled', false);
+        $(elem).attr('member', response.is_member);
+        if (response.is_member) {
+          $(elem).addClass('btn-outline-gc-green').removeClass([ 'btn-gc-blue', 'btn-gc-outline-red' ]).text('Following');
+        } else {
+          $(elem).removeClass([ 'btn-outline-gc-green', 'btn-gc-outline-red' ]).addClass('btn-gc-blue').text('Follow');
+        }
+      }).fail(function(error) {
+        $(elem).attr('disabled', false);
+      });
+    });
+  });
+};


if you rebase this then you will see this file now have const followRequest = (handle, elem, cb, cbError) function is just the request with a callback you can use it in a way you will have the handle, elem, response and in that way you don't need to copy paste the request part.

danlipert · 2020-04-22T13:55:57Z

@jschiarizzi I'm marking this as ready for review since you still have it set as a draft. Please remember to mark it ready so it notifies us when you finish a draft PR - thanks

danlipert · 2020-04-22T13:56:35Z

@jschiarizzi actually nvm I just saw @octavioamu set it as draft - disregard my comment

cupOJoseph · 2020-04-22T18:48:15Z

Thanks for the notes Octavio, will get on this shortly.

octavioamu

I left some comments about some things doesn't seeems to be related to this PR

octavioamu · 2020-04-29T13:48:30Z

app/assets/v2/css/town_square.css

+
+.new_grant {
+  border-top: 6px solid rgba(13, 7, 100, 0.25);
+}
+
+.new_kudos {
+  border-top: 6px solid rgba(0, 163, 255, 0.25);
+}
+
+.new_bounty {
+  border-top: 6px solid rgba(62, 0, 255, 0.4);
+}
+
+.new_hackathon_project {
+  border-top: 6px solid rgba(15, 206, 124, 0.25);
+}
+
+.bg-gc-blue {
+  background-color: var(--gc-blue);
+}
+
+.bg-gc-green {
+  background-color: var(--gc-green);
+}
+
+.bg-light-blue {
+  background-color: #00A3FF;
+}
+
+.bg-gc-dark-blue {
+  background-color: #0D0764;
+}
+
+.card-ribbon {
+  margin-top: -14px;
+  right: -10px;
+  width: 110px;
+  margin-bottom: 10px;
+  position: absolute;
+}
+
+.logo-metacard {
+  max-height: 4rem;
+  max-width: 4rem;
+}


what is all of this here? Is related ?

octavioamu · 2020-04-29T13:51:21Z

app/retail/templates/shared/activity.html

@@ -15,14 +15,8 @@
    along with this program. If not, see <http://www.gnu.org/licenses/>.

 {% endcomment %}
-{% load humanize i18n static %}
+{% load humanize i18n static grants_extra %}


not sure about this related

owocki · 2020-06-02T21:10:08Z

@jschiarizzi any interest in working on this follow up ticket? #6755

cupOJoseph · 2020-06-09T20:10:18Z

Looks like you already got to 6755. 🌮

cupOJoseph added 6 commits March 24, 2020 14:16

add follow tab in profile

0ca2ca3

update views for follow

13e854f

add new tabs for switching following and followers

6c2780e

better switch

e22d9f6

move switch inside tab-projects

c0dcaee

is_on_tribe import from follow.html

39f5a34

cupOJoseph requested review from danlipert, octavioamu and thelostone-mc as code owners March 26, 2020 04:58

cupOJoseph and others added 2 commits March 26, 2020 01:04

missing handle

8648841

Add follower and following profiles

cb8bafc

add chat button to profiles

edda50d

cupOJoseph and others added 3 commits April 2, 2020 16:12

blue follow buttons

7517420

small text on number of followers in second tab

a0efb30

Add follow and unfollow interactions

398f1f6

cupOJoseph mentioned this pull request Apr 5, 2020

As a funder/contributor I'd like to know who I'm following and who is following me on the Gitcoin platform. #6095

Closed

zoek1 added 2 commits April 5, 2020 16:02

Merge branch 'master' into follow

fa26429

Fix lint errors

bc5ae0c

cupOJoseph commented Apr 6, 2020

View reviewed changes

Update tab_follow.html

14ca76b

danlipert suggested changes Apr 7, 2020

View reviewed changes

remove email, add invite to bounty

0a98720

cupOJoseph commented Apr 7, 2020

View reviewed changes

danlipert approved these changes Apr 15, 2020

View reviewed changes

thelostone-mc approved these changes Apr 21, 2020

View reviewed changes

octavioamu suggested changes Apr 21, 2020

View reviewed changes

octavioamu marked this pull request as draft April 21, 2020 22:59

thelostone-mc requested a review from PixelantDesign April 22, 2020 13:43

danlipert marked this pull request as ready for review April 22, 2020 13:56

thelostone-mc requested a review from octavioamu April 28, 2020 18:30

thelostone-mc marked this pull request as draft April 29, 2020 13:47

octavioamu suggested changes Apr 29, 2020

View reviewed changes

zoek1 added 2 commits April 29, 2020 08:56

Merge branch 'master' into follow

ab54f3d

Fix errors and implemented requested changes

1dccfb9

zoek1 force-pushed the follow branch from b7b7cd1 to 1dccfb9 Compare April 29, 2020 14:02

thelostone-mc marked this pull request as ready for review April 29, 2020 14:04

octavioamu approved these changes Apr 29, 2020

View reviewed changes

thelostone-mc merged commit 9e9329f into gitcoinco:master Apr 29, 2020


		print(f'===== TRIBES COUNT: {TribeMember.objects.filter(org=request.user.profile)}')

Following section #6301

Following section #6301

Conversation

cupOJoseph commented Mar 26, 2020 • edited Loading

Description

Refers/Fixes

Testing

codecov bot commented Mar 26, 2020 • edited Loading

Codecov Report

octavioamu commented Apr 1, 2020

cupOJoseph commented Apr 2, 2020

octavioamu commented Apr 2, 2020

cupOJoseph commented Apr 5, 2020

cupOJoseph left a comment

Choose a reason for hiding this comment

cupOJoseph commented Apr 6, 2020

cupOJoseph commented Apr 6, 2020 • edited Loading

danlipert left a comment

Choose a reason for hiding this comment

cupOJoseph commented Apr 7, 2020

cupOJoseph left a comment

Choose a reason for hiding this comment

cupOJoseph commented Apr 14, 2020

PixelantDesign commented Apr 15, 2020

octavioamu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

danlipert commented Apr 22, 2020

danlipert commented Apr 22, 2020

cupOJoseph commented Apr 22, 2020

octavioamu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

owocki commented Jun 2, 2020

cupOJoseph commented Jun 9, 2020

cupOJoseph commented Mar 26, 2020 •

edited

Loading

codecov bot commented Mar 26, 2020 •

edited

Loading

cupOJoseph commented Apr 6, 2020 •

edited

Loading