Skip to content
Merged
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
12 changes: 10 additions & 2 deletions backend/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,20 @@ const app = express();

const cookieParser = require('cookie-parser')

app.use(cors("*"))


app.use(cors({
origin: "http://localhost:5173",
credentials: true
}));

app.use(express.json())
app.use(express.urlencoded({ extended: true }))

app.use(cookieParser())
app.use('/', indexRouter)

app.use('/chat', chatRouter)
app.use('/auth', authRouter)
app.use('/api/auth', authRouter)

module.exports = app;
3 changes: 2 additions & 1 deletion backend/src/controllers/auth.controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ const loginController = async (req, res)=>{
const token= jwt.sign({id:user._id}, process.env.JWT_SECRET)
res.cookie('token', token)
res.status(201).json({
message:'user loged in'
message:'user loged in',
user
})
} catch (error) {
console.log(error)
Expand Down
2 changes: 1 addition & 1 deletion frontend/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default defineConfig([
},
},
rules: {
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
'no-unused-vars': ['warn', { varsIgnorePattern: '^[A-Z_]' }],
},
},
])
130 changes: 128 additions & 2 deletions frontend/package-lock.json

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

3 changes: 3 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,12 @@
"preview": "vite preview"
},
"dependencies": {
"@reduxjs/toolkit": "^2.8.2",
"axios": "^1.11.0",
"react": "^19.1.1",
"react-dom": "^19.1.1",
"react-hook-form": "^7.62.0",
"react-redux": "^9.2.0",
"react-router-dom": "^7.8.2"
},
"devDependencies": {
Expand Down
23 changes: 16 additions & 7 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
import React from 'react'
import ChatInterface from './components/ChatInterface'
import MainRoutes from './routes/MainRoutes'
import React, { useEffect } from 'react';
import MainRoutes from './routes/MainRoutes';
import { useDispatch } from 'react-redux';
import { setUserFromStorage } from '../src/redux/reducers/authSlice';

const App = () => {
const dispatch = useDispatch();

useEffect(() => {
const user = localStorage.getItem('user');
if (user) {
dispatch(setUserFromStorage(JSON.parse(user)));
}
}, [dispatch]);

return (
<div>
{/* <ChatInterface /> */}
<MainRoutes />
</div>
)
}
);
};

export default App
export default App;
24 changes: 19 additions & 5 deletions frontend/src/api/axios.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
import { axios } from 'axios'

export const instance = axios.create({
baseURL:'http://localhost:3000'
})
// frontend/src/api/axios.jsx
import axios from 'axios';
import store from '../redux/store';
import { logout } from '../redux/reducers/authSlice';

export const axiosInstance = axios.create({
baseURL: 'http://localhost:3000/api',
withCredentials: true
});
// intercepters
axiosInstance.interceptors.response.use(
(response) => response,
(error) => {
if (error.response && (error.response.status === 401 || error.response.status === 404)) {
store.dispatch(logout());
localStorage.removeItem('user');
}
return Promise.reject(error);
}
);

Loading