diff --git a/app.js b/app.js
index 23633c1..4bf22f6 100644
--- a/app.js
+++ b/app.js
@@ -16,7 +16,7 @@ const passport = require("passport");
const LocalStrategy = require("passport-local");
const User = require("./models/user.js");
-const i18n = require("i18n");
+
const listingRouter = require("./routes/listing.js");
const reviewRouter = require("./routes/review.js");
const userRouter = require("./routes/user.js");
diff --git a/locales/de.json b/locales/de.json
deleted file mode 100644
index 0677de1..0000000
--- a/locales/de.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Trending": "Trend",
- "Rooms": "Zimmer",
- "Mountains": "Berge",
- "Castles": "Schlösser",
- "Amazing Pools": "Fantastische Pools",
- "Camping": "Camping",
- "Farms": "Bauernhöfe",
- "Arctic": "Arktis",
- "Beach Facing": "Direkt am Strand",
- "Display total after taxes": "Gesamtpreis inklusive Steuern anzeigen",
- "night": "Nacht",
- "GST": "+20% MwSt",
- "Iconic Cities": "Ikonische Städte",
- "Language": "Sprache",
- "WanderLust": "WanderLust",
- "Explore": "Entdecken",
- "Search": "Suche",
- "Add New Listing": "Neue Anzeige hinzufügen",
- "Sign up": "Registrieren",
- "Login": "Anmelden",
- "Logout": "Abmelden",
- "Privacy": "Datenschutz",
- "Terms": "Bedingungen",
- "Username": "Benutzername",
- "Password": "Passwort",
- "Please enter a Username": "Bitte geben Sie einen Benutzernamen ein",
- "Forgot Password?": "Passwort vergessen?",
- "SignUp": "Registrieren",
- "Please enter a valid email": "Bitte geben Sie eine gültige E-Mail ein",
- "Looks good!": "Sieht gut aus!",
- "Reset Password": "Passwort zurücksetzen",
- "New Password": "Neues Passwort",
- "Enter new password": "Neues Passwort eingeben",
- "Title is required.": "Titel ist erforderlich.",
- "Description is required.": "Beschreibung ist erforderlich.",
- "Upload Listing Image": "Anzeige Bild hochladen",
- "Price": "Preis",
- "Country": "Land",
- "Country is required.": "Land ist erforderlich.",
- "Location": "Ort",
- "Location is required.": "Ort ist erforderlich.",
- "Select Category": "Kategorie auswählen",
- "Add Listing": "Anzeige hinzufügen",
- "Owned By:": "Besitzt von:",
- "Edit": "Bearbeiten",
- "DELETE": "Löschen",
- "Leave a review": "Bewertung abgeben",
- "Rating": "Bewertung",
- "Terrible": "Schrecklich",
- "Not good": "Nicht gut",
- "Average": "Durchschnittlich",
- "Very good": "Sehr gut",
- "Amazing": "Fantastisch",
- "Comment": "Kommentar",
- "Add your review": "Fügen Sie Ihre Bewertung hinzu",
- "Submit": "Abschicken",
- "Where you'll be": "Wo Sie sein werden"
-}
\ No newline at end of file
diff --git a/locales/en.json b/locales/en.json
deleted file mode 100644
index 00d60ae..0000000
--- a/locales/en.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Trending": "Trending",
- "Rooms": "Rooms",
- "Mountains": "Mountains",
- "Castles": "Castles",
- "Amazing Pools": "Amazing Pools",
- "Camping": "Camping",
- "Farms": "Farms",
- "Arctic": "Arctic",
- "Beach Facing": "Beach Facing",
- "Display total after taxes": "Display total after taxes",
- "night": "night",
- "GST": "+20% GST",
- "Iconic Cities": "Iconic Cities",
- "Language": "Language",
- "WanderLust": "WanderLust",
- "Explore": "Explore",
- "Search": "Search",
- "Add New Listing": "Add New Listing",
- "Sign up": "Sign up",
- "Login": "Login",
- "Logout": "Logout",
- "Privacy": "Privacy",
- "Terms": "Terms",
- "Username": "Username",
- "Password": "Password",
- "Please enter a Username": "Please enter a Username",
- "Forgot Password?": "Forgot Password?",
- "SignUp": "Sign Up",
- "Please enter a valid email": "Please enter a valid email",
- "Looks good!": "Looks good!",
- "Reset Password": "Reset Password",
- "New Password": "New Password",
- "Enter new password": "Enter new password",
- "Title is required.": "Title is required.",
- "Description is required.": "Description is required.",
- "Upload Listing Image": "Upload Listing Image",
- "Price": "Price",
- "Country": "Country",
- "Country is required.": "Country is required.",
- "Location": "Location",
- "Location is required.": "Location is required.",
- "Select Category": "Select Category",
- "Add Listing": "Add Listing",
- "Owned By:": "Owned By:",
- "Edit": "Edit",
- "DELETE": "DELETE",
- "Leave a review": "Leave a review",
- "Rating": "Rating",
- "Terrible": "Terrible",
- "Not good": "Not good",
- "Average": "Average",
- "Very good": "Very good",
- "Amazing": "Amazing",
- "Comment": "Comment",
- "Add your review": "Add your review",
- "Submit": "Submit",
- "Where you'll be": "Where you'll be"
-}
\ No newline at end of file
diff --git a/locales/es.json b/locales/es.json
deleted file mode 100644
index 2dadbfc..0000000
--- a/locales/es.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Trending": "Tendencia",
- "Rooms": "Habitaciones",
- "Mountains": "Montañas",
- "Castles": "Castillos",
- "Amazing Pools": "Piscinas increíbles",
- "Camping": "Campamento",
- "Farms": "Granjas",
- "Arctic": "Ártico",
- "Beach Facing": "Frente a la playa",
- "Display total after taxes": "Mostrar total después de impuestos",
- "night": "noche",
- "GST": "+20% IVA",
- "Iconic Cities": "Ciudades emblemáticas",
- "Language": "Idioma",
- "WanderLust": "WanderLust",
- "Explore": "Explorar",
- "Search": "Buscar",
- "Add New Listing": "Agregar nueva publicación",
- "Sign up": "Registrarse",
- "Login": "Iniciar sesión",
- "Logout": "Cerrar sesión",
- "Privacy": "Privacidad",
- "Terms": "Términos",
- "Username": "Nombre de usuario",
- "Password": "Contraseña",
- "Please enter a Username": "Por favor ingrese un nombre de usuario",
- "Forgot Password?": "¿Olvidaste tu contraseña?",
- "SignUp": "Registrarse",
- "Please enter a valid email": "Por favor ingrese un correo válido",
- "Looks good!": "¡Se ve bien!",
- "Reset Password": "Restablecer contraseña",
- "New Password": "Nueva contraseña",
- "Enter new password": "Ingrese la nueva contraseña",
- "Title is required.": "Se requiere título.",
- "Description is required.": "Se requiere descripción.",
- "Upload Listing Image": "Subir imagen de la publicación",
- "Price": "Precio",
- "Country": "País",
- "Country is required.": "Se requiere país.",
- "Location": "Ubicación",
- "Location is required.": "Se requiere ubicación.",
- "Select Category": "Seleccionar categoría",
- "Add Listing": "Agregar publicación",
- "Owned By:": "Propietario:",
- "Edit": "Editar",
- "DELETE": "Eliminar",
- "Leave a review": "Dejar una reseña",
- "Rating": "Calificación",
- "Terrible": "Terrible",
- "Not good": "No está bien",
- "Average": "Promedio",
- "Very good": "Muy bien",
- "Amazing": "Increíble",
- "Comment": "Comentario",
- "Add your review": "Agrega tu reseña",
- "Submit": "Enviar",
- "Where you'll be": "Dónde estarás"
-}
\ No newline at end of file
diff --git a/locales/fr.json b/locales/fr.json
deleted file mode 100644
index b7817c4..0000000
--- a/locales/fr.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Trending": "Tendance",
- "Rooms": "Chambres",
- "Mountains": "Montagnes",
- "Castles": "Châteaux",
- "Amazing Pools": "Piscines incroyables",
- "Camping": "Camping",
- "Farms": "Fermes",
- "Arctic": "Arctique",
- "Beach Facing": "Face à la plage",
- "Display total after taxes": "Afficher le total après taxes",
- "night": "nuit",
- "GST": "+20% TVA",
- "Iconic Cities": "Villes emblématiques",
- "Language": "Langue",
- "WanderLust": "WanderLust",
- "Explore": "Explorer",
- "Search": "Recherche",
- "Add New Listing": "Ajouter une nouvelle annonce",
- "Sign up": "S'inscrire",
- "Login": "Connexion",
- "Logout": "Déconnexion",
- "Privacy": "Confidentialité",
- "Terms": "Conditions",
- "Username": "Nom d'utilisateur",
- "Password": "Mot de passe",
- "Please enter a Username": "Veuillez entrer un nom d'utilisateur",
- "Forgot Password?": "Mot de passe oublié ?",
- "SignUp": "S'inscrire",
- "Please enter a valid email": "Veuillez entrer un email valide",
- "Looks good!": "Ça a l'air bien !",
- "Reset Password": "Réinitialiser le mot de passe",
- "New Password": "Nouveau mot de passe",
- "Enter new password": "Entrez le nouveau mot de passe",
- "Title is required.": "Le titre est requis.",
- "Description is required.": "La description est requise.",
- "Upload Listing Image": "Télécharger l'image de l'annonce",
- "Price": "Prix",
- "Country": "Pays",
- "Country is required.": "Le pays est requis.",
- "Location": "Lieu",
- "Location is required.": "Le lieu est requis.",
- "Select Category": "Sélectionner une catégorie",
- "Add Listing": "Ajouter l'annonce",
- "Owned By:": "Propriétaire :",
- "Edit": "Modifier",
- "DELETE": "Supprimer",
- "Leave a review": "Laisser un avis",
- "Rating": "Évaluation",
- "Terrible": "Terrible",
- "Not good": "Pas bon",
- "Average": "Moyen",
- "Very good": "Très bien",
- "Amazing": "Incroyable",
- "Comment": "Commentaire",
- "Add your review": "Ajoutez votre avis",
- "Submit": "Soumettre",
- "Where you'll be": "Où vous serez"
-}
\ No newline at end of file
diff --git a/locales/hi.json b/locales/hi.json
deleted file mode 100644
index fa1a85c..0000000
--- a/locales/hi.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Trending": "ट्रेंडिंग",
- "Rooms": "कमरे",
- "Mountains": "पहाड़",
- "Castles": "किले",
- "Amazing Pools": "शानदार पूल",
- "Camping": "कैम्पिंग",
- "Farms": "खेत",
- "Arctic": "आर्कटिक",
- "Beach Facing": "समुद्र के सामने",
- "Display total after taxes": "करों के बाद कुल दिखाएं",
- "night": "रात",
- "GST": "+20% जीएसटी",
- "Iconic Cities": "प्रसिद्ध शहर",
- "Language": "भाषा",
- "WanderLust": "वांडरलस्ट",
- "Explore": "अन्वेषण",
- "Search": "खोज",
- "Add New Listing": "नई लिस्टिंग जोड़ें",
- "Sign up": "साइन अप",
- "Login": "लॉगिन",
- "Logout": "लॉगआउट",
- "Privacy": "गोपनीयता",
- "Terms": "शर्तें",
- "Username": "यूज़रनेम",
- "Password": "पासवर्ड",
- "Please enter a Username": "कृपया यूज़रनेम दर्ज करें",
- "Forgot Password?": "पासवर्ड भूल गए?",
- "SignUp": "साइन अप",
- "Please enter a valid email": "कृपया मान्य ईमेल दर्ज करें",
- "Looks good!": "ठीक लग रहा है!",
- "Reset Password": "पासवर्ड रीसेट करें",
- "New Password": "नया पासवर्ड",
- "Enter new password": "नया पासवर्ड दर्ज करें",
- "Title is required.": "शीर्षक आवश्यक है।",
- "Description is required.": "विवरण आवश्यक है।",
- "Upload Listing Image": "लिस्टिंग छवि अपलोड करें",
- "Price": "कीमत",
- "Country": "देश",
- "Country is required.": "देश आवश्यक है।",
- "Location": "स्थान",
- "Location is required.": "स्थान आवश्यक है।",
- "Select Category": "श्रेणी चुनें",
- "Add Listing": "लिस्टिंग जोड़ें",
- "Owned By:": "मालिक:",
- "Edit": "संपादित करें",
- "DELETE": "हटाएं",
- "Leave a review": "समीक्षा छोड़ें",
- "Rating": "रेटिंग",
- "Terrible": "भयानक",
- "Not good": "अच्छा नहीं",
- "Average": "औसत",
- "Very good": "बहुत अच्छा",
- "Amazing": "अद्भुत",
- "Comment": "टिप्पणी",
- "Add your review": "अपनी समीक्षा जोड़ें",
- "Submit": "सबमिट करें",
- "Where you'll be": "आप कहां होंगे"
-}
\ No newline at end of file
diff --git a/middleware.js b/middleware.js
index 7dc7d49..16035e5 100644
--- a/middleware.js
+++ b/middleware.js
@@ -73,3 +73,5 @@ module.exports.isReviewAuthor =async(req,res,next)=>{
}
next();
}
+
+
diff --git a/package-lock.json b/package-lock.json
index e8fcf72..6980141 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@
"ejs-mate": "^4.0.0",
"express": "^4.21.2",
"express-session": "^1.18.1",
- "i18n": "^0.15.3",
"joi": "^17.13.3",
"method-override": "^3.0.0",
"mongodb-memory-server": "^11.0.1",
@@ -32,7 +31,6 @@
"passport-local": "^1.0.0",
"passport-local-mongoose": "^8.0.0"
},
- "devDependencies": {},
"engines": {
"node": "20.16.0"
}
@@ -139,50 +137,6 @@
"polyline": "bin/polyline.bin.js"
}
},
- "node_modules/@messageformat/core": {
- "version": "3.4.0",
- "resolved": "https://registry.npmjs.org/@messageformat/core/-/core-3.4.0.tgz",
- "integrity": "sha512-NgCFubFFIdMWJGN5WuQhHCNmzk7QgiVfrViFxcS99j7F5dDS5EP6raR54I+2ydhe4+5/XTn/YIEppFaqqVWHsw==",
- "license": "MIT",
- "dependencies": {
- "@messageformat/date-skeleton": "^1.0.0",
- "@messageformat/number-skeleton": "^1.0.0",
- "@messageformat/parser": "^5.1.0",
- "@messageformat/runtime": "^3.0.1",
- "make-plural": "^7.0.0",
- "safe-identifier": "^0.4.1"
- }
- },
- "node_modules/@messageformat/date-skeleton": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@messageformat/date-skeleton/-/date-skeleton-1.1.0.tgz",
- "integrity": "sha512-rmGAfB1tIPER+gh3p/RgA+PVeRE/gxuQ2w4snFWPF5xtb5mbWR7Cbw7wCOftcUypbD6HVoxrVdyyghPm3WzP5A==",
- "license": "MIT"
- },
- "node_modules/@messageformat/number-skeleton": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@messageformat/number-skeleton/-/number-skeleton-1.2.0.tgz",
- "integrity": "sha512-xsgwcL7J7WhlHJ3RNbaVgssaIwcEyFkBqxHdcdaiJzwTZAWEOD8BuUFxnxV9k5S0qHN3v/KzUpq0IUpjH1seRg==",
- "license": "MIT"
- },
- "node_modules/@messageformat/parser": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.1.1.tgz",
- "integrity": "sha512-3p0YRGCcTUCYvBKLIxtDDyrJ0YijGIwrTRu1DT8gIviIDZru8H23+FkY6MJBzM1n9n20CiM4VeDYuBsrrwnLjg==",
- "license": "MIT",
- "dependencies": {
- "moo": "^0.5.1"
- }
- },
- "node_modules/@messageformat/runtime": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/@messageformat/runtime/-/runtime-3.0.2.tgz",
- "integrity": "sha512-dkIPDCjXcfhSHgNE1/qV6TeczQZR59Yx0xXeafVKgK3QVWoxc38ljwpksUpnzCGvN151KUbCJTDZVmahtf1YZw==",
- "license": "MIT",
- "dependencies": {
- "make-plural": "^7.0.0"
- }
- },
"node_modules/@mongodb-js/saslprep": {
"version": "1.4.6",
"resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.6.tgz",
@@ -424,6 +378,39 @@
"proxy-from-env": "^1.1.0"
}
},
+<<<<<<< HEAD
+ "node_modules/axios/node_modules/form-data": {
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+ "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+ "license": "MIT",
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "es-set-tostringtag": "^2.1.0",
+ "hasown": "^2.0.2",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/b4a": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
+ "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
+ "license": "Apache-2.0",
+ "peerDependencies": {
+ "react-native-b4a": "*"
+ },
+ "peerDependenciesMeta": {
+ "react-native-b4a": {
+ "optional": true
+ }
+ }
+ },
+=======
+>>>>>>> upstream/main
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2037,15 +2024,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/math-interval-parser": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz",
- "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/math-intrinsics": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -2476,12 +2454,6 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
- "node_modules/moo": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.3.tgz",
- "integrity": "sha512-m2fmM2dDm7GZQsY7KK2cme8agi+AAljILjQnof7p1ZMDe6dQ4bdnSMx0cPppudoeNv5hEFQirN6u+O4fDE0IWA==",
- "license": "BSD-3-Clause"
- },
"node_modules/mpath": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/mpath/-/mpath-0.9.0.tgz",
@@ -2559,15 +2531,6 @@
"cloudinary": "^1.21.0"
}
},
- "node_modules/mustache": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
- "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
- "license": "MIT",
- "bin": {
- "mustache": "bin/mustache"
- }
- },
"node_modules/negotiator": {
"version": "0.6.3",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
@@ -3258,12 +3221,6 @@
],
"license": "MIT"
},
- "node_modules/safe-identifier": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz",
- "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==",
- "license": "ISC"
- },
"node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
diff --git a/package.json b/package.json
index d2ebc90..ee88f63 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,12 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "node app.js",
- "dev": "nodemon app.js"
+ "dev": "nodemon app.js"
},
"keywords": [],
"author": "",
"license": "ISC",
- "description": "WanderLust is a full-stack travel listing web application inspired by platforms like Airbnb. It allows users to explore travel destinations, create and manage property listings, upload images, and share reviews with other users.",
+ "description": "",
"dependencies": {
"@mapbox/mapbox-sdk": "^0.16.1",
"axios": "^1.8.4",
@@ -26,7 +26,6 @@
"ejs-mate": "^4.0.0",
"express": "^4.21.2",
"express-session": "^1.18.1",
- "i18n": "^0.15.3",
"joi": "^17.13.3",
"method-override": "^3.0.0",
"mongodb-memory-server": "^11.0.1",
@@ -37,14 +36,5 @@
"passport": "^0.7.0",
"passport-local": "^1.0.0",
"passport-local-mongoose": "^8.0.0"
- },
- "repository": {
- "type": "git",
- "url": "git+https://github.com/JiyaBatra/wanderLust.git"
- },
- "type": "commonjs",
- "bugs": {
- "url": "https://github.com/JiyaBatra/wanderLust/issues"
- },
- "homepage": "https://github.com/JiyaBatra/wanderLust#readme"
+ }
}
diff --git a/views/includes/footer.ejs b/views/includes/footer.ejs
index 9c48c9b..c8c4e7b 100644
--- a/views/includes/footer.ejs
+++ b/views/includes/footer.ejs
@@ -5,10 +5,10 @@
- © <%= __("WanderLust") %>
+ © WanderLust Private Limited
\ No newline at end of file
diff --git a/views/listings/index.ejs b/views/listings/index.ejs
index 16a5451..d85bb1f 100644
--- a/views/listings/index.ejs
+++ b/views/listings/index.ejs
@@ -180,4 +180,4 @@
url.searchParams.set('sort', sortValue);
window.location.href = url.toString();
}
-
+
\ No newline at end of file
diff --git a/views/listings/new.ejs b/views/listings/new.ejs
index 6784d61..8fda5d0 100644
--- a/views/listings/new.ejs
+++ b/views/listings/new.ejs
@@ -10,7 +10,7 @@
- <%= __("Title is required.") %>
+ Title is required.
@@ -18,57 +18,57 @@
- <%= __("Description is required.") %>
+ Description is required.
-
+
-
+
- <%= __("Price is required.") %>
+ Price is required.
-
+
- <%= __("Country is required.") %>
+ Country is required.
-
+
- <%= __("Location is required.") %>
+ Location is required.