Merge branch 'main' into 670

Author: andrewtavis

backend/communities/organizations/tests/test_org_model_str_methods.py

@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+import datetime
+
+import pytest
+
+from communities.factories import StatusTypeFactory
+from communities.organizations.factories import (
+    OrganizationApplicationStatusFactory,
+    OrganizationFactory,
+    OrganizationImageFactory,
+    OrganizationTextFactory,
+)
+from communities.organizations.models import OrganizationApplication
+
+pytestmark = pytest.mark.django_db
+
+
+def test_organization_application_str() -> None:
+    """Test string representation of OrganizationApplication model."""
+
+    org = OrganizationFactory.build()
+    status = StatusTypeFactory()
+
+    # OrganizationApplication instead of OrganizationApplicationFactory (many-to-many field assignment issues).
+    org_application = OrganizationApplication(
+        org=org,
+        status=status,
+        creation_date=datetime.datetime.now(tz=datetime.timezone.utc),
+    )
+
+    assert str(org_application) == f"{org_application.creation_date}"
+
+    assert str(org_application) == f"{org_application.creation_date}"
+
+
+def test_organization_application_status_str() -> None:
+    """Test string representation of OrganizationApplicationStatus model."""
+    status = OrganizationApplicationStatusFactory.build(status_name="Approved")
+    assert str(status) == "Approved"
+
+
+def test_organization_image_str() -> None:
+    """Test string representation of OrganizationImage model."""
+    org_image = OrganizationImageFactory.build()
+    assert str(org_image) == f"{org_image.id}"
+
+
+def test_organization_text_str() -> None:
+    """Test string representation of OrganizationText model."""
+    org_text = OrganizationTextFactory.build(iso="en")
+    org = org_text.org
+    assert str(org_text) == f"{org} - en"

backend/content/tests/tests.py

@@ -5,9 +5,20 @@
 
 # mypy: ignore-errors
 import pytest
+from uuid import uuid4
+from django.utils import timezone
 
 from content.factories import ResourceFactory, TaskFactory, TopicFactory
-
+from content.models import (
+    Discussion,
+    Faq,
+    Image,
+    Location,
+    SocialLink,
+    Tag,
+    DiscussionEntry
+)
+from authentication.factories import UserFactory
 pytestmark = pytest.mark.django_db
 
 
@@ -19,3 +30,92 @@ def test_str_methods() -> None:
     assert str(resource) == resource.name
     assert str(task) == task.name
     assert str(topics) == topics.name
+
+def test_discussion_str_method():
+    """Test the __str__ method of the Discussion model."""
+    user = UserFactory()
+    discussion = Discussion(
+        id=uuid4(),
+        created_by=user,
+        title="Test Discussion",
+        creation_date=timezone.now()
+    )
+    assert str(discussion) == f"{discussion.id}"
+
+def test_faq_str_method():
+    """Test the __str__ method of the Faq model."""
+    faq = Faq(
+        id=uuid4(),
+        iso="en",
+        primary=True,
+        question="Test Question?",
+        answer="Test Answer",
+        order=1,
+        last_updated=timezone.now()
+    )
+    assert str(faq) == faq.question
+
+def test_image_str_method():
+    """Test the __str__ method of the Image model."""
+    image_id = uuid4()
+    image = Image(
+        id=image_id,
+        creation_date=timezone.now()
+    )
+    assert str(image) == f"{image_id}"
+
+def test_location_str_method():
+    """Test the __str__ method of the Location model."""
+    location_id = uuid4()
+    location = Location(
+        id=location_id,
+        lat="40.7128",
+        lon="-74.0060",
+        display_name="New York City"
+    )
+    assert str(location) == f"{location_id}"
+
+def test_social_link_str_method():
+    """Test the __str__ method of the SocialLink model."""
+    social_link = SocialLink(
+        id=uuid4(),
+        link="https://example.com",
+        label="Example",
+        order=1,
+        creation_date=timezone.now(),
+        last_updated=timezone.now()
+    )
+    assert str(social_link) == social_link.label
+
+def test_tag_str_method():
+    """Test the __str__ method of the Tag model."""
+    tag_id = uuid4()
+    tag = Tag(
+        id=tag_id,
+        text="Test Tag",
+        description="Test Description",
+        creation_date=timezone.now()
+    )
+    assert str(tag) == f"{tag_id}"
+
+def test_discussion_entry_str_method():
+    """Test the __str__ method of the DiscussionEntry model."""
+    user = UserFactory()
+    discussion = Discussion(
+        id=uuid4(),
+        created_by=user,
+        title="Test Discussion",
+        creation_date=timezone.now()
+    )
+    discussion.save()
+
+    entry_id = uuid4()
+    entry = DiscussionEntry(
+        id=entry_id,
+        discussion=discussion,
+        created_by=user,
+        text="Test Entry",
+        creation_date=timezone.now(),
+        last_updated=timezone.now()
+    )
+    assert str(entry) == f"{entry_id}"

backend/events/tests.py

@@ -13,6 +13,7 @@
     FormatFactory,
     RoleFactory,
 )
+from events.models import EventText
 
 pytestmark = pytest.mark.django_db
 
@@ -29,3 +30,14 @@ def test_str_methods() -> None:
     assert str(event_attendee_status) == event_attendee_status.status_name
     assert str(_format) == _format.name
     assert str(role) == role.name
+
+def test_event_text_str_method() -> None:
+    event = EventFactory.create()
+    event_text = EventText.objects.create(
+        event=event,
+        iso="en",
+        primary=True,
+        description="Test description",
+        get_involved="Get involved text"
+    )
+    assert str(event_text) == f"{event_text.event} - {event_text.iso}"

frontend/components/card/discussion/CardDiscussionInput.vue

@@ -128,13 +128,13 @@
 </template>
 
 <script setup lang="ts">
-import type { DiscussionInput } from "~/types/content/discussion";
-import { IconMap } from "~/types/icon-map";
-import { useEditor, EditorContent } from "@tiptap/vue-3";
-import Placeholder from "@tiptap/extension-placeholder";
-import StarterKit from "@tiptap/starter-kit";
 import Link from "@tiptap/extension-link";
 import Mention from "@tiptap/extension-mention";
+import Placeholder from "@tiptap/extension-placeholder";
+import StarterKit from "@tiptap/starter-kit";
+import { EditorContent, useEditor } from "@tiptap/vue-3";
+import type { DiscussionInput } from "~/types/content/discussion";
+import { IconMap } from "~/types/icon-map";
 import Suggestion from "../../../utils/mentionSuggestion";
 
 const showTooltip = ref(false);
@@ -189,7 +189,7 @@ const italic = () => {
 };
 const blockquote = () => {
   console.log("click on blockquote");
-  editor.value?.chain().focus().toggleCodeBlock().run();
+  editor.value?.chain().focus().toggleBlockquote().run();
 };
 const link = () => {
   console.log("click on link");
@@ -236,4 +236,8 @@ const listol = () => {
   height: 0;
   pointer-events: none;
 }
+
+.tiptap blockquote {
+  @apply my-2 rounded-r-md border-l-4 border-section-div bg-layer-2 py-1 pl-4 italic text-distinct-text;
+}
 </style>

frontend/nuxt.config.ts

@@ -12,25 +12,33 @@ export default defineNuxtConfig({
   app: {
     head,
   },
+
   modules: modules,
   ssr: false,
+
   typescript: {
     // strict: true,
     // typeCheck: true,
   },
+
   devtools: {
     enabled: true,
   },
+
   alias: {
     "@": resolve(__dirname, "./"),
   },
+
   plugins: ["~/plugins/i18n-head.ts"],
+
   content: {
     watch: { enabled: false },
   },
+
   imports: {
     dirs: ["./stores"],
   },
+
   vite: {
     server: {
       watch: {
@@ -47,23 +55,28 @@ export default defineNuxtConfig({
       },
     },
   },
+
   colorMode: {
     classSuffix: "",
   },
+
   css: ["reduced-motion/css"],
+
   tailwindcss: {
     cssPath: "~/assets/css/tailwind.css",
     configPath: "tailwind.config.ts",
     config: {
       plugins: [tailwindTypography],
     },
   },
+
   postcss: {
     plugins: {
       tailwindcss: {},
       autoprefixer: {},
     },
   },
+
   i18n: {
     lazy: true,
     strategy: "prefix_and_default",
@@ -79,18 +92,21 @@ export default defineNuxtConfig({
       redirectOn: "root",
     },
   },
+
   components: [
     {
       path: "~/components",
       global: true,
     },
   ],
+
   vue: {
     compilerOptions: {
       isCustomElement: (tag) =>
         ["swiper-slide", "swiper-container"].includes(tag),
     },
   },
+
   hooks: {
     "pages:extend": (pages: NuxtPage[]) => {
       applyMiddleware(pages);
@@ -99,9 +115,11 @@ export default defineNuxtConfig({
       console.log("App instance resolved:", app);
     },
   },
+
   nitro: {
     preset: "netlify-static",
   },
+
   security: {
     headers: {
       contentSecurityPolicy: {
@@ -124,4 +142,6 @@ export default defineNuxtConfig({
       maxUploadFileRequestInBytes: 5000000,
     },
   },
+
+  compatibilityDate: "2025-03-12",
 });