Merge pull request #73 from joaoc-dev/dev

merge dev

Author: joaoc-dev

.github/workflows/release.yaml

@@ -25,18 +25,21 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Important for semantic-release to get full git history
+          fetch-depth: 0 # Important for semantic-release to get full git history
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
           version: 10
+          package_json_file: blueledger-webapp/package.json
+          run_install: false
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'
+          cache-dependency-path: blueledger-webapp/pnpm-lock.yaml
 
       - name: Install dependencies
         run: pnpm install
@@ -47,4 +50,4 @@ jobs:
       - name: Run semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release
+        run: npx semantic-release

blueledger-webapp/app/api/friendships/invite/route.ts

@@ -120,7 +120,7 @@ export const POST = withAuth(async (request: NextAuthRequest) => {
 
     // Send pusher notification to recipient when created
     const privateChannel = `private-user-${recipientUser.id}`;
-    sendToPusher(privateChannel, PusherEvents.NOTIFICATION as PusherEvent, '');
+    await sendToPusher(privateChannel, PusherEvents.NOTIFICATION as PusherEvent, '');
 
     logger.info(LogEvents.FRIENDSHIP_INVITE_SENT, {
       fromUser,

blueledger-webapp/app/api/groups/[id]/memberships/route.ts

@@ -202,7 +202,7 @@ export const POST = withAuth(async (
 
     // Send pusher notification to recipient when created
     const privateChannel = `private-user-${recipientUser.id}`;
-    sendToPusher(privateChannel, PusherEvents.NOTIFICATION as PusherEvent, '');
+    await sendToPusher(privateChannel, PusherEvents.NOTIFICATION as PusherEvent, '');
 
     logger.info(LogEvents.GROUP_MEMBERSHIP_INVITE, {
       fromUser: inviterId,

blueledger-webapp/app/layout.tsx

@@ -25,6 +25,7 @@ const inter = Inter({
 
 export const metadata: Metadata = generateMetadata({
   manifest: '/manifest.json',
+  metadataBase: new URL(process.env.NEXT_PUBLIC_SITE_URL ?? 'https://blueledger.production.joao-carvalho.com'),
   icons: {
     icon: '/favicon.ico',
     apple: '/hand-coins.png',

blueledger-webapp/components/layout/nav-bar/nav-bar.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import { useEffect } from 'react';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { DesktopNavBar } from './desktop-nav-bar';
 import { MobileNavBar } from './mobile-nav-bar';
@@ -26,6 +27,12 @@ const links = [
 
 function NavBar() {
   const isMobile = useIsMobile();
+
+  useEffect(() => {
+    import('@/features/groups/components/groups-table');
+    import('@/features/friendship/components/friendships-table');
+  }, []);
+
   if (isMobile === undefined)
     return <NavBarLoading />;
 

blueledger-webapp/features/expenses/components/expenses-table/dynamic-table-wrapper.tsx

@@ -1,9 +1,11 @@
 'use client';
 
 import dynamic from 'next/dynamic';
+import ExpensesTableSkeleton from './expenses-table-skeleton';
 
 const DynamicTableWrapper = dynamic(() => import('./expenses-table'), {
   ssr: false,
+  loading: () => <ExpensesTableSkeleton />,
 });
 
 export default DynamicTableWrapper;

blueledger-webapp/features/friendship/components/friendships-table/dynamic-table-wrapper.tsx

@@ -1,9 +1,11 @@
 'use client';
 
 import dynamic from 'next/dynamic';
+import FriendshipsTableSkeleton from './friendships-table-skeleton';
 
 const DynamicTableWrapper = dynamic(() => import('./friendships-table'), {
   ssr: false,
+  loading: () => <FriendshipsTableSkeleton />,
 });
 
 export default DynamicTableWrapper;

blueledger-webapp/features/groups/components/groups-table/dynamic-table-wrapper.tsx

@@ -1,9 +1,11 @@
 'use client';
 
 import dynamic from 'next/dynamic';
+import GroupsTableSkeleton from './groups-table-skeleton';
 
 const DynamicTableWrapper = dynamic(() => import('./groups-table'), {
   ssr: false,
+  loading: () => <GroupsTableSkeleton />,
 });
 
 export default DynamicTableWrapper;

blueledger-webapp/features/groups/components/modals/add-member-by-email.tsx

@@ -14,12 +14,11 @@ import AddMemberPanel from './add-member-panel';
 
 interface AddMemberByEmailProps {
   currentUserMembership: GroupMembershipDisplay;
-  onSuccess: () => void;
   isInviting: boolean;
   setIsInviting: (inviting: boolean) => void;
 }
 
-function AddMemberByEmail({ currentUserMembership, onSuccess, isInviting, setIsInviting }: AddMemberByEmailProps) {
+function AddMemberByEmail({ currentUserMembership, isInviting, setIsInviting }: AddMemberByEmailProps) {
   const [email, setEmail] = useState('');
   const [queryEmail, setQueryEmail] = useState('');
 
@@ -43,6 +42,12 @@ function AddMemberByEmail({ currentUserMembership, onSuccess, isInviting, setIsI
     setQueryEmail('');
   }, []);
 
+  function handleSuccess() {
+    setIsInviting(false);
+    setEmail('');
+    setQueryEmail('');
+  }
+
   return (
     <div className="flex flex-col gap-4 w-full">
       <div className="flex items-center gap-2 w-full">
@@ -131,7 +136,7 @@ function AddMemberByEmail({ currentUserMembership, onSuccess, isInviting, setIsI
           }
 
           // User can be invited - show the invite panel
-          return <AddMemberPanel user={data.user} currentUserMembership={currentUserMembership} onSuccess={onSuccess} isInviting={isInviting} setIsInviting={setIsInviting} />;
+          return <AddMemberPanel user={data.user} currentUserMembership={currentUserMembership} onSuccess={handleSuccess} isInviting={isInviting} setIsInviting={setIsInviting} />;
         })()}
       </div>
     </div>

blueledger-webapp/features/groups/components/modals/add-member-modal.tsx

@@ -140,7 +140,6 @@ function AddMemberModal({ isOpen, setIsOpen, currentUserMembership }: AddMemberM
           </p>
           <AddMemberByEmail
             currentUserMembership={currentUserMembership}
-            onSuccess={handleClose}
             isInviting={isInviting}
             setIsInviting={setIsInviting}
           />