latest changes before server transfer
Some checks failed
Deploy to Firebase Hosting on merge / build_and_deploy (push) Has been cancelled
Some checks failed
Deploy to Firebase Hosting on merge / build_and_deploy (push) Has been cancelled
This commit is contained in:
23
server/server.js
Normal file → Executable file
23
server/server.js
Normal file → Executable file
@@ -3,7 +3,7 @@ const app = require('./app');
|
||||
const db = require('./db');
|
||||
|
||||
// Routes
|
||||
app.use(authRoutes); // Use the auth routes
|
||||
app.use(authRoutes);
|
||||
|
||||
// Create new session
|
||||
app.post('/api/session', async (req, res) => {
|
||||
@@ -11,7 +11,7 @@ app.post('/api/session', async (req, res) => {
|
||||
const query = 'INSERT INTO sessions (id) VALUES (?)';
|
||||
await db.query(query, [sessionId], (err, result) => {
|
||||
if (err) return res.status(500).json({ error: err });
|
||||
res.status(200).json({ sessionId });
|
||||
res.json({ sessionId });
|
||||
});
|
||||
});
|
||||
|
||||
@@ -48,7 +48,7 @@ app.post('/api/session/:sessionId/user', async (req, res) => {
|
||||
// Set the initial vote for the user in the session
|
||||
await db.query(voteQuery, [sessionId, userId]);
|
||||
|
||||
res.status(200).json({ userId });
|
||||
res.json({ userId });
|
||||
} catch (err) {
|
||||
console.error('Error adding user to session:', err);
|
||||
res.status(500).json({ error: 'Server error' });
|
||||
@@ -59,16 +59,15 @@ app.post('/api/session/:sessionId/user', async (req, res) => {
|
||||
app.get('/api/session/:sessionId/users', async (req, res) => {
|
||||
const { sessionId } = req.params;
|
||||
const query = `
|
||||
SELECT users.id, users.username
|
||||
FROM votes
|
||||
JOIN users ON votes.user_id = users.id
|
||||
SELECT session_users.user_id, session_users.provider
|
||||
FROM session_users
|
||||
WHERE session_id = ?
|
||||
`;
|
||||
|
||||
try {
|
||||
const [results] = await db.query(query, [sessionId]);
|
||||
console.log('Query results:', results); // Log query result
|
||||
res.status(200).json(results);
|
||||
console.log('Query results:', results);
|
||||
res.json(results);
|
||||
} catch (err) {
|
||||
console.error('Error fetching session users:', err);
|
||||
res.status(500).json({ error: 'Server error' });
|
||||
@@ -81,9 +80,7 @@ app.delete('/api/session/:sessionId/votes/:userId', async (req, res) => {
|
||||
|
||||
try {
|
||||
const [result] = await db.query(query, [sessionId, userId]);
|
||||
res
|
||||
.status(200)
|
||||
.json({ success: true, message: 'Vote removed successfully' });
|
||||
res.json({ success: true, message: 'Vote removed successfully' });
|
||||
} catch (error) {
|
||||
console.error('Error removing vote:', error);
|
||||
res.status(500).json({ error: 'Server error' });
|
||||
@@ -97,9 +94,7 @@ app.delete('/api/session/:sessionId/users/:userId', async (req, res) => {
|
||||
|
||||
try {
|
||||
const [result] = await db.query(query, [sessionId, userId]);
|
||||
res
|
||||
.status(200)
|
||||
.json({ success: true, message: 'User removed successfully' });
|
||||
res.json({ success: true, message: 'User removed successfully' });
|
||||
} catch (error) {
|
||||
console.error('Error removing user:', error);
|
||||
res.status(500).json({ error: 'Server error' });
|
||||
|
||||
Reference in New Issue
Block a user