Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@
"multer": "^1.4.5-lts.1",
"openai": "^4.85.4",
"pg": "^8.13.3",
"uuid": "^11.1.0"
"uuid": "^11.1.0",
"ws": "^8.18.1"
},
"devDependencies": {
"@types/cors": "^2.8.17",
"@types/express": "^5.0.0",
"@types/multer": "^1.4.12",
"@types/node": "^22.13.5",
"@types/pg": "^8.11.11",
"@types/ws": "^8.18.0",
"nodemon": "^3.1.9",
"ts-node": "^10.9.2",
"typescript": "^5.7.3"
Expand Down
11 changes: 11 additions & 0 deletions backend/src/controllers/noteController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
generateQueryResponse,
} from "../services/aiService";
import { generateTitle } from "../services/aiService";
import { broadcastUpdate } from "../routes/noteRoutes";

/**
* Note controller that saves a note to the postgres database
Expand Down Expand Up @@ -164,6 +165,7 @@ export const semanticQuery = async (
notes,
message: "Here are all your notes.",
});
return;
} else if (intent === "create_note") {
const trimmedQuery = await trimCommand(query);
createNoteFromBackend(trimmedQuery);
Expand All @@ -185,9 +187,11 @@ export const semanticQuery = async (
intent,
message: summaryMessage,
});
return;
} catch (err) {
console.error(err);
res.status(500).json({ error: "Error performing semantic search" });
return;
}
};

Expand All @@ -207,6 +211,7 @@ export async function createNoteFromBackend(content: string) {
try {
const note = new Note(title, content);
const savedNote = await note.save();
await broadcastUpdate(); // Notify frontend
return savedNote;
} catch (error) {
console.error("Error creating note:", error);
Expand Down Expand Up @@ -236,12 +241,15 @@ export const deleteNoteById = async (

if (deleted) {
res.status(200).json({ message: "Note deleted successfully" });
return;
} else {
res.status(404).json({ error: "Note not found" });
return;
}
} catch (err) {
console.error(err);
res.status(500).json({ error: "Error deleting note" });
return;
}
};

Expand Down Expand Up @@ -270,11 +278,14 @@ export const deleteNotes = async (
res
.status(200)
.json({ message: `${deletedCount} note(s) deleted successfully` });
return;
} else {
res.status(404).json({ error: "No notes found for deletion" });
return;
}
} catch (err) {
console.error(err);
res.status(500).json({ error: "Error deleting notes" });
return;
}
};
23 changes: 22 additions & 1 deletion backend/src/db.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Pool } from "pg";
/*import { Pool } from "pg";
import dotenv from "dotenv";

dotenv.config();
Expand All @@ -9,3 +9,24 @@ export const pool = new Pool({
rejectUnauthorized: false,
},
});
*/


import { Pool } from "pg";
import dotenv from "dotenv";

dotenv.config();

export const pool = new Pool({
user: process.env.PG_USER,
host: process.env.DATABASE_URL,
password: process.env.PG_PASSWORD,
port: Number(process.env.PG_PORT),
});

// Table Schema currently
// CREATE TABLE notes (
// id BIGINT PRIMARY KEY GENERATED ALWAYS AS IDENTITY,
// title VARCHAR(255),
// content VARCHAR(65535)
// );
41 changes: 41 additions & 0 deletions backend/src/routes/noteRoutes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import express from "express";
import WebSocket, { WebSocketServer } from "ws";
import { pool } from "../db";
import dotenv from "dotenv";
dotenv.config();

import {
createNote,
getNotes,
Expand All @@ -21,4 +26,40 @@ router.delete("/:id", deleteNoteById);
router.delete("/", deleteNotes);
router.put("/:id", updateNote);

const wss = new WebSocketServer({ port: Number(process.env.WS_PORT) });
const clients = new Set<WebSocket>();

// When a client connects
wss.on("connection", (ws) => {
console.log("Client connected");
clients.add(ws);

ws.on("close", () => {
console.log("Client disconnected");
clients.delete(ws);
});
});

const fetchNotesFromDB = async () => {
try {
const result = await pool.query("SELECT * FROM notes");
return result.rows;
} catch (error) {
console.error("Error fetching notes:", error);
return [];
}
};

// Broadcast updates to all connected clients
export const broadcastUpdate = async () => {
const allNotes = await fetchNotesFromDB(); // Get notes from the database
const message = JSON.stringify({ type: "update", notes: allNotes });

clients.forEach((client) => {
if (client.readyState === WebSocket.OPEN) {
client.send(message);
}
});
};

export { router as noteRoutes };
4 changes: 3 additions & 1 deletion client/src/components/NoteForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ export default function NoteForm({ setQuery }: NoteFormProps) {
handleSubmit,
refreshNotes,
handleSearchChange,
handleMicrophoneClick,
} = useForm({ setQuery });

//const { text, startRecording, stopRecording, isRecording } = useSpeechToText();
const { startRecording, stopRecording } = useSpeechToText();

return (
Expand Down Expand Up @@ -90,7 +92,7 @@ export default function NoteForm({ setQuery }: NoteFormProps) {
</button>
<button
type="button"
onClick={isRecording ? stopRecording : startRecording}
onClick={handleMicrophoneClick}
className={`p-3 rounded-full ${
isRecording ? "bg-red-500" : "bg-gray-300"
} text-white`}
Expand Down
17 changes: 16 additions & 1 deletion client/src/hooks/useForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ export const useForm = ({ setQuery }: UseFormProps) => {
const [content, setContent] = useState("");
const [filter, setFilter] = useState("");
const [isFilter, setIsFilter] = useState(false);
// const [isRecording, setIsRecording] = useState(false); // State for recording status



const { addNote, fetchNotes, updateAiResponse } = useNoteStore(
(state) => state
Expand Down Expand Up @@ -42,7 +45,18 @@ export const useForm = ({ setQuery }: UseFormProps) => {
await fetchNotes();
};

const { text, isRecording } = useSpeechToText();
const { text, startRecording, stopRecording, isRecording } = useSpeechToText();

// Function to start recording and set the content from speech
//const handleMicrophoneClick = async () => {
const handleMicrophoneClick = () => {
if (isRecording) {
stopRecording(); // ✅ Correctly stop recording
} else {
startRecording(); // ✅ Correctly start recording
}
};


useEffect(() => {
if (!isRecording && text) {
Expand All @@ -62,5 +76,6 @@ export const useForm = ({ setQuery }: UseFormProps) => {
handleSubmit,
refreshNotes,
handleSearchChange,
handleMicrophoneClick,
};
};
Loading