Skip to content

Add social feed with follow and posts #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aboldguess wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add social feed with follow and posts #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
489df3f
Add social feature with posts and following
aboldguess Jul 24, 2025
99efd91
Merge main and restore profile features
aboldguess Jul 24, 2025
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
3 changes: 2 additions & 1 deletion backend/jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
testMatch: ['**/test/**/*.test.ts']
testMatch: ['**/test/**/*.test.ts'],
maxWorkers: 1
};
211 changes: 210 additions & 1 deletion backend/package-lock.json
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"open": "^8.4.2",
"jsonwebtoken": "^9.0.2",
"mongoose": "^8.16.4",
"socket.io": "^4.7.2"
"socket.io": "^4.7.2",
"multer": "^1.4.5-lts.1"
},
"devDependencies": {
"@types/body-parser": "^1.19.6",
Expand All @@ -41,7 +42,8 @@
"supertest": "^7.1.4",
"ts-jest": "^29.4.0",
"ts-node": "^10.9.2",
"typescript": "^5.8.3"
"typescript": "^5.8.3",
"@types/multer": "^1.4.7"
},
"overrides": {
"test-exclude": "^7.0.1"
Expand Down
8 changes: 8 additions & 0 deletions backend/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import leaveRoutes from './routes/leaves';
import userRoutes from './routes/users';
import teamRoutes from './routes/teams';
import adminRoutes from './routes/admin';
import socialRoutes from './routes/social';
import profileRoutes from './routes/profile';
import { connectDB } from './db';
import { Message } from './models/message';
import { DirectMessage } from './models/directMessage';
Expand Down Expand Up @@ -149,6 +151,12 @@ app.use('/api/leaves', leaveRoutes);
app.use('/api/users', userRoutes);
app.use('/api/teams', teamRoutes);
app.use('/api/admin', adminRoutes);
app.use('/api/social', socialRoutes);
app.use('/api/profile', profileRoutes);

// Expose uploaded profile photos as static files
const uploadsDir = path.resolve(__dirname, '..', '..', 'uploads');
app.use('/uploads', express.static(uploadsDir));

// Serve static frontend files. The path is resolved relative to the compiled
// JavaScript location so it works when running from the 'dist' directory.
Expand Down
Loading