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
44 changes: 44 additions & 0 deletions client/package-lock.json

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

1 change: 1 addition & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"react-markdown": "^10.1.0",
"react-router-dom": "^6.23.1",
"remark-gfm": "^4.0.1",
"tailwind-scrollbar": "^4.0.2",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same goes for this, please uninstall.

"tailwindcss": "^3.4.4"
},
"devDependencies": {
Expand Down
21 changes: 20 additions & 1 deletion client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,23 @@ h1, h2, h3, h4, h5, h6 {

.nav-li-hover {
background-color: var(--fallback-bc, oklch(var(--bc) / 0.1));
}
}

/* Base scrollbar style */
::-webkit-scrollbar {
width: 8px;
}

::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color: var(--fallback-b1, oklch(var(--b1) / 0.6));
}

::-webkit-scrollbar-track {
background-color: var(--fallback-b2, oklch(var(--b2) / 0.3));
}

/* Optional: hover effect */
::-webkit-scrollbar-thumb:hover {
background-color: var(--fallback-b1, oklch(var(--b1) / 0.8));
}
2 changes: 1 addition & 1 deletion client/src/api/axios.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import axios from 'axios';
const BASE_URL = 'http://localhost:5000';
const BASE_URL = 'http://localhost:3000';
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should remain port 5000.
This is the port our backend server uses.


export default axios.create({
baseURL: BASE_URL
Expand Down
3 changes: 2 additions & 1 deletion client/src/assets/components/Dashboard/Dashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ const Dashboard = () => {
})

return (
<div className="flex flex-col h-auto">
<div className="h-screen overflow-y-auto scrollbar-thin scrollbar-thumb-base-content scrollbar-track-base-200 dark:scrollbar-thumb-base-100 dark:scrollbar-track-base-300">
{/*responsive scroll bar added*/}
Comment on lines +51 to +52
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's keep the scrollbar style changes just to main the scrollbar only, not overflow scrolling for now. so please remove.

{/* main container */}
<div className="md:grid w-[95%] h-auto md:grid-cols-4 gap-3 mx-auto">
{/* first column */}
Expand Down
1 change: 1 addition & 0 deletions client/src/assets/components/network/Network.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const Network = () => {

return (
<div className="max-w-[90%] lg:max-w-4xl mx-auto p-6 bg-base-100 rounded-lg shadow-md">
{/*Add scroll bar here if needed*/}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comment.

{loading
?
<Loading />
Expand Down
1 change: 1 addition & 0 deletions client/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = {
},
plugins: [
require("daisyui"),
require("tailwind-scrollbar"),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same goes for this as earlier, please uninstall.

],
daisyui: {
styled: true,
Expand Down
1 change: 0 additions & 1 deletion server/package-lock.json

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

8 changes: 8 additions & 0 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ const corsOptions = require('./config/corsOptions')
const app = express();
const port = process.env.PORT || 3000;

{/*you can add if needed for check res i have added this*/}
// app.get('/' , (req, res)=>{
// res.send('Dev Connecct to server')
// console.log('Dev Coonect to server');
// })

Comment on lines +11 to +16
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove.

connectDB();

// Cross Origin Resource Sharing
Expand All @@ -23,6 +29,8 @@ const logoutRoutes = require('./routes/logoutRoutes');
const profileRoutes = require('./routes/profileRoutes');
const blogPostRoutes = require('./routes/blogPostRoutes');



// Middleware
app.use(express.json());
app.use(cookieParser());
Expand Down