diff --git a/Backend/.env_sample b/Backend/.env_sample
index 2beb315..2a9f43b 100644
--- a/Backend/.env_sample
+++ b/Backend/.env_sample
@@ -1,5 +1,5 @@
MONGODB_URI=
-PORT=8080
+PORT=
CLOUD_NAME
CLOUD_API_KEY=
CLOUD_API_KEY_SECRET=
diff --git a/Backend/controllers/user.controller.js b/Backend/controllers/user.controller.js
index 48df3fc..4890e34 100644
--- a/Backend/controllers/user.controller.js
+++ b/Backend/controllers/user.controller.js
@@ -93,12 +93,10 @@ export const loginUser = async (req, res) => {
}
// Respond with success message (add token logic if needed)
- res
- .status(200)
- .json({
- message: "Login successful",
- user: { username: user.username, email: user.email },
- });
+ res.status(200).json({
+ message: "Login successful",
+ user: { username: user.username, email: user.email },
+ });
} catch (error) {
res.status(500).json({ message: "Error logging in", error: error.message });
}
diff --git a/Backend/package-lock.json b/Backend/package-lock.json
index b026d1a..79afb26 100644
--- a/Backend/package-lock.json
+++ b/Backend/package-lock.json
@@ -11,7 +11,7 @@
"dependencies": {
"bcrypt": "^5.1.1",
"bcryptjs": "^2.4.3",
- "cloudinary": "^2.5.0",
+ "cloudinary": "^1.21.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
@@ -274,15 +274,16 @@
}
},
"node_modules/cloudinary": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-2.5.0.tgz",
- "integrity": "sha512-gPkyylFpyBAXiErAnMgZBlpwztHuZoik/OTLQM9oswjlzYHLMtQGoh0oisPBQvVHQxHmBUjcgwsAi393HDedqQ==",
+ "version": "1.21.0",
+ "resolved": "https://registry.npmjs.org/cloudinary/-/cloudinary-1.21.0.tgz",
+ "integrity": "sha512-am8wpHbHl8bcpy9oGSlWrpWLNQ9szkW/jmhcJdEpMjaL23BYt05V1frWyrXDlo8Jt7aCo5NE6EO0CM9Zaynd5g==",
+ "license": "MIT",
"dependencies": {
- "lodash": "^4.17.21",
+ "lodash": "^4.17.11",
"q": "^1.5.1"
},
"engines": {
- "node": ">=9"
+ "node": ">=0.6"
}
},
"node_modules/color-support": {
@@ -444,6 +445,7 @@
"version": "16.4.5",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
"integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+ "license": "BSD-2-Clause",
"engines": {
"node": ">=12"
},
@@ -1124,6 +1126,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/multer-storage-cloudinary/-/multer-storage-cloudinary-4.0.0.tgz",
"integrity": "sha512-25lm9R6o5dWrHLqLvygNX+kBOxprzpmZdnVKH4+r68WcfCt8XV6xfQaMuAg+kUE5Xmr8mJNA4gE0AcBj9FJyWA==",
+ "license": "MIT",
"peerDependencies": {
"cloudinary": "^1.21.0"
}
diff --git a/Backend/package.json b/Backend/package.json
index fc24478..9ecf472 100644
--- a/Backend/package.json
+++ b/Backend/package.json
@@ -14,7 +14,7 @@
"dependencies": {
"bcrypt": "^5.1.1",
"bcryptjs": "^2.4.3",
- "cloudinary": "^2.5.0",
+ "cloudinary": "^1.21.0",
"cookie-parser": "^1.4.6",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
diff --git a/Backend/utils/cloud.js b/Backend/utils/cloud.js
index 20d4b8e..16daec4 100644
--- a/Backend/utils/cloud.js
+++ b/Backend/utils/cloud.js
@@ -1,18 +1,38 @@
-import { v2 as cloudinary } from 'cloudinary';
-import { CloudinaryStorage } from 'multer-storage-cloudinary';
+// import { v2 as cloudinary } from 'cloudinary';
+// import { CloudinaryStorage } from 'multer-storage-cloudinary';
-cloudinary.config({
+// cloudinary.config({
+// cloud_name: process.env.CLOUD_NAME,
+// api_key: process.env.CLOUD_API_KEY,
+// api_secret: process.env.CLOUD_API_KEY_SECRET
+// });
+
+// const storage = new CloudinaryStorage({
+// cloudinary: cloudinary,
+// params: {
+// folder: 'wanderlust_dev',
+// allowed_formats: ["png", "jpg", "jpeg"]
+// }
+// });
+
+// export { cloudinary, storage };
+import cloudinary from "cloudinary";
+import { CloudinaryStorage } from "multer-storage-cloudinary";
+
+const { v2: cloudinaryV2 } = cloudinary;
+
+cloudinaryV2.config({
cloud_name: process.env.CLOUD_NAME,
api_key: process.env.CLOUD_API_KEY,
- api_secret: process.env.CLOUD_API_KEY_SECRET
+ api_secret: process.env.CLOUD_API_KEY_SECRET,
});
const storage = new CloudinaryStorage({
- cloudinary: cloudinary,
+ cloudinary: cloudinaryV2,
params: {
- folder: 'wanderlust_dev',
- allowed_formats: ["png", "jpg", "jpeg"]
- }
+ folder: "wanderlust_dev",
+ allowed_formats: ["png", "jpg", "jpeg"],
+ },
});
-export { cloudinary, storage };
+export { cloudinaryV2 as cloudinary, storage };
diff --git a/src/App.jsx b/src/App.jsx
index 08bc914..c34129b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -10,13 +10,12 @@ import "./App.css";
import Publish from "./pages/Publish";
// import Footer from "./components/Footer";
-import Settings from './pages/settings';
+import Settings from "./pages/settings";
import LandingPage from "./pages/LandingPage"; // Ensure this path is correct
import Signup from "./pages/SignUp";
-
-
+import Login from "./pages/Login";
function App() {
return (
@@ -24,13 +23,14 @@ function App() {
{error}
} + ++ Don't have an account?{" "} + + Sign Up + +
+