Fix post sharing link & Remove unused share count & Remove ts-path `@…

…config` (#303)

canopeum_backend/canopeum_backend/management/commands/initialize_database.py

@@ -145,14 +145,14 @@ def create_posts_for_site(site):
     num_posts = random.randint(4, 8)
     for _ in range(num_posts):
         # Generate a random share_count between 0 and 10
-        share_count = random.randint(0, 10)
+        # share_count = random.randint(0, 10)
 
         # Create a post for the site
         post = Post.objects.create(
             site=site,
             body=f"{site.name} has planted {random.randint(100, 1000)} new trees today. "
             + "Let's continue to grow our forest!",
-            share_count=share_count,
+            # share_count=share_count,
         )
         # Change created_at date since it is auto-generated on create
         # Generate a random created_at time within the last 2 months
@@ -536,7 +536,7 @@ def create_sites(self):
             site=site1,
             body="The season is officially started; "
             + "new plants are starting to grow and our volunteers are very dedicated!",
-            share_count=5,
+            # share_count=5,
         )
         post.media.add(*Asset.objects.filter(asset__contains="canopeum_post_img"))
         create_posts_for_site(site1)

canopeum_backend/canopeum_backend/migrations/0002_remove_post_share_count.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1 on 2024-11-26 18:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canopeum_backend", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="post",
+            name="share_count",
+        ),
+    ]

canopeum_backend/canopeum_backend/models.py

@@ -334,7 +334,8 @@ def delete(self, using=None, keep_parents=False):
 class Post(models.Model):
     site = models.ForeignKey(Site, models.CASCADE, blank=False, null=False)
     body = models.TextField(blank=False, null=False)
-    share_count = models.IntegerField(default=0)
+    # Feature currently unused, maybe eventually we'll want to track social media shares
+    # share_count = models.IntegerField(default=0)
     created_at = models.DateTimeField(auto_now_add=True, blank=False, null=False)
     # TODO(NicolasDontigny): Add created by user?
     # created_by = models.ForeignKey(User, models.DO_NOTHING, blank=True, null=True)

canopeum_backend/canopeum_backend/serializers.py

@@ -689,7 +689,7 @@ class Meta:
             "created_at",
             "body",
             "like_count",
-            "share_count",
+            # "share_count",
             "comment_count",
             "has_liked",
             "media",

canopeum_backend/test.py

@@ -18,4 +18,8 @@ def test_no_pending_migrations(self):
                 stderr=StringIO(),
             )
         except SystemExit:
-            raise AssertionError("Pending migrations:\n" + out.getvalue()) from None
+            raise AssertionError(
+                "Pending migrations:\n"
+                + out.getvalue()
+                + "\nPlease run `uv run manage.py makemigrations`"
+            ) from None

canopeum_frontend/.eslintrc.cjs

@@ -10,7 +10,7 @@ module.exports = {
   parser: '@typescript-eslint/parser',
   parserOptions: {
     projectService: {
-      allowDefaultProject: ['*/*/*.js', '.eslintrc.cjs'],
+      allowDefaultProject: ['*/*/*.js', '.eslintrc.cjs', 'apiSchemaGenerator.js'],
     },
     // Still needed for plugins that haven't updated to typescript-eslint@8 yet
     // Namely: eslint-plugin-sonarjs
@@ -55,7 +55,6 @@ module.exports = {
             + '|src/'
             + '|@assets'
             + '|@components'
-            + '|@config'
             + '|@constants'
             + '|@hooks'
             + '|@models'

canopeum_frontend/src/config/apiSchemaGenerator.js → canopeum_frontend/apiSchemaGenerator.js

@@ -6,7 +6,7 @@ import * as url from 'node:url'
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 const schemaUrl = 'http://127.0.0.1:8000/api/schema/'
 const outputPath = path.join(__dirname, 'openapi.yaml')
-const nswagPath = path.join(__dirname, '../../..', 'docs/canopeum.nswag')
+const nswagPath = path.join(__dirname, '..', 'docs', 'canopeum.nswag')
 
 const response = await fetch(schemaUrl)
 if (!response.ok) {

canopeum_frontend/package.json

@@ -11,7 +11,7 @@
     "lint": "cd .. && dprint check && cd canopeum_frontend && npm run eslint",
     "lint:fix": "npm run eslint -- --fix && cd .. && dprint fmt",
     "preview": "vite preview",
-    "generate-api-client": "node ./src/config/apiSchemaGenerator.js"
+    "generate-api-client": "node ./apiSchemaGenerator.js"
   },
   "// @mui/x-charts": "https://github.com/mui/mui-x/pull/14392/files#r1764019386",
   "dependencies": {
@@ -47,7 +47,7 @@
     "@types/react-transition-group": "^4.4.10",
     "@vitejs/plugin-react": "^4.2.1",
     "dprint": "^0.47.2",
-    "eslint-config-beslogic": "^3.1.1",
+    "eslint-config-beslogic": "^3.1.2",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",

canopeum_frontend/src/components/settings/AdminInvitationDialog.tsx

@@ -4,7 +4,6 @@ import { useTranslation } from 'react-i18next'
 
 import { SnackbarContext } from '@components/context/SnackbarContext'
 import MultipleSelectChip, { type SelectionItem } from '@components/inputs/MultipleSelectChip'
-import { APP_CONFIG } from '@config/config'
 import useApiClient from '@hooks/ApiClientHook'
 import useErrorHandling from '@hooks/ErrorHandlingHook'
 import { CreateUserInvitation } from '@services/api'
@@ -72,7 +71,7 @@ const AdminInvitationDialog = ({ open, handleClose }: Props) => {
       })
       const response = await getApiClient().userInvitationClient.create(createUserInvitation)
 
-      setInvitationLink(`${APP_CONFIG.appBaseUrl}/register?code=${response.code}`)
+      setInvitationLink(`${globalThis.location.host}register?code=${response.code}`)
     } catch (error: unknown) {
       const errorMessage = getErrorMessage(
         error,

canopeum_frontend/src/components/social/PostCard.tsx

@@ -159,7 +159,6 @@ const PostCard = ({ post, deletePost }: Props) => {
             type='button'
           >
             <span className='material-symbols-outlined text-primary'>share</span>
-            <div>{post.shareCount}</div>
           </button>
         </div>
       </div>

canopeum_frontend/src/components/social/SharePostDialog.tsx

@@ -3,7 +3,6 @@ import { useContext, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { SnackbarContext } from '@components/context/SnackbarContext'
-import { APP_CONFIG } from '@config/config'
 import { appRoutes } from '@constants/routes.constant'
 import type { Post } from '@services/api'
 
@@ -20,7 +19,7 @@ const SharePostDialog = ({ onClose, open, post }: Props) => {
   const [shareUrl, setShareUrl] = useState('')
 
   useEffect(
-    () => setShareUrl(`${APP_CONFIG.appBaseUrl}${appRoutes.postDetail(post.id)}`),
+    () => setShareUrl(`${globalThis.location.host}${appRoutes.postDetail(post.id)}`),
     [post],
   )