From 84c97ee2baf89d2a349daf769872c892b1cb4d41 Mon Sep 17 00:00:00 2001 From: AdeepaK2 Date: Sun, 20 Jul 2025 10:16:52 +0530 Subject: [PATCH 1/4] feat: integrate jsPDF for generating meeting notes PDF - Added jsPDF library to package.json for PDF generation. - Implemented PDF generation functionality in pdfHandler.ts. - Updated MeetingItem and MeetingBox components to utilize the new PDF generation feature. - Refactored MeetingNotesSidebar to remove unused tag functionality. - Enhanced meeting notes download functionality to create PDFs instead of markdown files. - Removed MeetingTips component and related unused code. - Cleaned up MeetingNotesSidebar by simplifying the title input and removing rich text formatting options. - Adjusted meeting filtering logic in MeetingBox to exclude currently happening meetings. --- package-lock.json | 216 +++++++- package.json | 2 +- src/components/meetingSystem/MeetingItem.tsx | 32 +- .../meetingSystem/MeetingNotesSidebar.tsx | 486 ++---------------- src/components/meetingSystem/MeetingTips.tsx | 0 src/components/meetingSystem/new | 0 src/components/messageSystem/MeetingBox.tsx | 125 ++--- src/hooks/useMeetingNotes.ts | 31 -- src/utils/pdfHandler.ts | 148 ++++++ 9 files changed, 442 insertions(+), 598 deletions(-) delete mode 100644 src/components/meetingSystem/MeetingTips.tsx delete mode 100644 src/components/meetingSystem/new create mode 100644 src/utils/pdfHandler.ts diff --git a/package-lock.json b/package-lock.json index 72a0f643..5e49a1cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "googleapis": "^152.0.0", "jotai": "^2.12.5", "jsonwebtoken": "^9.0.2", + "jspdf": "^3.0.1", "jwt-decode": "^4.0.0", "kunuharupa": "^1.2.0", "lodash-es": "^4.17.21", @@ -59,7 +60,6 @@ "node-fetch": "^3.3.2", "node-record-lpcm16": "^1.0.1", "nodemailer": "^6.10.1", - "quill": "^2.0.3", "react": "^18.3.1", "react-chartjs-2": "^5.3.0", "react-day-picker": "^8.10.1", @@ -5038,6 +5038,13 @@ "version": "1.1.4", "license": "BSD-3-Clause" }, + "node_modules/@types/raf": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/@types/raf/-/raf-3.4.3.tgz", + "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==", + "license": "MIT", + "optional": true + }, "node_modules/@types/react": { "version": "19.1.2", "devOptional": true, @@ -6014,6 +6021,18 @@ "version": "0.4.0", "license": "MIT" }, + "node_modules/atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "license": "(MIT OR Apache-2.0)", + "bin": { + "atob": "bin/atob.js" + }, + "engines": { + "node": ">= 4.5.0" + } + }, "node_modules/available-typed-arrays": { "version": "1.0.7", "license": "MIT", @@ -6185,6 +6204,16 @@ "version": "1.0.0", "license": "MIT" }, + "node_modules/base64-arraybuffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz", + "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/base64-js": { "version": "1.5.1", "funding": [ @@ -6422,6 +6451,18 @@ "node": ">=16.20.1" } }, + "node_modules/btoa": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", + "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==", + "license": "(MIT OR Apache-2.0)", + "bin": { + "btoa": "bin/btoa.js" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/buffer": { "version": "4.9.2", "license": "MIT", @@ -6564,6 +6605,33 @@ ], "license": "CC-BY-4.0" }, + "node_modules/canvg": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/canvg/-/canvg-3.0.11.tgz", + "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==", + "license": "MIT", + "optional": true, + "dependencies": { + "@babel/runtime": "^7.12.5", + "@types/raf": "^3.4.0", + "core-js": "^3.8.3", + "raf": "^3.4.1", + "regenerator-runtime": "^0.13.7", + "rgbcolor": "^1.0.1", + "stackblur-canvas": "^2.0.0", + "svg-pathdata": "^6.0.3" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/canvg/node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", + "license": "MIT", + "optional": true + }, "node_modules/chalk": { "version": "4.1.2", "license": "MIT", @@ -6918,6 +6986,18 @@ "node": ">= 0.6" } }, + "node_modules/core-js": { + "version": "3.44.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.44.0.tgz", + "integrity": "sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/cors": { "version": "2.8.5", "license": "MIT", @@ -7013,6 +7093,16 @@ "version": "4.2.0", "license": "MIT" }, + "node_modules/css-line-break": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz", + "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==", + "license": "MIT", + "optional": true, + "dependencies": { + "utrie": "^1.0.2" + } + }, "node_modules/css.escape": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", @@ -8453,6 +8543,12 @@ "node": "^12.20 || >= 14.13" } }, + "node_modules/fflate": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", + "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "license": "MIT" + }, "node_modules/file-entry-cache": { "version": "8.0.0", "dev": true, @@ -9392,6 +9488,20 @@ "dev": true, "license": "MIT" }, + "node_modules/html2canvas": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz", + "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==", + "license": "MIT", + "optional": true, + "dependencies": { + "css-line-break": "^2.1.0", + "text-segmentation": "^1.0.3" + }, + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/http-cache-semantics": { "version": "4.1.1", "license": "BSD-2-Clause" @@ -11373,6 +11483,24 @@ "npm": ">=6" } }, + "node_modules/jspdf": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jspdf/-/jspdf-3.0.1.tgz", + "integrity": "sha512-qaGIxqxetdoNnFQQXxTKUD9/Z7AloLaw94fFsOiJMxbfYdBbrBuhWmbzI8TVjrw7s3jBY1PFHofBKMV/wZPapg==", + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.26.7", + "atob": "^2.1.2", + "btoa": "^1.2.1", + "fflate": "^0.8.1" + }, + "optionalDependencies": { + "canvg": "^3.0.11", + "core-js": "^3.6.0", + "dompurify": "^3.2.4", + "html2canvas": "^1.0.0-rc.5" + } + }, "node_modules/jsx-ast-utils": { "version": "3.3.5", "dev": true, @@ -12468,10 +12596,6 @@ "version": "1.0.1", "license": "BlueOak-1.0.0" }, - "node_modules/parchment": { - "version": "3.0.0", - "license": "BSD-3-Clause" - }, "node_modules/parent-module": { "version": "1.0.1", "dev": true, @@ -12573,6 +12697,13 @@ "url": "https://github.com/sponsors/Borewit" } }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", + "license": "MIT", + "optional": true + }, "node_modules/pg": { "version": "8.16.3", "license": "MIT", @@ -13116,19 +13247,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/quill": { - "version": "2.0.3", - "license": "BSD-3-Clause", - "dependencies": { - "eventemitter3": "^5.0.1", - "lodash-es": "^4.17.21", - "parchment": "^3.0.0", - "quill-delta": "^5.1.0" - }, - "engines": { - "npm": ">=8.2.3" - } - }, "node_modules/quill-delta": { "version": "5.1.0", "license": "MIT", @@ -13141,9 +13259,15 @@ "node": ">= 12.0.0" } }, - "node_modules/quill/node_modules/eventemitter3": { - "version": "5.0.1", - "license": "MIT" + "node_modules/raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "license": "MIT", + "optional": true, + "dependencies": { + "performance-now": "^2.1.0" + } }, "node_modules/react": { "version": "18.3.1", @@ -13572,6 +13696,16 @@ "node": ">=0.10.0" } }, + "node_modules/rgbcolor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz", + "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==", + "license": "MIT OR SEE LICENSE IN FEEL-FREE.md", + "optional": true, + "engines": { + "node": ">= 0.8.15" + } + }, "node_modules/rrweb-cssom": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz", @@ -14167,6 +14301,16 @@ "node": ">=8" } }, + "node_modules/stackblur-canvas": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz", + "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=0.1.14" + } + }, "node_modules/stopword": { "version": "3.1.5", "license": "MIT" @@ -14574,6 +14718,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/svg-pathdata": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz", + "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/swc": { "version": "1.0.11", "license": "MIT", @@ -14786,6 +14940,16 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/text-segmentation": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz", + "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==", + "license": "MIT", + "optional": true, + "dependencies": { + "utrie": "^1.0.2" + } + }, "node_modules/thenify": { "version": "3.3.1", "license": "MIT", @@ -15405,6 +15569,16 @@ "version": "1.0.2", "license": "MIT" }, + "node_modules/utrie": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz", + "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==", + "license": "MIT", + "optional": true, + "dependencies": { + "base64-arraybuffer": "^1.0.2" + } + }, "node_modules/uuid": { "version": "9.0.1", "funding": [ diff --git a/package.json b/package.json index db0467ce..52293c60 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "googleapis": "^152.0.0", "jotai": "^2.12.5", "jsonwebtoken": "^9.0.2", + "jspdf": "^3.0.1", "jwt-decode": "^4.0.0", "kunuharupa": "^1.2.0", "lodash-es": "^4.17.21", @@ -83,7 +84,6 @@ "node-fetch": "^3.3.2", "node-record-lpcm16": "^1.0.1", "nodemailer": "^6.10.1", - "quill": "^2.0.3", "react": "^18.3.1", "react-chartjs-2": "^5.3.0", "react-day-picker": "^8.10.1", diff --git a/src/components/meetingSystem/MeetingItem.tsx b/src/components/meetingSystem/MeetingItem.tsx index 3af9ed09..ab094eaf 100644 --- a/src/components/meetingSystem/MeetingItem.tsx +++ b/src/components/meetingSystem/MeetingItem.tsx @@ -1,7 +1,8 @@ import React from 'react'; import { Calendar, Clock, Download, Video, XCircle } from 'lucide-react'; import Meeting from '@/types/meeting'; -import { getMeetingStatus, downloadMeetingNotesFile, canCancelMeeting } from '@/services/meetingApiServices'; +import { getMeetingStatus, canCancelMeeting, checkMeetingNotesExist, fetchMeetingNotes } from '@/services/meetingApiServices'; +import { generateMeetingNotesPDF, MeetingNotePDFData } from '@/utils/pdfHandler'; import OptimizedAvatar from '@/components/ui/OptimizedAvatar'; interface UserProfile { @@ -83,15 +84,28 @@ export default function MeetingItem({ // Download notes for a meeting const handleDownloadNotes = async () => { try { - const success = await downloadMeetingNotesFile( - meeting._id, - userId, - `Meeting with ${otherUserName}`, - meeting.meetingTime.toString() - ); + const notesData = await fetchMeetingNotes(meeting._id, userId); - if (success) { - onAlert('success', 'Notes downloaded successfully as Markdown file!'); + if (notesData) { + const pdfData: MeetingNotePDFData = { + title: notesData.title || `Meeting with ${otherUserName}`, + content: notesData.content, + meetingId: meeting._id, + createdAt: notesData.createdAt, + lastModified: notesData.lastModified, + wordCount: notesData.wordCount, + tags: notesData.tags, + isPrivate: notesData.isPrivate, + otherUserName: otherUserName, + meetingInfo: { + description: meeting.description, + meetingTime: meeting.meetingTime.toString(), + isDeleted: false + } + }; + + generateMeetingNotesPDF(pdfData); + onAlert('success', 'Notes downloaded successfully as PDF!'); } else { onAlert('info', 'No notes found for this meeting'); } diff --git a/src/components/meetingSystem/MeetingNotesSidebar.tsx b/src/components/meetingSystem/MeetingNotesSidebar.tsx index d8e6c8ff..58468b10 100644 --- a/src/components/meetingSystem/MeetingNotesSidebar.tsx +++ b/src/components/meetingSystem/MeetingNotesSidebar.tsx @@ -1,34 +1,24 @@ import React, { useState, useRef, useEffect } from 'react'; import { StickyNote, - Save, - Edit3, - Tag, - Eye, - EyeOff, X, - Plus, - Clock, - Hash, - Trash2, - RefreshCw, - ChevronLeft, + ChevronLeft, ChevronRight, + Save, Download, - Bold, - Italic, - Underline, - Highlighter, - Type, - List, - Quote + Trash2, + RefreshCw, + Hash, + Clock } from 'lucide-react'; import { useMeetingNotes } from '@/hooks/useMeetingNotes'; +import { generateMeetingNotesPDF, MeetingNotePDFData } from '@/utils/pdfHandler'; interface MeetingNotesSidebarProps { meetingId?: string; userId?: string; userName?: string; + otherUserName?: string; isVisible: boolean; onToggle: () => void; } @@ -37,6 +27,7 @@ export const MeetingNotesSidebar: React.FC = ({ meetingId, userId, userName, + otherUserName, isVisible, onToggle }) => { @@ -49,20 +40,12 @@ export const MeetingNotesSidebar: React.FC = ({ hasUnsavedChanges, updateContent, updateTitle, - addTag, - removeTag, togglePrivacy, saveNotes, deleteNotes } = useMeetingNotes({ meetingId, userId, userName }); - const [isEditingTitle, setIsEditingTitle] = useState(false); - const [newTag, setNewTag] = useState(''); - const [showTagInput, setShowTagInput] = useState(false); - const [selectedText, setSelectedText] = useState(''); - const [currentTopic, setCurrentTopic] = useState(''); const textareaRef = useRef(null); - const titleInputRef = useRef(null); // Auto-resize textarea useEffect(() => { @@ -72,220 +55,28 @@ export const MeetingNotesSidebar: React.FC = ({ } }, [notes?.content]); - // Focus title input when editing - useEffect(() => { - if (isEditingTitle && titleInputRef.current) { - titleInputRef.current.focus(); - titleInputRef.current.select(); - } - }, [isEditingTitle]); - - const handleTitleSave = () => { - setIsEditingTitle(false); - }; - - const handleTitleKeyDown = (e: React.KeyboardEvent) => { - if (e.key === 'Enter') { - handleTitleSave(); - } else if (e.key === 'Escape') { - setIsEditingTitle(false); - } - }; - - const handleAddTag = () => { - if (newTag.trim()) { - addTag(newTag.trim()); - setNewTag(''); - setShowTagInput(false); - } - }; - - const handleTagKeyDown = (e: React.KeyboardEvent) => { - if (e.key === 'Enter') { - handleAddTag(); - } else if (e.key === 'Escape') { - setNewTag(''); - setShowTagInput(false); - } - }; - const downloadNotes = () => { if (!notes?.content) return; - // Create a well-formatted markdown document - const formattedDate = new Date(notes.createdAt).toLocaleDateString('en-US', { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric' - }); - - const formattedTime = new Date(notes.createdAt).toLocaleTimeString('en-US', { - hour: '2-digit', - minute: '2-digit', - hour12: true - }); - - // Keep markdown formatting intact and clean it up - let formattedContent = notes.content - .replace(/^## (.*$)/gm, '## $1') // Ensure proper heading format - .replace(/^# (.*$)/gm, '# $1') // Ensure proper heading format - .replace(/^> (.*$)/gm, '> $1') // Ensure proper quote format - .replace(/^- (.*$)/gm, '- $1') // Ensure proper list format - .trim(); - - const wordCount = getWordCount(); + const pdfData: MeetingNotePDFData = { + title: notes.title || 'Untitled Notes', + content: notes.content, + meetingId: notes.meetingId, + createdAt: notes.createdAt, + lastModified: new Date().toISOString(), + wordCount: getWordCount(), + userName: notes.userName, + otherUserName: otherUserName + }; - const markdownDocument = `# Meeting Notes - ---- - -## Meeting Information - -- **Meeting:** ${notes.title || 'Untitled Notes'} -- **Date:** ${formattedDate} -- **Time:** ${formattedTime} -- **Meeting ID:** \`${notes.meetingId}\` -- **Author:** ${notes.userName || 'Unknown'} - ---- - -## Content - -${formattedContent} - ---- - -## Meeting Details - -- **Word Count:** ${wordCount} -- **Tags:** ${notes.tags?.join(', ') || 'None'} -- **Created:** ${new Date(notes.createdAt).toLocaleDateString()} -- **Last Updated:** ${new Date().toLocaleDateString()} - ---- - -*Generated by SkillSwap Hub - Meeting Notes System* - `; - - const blob = new Blob([markdownDocument], { type: 'text/markdown;charset=utf-8' }); - const url = URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; - a.download = `meeting-notes-${notes.meetingId}-${new Date().toISOString().split('T')[0]}.md`; - document.body.appendChild(a); - a.click(); - document.body.removeChild(a); - URL.revokeObjectURL(url); - }; - - // Rich text editing functions - const getSelectedText = () => { - const textarea = textareaRef.current; - if (!textarea) return ''; - return textarea.value.substring(textarea.selectionStart, textarea.selectionEnd); - }; - - const insertAtCursor = (before: string, after: string = '', replaceBehavior: 'wrap' | 'insert' = 'wrap') => { - const textarea = textareaRef.current; - if (!textarea) return; - - const start = textarea.selectionStart; - const end = textarea.selectionEnd; - const selectedText = textarea.value.substring(start, end); - - let newText = ''; - if (replaceBehavior === 'wrap' && selectedText) { - newText = before + selectedText + after; - } else { - newText = before + after; - } - - const newContent = textarea.value.substring(0, start) + newText + textarea.value.substring(end); - updateContent(newContent); - - // Set cursor position after the inserted text - setTimeout(() => { - if (replaceBehavior === 'wrap' && selectedText) { - textarea.setSelectionRange(start + before.length, start + before.length + selectedText.length); - } else { - const cursorPos = start + before.length; - textarea.setSelectionRange(cursorPos, cursorPos); - } - textarea.focus(); - }, 0); - }; - - const formatBold = () => { - insertAtCursor('**', '**'); - }; - - const formatItalic = () => { - insertAtCursor('*', '*'); + generateMeetingNotesPDF(pdfData); }; - const formatUnderline = () => { - insertAtCursor('', ''); - }; - - const formatHighlight = () => { - insertAtCursor('==', '=='); - }; - - const insertTopic = () => { - if (currentTopic.trim()) { - insertAtCursor(`\n## ${currentTopic.trim()}\n\n`, '', 'insert'); - setCurrentTopic(''); - } - }; - - const insertBulletPoint = () => { - insertAtCursor('\n- ', '', 'insert'); - }; - - const insertQuote = () => { - insertAtCursor('\n> ', '', 'insert'); - }; - - const handleTopicKeyDown = (e: React.KeyboardEvent) => { - if (e.key === 'Enter') { - insertTopic(); - } - }; - - // Enhanced keyboard shortcuts + // Enhanced keyboard shortcuts for save const handleKeyDown = (e: React.KeyboardEvent) => { - if (e.ctrlKey || e.metaKey) { - switch (e.key) { - case 'b': - e.preventDefault(); - formatBold(); - break; - case 'i': - e.preventDefault(); - formatItalic(); - break; - case 'u': - e.preventDefault(); - formatUnderline(); - break; - case 'h': - e.preventDefault(); - formatHighlight(); - break; - case 'q': - e.preventDefault(); - insertQuote(); - break; - case 'l': - e.preventDefault(); - insertBulletPoint(); - break; - case 's': - e.preventDefault(); - saveNotes(); - break; - } + if ((e.ctrlKey || e.metaKey) && e.key === 's') { + e.preventDefault(); + saveNotes(); } }; @@ -301,41 +92,6 @@ ${formattedContent} }); }; - // Function to render markdown-like content as HTML - const renderFormattedContent = (content: string) => { - if (!content) return ''; - - let formatted = content - // Convert bold - .replace(/\*\*(.*?)\*\*/g, '$1') - // Convert italic - .replace(/\*(.*?)\*/g, '$1') - // Convert underline - .replace(/(.*?)<\/u>/g, '$1') - // Convert highlight - .replace(/==(.*?)==/g, '$1') - // Convert code - .replace(/`(.*?)`/g, '$1') - // Convert headings - .replace(/^## (.*$)/gm, '

$1

') - .replace(/^# (.*$)/gm, '

$1

') - // Convert quotes - .replace(/^> (.*$)/gm, '
$1
') - // Convert bullet points - .replace(/^- (.*$)/gm, '
  • $1
    • ') - // Convert line breaks - .replace(/\n/g, '
    '); - - // Wrap consecutive list items in
      - formatted = formatted.replace(/(]*>.*?<\/li>)(
      )*(?= { - // Remove trailing
      tags and wrap in
        - const cleanListItems = listItems.replace(/(
        )+$/g, ''); - return `
          ${cleanListItems}
        `; - }); - - return formatted; - }; - if (!meetingId || !userId) { return null; } @@ -377,34 +133,14 @@ ${formattedContent} - {/* Title Section */} + {/* Simple Title Input */}
        - {isEditingTitle ? ( - updateTitle(e.target.value)} - onBlur={handleTitleSave} - onKeyDown={handleTitleKeyDown} - className="flex-1 bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-600 rounded px-2 py-1 text-sm focus:outline-none focus:ring-1 focus:ring-blue-500" - placeholder="Enter title..." - /> - ) : ( -

        setIsEditingTitle(true)} - title="Click to edit title" - > - {notes?.title || 'Untitled Notes'} -

        - )} - + updateTitle(e.target.value)} + className="flex-1 bg-white dark:bg-gray-900 border border-gray-300 dark:border-gray-600 rounded px-3 py-2 text-sm focus:outline-none focus:ring-1 focus:ring-blue-500" + placeholder="Enter title..." + />
        @@ -430,151 +166,7 @@ ${formattedContent} {hasUnsavedChanges && (
        )} - -
        - - - - {/* Tags Section */} -
        -
        - - -
        - -
        - {notes?.tags.map((tag, index) => ( - - - {tag} - - - ))} -
        - - {showTagInput && ( -
        - setNewTag(e.target.value)} - onKeyDown={handleTagKeyDown} - placeholder="Add tag..." - className="flex-1 px-2 py-1 text-xs border border-gray-300 dark:border-gray-600 rounded focus:outline-none focus:ring-1 focus:ring-blue-500 bg-white dark:bg-gray-900" - autoFocus - /> - -
        - )} -
        - - {/* Enhanced Rich Text Toolbar */} -
        -
        -
        - Formatting -
        - -
        - {/* Text Formatting */} - - - - - -
        - - {/* Lists and Structure */} - - -
        -
        - - {/* Topic Input */} -
        - - setCurrentTopic(e.target.value)} - onKeyDown={handleTopicKeyDown} - placeholder="Add topic/heading..." - className="flex-1 px-2 py-1 text-xs border border-gray-300 dark:border-gray-600 rounded focus:outline-none focus:ring-1 focus:ring-blue-500 bg-white dark:bg-gray-900" - /> -
        @@ -596,19 +188,13 @@ ${formattedContent} onKeyDown={handleKeyDown} placeholder="Start typing your meeting notes here... -💡 Keyboard shortcuts: -• Ctrl+B for **bold**, Ctrl+I for *italic*, Ctrl+U for underline -• Ctrl+H for ==highlight==, Ctrl+Q for quotes, Ctrl+L for bullet points -• Ctrl+S to save, Add topics using the input above +💡 Use Ctrl+S to save your notes. Tips: -- Use **bold** for emphasis -- Use *italic* for highlights -- Use ==highlight== for important points -- Use ## Topic for headings (or use topic input) -- Use - for bullet points -- Use > for quotes" - className="flex-1 p-4 border-none resize-none focus:outline-none bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100 text-sm leading-relaxed font-mono" +- Keep it simple and focused +- Write down key points and decisions +- Note important action items" + className="flex-1 p-4 border-none resize-none focus:outline-none bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100 text-sm leading-relaxed" style={{ minHeight: '200px' }} /> )} diff --git a/src/components/meetingSystem/MeetingTips.tsx b/src/components/meetingSystem/MeetingTips.tsx deleted file mode 100644 index e69de29b..00000000 diff --git a/src/components/meetingSystem/new b/src/components/meetingSystem/new deleted file mode 100644 index e69de29b..00000000 diff --git a/src/components/messageSystem/MeetingBox.tsx b/src/components/messageSystem/MeetingBox.tsx index 127ea1e1..b73f5e8c 100644 --- a/src/components/messageSystem/MeetingBox.tsx +++ b/src/components/messageSystem/MeetingBox.tsx @@ -6,6 +6,7 @@ import MeetingList from '@/components/meetingSystem/MeetingList'; import SavedNotesList from '@/components/meetingSystem/SavedNotesList'; import NotesViewModal from '@/components/meetingSystem/NotesViewModal'; import Meeting from '@/types/meeting'; +import { generateMeetingNotesPDF, MeetingNotePDFData } from '@/utils/pdfHandler'; import { fetchMeetings, createMeeting, @@ -170,6 +171,9 @@ export default function MeetingBox({ chatRoomId, userId, onClose, onMeetingUpdat // Get meetings that are currently happening const currentlyHappeningMeetings = meetings.filter(isMeetingHappening); + // Get meetings excluding currently happening ones for other categories + const meetingsExcludingCurrent = meetings.filter(meeting => !isMeetingHappening(meeting)); + // Update meeting statuses every minute to refresh currently happening meetings useEffect(() => { if (meetings.length === 0) return; @@ -183,9 +187,18 @@ export default function MeetingBox({ chatRoomId, userId, onClose, onMeetingUpdat return () => clearInterval(interval); }, [meetings.length]); - // Use API service to filter meetings - const filteredMeetings = filterMeetingsByType(meetings, userId); - const hasActiveMeetingsOrRequests = filteredMeetings.pendingRequests.length > 0 || filteredMeetings.upcomingMeetings.length > 0 || currentlyHappeningMeetings.length > 0; + // Use API service to filter meetings (excluding currently happening ones) + const filteredMeetings = filterMeetingsByType(meetingsExcludingCurrent, userId); + + // Additional filtering to ensure no overlap between currently happening and upcoming + const cleanedUpcomingMeetings = filteredMeetings.upcomingMeetings.filter(meeting => !isMeetingHappening(meeting)); + + const finalFilteredMeetings = { + ...filteredMeetings, + upcomingMeetings: cleanedUpcomingMeetings + }; + + const hasActiveMeetingsOrRequests = finalFilteredMeetings.pendingRequests.length > 0 || finalFilteredMeetings.upcomingMeetings.length > 0 || currentlyHappeningMeetings.length > 0; // Track if meetings have been loaded to prevent duplicate onMeetingUpdate calls const hasFetchedMeetings = useRef(false); @@ -377,86 +390,26 @@ export default function MeetingBox({ chatRoomId, userId, onClose, onMeetingUpdat // Handle downloading notes const handleDownloadNotes = async (note: MeetingNote) => { try { - // Create markdown content directly from the note data - const meetingTitle = note.meetingInfo?.description || note.title; - const meetingDate = note.meetingInfo?.meetingTime || note.createdAt; - - // Create a well-formatted markdown document - const formattedDate = new Date(meetingDate).toLocaleDateString('en-US', { - weekday: 'long', - year: 'numeric', - month: 'long', - day: 'numeric' - }); - - const formattedTime = new Date(meetingDate).toLocaleTimeString('en-US', { - hour: '2-digit', - minute: '2-digit', - hour12: true - }); - - // Clean up the content - let formattedContent = note.content - .replace(/^## (.*$)/gm, '## $1') - .replace(/^# (.*$)/gm, '# $1') - .replace(/^> (.*$)/gm, '> $1') - .replace(/^- (.*$)/gm, '- $1') - .trim(); - - const markdownDocument = `# Meeting Notes - ---- - -## Meeting Information - -- **Meeting:** ${note.title} -- **Date:** ${formattedDate} -- **Time:** ${formattedTime} -- **Meeting ID:** \`${note.meetingId}\`${note.meetingInfo?.isDeleted ? '\n- **Status:** ⚠️ Meeting Removed from System' : ''} - ---- - -## Content - -${formattedContent} - ---- - -## Meeting Details - -- **Word Count:** ${note.wordCount} -- **Tags:** ${note.tags?.join(', ') || 'None'} -- **Created:** ${new Date(note.createdAt).toLocaleDateString()} -- **Last Updated:** ${new Date(note.lastModified).toLocaleDateString()} -- **Privacy:** ${note.isPrivate ? 'Private' : 'Public'}${note.meetingInfo?.isDeleted ? '\n- **Note:** Original meeting has been removed from the system but notes are preserved' : ''} - ---- - -*Generated by SkillSwap Hub - Meeting Notes System* - `; - - // Create and trigger download - const blob = new Blob([markdownDocument], { type: 'text/markdown;charset=utf-8' }); - const url = URL.createObjectURL(blob); - const fileName = `meeting-notes-${note.title.replace(/[^a-z0-9]/gi, '_').toLowerCase()}-${new Date(meetingDate).toISOString().split('T')[0]}.md`; - - // Create download link - const a = document.createElement('a'); - a.style.display = 'none'; - a.href = url; - a.download = fileName; - - // Add to DOM, click, and remove - document.body.appendChild(a); - a.click(); + // Get the other user's name + const otherUserName = otherUserId && userProfiles[otherUserId] + ? `${userProfiles[otherUserId].firstName} ${userProfiles[otherUserId].lastName}`.trim() + : 'User'; - // Cleanup - setTimeout(() => { - document.body.removeChild(a); - URL.revokeObjectURL(url); - }, 100); + const pdfData: MeetingNotePDFData = { + title: note.title, + content: note.content, + meetingId: note.meetingId, + createdAt: note.createdAt, + lastModified: note.lastModified, + wordCount: note.wordCount, + tags: note.tags, + isPrivate: note.isPrivate, + otherUserName: otherUserName, + meetingInfo: note.meetingInfo + }; - showAlert('success', 'Notes downloaded successfully!'); + generateMeetingNotesPDF(pdfData); + showAlert('success', 'Notes downloaded successfully as PDF!'); } catch (error: any) { console.error('Error downloading notes:', error); showAlert('error', 'Failed to download notes'); @@ -552,7 +505,7 @@ ${formattedContent} setShowCreateModal(true); }; - // Create Meeting Function + //* Create Meeting Function const handleCreateMeeting = async (meetingData: any) => { if (!otherUserId) return; @@ -679,10 +632,10 @@ ${formattedContent} {/* Meetings List */}
        { - if (!notes || !tag.trim()) return; - - const trimmedTag = tag.trim().toLowerCase(); - if (notes.tags.includes(trimmedTag)) return; - - setNotes(prev => prev ? { - ...prev, - tags: [...prev.tags, trimmedTag] - } : null); - hasUnsavedChanges.current = true; - scheduleAutoSave(); - }, [notes, scheduleAutoSave]); - - // Remove tag - const removeTag = useCallback((tagToRemove: string) => { - if (!notes) return; - - setNotes(prev => prev ? { - ...prev, - tags: prev.tags.filter(tag => tag !== tagToRemove) - } : null); - hasUnsavedChanges.current = true; - scheduleAutoSave(); - }, [notes, scheduleAutoSave]); - // Toggle privacy const togglePrivacy = useCallback(() => { if (!notes) return; @@ -259,8 +230,6 @@ export const useMeetingNotes = ({ hasUnsavedChanges: hasUnsavedChanges.current, updateContent, updateTitle, - addTag, - removeTag, togglePrivacy, saveNotes: forceSave, deleteNotes, diff --git a/src/utils/pdfHandler.ts b/src/utils/pdfHandler.ts new file mode 100644 index 00000000..5596f5df --- /dev/null +++ b/src/utils/pdfHandler.ts @@ -0,0 +1,148 @@ +import jsPDF from 'jspdf'; + +export interface MeetingNotePDFData { + title: string; + content: string; + meetingId?: string; + createdAt: string; + lastModified?: string; + wordCount?: number; + tags?: string[]; + isPrivate?: boolean; + userName?: string; + otherUserName?: string; // Add other user's name + meetingInfo?: { + description?: string; + meetingTime?: string; + isDeleted?: boolean; + }; +} + +export const generateMeetingNotesPDF = (data: MeetingNotePDFData): void => { + const doc = new jsPDF(); + + // Use meeting time if available, otherwise use createdAt + const meetingDate = data.meetingInfo?.meetingTime || data.createdAt; + + // Format date and time + const formattedDate = new Date(meetingDate).toLocaleDateString('en-US', { + weekday: 'long', + year: 'numeric', + month: 'long', + day: 'numeric' + }); + + const formattedTime = new Date(meetingDate).toLocaleTimeString('en-US', { + hour: '2-digit', + minute: '2-digit', + hour12: true + }); + + // Clean up the content - remove markdown formatting for PDF + let formattedContent = data.content + .replace(/^## (.*$)/gm, '$1') + .replace(/^# (.*$)/gm, '$1') + .replace(/^> (.*$)/gm, '$1') + .replace(/^- (.*$)/gm, '• $1') + .trim(); + + // Set up PDF document + let yPosition = 20; + + // Title + doc.setFontSize(18); + doc.setFont('helvetica', 'bold'); + doc.text('Meeting Notes', 20, yPosition); + yPosition += 15; + + // Separator line + doc.line(20, yPosition, 190, yPosition); + yPosition += 15; + + // Meeting Information + doc.setFontSize(14); + doc.setFont('helvetica', 'bold'); + doc.text('Meeting Information', 20, yPosition); + yPosition += 10; + + doc.setFontSize(11); + doc.setFont('helvetica', 'normal'); + + // Show "Meeting with [Person's Name]" if otherUserName is available + if (data.otherUserName) { + doc.text(`Meeting with: ${data.otherUserName}`, 20, yPosition); + yPosition += 8; + } + + // Show the meeting description/title + const meetingDescription = data.meetingInfo?.description || data.title || 'Untitled Notes'; + doc.text(`Meeting: ${meetingDescription}`, 20, yPosition); + yPosition += 8; + + doc.text(`Date: ${formattedDate}`, 20, yPosition); + yPosition += 8; + doc.text(`Time: ${formattedTime}`, 20, yPosition); + yPosition += 8; + + if (data.userName) { + doc.text(`Author: ${data.userName}`, 20, yPosition); + yPosition += 8; + } + + if (data.meetingInfo?.isDeleted) { + doc.setFont('helvetica', 'bold'); + doc.text('Status: ⚠️ Meeting Removed from System', 20, yPosition); + yPosition += 8; + doc.setFont('helvetica', 'normal'); + } + + yPosition += 5; + doc.line(20, yPosition, 190, yPosition); + yPosition += 15; + + // Content section + doc.setFontSize(14); + doc.setFont('helvetica', 'bold'); + doc.text('Content', 20, yPosition); + yPosition += 10; + + doc.setFontSize(11); + doc.setFont('helvetica', 'normal'); + + if (formattedContent) { + const lines = doc.splitTextToSize(formattedContent, 170); + for (let i = 0; i < lines.length; i++) { + if (yPosition > 270) { + doc.addPage(); + yPosition = 20; + } + doc.text(lines[i], 20, yPosition); + yPosition += 6; + } + } else { + doc.text('No content available.', 20, yPosition); + yPosition += 6; + } + + yPosition += 10; + doc.line(20, yPosition, 190, yPosition); + yPosition += 15; + + // Footer + if (yPosition > 270) { + doc.addPage(); + yPosition = 20; + } + + doc.setFontSize(10); + doc.setFont('helvetica', 'italic'); + doc.text('Generated by SkillSwap Hub - Meeting Notes System', 20, yPosition); + + // Generate filename + const baseFileName = data.title ? data.title.replace(/[^a-z0-9]/gi, '_').toLowerCase() : 'meeting-notes'; + const dateString = new Date(meetingDate).toISOString().split('T')[0]; + const fileName = `${baseFileName}-${dateString}.pdf`; + + // Save the PDF + doc.save(fileName); +}; From 3e81daf76741eee9949e09eddc53b7e1870b451e Mon Sep 17 00:00:00 2001 From: AdeepaK2 Date: Sun, 20 Jul 2025 10:26:32 +0530 Subject: [PATCH 2/4] feat: update dependencies for Quill and React-Quill --- package-lock.json | 147 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 4 +- 2 files changed, 143 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5e49a1cc..6ae7d8b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,6 @@ "@types/base-64": "^1.0.2", "@types/jsonwebtoken": "^9.0.9", "@types/nodemailer": "^6.4.17", - "@types/quill": "^2.0.14", "aws-sdk": "^2.1692.0", "axios": "^1.10.0", "base-64": "^1.0.0", @@ -60,6 +59,7 @@ "node-fetch": "^3.3.2", "node-record-lpcm16": "^1.0.1", "nodemailer": "^6.10.1", + "quill": "^2.0.3", "react": "^18.3.1", "react-chartjs-2": "^5.3.0", "react-day-picker": "^8.10.1", @@ -67,6 +67,7 @@ "react-hook-form": "^7.60.0", "react-hot-toast": "^2.5.2", "react-icons": "^5.5.0", + "react-quill": "^2.0.0", "react-toastify": "^11.0.5", "recharts": "^2.15.0", "socket.io": "^4.8.1", @@ -94,6 +95,7 @@ "@types/mongoose": "^5.11.96", "@types/node": "^20.17.17", "@types/node-fetch": "^2.6.12", + "@types/quill": "^2.0.14", "@types/react": "^19", "@types/react-dom": "^19", "@types/stopword": "^2.0.3", @@ -5028,6 +5030,9 @@ }, "node_modules/@types/quill": { "version": "2.0.14", + "resolved": "https://registry.npmjs.org/@types/quill/-/quill-2.0.14.tgz", + "integrity": "sha512-zvoXCRnc2Dl8g+7/9VSAmRWPN6oH+MVhTPizmCR+GJCITplZ5VRVzMs4+a/nOE3yzNwEZqylJJrMB07bwbM1/g==", + "dev": true, "license": "MIT", "dependencies": { "parchment": "^1.1.2", @@ -5036,6 +5041,7 @@ }, "node_modules/@types/quill/node_modules/parchment": { "version": "1.1.4", + "dev": true, "license": "BSD-3-Clause" }, "node_modules/@types/raf": { @@ -7383,6 +7389,26 @@ } } }, + "node_modules/deep-equal": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", + "license": "MIT", + "dependencies": { + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.5.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/deep-is": { "version": "0.1.4", "dev": true, @@ -7419,7 +7445,6 @@ }, "node_modules/define-properties": { "version": "1.2.1", - "dev": true, "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", @@ -8876,7 +8901,6 @@ }, "node_modules/functions-have-names": { "version": "1.2.3", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9848,7 +9872,6 @@ }, "node_modules/is-date-object": { "version": "1.1.0", - "dev": true, "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -12363,9 +12386,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/object-is": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", + "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object-keys": { "version": "1.1.1", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" @@ -12596,6 +12634,12 @@ "version": "1.0.1", "license": "BlueOak-1.0.0" }, + "node_modules/parchment": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/parchment/-/parchment-3.0.0.tgz", + "integrity": "sha512-HUrJFQ/StvgmXRcQ1ftY6VEZUq3jA2t9ncFN4F84J/vN0/FPpQF+8FKXb3l6fLces6q0uOHj6NJn+2xvZnxO6A==", + "license": "BSD-3-Clause" + }, "node_modules/parent-module": { "version": "1.0.1", "dev": true, @@ -13247,6 +13291,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/quill": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/quill/-/quill-2.0.3.tgz", + "integrity": "sha512-xEYQBqfYx/sfb33VJiKnSJp8ehloavImQ2A6564GAbqG55PGw1dAWUn1MUbQB62t0azawUS2CZZhWCjO8gRvTw==", + "license": "BSD-3-Clause", + "dependencies": { + "eventemitter3": "^5.0.1", + "lodash-es": "^4.17.21", + "parchment": "^3.0.0", + "quill-delta": "^5.1.0" + }, + "engines": { + "npm": ">=8.2.3" + } + }, "node_modules/quill-delta": { "version": "5.1.0", "license": "MIT", @@ -13259,6 +13318,12 @@ "node": ">= 12.0.0" } }, + "node_modules/quill/node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "license": "MIT" + }, "node_modules/raf": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", @@ -13352,6 +13417,76 @@ "version": "16.13.1", "license": "MIT" }, + "node_modules/react-quill": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/react-quill/-/react-quill-2.0.0.tgz", + "integrity": "sha512-4qQtv1FtCfLgoD3PXAur5RyxuUbPXQGOHgTlFie3jtxp43mXDtzCKaOgQ3mLyZfi1PUlyjycfivKelFhy13QUg==", + "license": "MIT", + "dependencies": { + "@types/quill": "^1.3.10", + "lodash": "^4.17.4", + "quill": "^1.3.7" + }, + "peerDependencies": { + "react": "^16 || ^17 || ^18", + "react-dom": "^16 || ^17 || ^18" + } + }, + "node_modules/react-quill/node_modules/@types/quill": { + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/@types/quill/-/quill-1.3.10.tgz", + "integrity": "sha512-IhW3fPW+bkt9MLNlycw8u8fWb7oO7W5URC9MfZYHBlA24rex9rs23D5DETChu1zvgVdc5ka64ICjJOgQMr6Shw==", + "license": "MIT", + "dependencies": { + "parchment": "^1.1.2" + } + }, + "node_modules/react-quill/node_modules/eventemitter3": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz", + "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==", + "license": "MIT" + }, + "node_modules/react-quill/node_modules/fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==", + "license": "Apache-2.0" + }, + "node_modules/react-quill/node_modules/parchment": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz", + "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==", + "license": "BSD-3-Clause" + }, + "node_modules/react-quill/node_modules/quill": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz", + "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", + "license": "BSD-3-Clause", + "dependencies": { + "clone": "^2.1.1", + "deep-equal": "^1.0.1", + "eventemitter3": "^2.0.3", + "extend": "^3.0.2", + "parchment": "^1.1.4", + "quill-delta": "^3.6.2" + } + }, + "node_modules/react-quill/node_modules/quill-delta": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz", + "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", + "license": "MIT", + "dependencies": { + "deep-equal": "^1.0.1", + "extend": "^3.0.2", + "fast-diff": "1.1.2" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/react-smooth": { "version": "4.0.4", "license": "MIT", @@ -13570,7 +13705,6 @@ }, "node_modules/regexp.prototype.flags": { "version": "1.5.4", - "dev": true, "license": "MIT", "dependencies": { "call-bind": "^1.0.8", @@ -13915,7 +14049,6 @@ }, "node_modules/set-function-name": { "version": "2.0.2", - "dev": true, "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", diff --git a/package.json b/package.json index 52293c60..e01c6624 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "@types/base-64": "^1.0.2", "@types/jsonwebtoken": "^9.0.9", "@types/nodemailer": "^6.4.17", - "@types/quill": "^2.0.14", "aws-sdk": "^2.1692.0", "axios": "^1.10.0", "base-64": "^1.0.0", @@ -84,6 +83,7 @@ "node-fetch": "^3.3.2", "node-record-lpcm16": "^1.0.1", "nodemailer": "^6.10.1", + "quill": "^2.0.3", "react": "^18.3.1", "react-chartjs-2": "^5.3.0", "react-day-picker": "^8.10.1", @@ -91,6 +91,7 @@ "react-hook-form": "^7.60.0", "react-hot-toast": "^2.5.2", "react-icons": "^5.5.0", + "react-quill": "^2.0.0", "react-toastify": "^11.0.5", "recharts": "^2.15.0", "socket.io": "^4.8.1", @@ -118,6 +119,7 @@ "@types/mongoose": "^5.11.96", "@types/node": "^20.17.17", "@types/node-fetch": "^2.6.12", + "@types/quill": "^2.0.14", "@types/react": "^19", "@types/react-dom": "^19", "@types/stopword": "^2.0.3", From e5ea21b92da52981b923d82e17162a1dd78e65eb Mon Sep 17 00:00:00 2001 From: AdeepaK2 Date: Sun, 20 Jul 2025 10:37:25 +0530 Subject: [PATCH 3/4] feat: enhance CI configuration with mock environment variables for testing --- .github/workflows/ci-build-check.yml | 68 ++++++++++++++++++++++++++++ src/lib/db.ts | 18 +++++++- 2 files changed, 85 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-build-check.yml b/.github/workflows/ci-build-check.yml index b07ea6d5..41ca17db 100644 --- a/.github/workflows/ci-build-check.yml +++ b/.github/workflows/ci-build-check.yml @@ -38,12 +38,80 @@ jobs: continue-on-error: false env: CI: true + # Database + MONGODB_URI: mongodb://localhost:27017/test-db + + # JWT & Auth + JWT_SECRET: test-jwt-secret-for-ci-testing-only + ADMIN_JWT_SECRET: test-admin-jwt-secret-for-ci-testing-only + M_KEY: test-m-key-for-ci-testing-only + + # Mock external services for testing + R2_ACCESS_KEY_ID: mock-r2-access-key-id + R2_SECRET_ACCESS_KEY: mock-r2-secret-access-key + R2_ACCOUNT_ID: mock-r2-account-id + R2_BUCKET_NAME: mock-test-bucket + R2_ENDPOINT: https://mock-endpoint.r2.cloudflarestorage.com + + SENDGRID_API_KEY: SG.mock-sendgrid-api-key-for-testing-only + SENDGRID_FROM_EMAIL: test@example.com + DAILY_API_KEY: mock-daily-api-key-for-testing-only + GOOGLE_CLIENT_ID: mock-google-client-id + GOOGLE_CLIENT_SECRET: mock-google-client-secret + GEMINI_API_KEY: mock-gemini-api-key-for-testing-only + SYSTEM_API_KEY: mock-system-api-key-for-testing-only + + # Test environment + NODE_ENV: test + NEXT_TELEMETRY_DISABLED: 1 - name: Build application run: npm run build continue-on-error: false env: CI: true + # Database + MONGODB_URI: mongodb://localhost:27017/test-db + + # JWT & Auth + JWT_SECRET: test-jwt-secret-for-ci-build-only-not-for-production-use + ADMIN_JWT_SECRET: test-admin-jwt-secret-for-ci-build-only-not-for-production + M_KEY: test-m-key-for-ci-build-only-not-for-production-use + + # Cloudflare R2 Storage + R2_ACCESS_KEY_ID: mock-r2-access-key-id + R2_SECRET_ACCESS_KEY: mock-r2-secret-access-key + R2_ACCOUNT_ID: mock-r2-account-id + R2_BUCKET_NAME: mock-skillswaphub-bucket + R2_ENDPOINT: https://mock-endpoint.r2.cloudflarestorage.com + + # Email Services + SENDGRID_API_KEY: SG.mock-sendgrid-api-key-for-ci-build-only + SENDGRID_FROM_EMAIL: test@example.com + MEETING_NOTI_MAIL: test@example.com + MEETING_NOTI_PW: mock-email-password + + # Daily.co Video + DAILY_API_KEY: mock-daily-api-key-for-ci-build-only + + # Google OAuth + GOOGLE_CLIENT_ID: mock-google-client-id.apps.googleusercontent.com + GOOGLE_CLIENT_SECRET: mock-google-client-secret + NEXT_PUBLIC_GOOGLE_CLIENT_ID: mock-google-client-id.apps.googleusercontent.com + + # AI Service + GEMINI_API_KEY: mock-gemini-api-key-for-ci-build-only + + # System API + SYSTEM_API_KEY: mock-system-api-key-for-ci-build-only + + # Socket Connection + NEXT_PUBLIC_SOCKET: https://mock-socket-server.example.com/ + + # Build Configuration + NODE_ENV: production + NEXT_TELEMETRY_DISABLED: 1 + SKIP_DB_VALIDATION: true - name: Check build output run: | diff --git a/src/lib/db.ts b/src/lib/db.ts index 29f99713..17a4a825 100644 --- a/src/lib/db.ts +++ b/src/lib/db.ts @@ -3,12 +3,28 @@ import mongoose from "mongoose"; const MONGODB_URI = process.env.MONGODB_URI as string; if (!MONGODB_URI) { - throw new Error('MONGODB_URI is not defined in environment variables'); + // In CI environment or when SKIP_DB_VALIDATION is set, provide a mock URI + if (process.env.CI === 'true' || process.env.SKIP_DB_VALIDATION === 'true') { + console.warn('Running in CI environment or DB validation skipped - using mock database connection'); + } else { + throw new Error('MONGODB_URI is not defined in environment variables'); + } } const connect = async () => { + // In CI environment or when DB validation is skipped, don't attempt real connection + if (process.env.CI === 'true' || process.env.SKIP_DB_VALIDATION === 'true') { + console.log('Skipping database connection in CI environment'); + return; + } + + // If no MONGODB_URI in non-CI environment, throw error + if (!MONGODB_URI) { + throw new Error('MONGODB_URI is not defined in environment variables'); + } + const connectionState = mongoose.connection.readyState; // If already connected, return early From 91097d97087922c2876a32cf170408475566a095 Mon Sep 17 00:00:00 2001 From: AdeepaK2 Date: Sun, 20 Jul 2025 10:42:29 +0530 Subject: [PATCH 4/4] feat: update CI configuration with secure mock environment variables for testing --- .github/workflows/ci-build-check.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-build-check.yml b/.github/workflows/ci-build-check.yml index 41ca17db..069b446b 100644 --- a/.github/workflows/ci-build-check.yml +++ b/.github/workflows/ci-build-check.yml @@ -42,9 +42,9 @@ jobs: MONGODB_URI: mongodb://localhost:27017/test-db # JWT & Auth - JWT_SECRET: test-jwt-secret-for-ci-testing-only - ADMIN_JWT_SECRET: test-admin-jwt-secret-for-ci-testing-only - M_KEY: test-m-key-for-ci-testing-only + JWT_SECRET: dd8a48e6f99d7b4c3b6a4c7e9587a2cc7f8b9e3a1d5f6g8h2j3k4m5n6p7q8r9t1u2v3w4x5y6z7-ci-test + ADMIN_JWT_SECRET: d8da04f2c803f88c68e38c47bad261223d01cc73e5f89d15e02bbf9f858f53b0f7220e5c23eb1f34ad355f821298d196-ci-test + M_KEY: e685b3de592422cdceff763ca3e784a2c792e4e7e5984cf0ea86544555612b80-ci-test # Mock external services for testing R2_ACCESS_KEY_ID: mock-r2-access-key-id @@ -73,10 +73,10 @@ jobs: # Database MONGODB_URI: mongodb://localhost:27017/test-db - # JWT & Auth - JWT_SECRET: test-jwt-secret-for-ci-build-only-not-for-production-use - ADMIN_JWT_SECRET: test-admin-jwt-secret-for-ci-build-only-not-for-production - M_KEY: test-m-key-for-ci-build-only-not-for-production-use + # JWT & Auth - Make sure these are long enough and properly formatted + JWT_SECRET: dd8a48e6f99d7b4c3b6a4c7e9587a2cc7f8b9e3a1d5f6g8h2j3k4m5n6p7q8r9t1u2v3w4x5y6z7-ci-build + ADMIN_JWT_SECRET: d8da04f2c803f88c68e38c47bad261223d01cc73e5f89d15e02bbf9f858f53b0f7220e5c23eb1f34ad355f821298d196-ci-build + M_KEY: e685b3de592422cdceff763ca3e784a2c792e4e7e5984cf0ea86544555612b80-ci-build # Cloudflare R2 Storage R2_ACCESS_KEY_ID: mock-r2-access-key-id @@ -108,8 +108,8 @@ jobs: # Socket Connection NEXT_PUBLIC_SOCKET: https://mock-socket-server.example.com/ - # Build Configuration - NODE_ENV: production + # Build Configuration - Use 'ci' instead of 'production' to avoid production validations + NODE_ENV: ci NEXT_TELEMETRY_DISABLED: 1 SKIP_DB_VALIDATION: true