Merge branch 'main' into dashboard/metrics-details-frontend

ahmedxgouda · web-flow · commit 22ff74d71e21 · 2025-07-17T21:27:27.000+03:00
diff --git a/backend/apps/common/utils.py b/backend/apps/common/utils.py
@@ -55,7 +55,7 @@ def get_absolute_url(path: str) -> str:
         str: The absolute URL.
 
     """
-    return f"{settings.SITE_URL}/{path}"
+    return f"{settings.SITE_URL}/{path.lstrip('/')}"
 
 
 def get_nest_user_agent() -> str:
diff --git a/backend/apps/github/models/user.py b/backend/apps/github/models/user.py
@@ -57,7 +57,7 @@ def issues(self):
     @property
     def nest_url(self) -> str:
         """Get Nest URL for user."""
-        return get_absolute_url(f"members/{self.nest_key}")
+        return get_absolute_url(f"/members/{self.nest_key}")
 
     @property
     def releases(self):
@@ -94,7 +94,7 @@ def from_github(self, gh_user) -> None:
 
     def get_absolute_url(self):
         """Get absolute URL for the user."""
-        return self.nest_url
+        return f"/members/{self.nest_key}"
 
     @staticmethod
     def bulk_save(users, fields=None) -> None:
diff --git a/backend/apps/owasp/models/project.py b/backend/apps/owasp/models/project.py
@@ -175,7 +175,7 @@ def nest_key(self) -> str:
     @property
     def nest_url(self) -> str:
         """Get Nest URL for project."""
-        return get_absolute_url(f"projects/{self.nest_key}")
+        return get_absolute_url(f"/projects/{self.nest_key}")
 
     @property
     def open_issues(self):
@@ -306,7 +306,7 @@ def from_github(self, repository) -> None:
 
     def get_absolute_url(self):
         """Get absolute URL for project."""
-        return self.nest_url
+        return f"/projects/{self.nest_key}"
 
     def save(self, *args, **kwargs) -> None:
         """Save the project instance."""
diff --git a/backend/apps/sitemap/views/base.py b/backend/apps/sitemap/views/base.py
@@ -8,6 +8,7 @@ class BaseSitemap(Sitemap):
 
     change_frequency = "weekly"
     prefix = ""
+    protocol = "https"
 
     STATIC_ROUTES = (
         {"path": "/chapters", "changefreq": "weekly", "priority": 0.8},
diff --git a/backend/apps/sitemap/views/member.py b/backend/apps/sitemap/views/member.py
@@ -1,11 +1,10 @@
 """Member sitemap."""
 
-from django.contrib.sitemaps import Sitemap
-
 from apps.github.models.user import User
+from apps.sitemap.views.base import BaseSitemap
 
 
-class MemberSitemap(Sitemap):
+class MemberSitemap(BaseSitemap):
     """Member sitemap."""
 
     prefix = "/members"
diff --git a/backend/apps/sitemap/views/project.py b/backend/apps/sitemap/views/project.py
@@ -1,11 +1,10 @@
 """Project sitemap."""
 
-from django.contrib.sitemaps import Sitemap
-
 from apps.owasp.models.project import Project
+from apps.sitemap.views.base import BaseSitemap
 
 
-class ProjectSitemap(Sitemap):
+class ProjectSitemap(BaseSitemap):
     """Project sitemap."""
 
     prefix = "/projects"
diff --git a/backend/apps/slack/commands/community.py b/backend/apps/slack/commands/community.py
@@ -24,5 +24,5 @@ def get_template_context(self, command: dict):
         return {
             **super().get_template_context(command),
             "name": "OWASP community",
-            "url": get_absolute_url("members"),
+            "url": get_absolute_url("/members"),
         }
diff --git a/backend/apps/slack/commands/gsoc.py b/backend/apps/slack/commands/gsoc.py
@@ -49,7 +49,7 @@ def get_template_context(self, command: dict):
                     "mode": "general",
                     "nest_bot_name": NEST_BOT_NAME,
                     "previous_year": gsoc_year,
-                    "projects_url": get_absolute_url("projects"),
+                    "projects_url": get_absolute_url("/projects"),
                 }
             )
         elif command_text.isnumeric():
diff --git a/backend/apps/slack/commands/leaders.py b/backend/apps/slack/commands/leaders.py
@@ -46,7 +46,7 @@ def get_template_context(self, command: dict):
                 "idx_key": chapter["idx_key"],
                 "idx_leaders": chapter["idx_leaders"],
                 "idx_name": chapter["idx_name"],
-                "url": get_absolute_url(f"chapters/{chapter['idx_key']}"),
+                "url": get_absolute_url(f"/chapters/{chapter['idx_key']}"),
             }
             for chapter in chapters
         ]
@@ -55,7 +55,7 @@ def get_template_context(self, command: dict):
                 "idx_key": project["idx_key"],
                 "idx_leaders": project["idx_leaders"],
                 "idx_name": project["idx_name"],
-                "url": get_absolute_url(f"projects/{project['idx_key']}"),
+                "url": get_absolute_url(f"/projects/{project['idx_key']}"),
             }
             for project in projects
         ]
diff --git a/backend/apps/slack/common/contribute.py b/backend/apps/slack/common/contribute.py
@@ -11,7 +11,7 @@
 )
 
 project_issues_url = get_absolute_url("/contribute")
-projects_url = get_absolute_url("projects")
+projects_url = get_absolute_url("/projects")
 
 CONTRIBUTE_GENERAL_INFORMATION_BLOCKS = (
     markdown(
diff --git a/backend/apps/slack/common/gsoc.py b/backend/apps/slack/common/gsoc.py
@@ -17,7 +17,7 @@
 
 now = timezone.now()
 gsoc_year = now.year if now.month >= MARCH else now.year - 1
-projects_url = get_absolute_url("projects")
+projects_url = get_absolute_url("/projects")
 
 GSOC_GENERAL_INFORMATION_BLOCKS = (
     markdown(
diff --git a/backend/apps/slack/common/handlers/chapters.py b/backend/apps/slack/common/handlers/chapters.py
@@ -100,7 +100,7 @@ def get_blocks(
         blocks.append(
             markdown(
                 f"⚠️ *Extended search over {Chapter.active_chapters_count()} OWASP chapters "
-                f"is available at <{get_absolute_url('chapters')}"
+                f"is available at <{get_absolute_url('/chapters')}"
                 f"?q={search_query}|{settings.SITE_NAME}>*{NL}"
                 f"{FEEDBACK_CHANNEL_MESSAGE}"
             )
diff --git a/backend/apps/slack/common/handlers/committees.py b/backend/apps/slack/common/handlers/committees.py
@@ -94,7 +94,7 @@ def get_blocks(
         blocks.append(
             markdown(
                 f"⚠️ *Extended search over {Committee.active_committees_count()} OWASP committees "
-                f"is available at <{get_absolute_url('committees')}"
+                f"is available at <{get_absolute_url('/committees')}"
                 f"?q={search_query}|{settings.SITE_NAME}>*{NL}"
                 f"{FEEDBACK_CHANNEL_MESSAGE}"
             )
diff --git a/backend/apps/slack/common/handlers/contribute.py b/backend/apps/slack/common/handlers/contribute.py
@@ -83,7 +83,7 @@ def get_blocks(
         blocks.append(
             markdown(
                 f"⚠️ *Extended search over {Issue.open_issues_count()} open issues "
-                f"is available at <{get_absolute_url('contribute')}"
+                f"is available at <{get_absolute_url('/contribute')}"
                 f"?q={search_query}|{settings.SITE_NAME}>*{NL}"
                 f"{FEEDBACK_CHANNEL_MESSAGE}"
             ),
diff --git a/backend/apps/slack/common/handlers/projects.py b/backend/apps/slack/common/handlers/projects.py
@@ -118,7 +118,7 @@ def get_blocks(
         blocks.append(
             markdown(
                 f"⚠️ *Extended search over {Project.active_projects_count()} OWASP projects "
-                f"is available at <{get_absolute_url('projects')}"
+                f"is available at <{get_absolute_url('/projects')}"
                 f"?q={search_query}|{settings.SITE_NAME}>*{NL}"
                 f"{FEEDBACK_CHANNEL_MESSAGE}"
             )
diff --git a/backend/poetry.lock b/backend/poetry.lock
diff --git a/backend/tests/apps/sitemap/views/base_test.py b/backend/tests/apps/sitemap/views/base_test.py
@@ -13,13 +13,6 @@ def sitemap():
 
 
 class TestBaseSitemap:
-    def test_get_static_priority_for_known_path(self, sitemap):
-        assert math.isclose(sitemap.get_static_priority("/projects"), 0.9)
-        assert math.isclose(sitemap.get_static_priority("/chapters"), 0.8)
-
-    def test_get_static_priority_for_unknown_path(self, sitemap):
-        assert math.isclose(sitemap.get_static_priority("/unknown"), 0.7)
-
     def test_changefreq(self, sitemap):
         obj = MagicMock()
 
@@ -46,3 +39,13 @@ def test_priority(self, sitemap):
         obj = MagicMock()
 
         assert math.isclose(sitemap.priority(obj), 0.7)
+
+    def test_get_protocol(self, sitemap):
+        assert sitemap.get_protocol() == "https"
+
+    def test_get_static_priority_for_known_path(self, sitemap):
+        assert math.isclose(sitemap.get_static_priority("/projects"), 0.9)
+        assert math.isclose(sitemap.get_static_priority("/chapters"), 0.8)
+
+    def test_get_static_priority_for_unknown_path(self, sitemap):
+        assert math.isclose(sitemap.get_static_priority("/unknown"), 0.7)
diff --git a/backend/tests/apps/sitemap/views/chapter_test.py b/backend/tests/apps/sitemap/views/chapter_test.py
@@ -3,7 +3,8 @@
 
 from django.utils import timezone
 
-from apps.sitemap.views import ChapterSitemap
+from apps.sitemap.views.base import BaseSitemap
+from apps.sitemap.views.chapter import ChapterSitemap
 
 
 class TestChapterSitemap:
@@ -42,3 +43,6 @@ def test_lastmod(self):
         obj = MagicMock(updated_at=None, created_at=dt)
 
         assert sitemap.lastmod(obj) == dt
+
+    def test_inherits_from_base(self):
+        assert issubclass(ChapterSitemap, BaseSitemap)
diff --git a/backend/tests/apps/sitemap/views/committee_test.py b/backend/tests/apps/sitemap/views/committee_test.py
@@ -3,7 +3,8 @@
 
 from django.utils import timezone
 
-from apps.sitemap.views import CommitteeSitemap
+from apps.sitemap.views.base import BaseSitemap
+from apps.sitemap.views.committee import CommitteeSitemap
 
 
 class TestCommitteeSitemap:
@@ -39,3 +40,6 @@ def test_lastmod(self):
 
         obj = MagicMock(updated_at=None, created_at=dt)
         assert sitemap.lastmod(obj) == dt
+
+    def test_inherits_from_base(self):
+        assert issubclass(CommitteeSitemap, BaseSitemap)
diff --git a/backend/tests/apps/sitemap/views/member_test.py b/backend/tests/apps/sitemap/views/member_test.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
-from apps.sitemap.views import MemberSitemap
+from apps.sitemap.views.base import BaseSitemap
+from apps.sitemap.views.member import MemberSitemap
 
 
 class TestMemberSitemap:
@@ -13,8 +14,9 @@ def test_items(self, mock_user):
         assert list(sitemap.items()) == [mock_obj]
 
     def test_location(self):
-        obj = MagicMock()
-        obj.get_absolute_url.return_value = "/members/qux"
         sitemap = MemberSitemap()
 
-        assert sitemap.location(obj) == "/members/qux"
+        assert sitemap.location(MagicMock(nest_key="bar")) == "/members/bar"
+
+    def test_inherits_from_base(self):
+        assert issubclass(MemberSitemap, BaseSitemap)
diff --git a/backend/tests/apps/sitemap/views/project_test.py b/backend/tests/apps/sitemap/views/project_test.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
-from apps.sitemap.views import ProjectSitemap
+from apps.sitemap.views.base import BaseSitemap
+from apps.sitemap.views.project import ProjectSitemap
 
 
 class TestProjectSitemap:
@@ -13,8 +14,9 @@ def test_items(self, mock_project):
         assert list(sitemap.items()) == [mock_obj]
 
     def test_location(self):
-        obj = MagicMock()
-        obj.get_absolute_url.return_value = "/projects/foo"
         sitemap = ProjectSitemap()
 
-        assert sitemap.location(obj) == "/projects/foo"
+        assert sitemap.location(MagicMock(nest_key="bar")) == "/projects/bar"
+
+    def test_inherits_from_base(self):
+        assert issubclass(ProjectSitemap, BaseSitemap)
diff --git a/backend/tests/apps/sitemap/views/static_test.py b/backend/tests/apps/sitemap/views/static_test.py
@@ -4,7 +4,8 @@
 import pytest
 from django.utils import timezone
 
-from apps.sitemap.views import StaticSitemap
+from apps.sitemap.views.base import BaseSitemap
+from apps.sitemap.views.static import StaticSitemap
 
 
 @pytest.fixture
@@ -13,6 +14,9 @@ def sitemap():
 
 
 class TestStaticSitemap:
+    def test_inherits_from_base(self):
+        assert issubclass(StaticSitemap, BaseSitemap)
+
     @patch("apps.sitemap.views.static.Chapter.objects.aggregate")
     @patch("apps.sitemap.views.static.Committee.objects.aggregate")
     @patch("apps.sitemap.views.static.Project.objects.aggregate")
diff --git a/frontend/package.json b/frontend/package.json
@@ -32,7 +32,7 @@
     "@heroui/tooltip": "^2.2.20",
     "@next/eslint-plugin-next": "^15.4.1",
     "@next/third-parties": "^15.4.1",
-    "@sentry/nextjs": "^9.39.0",
+    "@sentry/nextjs": "^9.40.0",
     "@testing-library/user-event": "^14.6.1",
     "@types/leaflet.markercluster": "^1.5.5",
     "@types/lodash": "^4.17.20",
@@ -58,7 +58,7 @@
     "react-apexcharts": "^1.7.0",
     "react-dom": "^19.1.0",
     "react-icons": "^5.5.0",
-    "react-router-dom": "^7.6.3",
+    "react-router-dom": "^7.7.0",
     "tailwind-merge": "^3.3.1",
     "tailwindcss-animate": "^1.0.7"
   },
diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
diff --git a/schema/poetry.lock b/schema/poetry.lock

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ def get_template_context(self, command: dict):`
`24`	`24`	`return {`
`25`	`25`	`**super().get_template_context(command),`
`26`	`26`	`"name": "OWASP community",`
`27`		`- "url": get_absolute_url("members"),`
	`27`	`+ "url": get_absolute_url("/members"),`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ def get_template_context(self, command: dict):`
`49`	`49`	`"mode": "general",`
`50`	`50`	`"nest_bot_name": NEST_BOT_NAME,`
`51`	`51`	`"previous_year": gsoc_year,`
`52`		`- "projects_url": get_absolute_url("projects"),`
	`52`	`+ "projects_url": get_absolute_url("/projects"),`
`53`	`53`	`}`
`54`	`54`	`)`
`55`	`55`	`elif command_text.isnumeric():`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ def get_template_context(self, command: dict):`
`46`	`46`	`"idx_key": chapter["idx_key"],`
`47`	`47`	`"idx_leaders": chapter["idx_leaders"],`
`48`	`48`	`"idx_name": chapter["idx_name"],`
`49`		`- "url": get_absolute_url(f"chapters/{chapter['idx_key']}"),`
	`49`	`+ "url": get_absolute_url(f"/chapters/{chapter['idx_key']}"),`
`50`	`50`	`}`
`51`	`51`	`for chapter in chapters`
`52`	`52`	`]`
`@@ -55,7 +55,7 @@ def get_template_context(self, command: dict):`
`55`	`55`	`"idx_key": project["idx_key"],`
`56`	`56`	`"idx_leaders": project["idx_leaders"],`
`57`	`57`	`"idx_name": project["idx_name"],`
`58`		`- "url": get_absolute_url(f"projects/{project['idx_key']}"),`
	`58`	`+ "url": get_absolute_url(f"/projects/{project['idx_key']}"),`
`59`	`59`	`}`
`60`	`60`	`for project in projects`
`61`	`61`	`]`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`project_issues_url = get_absolute_url("/contribute")`
`14`		`-projects_url = get_absolute_url("projects")`
	`14`	`+projects_url = get_absolute_url("/projects")`
`15`	`15`
`16`	`16`	`CONTRIBUTE_GENERAL_INFORMATION_BLOCKS = (`
`17`	`17`	`markdown(`