gitcoin.co/profile/owocki => gitcoin.co/owocki

app/app/context.py

@@ -117,6 +117,7 @@ def preprocess(request):
         'is_moderator': profile.is_moderator if profile else False,
         'persona_is_funder': profile.persona_is_funder if profile else False,
         'persona_is_hunter': profile.persona_is_hunter if profile else False,
+        'profile_url': profile.url if profile else False,
         'quests_live': settings.QUESTS_LIVE,
     }
     context['json_context'] = json.dumps(context)

app/app/urls.py

@@ -598,6 +598,11 @@
         re_path(r'^500/$', retail.views.handler500, name='500'),
     ]
 
+    urlpatterns += [
+        re_path(r'^(.*)/(.*)?', dashboard.views.profile, name='profile_min_by_tab'),
+        re_path(r'^(.*)', dashboard.views.profile, name='profile_min'),
+    ]
+
 handler403 = 'retail.views.handler403'
 handler404 = 'retail.views.handler404'
 handler500 = 'retail.views.handler500'

app/assets/v2/js/pages/quests.index.js

@@ -49,8 +49,8 @@ $(document).ready(function() {
     $('.difficulty_tab.' + target).removeClass('hidden');
 
     $('html,body').animate({
-        scrollTop: '+=1px'
-    })
+      scrollTop: '+=1px'
+    });
   });
 
   $('.quest-card.available').click(function(e) {

app/dashboard/models.py

@@ -3138,7 +3138,12 @@ def __str__(self):
         return self.handle
 
     def get_relative_url(self, preceding_slash=True):
-        return f"{'/' if preceding_slash else ''}profile/{self.handle}"
+        from dashboard.utils import get_url_first_indexes # avoid circular import
+        prefix = ''
+        if self.handle in get_url_first_indexes():
+            # handle collision
+            prefix = 'profile/'
+        return f"{'/' if preceding_slash else ''}{prefix}{self.handle}"
 
     def get_absolute_url(self):
         return settings.BASE_URL + self.get_relative_url(preceding_slash=False)

app/dashboard/templates/profiles/profile.html

@@ -7,6 +7,9 @@
     {% endif %}
     {% include 'shared/head.html' %}
     {% include 'shared/cards_pic.html' %}
+    {% if not hidden %}
+      <link rel="canonical" href="{{profile.url}}/{{tab}}" />
+    {% endif %}
     <link rel="stylesheet" href={% static "v2/css/dashboard.css" %} />
     <link rel="stylesheet" href={% static "v2/css/profile.css" %} />
     <link rel="stylesheet" href={% static "v2/css/tag.css" %} />

app/dashboard/templates/shared/nav_auth.html

@@ -44,7 +44,7 @@
           {% trans "Send Kudos" %}
         </a>
         <div class="dropdown-divider"></div>
-        <a class="dropdown-item" data-gtm="profile" href="{% url "profile" %}">
+        <a class="dropdown-item" data-gtm="profile" href="{{profile_url}}">
           <i class="fas fa-user"></i>
           {% trans "My Profile" %}
         </a>

app/dashboard/tests/test_dashboard_models.py

@@ -477,7 +477,7 @@ def test_profile():
         assert profile.tips.first() == tip
         assert profile.desc == '@gitcoinco is a organization who has participated in 1 funded issue on Gitcoin'
         assert profile.github_url == 'https://github.com/gitcoinco'
-        assert profile.get_relative_url() == '/profile/gitcoinco'
+        assert profile.get_relative_url() == '/gitcoinco'
 
     def test_tool(self):
         """Test the dashboard Tool model."""

app/dashboard/utils.py

@@ -23,6 +23,7 @@
 from json.decoder import JSONDecodeError
 
 from django.conf import settings
+from django.urls import URLPattern, URLResolver
 from django.utils import timezone
 
 import ipfshttpclient
@@ -896,3 +897,28 @@ def release_bounty_to_the_public(bounty, auto_save = True):
         return True
     else:
         return False
+
+
+def get_url_first_indexes():
+
+    urlconf = __import__(settings.ROOT_URLCONF, {}, {}, [''])
+
+    def list_urls(lis, acc=None):
+        if acc is None:
+            acc = []
+        if not lis:
+            return
+        l = lis[0]
+        if isinstance(l, URLPattern):
+            yield acc + [str(l.pattern)]
+        elif isinstance(l, URLResolver):
+            yield from list_urls(l.url_patterns, acc + [str(l.pattern)])
+
+        yield from list_urls(lis[1:], acc)
+
+    urls = []
+    for p in list_urls(urlconf.urlpatterns):
+        url = ''.join(p).split('/')[0].replace('^', '').replace('\\', '').replace('\$', '')
+        urls += url
+
+    return set(urls)