Compare commits
92 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
b1207b1d3a
|
|||
|
0722bf5086
|
|||
|
b818f7842b
|
|||
|
d7f26c5e1d
|
|||
|
e3bec4d1d0
|
|||
|
0ee14ddf99
|
|||
|
d84c2879cd
|
|||
|
94659c9afa
|
|||
|
e7d83032e2
|
|||
|
535ef056fd
|
|||
|
2957930be4
|
|||
|
e7ae4c93b1
|
|||
|
f32f7ddc6e
|
|||
|
220f822f3d
|
|||
|
fb8ac9eb82
|
|||
|
3a7ee73233
|
|||
|
d4748fd99f
|
|||
|
0003858e3a
|
|||
|
30464136a3
|
|||
|
1b10587747
|
|||
|
7ec4f386b1
|
|||
|
0c205270ee
|
|||
|
8ee1f1183c
|
|||
|
ae7b868065
|
|||
|
fc9e3ac0f2
|
|||
|
b67f7557ee
|
|||
|
66d7f76133
|
|||
|
f7c27d5a98
|
|||
|
3e93d8508b
|
|||
|
872a38c768
|
|||
|
b9824307dd
|
|||
|
45419247f7
|
|||
|
ccd5debcef
|
|||
|
ad06012860
|
|||
|
2a8b49241e
|
|||
|
ed9059a812
|
|||
|
d52204c2f5
|
|||
|
3a8ed215c4
|
|||
|
f51ee5667f
|
|||
|
5792849c1e
|
|||
|
4e0d54efa0
|
|||
|
301ff3679a
|
|||
|
f5cea1062a
|
|||
|
2c6abaf577
|
|||
|
dde591049f
|
|||
|
bdaafb66d9
|
|||
|
e3935c9760
|
|||
|
4115193ef7
|
|||
|
2afda4873b
|
|||
|
bc41904e06
|
|||
|
4fb54705ca
|
|||
|
12ce8b1ec3
|
|||
|
9c3feca6a7
|
|||
|
aaf88fda56
|
|||
|
23a271fbce
|
|||
|
f3e52cda73
|
|||
|
04e69202b6
|
|||
|
001727ab85
|
|||
|
351f57229c
|
|||
|
25cfa659c7
|
|||
|
d5d1e16d1f
|
|||
|
e40eae866a
|
|||
|
3458d21567
|
|||
|
63c73bc6d9
|
|||
|
90d09350e2
|
|||
|
06b11cb2eb
|
|||
|
14295f1931
|
|||
|
0aa8a3842c
|
|||
|
1395496fce
|
|||
|
91aaa092f3
|
|||
|
a7ae00beac
|
|||
|
7ad0db73b0
|
|||
|
36693ba21b
|
|||
|
9e170a91ef
|
|||
|
911b08ba71
|
|||
|
36781b3af4
|
|||
|
a70afd8615
|
|||
|
9fe5d04fca
|
|||
|
23e12d3c7e
|
|||
|
4b6faef5eb
|
|||
|
cacf3f9c0d
|
|||
|
697a873148
|
|||
|
c123c4985c
|
|||
|
64a34fdf0d
|
|||
|
5484b122a1
|
|||
|
b2fe22195f
|
|||
|
3b21ab5b63
|
|||
|
d431ff809e
|
|||
|
dcc5ce361d
|
|||
|
1966a696ab
|
|||
|
1f0855c9f3
|
|||
|
6e813383fb
|
@@ -0,0 +1,22 @@
|
|||||||
|
# Database
|
||||||
|
MONGODB_ROOT_USERNAME=mongo_user
|
||||||
|
MONGODB_ROOT_PASSWORD=mongo_pass
|
||||||
|
MONGODB_URI=mongodb://mongo_user:mongo_pass@database:27017
|
||||||
|
|
||||||
|
# SMTP
|
||||||
|
SMTP_SERVICE=gmail
|
||||||
|
SMTP_EMAILADDR=example@gmail.com
|
||||||
|
SMTP_PASSWORD=app pass here
|
||||||
|
SMTP_HOST=smtp.gmail.com
|
||||||
|
SMTP_PORT=587
|
||||||
|
|
||||||
|
# Cloudinary
|
||||||
|
CLOUDINARY_CLOUD_NAME=cloudname_here
|
||||||
|
CLOUDINARY_API_KEY=api_key_here
|
||||||
|
CLOUDINARY_API_SECRET=api_secret_here
|
||||||
|
|
||||||
|
# Gemini
|
||||||
|
GEMINI_API_KEY=gemini_api_here
|
||||||
|
|
||||||
|
# Refresh token
|
||||||
|
REFRESH_TOKEN_SECRET=a_random_60_or_more_char_secret_here
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
package-lock.json
|
||||||
|
node_modules/
|
||||||
|
db/
|
||||||
|
deployed-compose.yaml
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
Dockerfile
|
||||||
|
node_modules/
|
||||||
|
package-lock.json
|
||||||
|
.dockerignore
|
||||||
|
.env.back
|
||||||
|
.gitignore
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
PORT = 8000
|
||||||
|
FRONTEND_URI = ${FRONTEND_URI}
|
||||||
|
|
||||||
|
# Database
|
||||||
|
MONGODB_URI = ${MONGODB_URI}
|
||||||
|
DATABASE_NAME=CropCompass
|
||||||
|
|
||||||
|
# Mail server
|
||||||
|
SMPT_SERVICE = ${SMTP_SERVICE}
|
||||||
|
SMPT_MAIL = ${SMTP_EMAILADDR}
|
||||||
|
SMPT_PASSWORD = ${SMTP_PASSWORD}
|
||||||
|
HOST = ${SMTP_HOST}
|
||||||
|
EMAIL_PORT = ${SMTP_PORT}
|
||||||
|
|
||||||
|
# Cloudinary
|
||||||
|
CLOUDINARY_CLOUD_NAME = ${CLOUDINARY_CLOUD_NAME}
|
||||||
|
CLOUDINARY_API_KEY = ${CLOUDINARY_API_KEY}
|
||||||
|
CLOUDINARY_API_SECRET = ${CLOUDINARY_API_SECRET}
|
||||||
|
|
||||||
|
# Gemini
|
||||||
|
GEMINI_API_KEY = ${GEMINI_API_KEY}
|
||||||
|
|
||||||
|
# Refresh token
|
||||||
|
TOKEN_NAME = uid
|
||||||
|
REFRESH_TOKEN_EXPIRY = 10d
|
||||||
|
REFRESH_TOKEN_SECRET = ${REFRESH_TOKEN_SECRET}
|
||||||
+3
-1
@@ -1,3 +1,5 @@
|
|||||||
|
package-lock.json
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
logs
|
logs
|
||||||
*.log
|
*.log
|
||||||
@@ -17,7 +19,7 @@ node_modules/
|
|||||||
jspm_packages/
|
jspm_packages/
|
||||||
|
|
||||||
# Environment files
|
# Environment files
|
||||||
.env
|
.env.bak
|
||||||
.env.*.local
|
.env.*.local
|
||||||
|
|
||||||
# Build outputs
|
# Build outputs
|
||||||
|
|||||||
@@ -4,11 +4,28 @@ const { uploadOnCloudinary } = require("../Utils/cloudinary.js");
|
|||||||
const sendEmail = require("../Utils/sendmail.js");
|
const sendEmail = require("../Utils/sendmail.js");
|
||||||
const crypto = require("crypto");
|
const crypto = require("crypto");
|
||||||
const jwt = require("jsonwebtoken");
|
const jwt = require("jsonwebtoken");
|
||||||
|
const sha1 = require("sha1");
|
||||||
|
const axios = require("axios");
|
||||||
|
|
||||||
// Register or Sign up new User -- Done
|
// Register or Sign up new User -- Done
|
||||||
const registerUser = catchAsyncErrors(async (req, res) => {
|
const registerUser = catchAsyncErrors(async (req, res) => {
|
||||||
const { name, email, password, role } = req.body;
|
const { name, email, password, role } = req.body;
|
||||||
|
|
||||||
|
// Strong password policy
|
||||||
|
const strongPasswordRegex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&]).{8,}$/;
|
||||||
|
if (!strongPasswordRegex.test(password)) {
|
||||||
|
return res.status(400).json({ success: false, message: "Password must be at least 8 characters long and include uppercase, lowercase, number, and special character." });
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for data breach with haveibeenpwned.com
|
||||||
|
const hashed = sha1(password).toUpperCase();
|
||||||
|
const prefix = hashed.slice(0, 5);
|
||||||
|
const suffix = hashed.slice(5);
|
||||||
|
const response = await axios.get(`https://api.pwnedpasswords.com/range/${prefix}`);
|
||||||
|
if (response.data.includes(suffix)) {
|
||||||
|
return res.status(400).json({ success: false, message: "This password has appeared in a data breach. Please choose a different one." });
|
||||||
|
}
|
||||||
|
|
||||||
const user = await User.create({
|
const user = await User.create({
|
||||||
name,
|
name,
|
||||||
email,
|
email,
|
||||||
|
|||||||
@@ -3,19 +3,23 @@ const catchAsyncErrors = require("../Middlewares/catchAsyncErrors.js");
|
|||||||
|
|
||||||
const DB_connect = catchAsyncErrors(async () => {
|
const DB_connect = catchAsyncErrors(async () => {
|
||||||
try {
|
try {
|
||||||
const connectionInstance = await mongoose.connect(
|
const dbUri = `${process.env.MONGODB_URI}/${process.env.DATABASE_NAME}?authSource=admin`;
|
||||||
`${process.env.MONGODB_URI}/${process.env.DATABASE_NAME}`
|
const connectionInstance = await mongoose.connect(dbUri, {
|
||||||
);
|
useNewUrlParser: true,
|
||||||
|
useUnifiedTopology: true,
|
||||||
|
});
|
||||||
|
|
||||||
if (!connectionInstance) {
|
if (!connectionInstance) {
|
||||||
console.log("MongoDB connection failed");
|
console.log("MongoDB connection failed");
|
||||||
}
|
} else {
|
||||||
console.log(
|
console.log(
|
||||||
"MongoDB connected Successfully on server : " +
|
"MongoDB connected Successfully to:",
|
||||||
connectionInstance.connection.host
|
connectionInstance.connection.host
|
||||||
);
|
);
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("MongoDB connection failed due to some error :", error);
|
console.log("MongoDB connection failed due to some error :", error);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
module.exports = DB_connect;
|
module.exports = DB_connect;
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# Base image
|
||||||
|
FROM node:22
|
||||||
|
|
||||||
|
# Metadata
|
||||||
|
LABEL maintainer="kshitijka"
|
||||||
|
LABEL version=1.1.0
|
||||||
|
LABEL description="Crop Compass is a centralized management dashboard designed for farmers, enabling them to efficiently oversee their farms while leveraging advanced AI technology for disease identification and more."
|
||||||
|
|
||||||
|
# Update and upgrade
|
||||||
|
RUN apt update && apt upgrade -y && \
|
||||||
|
apt clean all && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Create non-root user
|
||||||
|
RUN useradd -s /bin/bash nonroot
|
||||||
|
|
||||||
|
# Create working directory
|
||||||
|
RUN mkdir -p /app /home/nonroot
|
||||||
|
RUN chown -R nonroot:nonroot /app /home/nonroot
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Switch user
|
||||||
|
USER nonroot
|
||||||
|
|
||||||
|
# Copy contents
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Generate a random hex token and write it to .env
|
||||||
|
#RUN echo "REFRESH_TOKEN_SECRET = $(openssl rand -hex 32)" >> /app/.env
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
# Expose backend port
|
||||||
|
EXPOSE 8000
|
||||||
|
|
||||||
|
# Run backend
|
||||||
|
CMD ["node", "index.js"]
|
||||||
@@ -2,7 +2,7 @@ const multer = require("multer");
|
|||||||
|
|
||||||
const storage = multer.diskStorage({
|
const storage = multer.diskStorage({
|
||||||
destination: function (req, file, cb) {
|
destination: function (req, file, cb) {
|
||||||
cb(null, "./public/images");
|
cb(null, "./uploads");
|
||||||
},
|
},
|
||||||
|
|
||||||
filename: function (req, file, cb) {
|
filename: function (req, file, cb) {
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
const rateLimit = require("express-rate-limit");
|
||||||
|
|
||||||
|
const loginLimiter = rateLimit({
|
||||||
|
windowMs: 15 * 60 * 1000, // 15 minutes
|
||||||
|
max: 5, // limit each IP to 5 login requests per windowMs
|
||||||
|
message: "Too many login attempts. Try again in 15 minutes.",
|
||||||
|
standardHeaders: true,
|
||||||
|
legacyHeaders: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
module.exports = { loginLimiter };
|
||||||
@@ -19,11 +19,13 @@ const { checkAuthenticated } = require("../Middlewares/authentication.js");
|
|||||||
|
|
||||||
const upload = require("../Middlewares/multer.js");
|
const upload = require("../Middlewares/multer.js");
|
||||||
|
|
||||||
|
const { loginLimiter } = require("../Middlewares/rateLimiter");
|
||||||
|
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
|
|
||||||
router.route("/register").post(registerUser);
|
router.route("/register").post(registerUser);
|
||||||
|
|
||||||
router.route("/login").post(loginUser);
|
router.route("/login").post(loginLimiter, loginUser);
|
||||||
|
|
||||||
router.route("/password/forgot").post(forgetPassword);
|
router.route("/password/forgot").post(forgetPassword);
|
||||||
|
|
||||||
|
|||||||
@@ -1,359 +1,3 @@
|
|||||||
// const {
|
|
||||||
// GoogleGenerativeAI,
|
|
||||||
// HarmCategory,
|
|
||||||
// HarmBlockThreshold,
|
|
||||||
// } = require("@google/generative-ai");
|
|
||||||
// const {
|
|
||||||
// GoogleGenerativeAI,
|
|
||||||
// HarmCategory,
|
|
||||||
// HarmBlockThreshold,
|
|
||||||
// } = require("@google/generative-ai");
|
|
||||||
// const dotenv = require("dotenv");
|
|
||||||
|
|
||||||
// dotenv.config({
|
|
||||||
// path: "./.env",
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const apiKey = process.env.GEMINI_API_KEY;
|
|
||||||
// const genAI = new GoogleGenerativeAI(apiKey);
|
|
||||||
|
|
||||||
// const model = genAI.getGenerativeModel({
|
|
||||||
// model: "gemini-2.0-flash",
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const generationConfig = {
|
|
||||||
// temperature: 1,
|
|
||||||
// topP: 0.95,
|
|
||||||
// topK: 40,
|
|
||||||
// maxOutputTokens: 8192,
|
|
||||||
// responseMimeType: "text/plain",
|
|
||||||
// };
|
|
||||||
|
|
||||||
// export async function run(message) {
|
|
||||||
// const chatSession = model.startChat({
|
|
||||||
// generationConfig,
|
|
||||||
// history: [
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "AI Model Guidelines:\n\nContext Restriction: Only provide answers based on the content available on [Your Website Name]. Do not generate responses unrelated to the website's information.\nNo External Knowledge: If a user asks about a topic outside the website’s scope, politely inform them that you can only assist with website-related queries.\nSafe & Ethical Responses: Do not answer harmful, illegal, controversial, or inappropriate questions. If such a query is detected, respond with a neutral message stating that the request cannot be fulfilled.\nAccuracy & Clarity: Ensure responses are factual, clear, and helpful, directly referencing available website data without assumptions or speculation.\n\nGreeting should be similar lto this :\nHello! 👋\nI’m here to assist you with information available on [Your Website Name]. Here’s what I can do:\n\n✅ Answer questions based on the content from this website.\n✅ Guide you through available services, features, and resources.\n✅ Help you navigate and find what you need.\n\nuse emoji when you feel like it makes sense and increases the user understanding",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Hello! 👋\n\nI’m here to assist you with information available on [Your Website Name]. Here’s what I can do:\n\n✅ Answer questions based on the content from this website.\n✅ Guide you through available services, features, and resources.\n✅ Help you navigate and find what you need.\n\nHow can I help you today? 😃\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [{ text: "forget everythings until now " }],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I am now reset and ready to assist you with information available on [Your Website Name], adhering to the guidelines. How can I help you?\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "you will get some json or js object which will be some questions related to farming, you have to answer those questions and give proper description which is neccessary for a farmer to have if you recommend some kind of poisonous pestiside or something give a small warning and some things to keep some precausetions, dont answer anything unrelated to farming and strictly avoid harmful topics like war or viiolence, if farmer wants to kill pestisides then thats ok but anything else is not \n ",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will answer questions related to farming based on the content available on [Your Website Name]. I will provide detailed descriptions where necessary, including precautions when recommending potentially harmful pesticides. I will strictly avoid topics unrelated to farming or any harmful subjects. Please provide the JSON or JS object containing the questions. I'm ready! 🚜\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "keep the warning and precuastions short, and you are not a chatbot you are a data processing unit who will have the data and analyze it and answer accordingly\n ",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will function as a data processing unit, analyzing the provided data related to farming and answering questions with concise warnings and precautions where applicable. I will not engage in conversational chatbot behavior. Please provide the data. I'm ready to process! 👩🌾\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const result = await chatSession.sendMessage(message);
|
|
||||||
// console.log(result.response.text());
|
|
||||||
// }
|
|
||||||
|
|
||||||
// const {
|
|
||||||
// GoogleGenerativeAI,
|
|
||||||
// HarmCategory,
|
|
||||||
// HarmBlockThreshold,
|
|
||||||
// } = require("@google/generative-ai");
|
|
||||||
// const apiKey = "AIzaSyDsXug23r4umgcJpj77KeqNyYW0hQnYDgg";
|
|
||||||
// const genAI = new GoogleGenerativeAI(apiKey);
|
|
||||||
// const model = genAI.getGenerativeModel({
|
|
||||||
// model: "gemini-2.0-flash",
|
|
||||||
// });
|
|
||||||
// const generationConfig = {
|
|
||||||
// temperature: 1,
|
|
||||||
// topP: 0.95,
|
|
||||||
// topK: 40,
|
|
||||||
// maxOutputTokens: 8192,
|
|
||||||
// responseMimeType: "text/plain",
|
|
||||||
// };
|
|
||||||
// async function run(message) {
|
|
||||||
// const chatSession = model.startChat({
|
|
||||||
// generationConfig,
|
|
||||||
// history: [
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "you will get some json or js object which will be some questions related to farming, you have to answer those questions and give proper description which is neccessary for a farmer to have if you recommend some kind of poisonous pestiside or something give a small warning and some things to keep some precausetions, dont answer anything unrelated to farming and strictly avoid harmful topics like war or viiolence, if farmer wants to kill pestisides then thats ok but anything else is not \n ",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will answer questions related to farming based on the content available on [Your Website Name]. I will provide detailed descriptions where necessary, including precautions when recommending potentially harmful pesticides. I will strictly avoid topics unrelated to farming or any harmful subjects. Please provide the JSON or JS object containing the questions. I'm ready! 🚜\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "keep the warning and precuastions short, and you are not a chatbot you are a data processing unit who will have the data and analyze it and answer accordingly\n ",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will function as a data processing unit, analyzing the provided data related to farming and answering questions with concise warnings and precautions where applicable. I will not engage in conversational chatbot behavior. Please provide the data. I'm ready to process! 👩🌾\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// });
|
|
||||||
// const result = await chatSession.sendMessage(message);
|
|
||||||
// console.log(result.response.text());
|
|
||||||
// }
|
|
||||||
// run("How we check the farmes soil type ? ");
|
|
||||||
|
|
||||||
// const {
|
|
||||||
// GoogleGenerativeAI,
|
|
||||||
// HarmCategory,
|
|
||||||
// HarmBlockThreshold,
|
|
||||||
// } = require("@google/generative-ai");
|
|
||||||
|
|
||||||
// const apiKey = "AIzaSyDsXug23r4umgcJpj77KeqNyYW0hQnYDgg";
|
|
||||||
// const genAI = new GoogleGenerativeAI(apiKey);
|
|
||||||
|
|
||||||
// const model = genAI.getGenerativeModel({
|
|
||||||
// model: "gemini-2.0-flash",
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const generationConfig = {
|
|
||||||
// temperature: 1,
|
|
||||||
// topP: 0.95,
|
|
||||||
// topK: 40,
|
|
||||||
// maxOutputTokens: 8192,
|
|
||||||
// responseMimeType: "text/plain",
|
|
||||||
// };
|
|
||||||
|
|
||||||
// async function run(message) {
|
|
||||||
// const chatSession = model.startChat({
|
|
||||||
// generationConfig,
|
|
||||||
// history: [
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "AI Guidelines:\n- The AI must only provide answers related to farming, including crops, sowing, irrigation, harvesting, fertilizers, pesticides, soil health, and climate conditions. \n- The AI must not answer anything outside farming. \n- If asked an unrelated question, the AI must not respond. \n- If the query is unclear, the AI must default to farming-related guidance. \n- The AI must provide only one-line responses without extra details. \n- No harmful, hurtful, or controversial responses. \n- No advice on illegal, unsafe, or unethical farming practices.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will only provide one-line responses directly related to farming.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const result = await chatSession.sendMessage(message);
|
|
||||||
// console.log(result.response.text());
|
|
||||||
// }
|
|
||||||
|
|
||||||
// const {
|
|
||||||
// GoogleGenerativeAI,
|
|
||||||
// HarmCategory,
|
|
||||||
// HarmBlockThreshold,
|
|
||||||
// } = require("@google/generative-ai");
|
|
||||||
|
|
||||||
// const apiKey = "AIzaSyDsXug23r4umgcJpj77KeqNyYW0hQnYDgg";
|
|
||||||
// const genAI = new GoogleGenerativeAI(apiKey);
|
|
||||||
|
|
||||||
// const model = genAI.getGenerativeModel({
|
|
||||||
// model: "gemini-2.0-flash",
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const generationConfig = {
|
|
||||||
// temperature: 1,
|
|
||||||
// topP: 0.95,
|
|
||||||
// topK: 40,
|
|
||||||
// maxOutputTokens: 8192,
|
|
||||||
// responseMimeType: "text/plain",
|
|
||||||
// };
|
|
||||||
|
|
||||||
// async function run() {
|
|
||||||
// const chatSession = model.startChat({
|
|
||||||
// generationConfig,
|
|
||||||
// history: [
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "AI Guidelines:\n- The AI must only provide answers related to farming, including crops, sowing, irrigation, harvesting, fertilizers, pesticides, soil health, and climate conditions. \n- The AI must not answer anything outside farming. \n- If asked an unrelated question, the AI must not respond. \n- If the query is unclear, the AI must default to farming-related guidance. \n- The AI must provide only one-line responses without extra details. \n- No harmful, hurtful, or controversial responses. \n- No advice on illegal, unsafe, or unethical farming practices.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will only provide one-line responses directly related to farming.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "you can also receive json or javascript object as an input ",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will process the JSON or JavaScript object only if it pertains to farming and respond with a single line.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const result = await chatSession.sendMessage("INSERT_INPUT_HERE");
|
|
||||||
// console.log(result.response.text());
|
|
||||||
// }
|
|
||||||
|
|
||||||
// const {
|
|
||||||
// GoogleGenerativeAI,
|
|
||||||
// HarmCategory,
|
|
||||||
// HarmBlockThreshold,
|
|
||||||
// } = require("@google/generative-ai");
|
|
||||||
|
|
||||||
// const apiKey = "AIzaSyDsXug23r4umgcJpj77KeqNyYW0hQnYDgg";
|
|
||||||
// const genAI = new GoogleGenerativeAI(apiKey);
|
|
||||||
|
|
||||||
// const model = genAI.getGenerativeModel({
|
|
||||||
// model: "gemini-2.0-flash",
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const generationConfig = {
|
|
||||||
// temperature: 1,
|
|
||||||
// topP: 0.95,
|
|
||||||
// topK: 40,
|
|
||||||
// maxOutputTokens: 8192,
|
|
||||||
// responseMimeType: "text/plain",
|
|
||||||
// };
|
|
||||||
|
|
||||||
// async function run(message) {
|
|
||||||
// const chatSession = model.startChat({
|
|
||||||
// generationConfig,
|
|
||||||
// history: [
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "AI Guidelines:\n- The AI must only provide answers related to farming, including crops, sowing, irrigation, harvesting, fertilizers, pesticides, soil health, and climate conditions. \n- The AI must not answer anything outside farming. \n- If asked an unrelated question, the AI must not respond. \n- If the query is unclear, the AI must default to farming-related guidance. \n- The AI must provide only one-line responses without extra details. \n- No harmful, hurtful, or controversial responses. \n- No advice on illegal, unsafe, or unethical farming practices.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will only provide one-line responses directly related to farming.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "you can also receive json or javascript object as an input ",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will process the JSON or JavaScript object only if it pertains to farming and respond with a single line.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "user",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Answer everything which falls under the farming and agriculture even if the prompt does not include any farm or agriculture word in it",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// {
|
|
||||||
// role: "model",
|
|
||||||
// parts: [
|
|
||||||
// {
|
|
||||||
// text: "Understood. I will assume all queries are related to farming and provide a one-line farming-related response.\n",
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// },
|
|
||||||
// ],
|
|
||||||
// });
|
|
||||||
|
|
||||||
// const result = await chatSession.sendMessage(message);
|
|
||||||
// console.log(result.response.text());
|
|
||||||
|
|
||||||
// return result.response.text();
|
|
||||||
// }
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
GoogleGenerativeAI,
|
GoogleGenerativeAI,
|
||||||
HarmCategory,
|
HarmCategory,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
const express = require("express");
|
const express = require("express");
|
||||||
const cors = require("cors");
|
const cors = require("cors");
|
||||||
const cookieParser = require("cookie-parser");
|
const cookieParser = require("cookie-parser");
|
||||||
|
const helmet = require("helmet");
|
||||||
|
|
||||||
const userRoute = require("./Routes/user.routes.js");
|
const userRoute = require("./Routes/user.routes.js");
|
||||||
const farmRoute = require("./Routes/farm.routes.js");
|
const farmRoute = require("./Routes/farm.routes.js");
|
||||||
@@ -17,6 +18,8 @@ dotenv.config({
|
|||||||
|
|
||||||
const app = express();
|
const app = express();
|
||||||
|
|
||||||
|
app.use(helmet()); // Secure headers
|
||||||
|
|
||||||
const corsOptions = {
|
const corsOptions = {
|
||||||
origin: process.env.FRONTEND_URI,
|
origin: process.env.FRONTEND_URI,
|
||||||
methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
|
methods: "GET,HEAD,PUT,PATCH,POST,DELETE",
|
||||||
@@ -43,4 +46,12 @@ app.use("/api/v1/finance", financeRoute);
|
|||||||
|
|
||||||
app.use("/api/v1/task", taskRoute);
|
app.use("/api/v1/task", taskRoute);
|
||||||
|
|
||||||
|
// Redirect HTTP to HTTPS (works behind proxy)
|
||||||
|
app.use((req, res, next) => {
|
||||||
|
if (req.headers["x-forwarded-proto"] !== "https" && process.env.NODE_ENV === "production") {
|
||||||
|
return res.redirect(`https://${req.headers.host}${req.url}`);
|
||||||
|
}
|
||||||
|
next();
|
||||||
|
});
|
||||||
|
|
||||||
module.exports = app;
|
module.exports = app;
|
||||||
|
|||||||
Generated
-4823
File diff suppressed because it is too large
Load Diff
+16
-15
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "backend",
|
"name": "backend",
|
||||||
"version": "1.0.0",
|
"version": "1.1.0",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "echo \"Error: no test specified\" && exit 1",
|
"test": "echo \"Error: no test specified\" && exit 1",
|
||||||
@@ -10,23 +10,24 @@
|
|||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"description": "",
|
"description": "",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@google/generative-ai": "^0.22.0",
|
"@google/generative-ai": "^0.24.1",
|
||||||
"@huggingface/transformers": "^3.3.3",
|
"axios": "^1.6.8",
|
||||||
"@xenova/transformers": "^2.17.2",
|
"bcrypt": "^6.0.0",
|
||||||
"bcrypt": "^5.1.1",
|
"cloudinary": "^2.7.0",
|
||||||
"cloudinary": "^2.5.1",
|
"cookie-parser": "^1.4.7",
|
||||||
"cookie-parser": "^1.4.6",
|
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
"dotenv": "^16.4.5",
|
"dotenv": "^16.5.0",
|
||||||
"express": "^4.19.2",
|
"express": "^5.1.0",
|
||||||
"jimp": "^1.6.0",
|
"express-rate-limit": "^6.7.0",
|
||||||
|
"helmet": "^7.0.0",
|
||||||
"jsonwebtoken": "^9.0.2",
|
"jsonwebtoken": "^9.0.2",
|
||||||
"mongoose": "^8.6.1",
|
"mongoose": "^8.16.0",
|
||||||
"multer": "^1.4.5-lts.1",
|
"multer": "^2.0.1",
|
||||||
"nodemailer": "^6.9.15",
|
"nodemailer": "^7.0.3",
|
||||||
"socket.io": "^4.7.5"
|
"sha1": "^1.1.1",
|
||||||
|
"socket.io": "^4.8.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"nodemon": "^3.1.4"
|
"nodemon": "^3.1.10"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
import { pipeline } from "@xenova/transformers";
|
|
||||||
import Jimp from "jimp";
|
|
||||||
|
|
||||||
async function main() {
|
|
||||||
const modelName = "Xenova/distilbert-base-uncased-finetuned-sst-2-english"; // Example model
|
|
||||||
|
|
||||||
// Load the model
|
|
||||||
const classifier = await pipeline("image-classification", modelName);
|
|
||||||
|
|
||||||
// Load the image
|
|
||||||
let image;
|
|
||||||
try {
|
|
||||||
image = await Jimp.read("/home/karan/Downloads/tomato.png");
|
|
||||||
image.rgba(true);
|
|
||||||
} catch (error) {
|
|
||||||
console.error("Error: Unable to open image. Check the file type or path.");
|
|
||||||
console.error(error);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert image to buffer
|
|
||||||
const buffer = await image.getBufferAsync(Jimp.MIME_PNG);
|
|
||||||
|
|
||||||
// Classify the image
|
|
||||||
const result = await classifier(buffer);
|
|
||||||
|
|
||||||
console.log("Predicted class:", result);
|
|
||||||
}
|
|
||||||
|
|
||||||
main().catch(console.error);
|
|
||||||
|
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
dist/
|
||||||
|
Dockerfile
|
||||||
|
node_modules/
|
||||||
|
package-lock.json
|
||||||
|
README.md
|
||||||
|
vercel.json
|
||||||
|
.dockerignore
|
||||||
|
.gitignore
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
VITE_API_URL=http://localhost:8000
|
VITE_API_URL = ${BACKEND_URI}
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
# Base image
|
||||||
|
FROM node:22
|
||||||
|
|
||||||
|
# Environment variables
|
||||||
|
ENV MODEL_URI=http://localhost:8081
|
||||||
|
ENV BACKEND_URI=http://localhost:8000
|
||||||
|
|
||||||
|
# Metadata
|
||||||
|
LABEL maintainer="kshitijka"
|
||||||
|
LABEL version=1.1.0
|
||||||
|
LABEL description="Crop Compass is a centralized management dashboard designed for farmers, enabling them to efficiently oversee their farms while leveraging advanced AI technology for disease identification and more."
|
||||||
|
|
||||||
|
# Update and upgrade
|
||||||
|
RUN apt update && apt upgrade -y && \
|
||||||
|
apt clean all && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Create non-root user
|
||||||
|
RUN useradd -s /bin/bash nonroot
|
||||||
|
|
||||||
|
# Create working directory
|
||||||
|
RUN mkdir -p /app
|
||||||
|
RUN chown -R nonroot:nonroot /app
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copying contents
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Writing backend uri in .env
|
||||||
|
RUN echo "VITE_API_URL = $BACKEND_URI" > /app/.env
|
||||||
|
|
||||||
|
# Building frontend
|
||||||
|
RUN npm install
|
||||||
|
RUN npm run build
|
||||||
|
|
||||||
|
# Clean-up
|
||||||
|
RUN rm -rf eslint.config.js index.html node_modules/ package-lock.json package.json postcss.config.js public/ src/ tailwind.config.js vite.config.js .dockerignore .gitignore .vite/
|
||||||
|
|
||||||
|
# Install server
|
||||||
|
RUN npm install -g serve
|
||||||
|
|
||||||
|
# Switch user
|
||||||
|
USER nonroot
|
||||||
|
|
||||||
|
# Expose frontend port
|
||||||
|
EXPOSE 3000
|
||||||
|
|
||||||
|
# Run frontend
|
||||||
|
CMD ["serve", "-s", "/app/dist"]
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "frontend",
|
"name": "frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.0.0",
|
"version": "1.1.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -26,7 +26,9 @@
|
|||||||
"react-redux": "^9.1.2",
|
"react-redux": "^9.1.2",
|
||||||
"react-router-dom": "^6.26.1",
|
"react-router-dom": "^6.26.1",
|
||||||
"react-typewriter-effect": "^1.1.0",
|
"react-typewriter-effect": "^1.1.0",
|
||||||
"socket.io-client": "^4.7.5"
|
"socket.io-client": "^4.7.5",
|
||||||
|
"axios": "^1.6.8",
|
||||||
|
"sha1": "^1.1.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.9.0",
|
"@eslint/js": "^9.9.0",
|
||||||
|
|||||||
+37
-11
@@ -2,44 +2,69 @@ import { useDispatch, useSelector } from "react-redux";
|
|||||||
import "./App.css";
|
import "./App.css";
|
||||||
// import Navbar from "./components/Navbar";
|
// import Navbar from "./components/Navbar";
|
||||||
import Navbar2 from "./components/Navbar2";
|
import Navbar2 from "./components/Navbar2";
|
||||||
import { useEffect } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { userSliceActions } from "./store/userSlice";
|
import { userSliceActions } from "./store/userSlice";
|
||||||
|
|
||||||
import { Outlet } from "react-router-dom";
|
import { Outlet } from "react-router-dom";
|
||||||
import { BACKEND_URL } from "./constants";
|
import { BACKEND_URL } from "./constants";
|
||||||
|
|
||||||
|
// Simple LanguageSwitcher component
|
||||||
|
function LanguageSwitcher({ language, setLanguage }) {
|
||||||
|
return (
|
||||||
|
<select
|
||||||
|
value={language}
|
||||||
|
onChange={(e) => {
|
||||||
|
setLanguage(e.target.value);
|
||||||
|
localStorage.setItem("language", e.target.value);
|
||||||
|
}}
|
||||||
|
className="absolute top-2 right-2 p-1 rounded border"
|
||||||
|
aria-label="Select language"
|
||||||
|
>
|
||||||
|
<option value="en">English</option>
|
||||||
|
<option value="hi">Hindi (हिंदी)</option>
|
||||||
|
<option value="mr">Marathi (मराठी)</option>
|
||||||
|
<option value="fr">Français</option>
|
||||||
|
{/* Add more languages here */}
|
||||||
|
</select>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const user = useSelector((store) => store.user);
|
const user = useSelector((store) => store.user);
|
||||||
|
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
|
||||||
const loader = useSelector((store) => store.loader);
|
const loader = useSelector((store) => store.loader);
|
||||||
|
|
||||||
|
// Language state, initialized from localStorage or default to 'en'
|
||||||
|
const [language, setLanguage] = useState(
|
||||||
|
localStorage.getItem("language") || "en"
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log("Current language:", language);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
async function initialiseUser() {
|
async function initialiseUser() {
|
||||||
if (user.role == "unloggeduser") {
|
if (user.role === "unloggeduser") {
|
||||||
const responce = await fetch(`${BACKEND_URL}/api/v1/getuser`, {
|
const responce = await fetch(`${BACKEND_URL}/api/v1/getuser`, {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
credentials: "include",
|
credentials: "include",
|
||||||
});
|
});
|
||||||
|
|
||||||
const userData = await responce.json();
|
const userData = await responce.json();
|
||||||
|
|
||||||
//console.log("User Datae is ", userData);
|
|
||||||
|
|
||||||
dispatch(userSliceActions.addUser(userData.data));
|
dispatch(userSliceActions.addUser(userData.data));
|
||||||
|
|
||||||
//console.log("Updated User is : ", user);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
initialiseUser();
|
initialiseUser();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="w-full h-auto flex-col relative">
|
<div className="w-full h-auto flex-col relative">
|
||||||
|
{/* 2. Language Switcher visible on all pages */}
|
||||||
|
<LanguageSwitcher language={language} setLanguage={setLanguage} />
|
||||||
|
|
||||||
|
{/* 3. Pass language as prop to Navbar2 and Outlet if needed */}
|
||||||
|
|
||||||
|
<Outlet context={{ language }} />
|
||||||
|
|
||||||
<Outlet />
|
|
||||||
<div
|
<div
|
||||||
className={`${
|
className={`${
|
||||||
loader ? "block" : "hidden"
|
loader ? "block" : "hidden"
|
||||||
@@ -73,3 +98,4 @@ function App() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default App;
|
export default App;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
import React from "react";
|
||||||
|
|
||||||
|
const LanguageSwitcher = ({ currentLanguage, onChangeLanguage }) => (
|
||||||
|
<select value={currentLanguage} onChange={e => onChangeLanguage(e.target.value)}>
|
||||||
|
<option value="en">English</option>
|
||||||
|
<option value="hi">Hindi (हिंदी)</option>
|
||||||
|
<option value="mr">Marathi (मराठी)</option>
|
||||||
|
<option value="fr">French (Français)</option>
|
||||||
|
{/* Add more languages as needed */}
|
||||||
|
</select>
|
||||||
|
);
|
||||||
|
|
||||||
|
export default LanguageSwitcher;
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
const Laoder = () => {
|
||||||
|
return (
|
||||||
|
<div className="w-full bg-white rounded-lg shadow p-4">
|
||||||
|
<div class="flex items-center justify-center w-full h-56 border border-gray-200 rounded-lg bg-gray-50 dark:bg-gray-800 dark:border-gray-700">
|
||||||
|
<div role="status">
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
|
||||||
|
viewBox="0 0 100 101"
|
||||||
|
fill="none"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
|
||||||
|
fill="currentFill"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
<span class="sr-only">Loading...</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Laoder;
|
||||||
@@ -1,12 +1,18 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
|
|
||||||
const Message = ({ message }) => {
|
const Message = ({ message, type = "error" }) => {
|
||||||
const date = new Date();
|
const date = new Date();
|
||||||
|
|
||||||
|
const background =
|
||||||
|
type === "error"
|
||||||
|
? "bg-red-100 border border-red-400 text-red-700"
|
||||||
|
: "bg-gray-100 border border-gray-300 text-gray-800";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-auto h-auto bg-gray-200 rounded-md text-start p-3 mx-4">
|
<div className={`rounded-md p-3 ${background}`}>
|
||||||
<p className="">{message}</p>
|
<p className="font-medium">{message}</p>
|
||||||
<p className="text-end text-sm ">
|
<p className="text-end text-sm text-gray-600">
|
||||||
{date.getDate()}/{date.getMonth()}/{date.getFullYear()}{" "}
|
{date.getDate()}/{date.getMonth() + 1}/{date.getFullYear()}{" "}
|
||||||
{date.toLocaleTimeString()}
|
{date.toLocaleTimeString()}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
{
|
||||||
|
"welcome": "Welcome to CropCompass",
|
||||||
|
"dashboard": "Dashboard",
|
||||||
|
"settings": "Settings",
|
||||||
|
|
||||||
|
"login_welcome_back": "Welcome Back!",
|
||||||
|
"login_title": "Login",
|
||||||
|
"login_subtitle": "Welcome back! Please login to your account.",
|
||||||
|
"login_email_label": "Email",
|
||||||
|
"login_email_placeholder": "username@gmail.com",
|
||||||
|
"login_password_label": "Password",
|
||||||
|
"login_password_placeholder": "********",
|
||||||
|
"login_remember_me": "Remember Me",
|
||||||
|
"login_forgot_password": "Forgot Password?",
|
||||||
|
"login_button": "Login",
|
||||||
|
"login_new_user": "New User?",
|
||||||
|
"login_signup": "Signup",
|
||||||
|
"main_login_heading": "Welcome to the Login Portal",
|
||||||
|
|
||||||
|
"signup_register_heading": "Register Your account",
|
||||||
|
"signup_welcome": "Welcome to Crop Compass.",
|
||||||
|
"signup_subtitle": "Please register your new account.",
|
||||||
|
"signup_first_name_label": "First Name",
|
||||||
|
"signup_first_name_placeholder": "John",
|
||||||
|
"signup_last_name_label": "Last Name",
|
||||||
|
"signup_last_name_placeholder": "Doe",
|
||||||
|
"signup_email_label": "Email",
|
||||||
|
"signup_email_placeholder": "user@mail.com",
|
||||||
|
"signup_password_label": "Password",
|
||||||
|
"signup_password_placeholder": "At least 6 unique Characters.. ",
|
||||||
|
"signup_remember_me": "Remember Me",
|
||||||
|
"signup_register_button": "Register your Account",
|
||||||
|
"signup_already_have_account": "Already have an Account?",
|
||||||
|
"signup_login": "Login",
|
||||||
|
"signup_journey_heading": "Start your Journey",
|
||||||
|
"signup_with": "with",
|
||||||
|
|
||||||
|
"forget_password_heading": "Forget Password?",
|
||||||
|
"forget_password_subtitle": "No worries, we'll send you reset instructions.",
|
||||||
|
"forget_password_email_placeholder": "Enter your email",
|
||||||
|
"forget_password_send_email": "Send Email",
|
||||||
|
"forget_password_email_sent": "Email Sent to your Mail",
|
||||||
|
"forget_password_back_to_login": "Back to Login Page",
|
||||||
|
|
||||||
|
"reset_password_heading": "Create New Password",
|
||||||
|
"reset_password_subtitle": "Create your new, unique and secure password here.",
|
||||||
|
"reset_password_new_label": "New Password :",
|
||||||
|
"reset_password_new_placeholder": "Enter your New Password",
|
||||||
|
"reset_password_confirm_label": "Confirm Password :",
|
||||||
|
"reset_password_confirm_placeholder": "Enter your Confirm Password",
|
||||||
|
"reset_password_error": "Password and confirm password do not match. Please enter the same password in both fields.",
|
||||||
|
"reset_password_button": "Reset Password",
|
||||||
|
"reset_password_back_to_login": "Back to Login Page",
|
||||||
|
|
||||||
|
"hero_one_stop_solution": "One stop solution for every farmer's need.",
|
||||||
|
"hero_plant_alt": "plant",
|
||||||
|
|
||||||
|
"card_with_image_alt": "plant",
|
||||||
|
"card_with_image_title": "High tech, high yields?",
|
||||||
|
"card_with_image_body": "The Kenyan farmers deploying AI to increase productivity. This article is more than 4 months old. AI apps are increasingly popular among small-scale farmers seeking to improve the quality and quantity of their crop.",
|
||||||
|
"card_with_image_read_more": "Read more",
|
||||||
|
|
||||||
|
"card_with_button_title": "Empowering smallholder farmers with AI tools can bolster global food security",
|
||||||
|
"card_with_button_body": "AI-powered weather forecasts help rural Indian farmers make informed planting decisions, reducing debt and boosting savings.",
|
||||||
|
"card_with_button_read_more": "Read more",
|
||||||
|
|
||||||
|
"card_with_only_image_alt": "Agritech success story",
|
||||||
|
|
||||||
|
"card_only_text_heading1": "AI for agriculture: How Indian farmers are harvesting innovation",
|
||||||
|
"card_only_text_body1": "Farmers participating in the programme saw a 21% increase in chili yields per acre, a 9% reduction in pesticide use, a 5% decrease in fertilizer usage, and an 8% improvement in unit prices due to quality enhancements.",
|
||||||
|
|
||||||
|
"card_only_text_heading2": "SugarChain: Blockchain technology meets Agriculture",
|
||||||
|
"card_only_text_body2": "The use of blockchain technology can help farmers automate processes with high trust, addressing issues like middlemen involvement and ensuring accurate compensation for their products",
|
||||||
|
|
||||||
|
|
||||||
|
"customization_schedule": "CUSTOMIZE WITH YOUR SCHEDULE",
|
||||||
|
"customization_tutors_title": "Talented and Qualified Tutors to Serve You for Help",
|
||||||
|
"customization_paragraph": "Our scheduling system allows you to select based on free time. Lorem ipsum demo text for template. Keep track of your students class and tutoring schedules, and never miss your lectures. The best online class scheduling system with easy accessibility. Lorem ipsum is a placeholder text commonly used to demonstrate the visual form",
|
||||||
|
"customization_get_started": "Get started",
|
||||||
|
"customization_image_alt": "Interaction illustration",
|
||||||
|
|
||||||
|
"footer_logo_alt": "Crop Compass Logo",
|
||||||
|
"footer_brand": "Crop Compass",
|
||||||
|
"footer_rights_reserved": "All Rights Reserved.",
|
||||||
|
|
||||||
|
"hero2_card1_heading": "AI for agriculture: How Indian farmers are harvesting innovation",
|
||||||
|
"hero2_card1_body": "Farmers participating in the programme saw a 21% increase in chili yields per acre, a 9% reduction in pesticide use, a 5% decrease in fertilizer usage, and an 8% improvement in unit prices due to quality enhancements.",
|
||||||
|
"hero2_card2_heading": "SugarChain: Blockchain technology meets Agriculture",
|
||||||
|
"hero2_card2_body": "The use of blockchain technology can help farmers automate processes with high trust, addressing issues like middlemen involvement and ensuring accurate compensation for their products",
|
||||||
|
|
||||||
|
"hero_heading_main": "Anything and Everything you Need to know About",
|
||||||
|
"hero_heading_sub": "Your crops and their Health!",
|
||||||
|
"hero_image_alt": "plant",
|
||||||
|
"hero_card1_image_alt": "plant",
|
||||||
|
"hero_card1_title": "Noteworthy technology acquisitions 2021",
|
||||||
|
"hero_card1_body": "Here are the biggest enterprise technology acquisitions of 2021 so far, in reverse chronological order.",
|
||||||
|
"hero_card1_read_more": "Read more",
|
||||||
|
"hero_card2_title": "Noteworthy technology acquisitions 2021",
|
||||||
|
"hero_card2_body": "Here are the biggest enterprise technology acquisitions of 2021 so far, in reverse chronological order.",
|
||||||
|
"hero_card3_title": "Noteworthy technology acquisitions 2021",
|
||||||
|
"hero_card3_body": "Here are the biggest enterprise technology acquisitions of 2021 so far, in reverse chronological order.",
|
||||||
|
"hero_card3_read_more": "Read more",
|
||||||
|
"hero_card4_image_alt": "product image",
|
||||||
|
"hero_card5_title": "Noteworthy technology acquisitions 2021",
|
||||||
|
"hero_card5_body": "Here are the biggest enterprise technology acquisitions of 2021 so far, in reverse chronological order.",
|
||||||
|
|
||||||
|
"testimonial_heading": "WHY CHOOSE US?",
|
||||||
|
"testimonial_typewriter": "Unparalleled management for crops & farms.",
|
||||||
|
"testimonial_card1_title": "Excellent Dashboards",
|
||||||
|
"testimonial_card1_body": "Our descriptive dashboards give insights into your crop's health and keep track of your burning expenses.",
|
||||||
|
"testimonial_card2_title": "Crop Disease Prediction",
|
||||||
|
"testimonial_card2_body": "Predict the possible crop diseases based on their shown symptoms.",
|
||||||
|
"testimonial_card3_title": "Crop Planner",
|
||||||
|
"testimonial_card3_body": "Based on previous season's crop and used fertilizers and pesticides, plan what crops would best suit the present state of your soil.",
|
||||||
|
"testimonial_check_out": "Check Out"
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
{
|
||||||
|
"welcome": "Bienvenue sur CropCompass",
|
||||||
|
"dashboard": "Tableau de bord",
|
||||||
|
"settings": "Paramètres",
|
||||||
|
|
||||||
|
"login_welcome_back": "Bon retour !",
|
||||||
|
"login_title": "Connexion",
|
||||||
|
"login_subtitle": "Bon retour ! Veuillez vous connecter à votre compte.",
|
||||||
|
"login_email_label": "E-mail",
|
||||||
|
"login_email_placeholder": "nomutilisateur@gmail.com",
|
||||||
|
"login_password_label": "Mot de passe",
|
||||||
|
"login_password_placeholder": "********",
|
||||||
|
"login_remember_me": "Se souvenir de moi",
|
||||||
|
"login_forgot_password": "Mot de passe oublié ?",
|
||||||
|
"login_button": "Connexion",
|
||||||
|
"login_new_user": "Nouvel utilisateur ?",
|
||||||
|
"login_signup": "S'inscrire",
|
||||||
|
"main_login_heading": "Bienvenue sur le portail de connexion",
|
||||||
|
|
||||||
|
"signup_register_heading": "Enregistrez votre compte",
|
||||||
|
"signup_welcome": "Bienvenue sur Crop Compass.",
|
||||||
|
"signup_subtitle": "Veuillez enregistrer votre nouveau compte.",
|
||||||
|
"signup_first_name_label": "Prénom",
|
||||||
|
"signup_first_name_placeholder": "Jean",
|
||||||
|
"signup_last_name_label": "Nom",
|
||||||
|
"signup_last_name_placeholder": "Dupont",
|
||||||
|
"signup_email_label": "E-mail",
|
||||||
|
"signup_email_placeholder": "utilisateur@mail.com",
|
||||||
|
"signup_password_label": "Mot de passe",
|
||||||
|
"signup_password_placeholder": "Au moins 6 caractères uniques.. ",
|
||||||
|
"signup_remember_me": "Se souvenir de moi",
|
||||||
|
"signup_register_button": "Enregistrer votre compte",
|
||||||
|
"signup_already_have_account": "Vous avez déjà un compte ?",
|
||||||
|
"signup_login": "Connexion",
|
||||||
|
"signup_journey_heading": "Commencez votre aventure",
|
||||||
|
"signup_with": "avec",
|
||||||
|
|
||||||
|
"forget_password_heading": "Mot de passe oublié ?",
|
||||||
|
"forget_password_subtitle": "Pas d'inquiétude, nous vous enverrons des instructions de réinitialisation.",
|
||||||
|
"forget_password_email_placeholder": "Entrez votre e-mail",
|
||||||
|
"forget_password_send_email": "Envoyer l'e-mail",
|
||||||
|
"forget_password_email_sent": "E-mail envoyé à votre adresse",
|
||||||
|
"forget_password_back_to_login": "Retour à la page de connexion",
|
||||||
|
|
||||||
|
"reset_password_heading": "Créer un nouveau mot de passe",
|
||||||
|
"reset_password_subtitle": "Créez ici votre nouveau mot de passe unique et sécurisé.",
|
||||||
|
"reset_password_new_label": "Nouveau mot de passe :",
|
||||||
|
"reset_password_new_placeholder": "Entrez votre nouveau mot de passe",
|
||||||
|
"reset_password_confirm_label": "Confirmer le mot de passe :",
|
||||||
|
"reset_password_confirm_placeholder": "Entrez à nouveau votre mot de passe",
|
||||||
|
"reset_password_error": "Le mot de passe et sa confirmation ne correspondent pas. Veuillez saisir le même mot de passe dans les deux champs.",
|
||||||
|
"reset_password_button": "Réinitialiser le mot de passe",
|
||||||
|
"reset_password_back_to_login": "Retour à la page de connexion",
|
||||||
|
|
||||||
|
"hero_one_stop_solution": "Une solution unique pour tous les besoins des agriculteurs.",
|
||||||
|
"hero_plant_alt": "plante",
|
||||||
|
|
||||||
|
"card_with_image_alt": "plante",
|
||||||
|
"card_with_image_title": "Haute technologie, hauts rendements ?",
|
||||||
|
"card_with_image_body": "Les agriculteurs kenyans utilisent l'IA pour augmenter leur productivité. Cet article a plus de 4 mois. Les applications d'IA sont de plus en plus populaires auprès des petits exploitants cherchant à améliorer la qualité et la quantité de leurs récoltes.",
|
||||||
|
"card_with_image_read_more": "Lire la suite",
|
||||||
|
|
||||||
|
"card_with_button_title": "Donner aux petits exploitants des outils d'IA peut renforcer la sécurité alimentaire mondiale",
|
||||||
|
"card_with_button_body": "Les prévisions météorologiques alimentées par l'IA aident les agriculteurs ruraux indiens à prendre des décisions de plantation éclairées, réduisant les dettes et augmentant les économies.",
|
||||||
|
"card_with_button_read_more": "Lire la suite",
|
||||||
|
|
||||||
|
"card_with_only_image_alt": "Succès de l'agritech",
|
||||||
|
|
||||||
|
"card_only_text_heading1": "L’IA pour l’agriculture : comment les agriculteurs indiens récoltent l’innovation",
|
||||||
|
"card_only_text_body1": "Les agriculteurs participant au programme ont constaté une augmentation de 21 % des rendements de piment par acre, une réduction de 9 % de l’utilisation de pesticides, une diminution de 5 % de l’utilisation d’engrais et une amélioration de 8 % des prix unitaires grâce à l’amélioration de la qualité.",
|
||||||
|
|
||||||
|
"card_only_text_heading2": "SugarChain : la blockchain rencontre l’agriculture",
|
||||||
|
"card_only_text_body2": "L’utilisation de la technologie blockchain peut aider les agriculteurs à automatiser les processus avec une grande confiance, à résoudre les problèmes liés aux intermédiaires et à garantir une rémunération précise de leurs produits",
|
||||||
|
|
||||||
|
|
||||||
|
"customization_schedule": "PERSONNALISEZ AVEC VOTRE EMPLOI DU TEMPS",
|
||||||
|
"customization_tutors_title": "Des tuteurs talentueux et qualifiés à votre service",
|
||||||
|
"customization_paragraph": "Notre système de planification vous permet de sélectionner en fonction de votre temps libre. Texte de démonstration Lorem ipsum pour le modèle. Suivez les horaires de vos étudiants et de tutorat, et ne manquez jamais vos cours. Le meilleur système de planification de cours en ligne avec une accessibilité facile. Lorem ipsum est un texte de remplacement couramment utilisé pour démontrer la forme visuelle",
|
||||||
|
"customization_get_started": "Commencer",
|
||||||
|
"customization_image_alt": "Illustration d'interaction",
|
||||||
|
|
||||||
|
"footer_logo_alt": "Logo de Crop Compass",
|
||||||
|
"footer_brand": "Crop Compass",
|
||||||
|
"footer_rights_reserved": "Tous droits réservés.",
|
||||||
|
|
||||||
|
"hero2_card1_heading": "L’IA pour l’agriculture : comment les agriculteurs indiens récoltent l’innovation",
|
||||||
|
"hero2_card1_body": "Les agriculteurs participant au programme ont constaté une augmentation de 21 % des rendements de piment par acre, une réduction de 9 % de l’utilisation de pesticides, une diminution de 5 % de l’utilisation d’engrais et une amélioration de 8 % des prix unitaires grâce à l’amélioration de la qualité.",
|
||||||
|
"hero2_card2_heading": "SugarChain : la blockchain rencontre l’agriculture",
|
||||||
|
"hero2_card2_body": "L’utilisation de la technologie blockchain peut aider les agriculteurs à automatiser les processus avec une grande confiance, à résoudre les problèmes liés aux intermédiaires et à garantir une rémunération précise de leurs produits",
|
||||||
|
|
||||||
|
"hero_heading_main": "Tout ce que vous devez savoir sur",
|
||||||
|
"hero_heading_sub": "Vos cultures et leur santé !",
|
||||||
|
"hero_image_alt": "plante",
|
||||||
|
"hero_card1_image_alt": "plante",
|
||||||
|
"hero_card1_title": "Acquisitions technologiques remarquables 2021",
|
||||||
|
"hero_card1_body": "Voici les plus grandes acquisitions technologiques d'entreprise de 2021 à ce jour, par ordre chronologique inverse.",
|
||||||
|
"hero_card1_read_more": "Lire la suite",
|
||||||
|
"hero_card2_title": "Acquisitions technologiques remarquables 2021",
|
||||||
|
"hero_card2_body": "Voici les plus grandes acquisitions technologiques d'entreprise de 2021 à ce jour, par ordre chronologique inverse.",
|
||||||
|
"hero_card3_title": "Acquisitions technologiques remarquables 2021",
|
||||||
|
"hero_card3_body": "Voici les plus grandes acquisitions technologiques d'entreprise de 2021 à ce jour, par ordre chronologique inverse.",
|
||||||
|
"hero_card3_read_more": "Lire la suite",
|
||||||
|
"hero_card4_image_alt": "image du produit",
|
||||||
|
"hero_card5_title": "Acquisitions technologiques remarquables 2021",
|
||||||
|
"hero_card5_body": "Voici les plus grandes acquisitions technologiques d'entreprise de 2021 à ce jour, par ordre chronologique inverse.",
|
||||||
|
|
||||||
|
"testimonial_heading": "POURQUOI NOUS CHOISIR ?",
|
||||||
|
"testimonial_typewriter": "Gestion inégalée pour les cultures et les fermes.",
|
||||||
|
"testimonial_card1_title": "Tableaux de bord excellents",
|
||||||
|
"testimonial_card1_body": "Nos tableaux de bord descriptifs donnent un aperçu de la santé de vos cultures et suivent vos dépenses importantes.",
|
||||||
|
"testimonial_card2_title": "Prédiction des maladies des cultures",
|
||||||
|
"testimonial_card2_body": "Prédisez les maladies possibles des cultures en fonction des symptômes observés.",
|
||||||
|
"testimonial_card3_title": "Planificateur de cultures",
|
||||||
|
"testimonial_card3_body": "En fonction des cultures de la saison précédente et des engrais et pesticides utilisés, planifiez les cultures qui conviendraient le mieux à l’état actuel de votre sol.",
|
||||||
|
"testimonial_check_out": "Voir"
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
{
|
||||||
|
"welcome": "क्रॉप कम्पास में आपका स्वागत है",
|
||||||
|
"dashboard": "डैशबोर्ड",
|
||||||
|
"settings": "सेटिंग्स",
|
||||||
|
|
||||||
|
"login_welcome_back": "फिर से स्वागत है!",
|
||||||
|
"login_title": "लॉगिन",
|
||||||
|
"login_subtitle": "फिर से स्वागत है! कृपया अपने खाते में लॉगिन करें।",
|
||||||
|
"login_email_label": "ईमेल",
|
||||||
|
"login_email_placeholder": "username@gmail.com",
|
||||||
|
"login_password_label": "पासवर्ड",
|
||||||
|
"login_password_placeholder": "********",
|
||||||
|
"login_remember_me": "मुझे याद रखें",
|
||||||
|
"login_forgot_password": "पासवर्ड भूल गए?",
|
||||||
|
"login_button": "लॉगिन",
|
||||||
|
"login_new_user": "नया उपयोगकर्ता?",
|
||||||
|
"login_signup": "साइनअप",
|
||||||
|
"main_login_heading": "लॉगिन पोर्टल में आपका स्वागत है",
|
||||||
|
|
||||||
|
"signup_register_heading": "अपना खाता पंजीकृत करें",
|
||||||
|
"signup_welcome": "क्रॉप कम्पास में आपका स्वागत है।",
|
||||||
|
"signup_subtitle": "कृपया अपना नया खाता पंजीकृत करें।",
|
||||||
|
"signup_first_name_label": "पहला नाम",
|
||||||
|
"signup_first_name_placeholder": "जॉन",
|
||||||
|
"signup_last_name_label": "अंतिम नाम",
|
||||||
|
"signup_last_name_placeholder": "डो",
|
||||||
|
"signup_email_label": "ईमेल",
|
||||||
|
"signup_email_placeholder": "user@mail.com",
|
||||||
|
"signup_password_label": "पासवर्ड",
|
||||||
|
"signup_password_placeholder": "कम से कम 6 अद्वितीय अक्षर...",
|
||||||
|
"signup_remember_me": "मुझे याद रखें",
|
||||||
|
"signup_register_button": "अपना खाता पंजीकृत करें",
|
||||||
|
"signup_already_have_account": "पहले से खाता है?",
|
||||||
|
"signup_login": "लॉगिन",
|
||||||
|
"signup_journey_heading": "अपनी यात्रा शुरू करें",
|
||||||
|
"signup_with": "के साथ",
|
||||||
|
|
||||||
|
"forget_password_heading": "पासवर्ड भूल गए?",
|
||||||
|
"forget_password_subtitle": "कोई बात नहीं, हम आपको रीसेट निर्देश भेज देंगे।",
|
||||||
|
"forget_password_email_placeholder": "अपना ईमेल दर्ज करें",
|
||||||
|
"forget_password_send_email": "ईमेल भेजें",
|
||||||
|
"forget_password_email_sent": "ईमेल आपके इनबॉक्स में भेजा गया है",
|
||||||
|
"forget_password_back_to_login": "लॉगिन पेज पर वापस जाएं",
|
||||||
|
|
||||||
|
"reset_password_heading": "नया पासवर्ड बनाएं",
|
||||||
|
"reset_password_subtitle": "यहां अपना नया, अद्वितीय और सुरक्षित पासवर्ड बनाएं।",
|
||||||
|
"reset_password_new_label": "नया पासवर्ड:",
|
||||||
|
"reset_password_new_placeholder": "अपना नया पासवर्ड दर्ज करें",
|
||||||
|
"reset_password_confirm_label": "पासवर्ड की पुष्टि करें:",
|
||||||
|
"reset_password_confirm_placeholder": "अपना पुष्टि पासवर्ड दर्ज करें",
|
||||||
|
"reset_password_error": "पासवर्ड और पुष्टि पासवर्ड मेल नहीं खाते। कृपया दोनों फ़ील्ड में समान पासवर्ड दर्ज करें।",
|
||||||
|
"reset_password_button": "पासवर्ड रीसेट करें",
|
||||||
|
"reset_password_back_to_login": "लॉगिन पेज पर वापस जाएं",
|
||||||
|
|
||||||
|
"hero_one_stop_solution": "हर किसान की ज़रूरत के लिए एक ही समाधान।",
|
||||||
|
"hero_plant_alt": "पौधा",
|
||||||
|
|
||||||
|
"card_with_image_alt": "पौधा",
|
||||||
|
"card_with_image_title": "हाई टेक, उच्च उत्पादन?",
|
||||||
|
"card_with_image_body": "केन्या के किसान AI का उपयोग करके उत्पादकता बढ़ा रहे हैं। यह लेख 4 महीने पुराना है। छोटे किसानों में AI ऐप्स गुणवत्ता और मात्रा सुधारने के लिए तेजी से लोकप्रिय हो रहे हैं।",
|
||||||
|
"card_with_image_read_more": "और पढ़ें",
|
||||||
|
|
||||||
|
"card_with_button_title": "AI उपकरणों से छोटे किसानों को सशक्त बनाकर वैश्विक खाद्य सुरक्षा को बढ़ावा",
|
||||||
|
"card_with_button_body": "AI-संचालित मौसम पूर्वानुमान भारतीय किसानों को बेहतर निर्णय लेने में मदद करते हैं, कर्ज घटाते हैं और बचत बढ़ाते हैं।",
|
||||||
|
"card_with_button_read_more": "और पढ़ें",
|
||||||
|
|
||||||
|
"card_with_only_image_alt": "एग्रीटेक सफलता की कहानी",
|
||||||
|
|
||||||
|
"card_only_text_heading1": "कृषि में AI: कैसे भारतीय किसान नवाचार का लाभ उठा रहे हैं",
|
||||||
|
"card_only_text_body1": "इस कार्यक्रम में भाग लेने वाले किसानों की मिर्च की उपज में प्रति एकड़ 21% वृद्धि, कीटनाशक उपयोग में 9% कमी, उर्वरक उपयोग में 5% कमी और गुणवत्ता सुधार के कारण मूल्य में 8% वृद्धि देखी गई।",
|
||||||
|
|
||||||
|
"card_only_text_heading2": "शुगरचेन: कृषि में ब्लॉकचेन तकनीक",
|
||||||
|
"card_only_text_body2": "ब्लॉकचेन तकनीक के उपयोग से किसान प्रक्रियाओं को उच्च विश्वास के साथ स्वचालित कर सकते हैं, बिचौलियों की भूमिका कम होती है और सही भुगतान सुनिश्चित होता है।",
|
||||||
|
|
||||||
|
"customization_schedule": "अपने शेड्यूल के अनुसार अनुकूलित करें",
|
||||||
|
"customization_tutors_title": "आपकी मदद के लिए प्रतिभाशाली और योग्य शिक्षक",
|
||||||
|
"customization_paragraph": "हमारी शेड्यूलिंग प्रणाली आपको अपने खाली समय के अनुसार चुनने की सुविधा देती है। छात्रों की कक्षा और ट्यूटरिंग शेड्यूल को ट्रैक करें और कोई भी लेक्चर न छोड़ें। सबसे अच्छा ऑनलाइन कक्षा शेड्यूलिंग सिस्टम।",
|
||||||
|
"customization_get_started": "शुरू करें",
|
||||||
|
"customization_image_alt": "इंटरएक्शन चित्रण",
|
||||||
|
|
||||||
|
"footer_logo_alt": "क्रॉप कम्पास लोगो",
|
||||||
|
"footer_brand": "क्रॉप कम्पास",
|
||||||
|
"footer_rights_reserved": "सभी अधिकार सुरक्षित।",
|
||||||
|
|
||||||
|
"hero2_card1_heading": "कृषि में AI: कैसे भारतीय किसान नवाचार का लाभ उठा रहे हैं",
|
||||||
|
"hero2_card1_body": "इस कार्यक्रम में भाग लेने वाले किसानों की मिर्च की उपज में प्रति एकड़ 21% वृद्धि, कीटनाशक उपयोग में 9% कमी, उर्वरक उपयोग में 5% कमी और गुणवत्ता सुधार के कारण मूल्य में 8% वृद्धि देखी गई।",
|
||||||
|
"hero2_card2_heading": "शुगरचेन: कृषि में ब्लॉकचेन तकनीक",
|
||||||
|
"hero2_card2_body": "ब्लॉकचेन तकनीक के उपयोग से किसान प्रक्रियाओं को उच्च विश्वास के साथ स्वचालित कर सकते हैं, बिचौलियों की भूमिका कम होती है और सही भुगतान सुनिश्चित होता है।",
|
||||||
|
|
||||||
|
"hero_heading_main": "अपने फसलों और उनकी सेहत के बारे में सब कुछ जानें",
|
||||||
|
"hero_heading_sub": "आपकी फसलों और उनकी सेहत!",
|
||||||
|
"hero_image_alt": "पौधा",
|
||||||
|
"hero_card1_image_alt": "पौधा",
|
||||||
|
"hero_card1_title": "2021 की उल्लेखनीय टेक्नोलॉजी अधिग्रहण",
|
||||||
|
"hero_card1_body": "अब तक के सबसे बड़े एंटरप्राइज टेक्नोलॉजी अधिग्रहण, उल्टे कालक्रम में।",
|
||||||
|
"hero_card1_read_more": "और पढ़ें",
|
||||||
|
"hero_card2_title": "2021 की उल्लेखनीय टेक्नोलॉजी अधिग्रहण",
|
||||||
|
"hero_card2_body": "अब तक के सबसे बड़े एंटरप्राइज टेक्नोलॉजी अधिग्रहण, उल्टे कालक्रम में।",
|
||||||
|
"hero_card3_title": "2021 की उल्लेखनीय टेक्नोलॉजी अधिग्रहण",
|
||||||
|
"hero_card3_body": "अब तक के सबसे बड़े एंटरप्राइज टेक्नोलॉजी अधिग्रहण, उल्टे कालक्रम में।",
|
||||||
|
"hero_card3_read_more": "और पढ़ें",
|
||||||
|
"hero_card4_image_alt": "उत्पाद छवि",
|
||||||
|
"hero_card5_title": "2021 की उल्लेखनीय टेक्नोलॉजी अधिग्रहण",
|
||||||
|
"hero_card5_body": "अब तक के सबसे बड़े एंटरप्राइज टेक्नोलॉजी अधिग्रहण, उल्टे कालक्रम में।",
|
||||||
|
|
||||||
|
"testimonial_heading": "हमें क्यों चुनें?",
|
||||||
|
"testimonial_typewriter": "फसलों और खेतों के लिए बेजोड़ प्रबंधन।",
|
||||||
|
"testimonial_card1_title": "उत्कृष्ट डैशबोर्ड",
|
||||||
|
"testimonial_card1_body": "हमारे विवरणात्मक डैशबोर्ड आपकी फसलों की स्थिति और खर्चों पर नजर रखते हैं।",
|
||||||
|
"testimonial_card2_title": "फसल रोग पूर्वानुमान",
|
||||||
|
"testimonial_card2_body": "दिखाई देने वाले लक्षणों के आधार पर संभावित फसल रोगों की भविष्यवाणी करें।",
|
||||||
|
"testimonial_card3_title": "फसल योजना",
|
||||||
|
"testimonial_card3_body": "पिछले सीजन की फसल और उपयोग किए गए उर्वरक और कीटनाशकों के आधार पर, वर्तमान मिट्टी के अनुसार सर्वोत्तम फसल योजना बनाएं।",
|
||||||
|
"testimonial_check_out": "देखें"
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
{
|
||||||
|
"welcome": "क्रॉप कम्पासमध्ये आपले स्वागत आहे",
|
||||||
|
"dashboard": "डॅशबोर्ड",
|
||||||
|
"settings": "सेटिंग्ज",
|
||||||
|
|
||||||
|
"login_welcome_back": "पुन्हा स्वागत आहे!",
|
||||||
|
"login_title": "लॉगिन",
|
||||||
|
"login_subtitle": "पुन्हा स्वागत आहे! कृपया आपल्या खात्यात लॉगिन करा.",
|
||||||
|
"login_email_label": "ईमेल",
|
||||||
|
"login_email_placeholder": "username@gmail.com",
|
||||||
|
"login_password_label": "पासवर्ड",
|
||||||
|
"login_password_placeholder": "********",
|
||||||
|
"login_remember_me": "माझी आठवण ठेवा",
|
||||||
|
"login_forgot_password": "पासवर्ड विसरलात?",
|
||||||
|
"login_button": "लॉगिन",
|
||||||
|
"login_new_user": "नवीन वापरकर्ता?",
|
||||||
|
"login_signup": "नोंदणी करा",
|
||||||
|
"main_login_heading": "लॉगिन पोर्टलमध्ये आपले स्वागत आहे",
|
||||||
|
|
||||||
|
"signup_register_heading": "आपले खाते नोंदणी करा",
|
||||||
|
"signup_welcome": "क्रॉप कम्पासमध्ये आपले स्वागत आहे.",
|
||||||
|
"signup_subtitle": "कृपया आपले नवीन खाते नोंदणी करा.",
|
||||||
|
"signup_first_name_label": "पहिले नाव",
|
||||||
|
"signup_first_name_placeholder": "जॉन",
|
||||||
|
"signup_last_name_label": "आडनाव",
|
||||||
|
"signup_last_name_placeholder": "डो",
|
||||||
|
"signup_email_label": "ईमेल",
|
||||||
|
"signup_email_placeholder": "user@mail.com",
|
||||||
|
"signup_password_label": "पासवर्ड",
|
||||||
|
"signup_password_placeholder": "किमान 6 अद्वितीय अक्षरे...",
|
||||||
|
"signup_remember_me": "माझी आठवण ठेवा",
|
||||||
|
"signup_register_button": "आपले खाते नोंदणी करा",
|
||||||
|
"signup_already_have_account": "आधीच खाते आहे?",
|
||||||
|
"signup_login": "लॉगिन",
|
||||||
|
"signup_journey_heading": "आपली यात्रा सुरू करा",
|
||||||
|
"signup_with": "सह",
|
||||||
|
|
||||||
|
"forget_password_heading": "पासवर्ड विसरलात?",
|
||||||
|
"forget_password_subtitle": "चिंता करू नका, आम्ही आपल्याला रीसेट करण्याच्या सूचना पाठवू.",
|
||||||
|
"forget_password_email_placeholder": "आपला ईमेल टाका",
|
||||||
|
"forget_password_send_email": "ईमेल पाठवा",
|
||||||
|
"forget_password_email_sent": "ईमेल पाठवला गेला आहे",
|
||||||
|
"forget_password_back_to_login": "लॉगिन पेजवर परत जा",
|
||||||
|
|
||||||
|
"reset_password_heading": "नवीन पासवर्ड तयार करा",
|
||||||
|
"reset_password_subtitle": "येथे आपला नवीन, सुरक्षित पासवर्ड तयार करा.",
|
||||||
|
"reset_password_new_label": "नवीन पासवर्ड:",
|
||||||
|
"reset_password_new_placeholder": "नवीन पासवर्ड टाका",
|
||||||
|
"reset_password_confirm_label": "पासवर्डची पुष्टी करा:",
|
||||||
|
"reset_password_confirm_placeholder": "पासवर्डची पुष्टी करा",
|
||||||
|
"reset_password_error": "पासवर्ड आणि पुष्टी पासवर्ड जुळत नाहीत. कृपया दोन्ही ठिकाणी एकच पासवर्ड टाका.",
|
||||||
|
"reset_password_button": "पासवर्ड रीसेट करा",
|
||||||
|
"reset_password_back_to_login": "लॉगिन पेजवर परत जा",
|
||||||
|
|
||||||
|
"hero_one_stop_solution": "प्रत्येक शेतकऱ्याच्या गरजेसाठी एकाच ठिकाणी उपाय.",
|
||||||
|
"hero_plant_alt": "झाड",
|
||||||
|
|
||||||
|
"card_with_image_alt": "झाड",
|
||||||
|
"card_with_image_title": "हाय-टेक, जास्त उत्पादन?",
|
||||||
|
"card_with_image_body": "केनियातील शेतकरी AI वापरून उत्पादकता वाढवत आहेत. हा लेख ४ महिन्यांपेक्षा जुना आहे. लहान शेतकऱ्यांमध्ये AI अॅप्स अधिक लोकप्रिय होत आहेत.",
|
||||||
|
"card_with_image_read_more": "अधिक वाचा",
|
||||||
|
|
||||||
|
"card_with_button_title": "AI साधनांनी लहान शेतकऱ्यांना सशक्त करून जागतिक अन्न सुरक्षेला चालना",
|
||||||
|
"card_with_button_body": "AI आधारित हवामान अंदाजामुळे भारतीय शेतकऱ्यांना चांगले निर्णय घेण्यास मदत होते, कर्ज कमी होते आणि बचत वाढते.",
|
||||||
|
"card_with_button_read_more": "अधिक वाचा",
|
||||||
|
|
||||||
|
"card_with_only_image_alt": "अॅग्रीटेक यशोगाथा",
|
||||||
|
|
||||||
|
"card_only_text_heading1": "शेतीसाठी AI: भारतीय शेतकरी कसे नवकल्पना करत आहेत",
|
||||||
|
"card_only_text_body1": "या कार्यक्रमात सहभागी झालेल्या शेतकऱ्यांची मिरची उत्पादनात २१% वाढ, कीटकनाशक वापरात ९% घट, खत वापरात ५% घट, आणि गुणवत्तेमुळे किंमतीत ८% वाढ झाली.",
|
||||||
|
|
||||||
|
"card_only_text_heading2": "शुगरचेन: ब्लॉकचेन तंत्रज्ञान आणि शेती",
|
||||||
|
"card_only_text_body2": "ब्लॉकचेन तंत्रज्ञानामुळे प्रक्रिया स्वयंचलित करता येतात, दलालांची भूमिका कमी होते आणि शेतकऱ्यांना योग्य मोबदला मिळतो.",
|
||||||
|
|
||||||
|
"customization_schedule": "आपल्या वेळापत्रकानुसार सानुकूल करा",
|
||||||
|
"customization_tutors_title": "आपल्याला मदतीसाठी कुशल आणि पात्र शिक्षक",
|
||||||
|
"customization_paragraph": "आमची वेळापत्रक प्रणाली आपल्याला आपल्या मोकळ्या वेळेनुसार निवडण्याची सुविधा देते. आपले वर्ग व शिकवणीचे वेळापत्रक व्यवस्थापित करा आणि एकही व्याख्यान चुकवू नका.",
|
||||||
|
"customization_get_started": "सुरू करा",
|
||||||
|
"customization_image_alt": "इंटरअॅक्शन प्रतिमा",
|
||||||
|
|
||||||
|
"footer_logo_alt": "क्रॉप कम्पास लोगो",
|
||||||
|
"footer_brand": "क्रॉप कम्पास",
|
||||||
|
"footer_rights_reserved": "सर्व हक्क राखीव.",
|
||||||
|
|
||||||
|
"hero2_card1_heading": "शेतीसाठी AI: भारतीय शेतकरी कसे नवकल्पना करत आहेत",
|
||||||
|
"hero2_card1_body": "या कार्यक्रमात सहभागी झालेल्या शेतकऱ्यांची मिरची उत्पादनात २१% वाढ, कीटकनाशक वापरात ९% घट, खत वापरात ५% घट, आणि गुणवत्तेमुळे किंमतीत ८% वाढ झाली.",
|
||||||
|
"hero2_card2_heading": "शुगरचेन: ब्लॉकचेन तंत्रज्ञान आणि शेती",
|
||||||
|
"hero2_card2_body": "ब्लॉकचेन तंत्रज्ञानामुळे प्रक्रिया स्वयंचलित करता येतात, दलालांची भूमिका कमी होते आणि शेतकऱ्यांना योग्य मोबदला मिळतो.",
|
||||||
|
|
||||||
|
"hero_heading_main": "आपल्या पिकांबद्दल सर्व काही जाणून घ्या",
|
||||||
|
"hero_heading_sub": "आपल्या पिकांची आरोग्य स्थिती!",
|
||||||
|
"hero_image_alt": "झाड",
|
||||||
|
"hero_card1_image_alt": "झाड",
|
||||||
|
"hero_card1_title": "२०२१ मधील उल्लेखनीय तंत्रज्ञान खरेदी",
|
||||||
|
"hero_card1_body": "२०२१ मधील सर्वात मोठ्या एंटरप्राइज तंत्रज्ञान खरेदी, उलट्या क्रमाने.",
|
||||||
|
"hero_card1_read_more": "अधिक वाचा",
|
||||||
|
"hero_card2_title": "२०२१ मधील उल्लेखनीय तंत्रज्ञान खरेदी",
|
||||||
|
"hero_card2_body": "२०२१ मधील सर्वात मोठ्या एंटरप्राइज तंत्रज्ञान खरेदी, उलट्या क्रमाने.",
|
||||||
|
"hero_card3_title": "२०२१ मधील उल्लेखनीय तंत्रज्ञान खरेदी",
|
||||||
|
"hero_card3_body": "२०२१ मधील सर्वात मोठ्या एंटरप्राइज तंत्रज्ञान खरेदी, उलट्या क्रमाने.",
|
||||||
|
"hero_card3_read_more": "अधिक वाचा",
|
||||||
|
"hero_card4_image_alt": "उत्पादन प्रतिमा",
|
||||||
|
"hero_card5_title": "२०२१ मधील उल्लेखनीय तंत्रज्ञान खरेदी",
|
||||||
|
"hero_card5_body": "२०२१ मधील सर्वात मोठ्या एंटरप्राइज तंत्रज्ञान खरेदी, उलट्या क्रमाने.",
|
||||||
|
|
||||||
|
"testimonial_heading": "आम्हाला का निवडाल?",
|
||||||
|
"testimonial_typewriter": "पिके आणि शेतासाठी उत्कृष्ट व्यवस्थापन.",
|
||||||
|
"testimonial_card1_title": "उत्कृष्ट डॅशबोर्ड",
|
||||||
|
"testimonial_card1_body": "आमचे डॅशबोर्ड आपली पिकांची आरोग्य स्थिती व खर्च यांची माहिती देतात.",
|
||||||
|
"testimonial_card2_title": "पिकांवरील रोगाचे भाकीत",
|
||||||
|
"testimonial_card2_body": "दिसणाऱ्या लक्षणांच्या आधारे संभाव्य रोगांचे भाकीत करा.",
|
||||||
|
"testimonial_card3_title": "पीक नियोजन",
|
||||||
|
"testimonial_card3_body": "मागील हंगामाच्या पिकांवरून व वापरलेल्या खतांवरून योग्य पीक निवडा.",
|
||||||
|
"testimonial_check_out": "पहा"
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
const About = () => {
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<section className="bg-white py-12 w-full flex justify-center">
|
|
||||||
<div className="flex flex-col md:flex-row justify-between w-10/12 h-auto">
|
|
||||||
<div className="w-full md:w-4/5 object-contain flex justify-center items-center">
|
|
||||||
<img src="/images/calender.png" className="w-full h-auto" alt="" />
|
|
||||||
</div>
|
|
||||||
<div className="container mx-auto flex flex-col justify-around h-full w-full md:py-10">
|
|
||||||
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
|
||||||
<h2 className="text-xl font-bold mb-4 text-yellow-600">
|
|
||||||
CUSTOMIZE WITH YOUR SCHEDULE
|
|
||||||
</h2>
|
|
||||||
<h1 className="text-2xl md:text-4xl md:font-extrabold font-bold mb-4">
|
|
||||||
Personalized Professional Online Mentor on Your Schedule
|
|
||||||
</h1>
|
|
||||||
<p className="text-base mb-8">
|
|
||||||
Our scheduling system allows you to select based on free time.
|
|
||||||
Lorem ipsum demo text for template. Keep track of your students
|
|
||||||
class and mentoring schedules, and never miss your Session. The
|
|
||||||
best online class scheduling system with easy accessibility.
|
|
||||||
Lorem ipsum is a placeholder text commonly used to demonstrate
|
|
||||||
the visual form
|
|
||||||
</p>
|
|
||||||
<div className="flex gap-4 justify-center md:justify-start">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
|
||||||
>
|
|
||||||
Get started
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default About;
|
|
||||||
@@ -1,13 +1,10 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import { useSelector } from "react-redux";
|
import { useSelector, useDispatch } from "react-redux";
|
||||||
import { useEffect } from "react";
|
import { t } from "../../service/translation";
|
||||||
|
|
||||||
import { Link } from "react-router-dom";
|
export const HeroSecn = ({ language = "en" }) => {
|
||||||
|
|
||||||
export const HeroSecn = () => {
|
|
||||||
const user = useSelector((store) => store.user);
|
const user = useSelector((store) => store.user);
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
|
||||||
|
|
||||||
const [isLoggedIn, setLoggedIn] = useState(false);
|
const [isLoggedIn, setLoggedIn] = useState(false);
|
||||||
|
|
||||||
@@ -25,17 +22,16 @@ export const HeroSecn = () => {
|
|||||||
|
|
||||||
const user = await responce.json();
|
const user = await responce.json();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
dispatch(userSliceActions.addUser(user.data));
|
dispatch(userSliceActions.addUser(user.data));
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="py-40 w-full flex justify-center text-gray-100">
|
<section className="py-40 w-full flex justify-center text-gray-100">
|
||||||
<div className="flex flex-col-reverse md:flex-row justify-between w-10/12 h-auto">
|
<div className="flex flex-col-reverse md:flex-row justify-between w-10/12 h-auto">
|
||||||
<div className="container mx-auto flex flex-col justify-between h-full w-full">
|
<div className="container mx-auto flex flex-col justify-between h-full w-full">
|
||||||
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
||||||
<h1 className="text-6xl md:text-6xl md:w-2/3 md:font-extrabold font-bold ">
|
<h1 className="text-6xl md:text-6xl md:w-2/3 md:font-extrabold font-bold ">
|
||||||
One stop solution for every farmer's need.
|
{t("hero_one_stop_solution", language)}
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
@@ -47,7 +43,7 @@ export const HeroSecn = () => {
|
|||||||
<img
|
<img
|
||||||
src="/images/plant.png"
|
src="/images/plant.png"
|
||||||
className="w-full h-auto rounded-3xl shadow-xl"
|
className="w-full h-auto rounded-3xl shadow-xl"
|
||||||
alt="plant"
|
alt={t("hero_plant_alt", language)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -55,34 +51,31 @@ export const HeroSecn = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CardWithImage = () => {
|
export const CardWithImage = ({ language = "en" }) => {
|
||||||
return (
|
return (
|
||||||
<div className="max-w-sm rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
<div className="max-w-sm rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<img
|
<img
|
||||||
className="rounded-t-lg"
|
className="rounded-t-lg"
|
||||||
src="https://i.pinimg.com/736x/07/2b/5f/072b5f6a1630d919ceee1a8569683cf7.jpg"
|
src="https://i.pinimg.com/736x/07/2b/5f/072b5f6a1630d919ceee1a8569683cf7.jpg"
|
||||||
alt="plant"
|
alt={t("card_with_image_alt", language)}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
<div className="p-6 backdrop-blur-md rounded-b-lg">
|
<div className="p-6 backdrop-blur-md rounded-b-lg">
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-white dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-white dark:text-white">
|
||||||
High tech, high yields?
|
{t("card_with_image_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-white dark:text-gray-400">
|
<p className="mb-3 font-normal text-white dark:text-gray-400">
|
||||||
The Kenyan farmers deploying AI to increase productivity This article
|
{t("card_with_image_body", language)}
|
||||||
is more than 4 months old. AI apps are increasingly popular among
|
|
||||||
small-scale farmers seeking to improve the quality and quantity of
|
|
||||||
their crop.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="https://www.theguardian.com/world/2024/sep/30/high-tech-high-yields-the-kenyan-farmers-deploying-ai-to-increase-productivity"
|
href="https://www.theguardian.com/world/2024/sep/30/high-tech-high-yields-the-kenyan-farmers-deploying-ai-to-increase-productivity"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl "
|
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl "
|
||||||
>
|
>
|
||||||
Read more
|
{t("card_with_image_read_more", language)}
|
||||||
<svg
|
<svg
|
||||||
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -92,9 +85,9 @@ export const CardWithImage = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M1 5h12m0 0L9 1m4 4L9 9"
|
d="M1 5h12m0 0L9 1m4 4L9 9"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -104,47 +97,47 @@ export const CardWithImage = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CardOnlyText = (props) => {
|
export const CardOnlyText = ({
|
||||||
|
headingText,
|
||||||
|
bodyText,
|
||||||
|
href,
|
||||||
|
language = "en",
|
||||||
|
}) => {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<a
|
<a
|
||||||
href={props.href}
|
href={href}
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="block max-w-sm p-6 rounded-lg shadow-md backdrop-blur-md dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700"
|
className="block max-w-sm min-h-[275px] p-6 rounded-lg shadow-md backdrop-blur-md dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700"
|
||||||
>
|
>
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
||||||
{" "}
|
{headingText}
|
||||||
{props.headingText}{" "}
|
|
||||||
</h5>
|
</h5>
|
||||||
<p className="font-normal text-gray-50 dark:text-gray-400">
|
<p className="font-normal text-gray-50 dark:text-gray-400">
|
||||||
{" "}
|
{bodyText}
|
||||||
{props.bodyText}{" "}
|
|
||||||
</p>
|
</p>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CardWithButton = () => {
|
export const CardWithButton = ({ language = "en" }) => {
|
||||||
return (
|
return (
|
||||||
<div className="max-w-sm p-6 backdrop-blur-md rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
<div className="max-w-sm min-h-[290px] p-6 backdrop-blur-md rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
||||||
<a target="_blank">
|
<a target="_blank" href="#">
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
||||||
Empowering smallholder farmers with AI tools can bolster global food
|
{t("card_with_button_title", language)}
|
||||||
security
|
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
||||||
{" "}
|
{t("card_with_button_body", language)}
|
||||||
AI-powered weather forecasts help rural Indian farmers make informed
|
|
||||||
planting decisions, reducing debt and boosting savings.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="https://www.reuters.com/sustainability/land-use-biodiversity/comment-how-empowering-smallholder-farmers-with-ai-tools-can-bolster-global-food-2025-01-10/"
|
href="https://www.reuters.com/sustainability/land-use-biodiversity/comment-how-empowering-smallholder-farmers-with-ai-tools-can-bolster-global-food-2025-01-10/"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl "
|
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl "
|
||||||
>
|
>
|
||||||
Read more
|
{t("card_with_button_read_more", language)}
|
||||||
<svg
|
<svg
|
||||||
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -154,9 +147,9 @@ export const CardWithButton = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M1 5h12m0 0L9 1m4 4L9 9"
|
d="M1 5h12m0 0L9 1m4 4L9 9"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -165,17 +158,18 @@ export const CardWithButton = () => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const CardWithOnlyImage = () => {
|
export const CardWithOnlyImage = ({ language = "en" }) => {
|
||||||
return (
|
return (
|
||||||
<div className="w-full max-w-sm bg-white rounded-lg shadow-xl dark:bg-gray-800 dark:border-gray-700">
|
<div className="w-full h-full object-cover max-w-sm bg-white rounded-lg shadow-xl dark:bg-gray-800 dark:border-gray-700">
|
||||||
<a
|
<a
|
||||||
href="https://theprint.in/economy/telangana-is-the-success-story-of-indian-agritech-ai-tools-soil-testing-e-commerce-more/1630359/"
|
href="https://theprint.in/economy/telangana-is-the-success-story-of-indian-agritech-ai-tools-soil-testing-e-commerce-more/1630359/"
|
||||||
target="_blank"
|
target="_blank"
|
||||||
|
className="w-full h-full"
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
className="rounded-lg"
|
className="rounded-lg"
|
||||||
src="https://i.pinimg.com/736x/2b/2a/0f/2b2a0f7003bd3e4201573c1189d600de.jpg"
|
src="https://i.pinimg.com/736x/2b/2a/0f/2b2a0f7003bd3e4201573c1189d600de.jpg"
|
||||||
alt="product image"
|
alt={t("card_with_only_image_alt", language)}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -192,21 +186,30 @@ const cards = [
|
|||||||
|
|
||||||
export default cards;
|
export default cards;
|
||||||
|
|
||||||
export const CardLayout = () => {
|
export const CardLayout = ({ language = "en" }) => {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<HeroSecn />
|
<HeroSecn language={language} />
|
||||||
<div className="flex justify-center">
|
<div className="flex justify-center">
|
||||||
<div className="flex justify-between py-8 w-5/6 ">
|
<div className="flex justify-between py-8 w-5/6 ">
|
||||||
<cardWithImage />
|
<CardWithImage language={language} />
|
||||||
<div className="flex flex-col gap-10 justify-between ">
|
<div className="flex flex-col gap-10 justify-between ">
|
||||||
<cardOnlyText />
|
<CardOnlyText
|
||||||
<cardWithButton />
|
headingText={t("card_only_text_heading1", language)}
|
||||||
|
bodyText={t("card_only_text_body1", language)}
|
||||||
|
href="https://example.com/article1"
|
||||||
|
language={language}
|
||||||
|
/>
|
||||||
|
<CardWithButton language={language} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col justify-between">
|
<div className="flex flex-col justify-between">
|
||||||
<cardWithOnlyImage />
|
<CardWithOnlyImage language={language} />
|
||||||
<cardOnlyText />
|
<CardOnlyText
|
||||||
|
headingText={t("card_only_text_heading2", language)}
|
||||||
|
bodyText={t("card_only_text_body2", language)}
|
||||||
|
href="https://example.com/article2"
|
||||||
|
language={language}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,13 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
import { useOutletContext } from "react-router-dom";
|
||||||
|
|
||||||
|
const Customization = (props) => {
|
||||||
|
// Get language from context if available, else from props, default to "en"
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const Customization = () => {
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<section
|
<section
|
||||||
@@ -11,25 +18,20 @@ const Customization = () => {
|
|||||||
<div className="container mx-auto flex flex-col justify-around h-full w-full md:py-10">
|
<div className="container mx-auto flex flex-col justify-around h-full w-full md:py-10">
|
||||||
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
||||||
<h2 className="text-xl font-bold mb-4 text-yellow-600">
|
<h2 className="text-xl font-bold mb-4 text-yellow-600">
|
||||||
CUSTOMIZE WITH YOUR SCHEDULE
|
{t("customization_schedule", language)}
|
||||||
</h2>
|
</h2>
|
||||||
<h1 className="text-2xl md:text-4xl md:font-extrabold font-bold mb-4">
|
<h1 className="text-2xl md:text-4xl md:font-extrabold font-bold mb-4">
|
||||||
Talented and Qualified Tutors to Serve You for Help
|
{t("customization_tutors_title", language)}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-base mb-8">
|
<p className="text-base mb-8">
|
||||||
Our scheduling system allows you to select based on free time.
|
{t("customization_paragraph", language)}
|
||||||
Lorem ipsum demo text for template. Keep track of your students
|
|
||||||
class and tutoring schedules, and never miss your lectures. The
|
|
||||||
best online class scheduling system with easy accessibility.
|
|
||||||
Lorem ipsum is a placeholder text commonly used to demonstrate
|
|
||||||
the visual form
|
|
||||||
</p>
|
</p>
|
||||||
<div className="flex gap-4 justify-center md:justify-start">
|
<div className="flex gap-4 justify-center md:justify-start">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
||||||
>
|
>
|
||||||
Get started
|
{t("customization_get_started", language)}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -38,7 +40,7 @@ const Customization = () => {
|
|||||||
<img
|
<img
|
||||||
src="/images/interaction2.png"
|
src="/images/interaction2.png"
|
||||||
className="w-full h-auto"
|
className="w-full h-auto"
|
||||||
alt=""
|
alt={t("customization_image_alt", language)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -48,3 +50,4 @@ const Customization = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default Customization;
|
export default Customization;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,13 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
import { useOutletContext } from "react-router-dom";
|
||||||
|
|
||||||
|
const Footer = (props) => {
|
||||||
|
// Get language from context if available, else from props, default to "en"
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const Footer = () => {
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<footer className="text-gray-50">
|
<footer className="text-gray-50">
|
||||||
@@ -11,10 +18,10 @@ const Footer = () => {
|
|||||||
<img
|
<img
|
||||||
src="/images/logo.png"
|
src="/images/logo.png"
|
||||||
className="h-9 rounded-full"
|
className="h-9 rounded-full"
|
||||||
alt="Logo"
|
alt={t("footer_logo_alt", language)}
|
||||||
/>
|
/>
|
||||||
<span className="self-center text-xl font-bold whitespace-nowrap dark:text-white">
|
<span className="self-center text-xl font-bold whitespace-nowrap dark:text-white">
|
||||||
Crop Compass
|
{t("footer_brand", language)}
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -24,9 +31,9 @@ const Footer = () => {
|
|||||||
<span className="text-sm text-gray-50 sm:text-center dark:text-gray-400">
|
<span className="text-sm text-gray-50 sm:text-center dark:text-gray-400">
|
||||||
© 2025{" "}
|
© 2025{" "}
|
||||||
<a href="/" className="hover:underline">
|
<a href="/" className="hover:underline">
|
||||||
Crop Compass™
|
{t("footer_brand", language)}™
|
||||||
</a>
|
</a>
|
||||||
. All Rights Reserved.
|
. {t("footer_rights_reserved", language)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -36,3 +43,4 @@ const Footer = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default Footer;
|
export default Footer;
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,13 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { Link } from "react-router-dom";
|
import { Link, useOutletContext } from "react-router-dom";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
|
||||||
|
const Hero = (props) => {
|
||||||
|
// Get language from outlet context or props or default to 'en'
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const Hero = () => {
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<section className="py-12 w-full flex justify-center pt-28 text-gray-100">
|
<section className="py-12 w-full flex justify-center pt-28 text-gray-100">
|
||||||
@@ -9,10 +15,10 @@ const Hero = () => {
|
|||||||
<div className="container mx-auto flex flex-col justify-between h-full w-full">
|
<div className="container mx-auto flex flex-col justify-between h-full w-full">
|
||||||
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
<div className="text-center md:text-start flex flex-col justify-around h-full">
|
||||||
<h1 className="text-6xl md:text-6xl md:w-2/3 md:font-extrabold font-bold">
|
<h1 className="text-6xl md:text-6xl md:w-2/3 md:font-extrabold font-bold">
|
||||||
Anything and Everything you Need to know About
|
{t("hero_heading_main", language)}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-2xl font-semibold mb-8 ">
|
<p className="text-2xl font-semibold mb-8 ">
|
||||||
Your crops and their Health!
|
{t("hero_heading_sub", language)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -20,7 +26,7 @@ const Hero = () => {
|
|||||||
<img
|
<img
|
||||||
src="/images/plant.png"
|
src="/images/plant.png"
|
||||||
className="w-full h-auto rounded-3xl shadow-xl"
|
className="w-full h-auto rounded-3xl shadow-xl"
|
||||||
alt="plant"
|
alt={t("hero_image_alt", language)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -33,24 +39,23 @@ const Hero = () => {
|
|||||||
<img
|
<img
|
||||||
className="rounded-t-lg"
|
className="rounded-t-lg"
|
||||||
src="/images/plant.png"
|
src="/images/plant.png"
|
||||||
alt="plant"
|
alt={t("hero_card1_image_alt", language)}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
<div className="p-8 backdrop-blur-md rounded-b-lg">
|
<div className="p-8 backdrop-blur-md rounded-b-lg">
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-white dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-white dark:text-white">
|
||||||
Noteworthy technology acquisitions 2021
|
{t("hero_card1_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-white dark:text-gray-400">
|
<p className="mb-3 font-normal text-white dark:text-gray-400">
|
||||||
Here are the biggest enterprise technology acquisitions of 2021
|
{t("hero_card1_body", language)}
|
||||||
so far, in reverse chronological order.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl"
|
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl"
|
||||||
>
|
>
|
||||||
Read more
|
{t("hero_card1_read_more", language)}
|
||||||
<svg
|
<svg
|
||||||
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -60,9 +65,9 @@ const Hero = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M1 5h12m0 0L9 1m4 4L9 9"
|
d="M1 5h12m0 0L9 1m4 4L9 9"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -77,11 +82,10 @@ const Hero = () => {
|
|||||||
className="block max-w-sm p-6 rounded-lg shadow-md backdrop-blur-md dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700"
|
className="block max-w-sm p-6 rounded-lg shadow-md backdrop-blur-md dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700"
|
||||||
>
|
>
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
||||||
Noteworthy technology acquisitions 2021
|
{t("hero_card2_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
<p className="font-normal text-gray-50 dark:text-gray-400">
|
<p className="font-normal text-gray-50 dark:text-gray-400">
|
||||||
Here are the biggest enterprise technology acquisitions of
|
{t("hero_card2_body", language)}
|
||||||
2021 so far, in reverse chronological order.
|
|
||||||
</p>
|
</p>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -89,18 +93,17 @@ const Hero = () => {
|
|||||||
<div className="max-w-sm p-6 backdrop-blur-md rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
<div className="max-w-sm p-6 backdrop-blur-md rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
||||||
Noteworthy technology acquisitions 2021
|
{t("hero_card3_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
||||||
Here are the biggest enterprise technology acquisitions of 2021
|
{t("hero_card3_body", language)}
|
||||||
so far, in reverse chronological order.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl"
|
className="inline-flex shadow-md backdrop-blur-md bg-gradient-to-tr from-gray-700/20 to-gray-50/20 items-center px-3 py-2 text-sm font-medium text-center text-white rounded-lg hover:backdrop-blur-xl"
|
||||||
>
|
>
|
||||||
Read more
|
{t("hero_card3_read_more", language)}
|
||||||
<svg
|
<svg
|
||||||
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -110,9 +113,9 @@ const Hero = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M1 5h12m0 0L9 1m4 4L9 9"
|
d="M1 5h12m0 0L9 1m4 4L9 9"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -126,7 +129,7 @@ const Hero = () => {
|
|||||||
<img
|
<img
|
||||||
className="rounded-lg"
|
className="rounded-lg"
|
||||||
src="/images/plant.png"
|
src="/images/plant.png"
|
||||||
alt="product image"
|
alt={t("hero_card4_image_alt", language)}
|
||||||
/>
|
/>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -137,11 +140,10 @@ const Hero = () => {
|
|||||||
className="block max-w-sm p-6 backdrop-blur-xl rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700"
|
className="block max-w-sm p-6 backdrop-blur-xl rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700 dark:hover:bg-gray-700"
|
||||||
>
|
>
|
||||||
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-50 dark:text-white">
|
||||||
Noteworthy technology acquisitions 2021
|
{t("hero_card5_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
<p className="font-normal text-gray-50 dark:text-gray-400">
|
<p className="font-normal text-gray-50 dark:text-gray-400">
|
||||||
Here are the biggest enterprise technology acquisitions of
|
{t("hero_card5_body", language)}
|
||||||
2021 so far, in reverse chronological order.
|
|
||||||
</p>
|
</p>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -154,4 +156,3 @@ const Hero = () => {
|
|||||||
|
|
||||||
export default Hero;
|
export default Hero;
|
||||||
|
|
||||||
// {grid grid-cols-1 sm:grid-cols-2 md:grid-cols-2}
|
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import {
|
|||||||
} from "./Cards";
|
} from "./Cards";
|
||||||
import Testimonial from "./Testimonial";
|
import Testimonial from "./Testimonial";
|
||||||
import Navbar2 from "../../components/Navbar2";
|
import Navbar2 from "../../components/Navbar2";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
import { useOutletContext } from "react-router-dom";
|
||||||
|
|
||||||
const ScrollReveal = ({ children, direction = "left" }) => {
|
const ScrollReveal = ({ children, direction = "left" }) => {
|
||||||
const { ref, inView } = useInView({ triggerOnce: true, threshold: 0.2 });
|
const { ref, inView } = useInView({ triggerOnce: true, threshold: 0.2 });
|
||||||
@@ -33,59 +35,50 @@ const ScrollReveal = ({ children, direction = "left" }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
function Hero2() {
|
function Hero2(props) {
|
||||||
const myRef = document.querySelector(".scrollable-div");
|
// Get language from context if available, else from props, default to "en"
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Navbar2 />
|
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
<HeroSecn />
|
<HeroSecn language={language} />
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
<Testimonial />
|
<Testimonial language={language} />
|
||||||
<div className="flex justify-center">
|
<div className="flex justify-center">
|
||||||
<div className="flex justify-between py-8 w-5/6 ">
|
<div className="flex justify-between py-8 w-5/6 ">
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
<CardWithImage />
|
<CardWithImage language={language} />
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
|
|
||||||
<div className="flex flex-col gap-10 justify-between ">
|
<div className="flex flex-col gap-10 justify-between ">
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
{" "}
|
|
||||||
<CardOnlyText
|
<CardOnlyText
|
||||||
headingText={
|
headingText={t("hero2_card1_heading", language)}
|
||||||
"AI for agriculture: How Indian farmers are harvesting innovation"
|
bodyText={t("hero2_card1_body", language)}
|
||||||
}
|
href="https://www.weforum.org/impact/ai-for-agriculture-in-india/"
|
||||||
bodyText={
|
language={language}
|
||||||
"Farmers participating in the programme saw a 21% increase in chili yields per acre, a 9% reduction in pesticide use, a 5% decrease in fertilizer usage, and an 8% improvement in unit prices due to quality enhancements."
|
/>
|
||||||
}
|
|
||||||
href={
|
|
||||||
"https://www.weforum.org/impact/ai-for-agriculture-in-india/ "
|
|
||||||
}
|
|
||||||
/>{" "}
|
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
{" "}
|
<CardWithButton language={language} />
|
||||||
<CardWithButton />{" "}
|
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-col justify-between">
|
<div className="flex flex-col justify-between">
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
{" "}
|
|
||||||
<CardOnlyText
|
<CardOnlyText
|
||||||
headingText={
|
headingText={t("hero2_card2_heading", language)}
|
||||||
"SugarChain: Blockchain technology meets Agriculture"
|
bodyText={t("hero2_card2_body", language)}
|
||||||
}
|
href="https://arxiv.org/abs/2301.08405"
|
||||||
bodyText={
|
language={language}
|
||||||
"The use of blockchain technology can help farmers automate processes with high trust, addressing issues like middlemen involvement and ensuring accurate compensation for their products"
|
/>
|
||||||
}
|
|
||||||
href={"https://arxiv.org/abs/2301.08405"}
|
|
||||||
/>{" "}
|
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
{" "}
|
<CardWithOnlyImage language={language} />
|
||||||
<CardWithOnlyImage />{" "}
|
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -95,3 +88,4 @@ function Hero2() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default Hero2;
|
export default Hero2;
|
||||||
|
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import Hero from "./Hero";
|
|||||||
import Testimonial from "./Testimonial";
|
import Testimonial from "./Testimonial";
|
||||||
import Hero2 from "./Hero2";
|
import Hero2 from "./Hero2";
|
||||||
import Footer from "./Footer";
|
import Footer from "./Footer";
|
||||||
|
import Navbar2 from "../../components/Navbar2";
|
||||||
|
|
||||||
const HomePage = () => {
|
const HomePage = () => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className=" bg-[url(/images/bgphoto.png)] bg-no-repeat bg-cover">
|
<div className=" bg-[url(/images/bgphoto.png)] bg-no-repeat bg-cover">
|
||||||
|
<Navbar2 />
|
||||||
<Hero2 />
|
<Hero2 />
|
||||||
|
|
||||||
<Footer />
|
<Footer />
|
||||||
|
|||||||
@@ -1,289 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
|
|
||||||
const Reviews = [
|
|
||||||
[
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
[
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
[
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
|
|
||||||
[
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
|
|
||||||
[
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: "/images/Review1.jpeg",
|
|
||||||
alt: "Bonnie image",
|
|
||||||
name: "Bonnie",
|
|
||||||
occupation: "Student",
|
|
||||||
review:
|
|
||||||
"As a student of this online education website, I can confidently say that it has been an incredible experience. The platform is user-friendly and making it easy for me to learn at my own pace.",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
const ReviewSection = () => {
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<section className="bg-gray-100 py-12">
|
|
||||||
<div className="container mx-auto">
|
|
||||||
<div className="text-center">
|
|
||||||
<h2 className=" text-2xl md:text-4xl font-bold mb-4">OUR TESTIMONIALS</h2>
|
|
||||||
<h1 className="text-3xl md:text-6xl font-bold mb-4">
|
|
||||||
What Our Students Say About Us
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="default-carousel"
|
|
||||||
className="relative w-full"
|
|
||||||
data-carousel="slide"
|
|
||||||
>
|
|
||||||
{/* <!-- Carousel wrapper --> */}
|
|
||||||
<div className="relative h-64 overflow-hidden rounded-lg md:h-96">
|
|
||||||
{/* <!-- Item 1 --> */}
|
|
||||||
{Reviews.map((reviewList) => (
|
|
||||||
<div
|
|
||||||
className="hidden duration-700 ease-in-out w-full"
|
|
||||||
data-carousel-item
|
|
||||||
>
|
|
||||||
<div className="flex w-full items-center justify-center h-full gap-8">
|
|
||||||
{/* Review no 1 */}
|
|
||||||
|
|
||||||
{reviewList.map((review) => (
|
|
||||||
<div className="w-full max-w-sm bg-white border border-gray-200 rounded-lg shadow dark:bg-gray-800 dark:border-gray-700 md:py-2">
|
|
||||||
<div className="flex flex-col items-center pb-10 p-2">
|
|
||||||
<img
|
|
||||||
className="w-20 h-20 md:w-24 md:h-24 mb-3 rounded-full shadow-lg"
|
|
||||||
src={`${review.src}`}
|
|
||||||
alt={`${review.alt}`}
|
|
||||||
/>
|
|
||||||
<h5 className="mb-1 text-xl font-medium text-gray-900 dark:text-white">
|
|
||||||
{review.name}
|
|
||||||
</h5>
|
|
||||||
<span className="text-base font-semibold text-gray-500 dark:text-gray-400">
|
|
||||||
{review.occupation}
|
|
||||||
</span>
|
|
||||||
|
|
||||||
<p className="md:hidden text-sm text-gray-600 text-center">
|
|
||||||
{review.review.substring(0, 35)}....
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<p className="hidden md:block text-sm text-gray-600 text-center">
|
|
||||||
{review.review.substring(0,200)}...
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
{/* <!-- Slider indicators --> */}
|
|
||||||
<div className="absolute z-30 flex -translate-x-1/2 bottom-5 left-1/2 space-x-3 rtl:space-x-reverse">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="w-3 h-3 rounded-full"
|
|
||||||
aria-current="true"
|
|
||||||
aria-label="Slide 1"
|
|
||||||
data-carousel-slide-to="0"
|
|
||||||
></button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="w-3 h-3 rounded-full"
|
|
||||||
aria-current="false"
|
|
||||||
aria-label="Slide 2"
|
|
||||||
data-carousel-slide-to="1"
|
|
||||||
></button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="w-3 h-3 rounded-full"
|
|
||||||
aria-current="false"
|
|
||||||
aria-label="Slide 3"
|
|
||||||
data-carousel-slide-to="2"
|
|
||||||
></button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="w-3 h-3 rounded-full"
|
|
||||||
aria-current="false"
|
|
||||||
aria-label="Slide 4"
|
|
||||||
data-carousel-slide-to="3"
|
|
||||||
></button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="w-3 h-3 rounded-full"
|
|
||||||
aria-current="false"
|
|
||||||
aria-label="Slide 5"
|
|
||||||
data-carousel-slide-to="4"
|
|
||||||
></button>
|
|
||||||
</div>
|
|
||||||
{/* <!-- Slider controls --> */}
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="absolute top-0 start-0 z-30 flex items-center justify-center h-full px-4 cursor-pointer group focus:outline-none"
|
|
||||||
data-carousel-prev
|
|
||||||
>
|
|
||||||
<span className="inline-flex items-center justify-center w-10 h-10 rounded-full bg-white/30 dark:bg-gray-800/30 group-hover:bg-white/50 dark:group-hover:bg-gray-800/60 group-focus:ring-4 group-focus:ring-white dark:group-focus:ring-gray-800/70 group-focus:outline-none">
|
|
||||||
<svg
|
|
||||||
className="w-4 h-4 text-white dark:text-gray-800 rtl:rotate-180"
|
|
||||||
aria-hidden="true"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 6 10"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
strokeWidth="2"
|
|
||||||
d="M5 1 1 5l4 4"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<span className="sr-only">Previous</span>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="absolute top-0 end-0 z-30 flex items-center justify-center h-full px-4 cursor-pointer group focus:outline-none"
|
|
||||||
data-carousel-next
|
|
||||||
>
|
|
||||||
<span className="inline-flex items-center justify-center w-10 h-10 rounded-full bg-white/30 dark:bg-gray-800/30 group-hover:bg-white/50 dark:group-hover:bg-gray-800/60 group-focus:ring-4 group-focus:ring-white dark:group-focus:ring-gray-800/70 group-focus:outline-none">
|
|
||||||
<svg
|
|
||||||
className="w-4 h-4 text-white dark:text-gray-800 rtl:rotate-180"
|
|
||||||
aria-hidden="true"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
fill="none"
|
|
||||||
viewBox="0 0 6 10"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
stroke="currentColor"
|
|
||||||
strokeLinecap="round"
|
|
||||||
strokeLinejoin="round"
|
|
||||||
strokeWidth="2"
|
|
||||||
d="m1 9 4-4-4-4"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<span className="sr-only">Next</span>
|
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default ReviewSection;
|
|
||||||
@@ -1,179 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { MdEngineering } from "react-icons/md";
|
|
||||||
import { FaLaptopCode } from "react-icons/fa";
|
|
||||||
import { LiaLanguageSolid } from "react-icons/lia";
|
|
||||||
import { MdScience } from "react-icons/md";
|
|
||||||
import { MdHistoryEdu } from "react-icons/md";
|
|
||||||
import { MdPsychology } from "react-icons/md";
|
|
||||||
import { CgWebsite } from "react-icons/cg";
|
|
||||||
import { FaReplyAll } from "react-icons/fa";
|
|
||||||
|
|
||||||
const SubjectList = [
|
|
||||||
{
|
|
||||||
icon: "FaLaptopCode",
|
|
||||||
title: "Programming",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "MdEngineering",
|
|
||||||
title: "Engineering",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "LiaLanguageSolid",
|
|
||||||
title: "Languages",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "MdScience",
|
|
||||||
title: "Science",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "MdHistoryEdu",
|
|
||||||
title: "History",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "MdPsychology",
|
|
||||||
title: "Psychology",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "CgWebsite",
|
|
||||||
title: "Web Design",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
icon: "FaReplyAll",
|
|
||||||
title: "See all",
|
|
||||||
},
|
|
||||||
];
|
|
||||||
const SubjectSection = () => {
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<section className="bg-white py-12 flex justify-center">
|
|
||||||
<div className="w-11/12">
|
|
||||||
<div className="container mx-auto">
|
|
||||||
<div className="text-center">
|
|
||||||
<h2 className="text-xl md:text-4xl font-bold mb-4">
|
|
||||||
OUR TUTOR SUBJECTS
|
|
||||||
</h2>
|
|
||||||
<h1 className="text-4xl md:text-6xl font-bold mb-4">
|
|
||||||
Find Online Tutor in Any Subject
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
<div className="grid grid-cols-2 gap-3 md:gap-4 mt-10 md:grid-cols-3 lg:grid-cols-4">
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800 "
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-green-500 bg-green-100 rounded-lg dark:bg-green-800 dark:text-green-200">
|
|
||||||
<FaLaptopCode className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-sm sm:text-xl font-bold text-black font-sans">
|
|
||||||
Programming
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-blue-500 bg-blue-100 rounded-lg dark:bg-blue-800 dark:text-blue-200">
|
|
||||||
<MdEngineering className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-sm sm:text-xl font-bold text-black font-sans">
|
|
||||||
Engineering
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-pink-500 bg-pink-100 rounded-lg dark:bg-pink-800 dark:text-pink-200">
|
|
||||||
<LiaLanguageSolid className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-base sm:text-xl font-bold text-black font-sans">
|
|
||||||
Languages
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-purple-500 bg-purple-100 rounded-lg dark:bg-purple-800 dark:text-purple-200">
|
|
||||||
<MdScience className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-base sm:text-xl font-bold text-black font-sans">
|
|
||||||
Science
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-yellow-500 bg-yellow-100 rounded-lg dark:bg-yellow-800 dark:text-yellow-200">
|
|
||||||
<MdHistoryEdu className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-base sm:text-xl font-bold text-black font-sans">
|
|
||||||
History
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-red-500 bg-red-100 rounded-lg dark:bg-red-800 dark:text-red-200">
|
|
||||||
<MdPsychology className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-base sm:text-xl font-bold text-black font-sans">
|
|
||||||
Psychology
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800 md:hidden lg:flex"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-orange-500 bg-orange-100 rounded-lg dark:bg-orange-800 dark:text-orange-200 ">
|
|
||||||
<CgWebsite className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-base sm:text-xl font-bold text-black font-sans">
|
|
||||||
Web Design
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
id="toast-success"
|
|
||||||
className="flex items-center w-full max-w-xs p-4 mb-4 text-gray-500 bg-white rounded-lg shadow dark:text-gray-400 dark:bg-gray-800 md:hidden lg:flex"
|
|
||||||
role="alert"
|
|
||||||
>
|
|
||||||
<div className="inline-flex items-center justify-center flex-shrink-0 w-8 h-8 md:w-9 md:h-9 text-gray-500 bg-gray-100 rounded-lg dark:bg-gray-800 dark:text-gray-200">
|
|
||||||
<FaReplyAll className="text-base sm:text-xl" />
|
|
||||||
<span className="sr-only">Check icon</span>
|
|
||||||
</div>
|
|
||||||
<div className="ms-3 text-base sm:text-xl font-bold text-black font-sans">
|
|
||||||
See all
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default SubjectSection;
|
|
||||||
@@ -6,6 +6,8 @@ import { motion } from "framer-motion";
|
|||||||
import { useInView } from "react-intersection-observer";
|
import { useInView } from "react-intersection-observer";
|
||||||
import TypeWriterEffect from "react-typewriter-effect";
|
import TypeWriterEffect from "react-typewriter-effect";
|
||||||
import cards from "./Cards";
|
import cards from "./Cards";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
import { useOutletContext } from "react-router-dom";
|
||||||
|
|
||||||
const ScrollReveal = ({ children, direction = "left" }) => {
|
const ScrollReveal = ({ children, direction = "left" }) => {
|
||||||
const { ref, inView } = useInView({ triggerOnce: true, threshold: 0.5 });
|
const { ref, inView } = useInView({ triggerOnce: true, threshold: 0.5 });
|
||||||
@@ -29,7 +31,12 @@ const ScrollReveal = ({ children, direction = "left" }) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const Testimonial = () => {
|
const Testimonial = (props) => {
|
||||||
|
// Get language from context or props, default to 'en'
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const myRef = document.querySelector(".scrollable-div");
|
const myRef = document.querySelector(".scrollable-div");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -39,7 +46,7 @@ const Testimonial = () => {
|
|||||||
<div className="text-center flex-col justify-center align-middle min-h-full">
|
<div className="text-center flex-col justify-center align-middle min-h-full">
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
<h2 className="text-xl sm:text-4xl font-bold mb-4 drop-shadow-md">
|
<h2 className="text-xl sm:text-4xl font-bold mb-4 drop-shadow-md">
|
||||||
WHY CHOOSE US?
|
{t("testimonial_heading", language)}
|
||||||
</h2>
|
</h2>
|
||||||
</ScrollReveal>
|
</ScrollReveal>
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
@@ -50,7 +57,7 @@ const Testimonial = () => {
|
|||||||
scrollArea={myRef}
|
scrollArea={myRef}
|
||||||
startDelay={100}
|
startDelay={100}
|
||||||
cursorColor="white"
|
cursorColor="white"
|
||||||
text="⠀Unparalled management for crops & farms."
|
text={t("testimonial_typewriter", language)}
|
||||||
typeSpeed={100}
|
typeSpeed={100}
|
||||||
/>
|
/>
|
||||||
</h1>
|
</h1>
|
||||||
@@ -60,25 +67,20 @@ const Testimonial = () => {
|
|||||||
<div className="flex flex-col sm:flex-row justify-around mt-8 h-auto min-h-[50]">
|
<div className="flex flex-col sm:flex-row justify-around mt-8 h-auto min-h-[50]">
|
||||||
<ScrollReveal direction="up">
|
<ScrollReveal direction="up">
|
||||||
<div className="max-w-sm p-6 backdrop-blur-md rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
<div className="max-w-sm p-6 backdrop-blur-md rounded-lg shadow-md dark:bg-gray-800 dark:border-gray-700">
|
||||||
<img
|
<img src="/images/dashboard.png" alt="dashboard" className="w-7 h-7" />
|
||||||
src="/images/dashboard.png"
|
|
||||||
alt="dashboard"
|
|
||||||
className="w-7 h-7"
|
|
||||||
></img>
|
|
||||||
<a href="/user/dashboard/">
|
<a href="/user/dashboard/">
|
||||||
<h5 className="mb-2 text-2xl font-semibold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-semibold tracking-tight text-gray-50 dark:text-white">
|
||||||
Excellent Dashboards
|
{t("testimonial_card1_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
||||||
Our descriptive dashboards give insights into your crop's
|
{t("testimonial_card1_body", language)}
|
||||||
health and keeps track of your burning expenses.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
className="inline-flex font-medium items-center text-blue-600 hover:underline"
|
className="inline-flex font-medium items-center text-blue-600 hover:underline"
|
||||||
>
|
>
|
||||||
Check Out
|
{t("testimonial_check_out", language)}
|
||||||
<svg
|
<svg
|
||||||
className="w-3 h-3 ms-2.5 rtl:rotate-[270deg]"
|
className="w-3 h-3 ms-2.5 rtl:rotate-[270deg]"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -88,9 +90,9 @@ const Testimonial = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M15 11v4.833A1.166 1.166 0 0 1 13.833 17H2.167A1.167 1.167 0 0 1 1 15.833V4.167A1.166 1.166 0 0 1 2.167 3h4.618m4.447-2H17v5.768M9.111 8.889l7.778-7.778"
|
d="M15 11v4.833A1.166 1.166 0 0 1 13.833 17H2.167A1.167 1.167 0 0 1 1 15.833V4.167A1.166 1.166 0 0 1 2.167 3h4.618m4.447-2H17v5.768M9.111 8.889l7.778-7.778"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -103,19 +105,17 @@ const Testimonial = () => {
|
|||||||
<img src="/images/crops.png" className="w-7 h-7" alt="" />
|
<img src="/images/crops.png" className="w-7 h-7" alt="" />
|
||||||
<a href="#">
|
<a href="#">
|
||||||
<h5 className="mb-2 text-2xl font-semibold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-semibold tracking-tight text-gray-50 dark:text-white">
|
||||||
{" "}
|
{t("testimonial_card2_title", language)}
|
||||||
Crop Disease Prediction{" "}
|
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
||||||
Predict the possible crop diseases based on their shown
|
{t("testimonial_card2_body", language)}
|
||||||
symptoms.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="/ai"
|
href="/ai"
|
||||||
className="inline-flex font-medium items-center text-blue-600 hover:underline"
|
className="inline-flex font-medium items-center text-blue-600 hover:underline"
|
||||||
>
|
>
|
||||||
Check Out
|
{t("testimonial_check_out", language)}
|
||||||
<svg
|
<svg
|
||||||
className="w-3 h-3 ms-2.5 rtl:rotate-[270deg]"
|
className="w-3 h-3 ms-2.5 rtl:rotate-[270deg]"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -125,9 +125,9 @@ const Testimonial = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M15 11v4.833A1.166 1.166 0 0 1 13.833 17H2.167A1.167 1.167 0 0 1 1 15.833V4.167A1.166 1.166 0 0 1 2.167 3h4.618m4.447-2H17v5.768M9.111 8.889l7.778-7.778"
|
d="M15 11v4.833A1.166 1.166 0 0 1 13.833 17H2.167A1.167 1.167 0 0 1 1 15.833V4.167A1.166 1.166 0 0 1 2.167 3h4.618m4.447-2H17v5.768M9.111 8.889l7.778-7.778"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
@@ -140,19 +140,17 @@ const Testimonial = () => {
|
|||||||
<img src="/images/planner.png" className="w-7 h-7" alt="" />
|
<img src="/images/planner.png" className="w-7 h-7" alt="" />
|
||||||
<a href="/user/dashboard/monitoring">
|
<a href="/user/dashboard/monitoring">
|
||||||
<h5 className="mb-2 text-2xl font-semibold tracking-tight text-gray-50 dark:text-white">
|
<h5 className="mb-2 text-2xl font-semibold tracking-tight text-gray-50 dark:text-white">
|
||||||
Crop Planner
|
{t("testimonial_card3_title", language)}
|
||||||
</h5>
|
</h5>
|
||||||
</a>
|
</a>
|
||||||
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
<p className="mb-3 font-normal text-gray-50 dark:text-gray-400">
|
||||||
Based on previous season's crop and used pertilizers and
|
{t("testimonial_card3_body", language)}
|
||||||
pesticides, plan what crops would best suit the present state
|
|
||||||
of your soil.
|
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
className="inline-flex font-medium items-center text-blue-600 hover:underline"
|
className="inline-flex font-medium items-center text-blue-600 hover:underline"
|
||||||
>
|
>
|
||||||
Check Out
|
{t("testimonial_check_out", language)}
|
||||||
<svg
|
<svg
|
||||||
className="w-3 h-3 ms-2.5 rtl:rotate-[270deg]"
|
className="w-3 h-3 ms-2.5 rtl:rotate-[270deg]"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
@@ -162,9 +160,9 @@ const Testimonial = () => {
|
|||||||
>
|
>
|
||||||
<path
|
<path
|
||||||
stroke="currentColor"
|
stroke="currentColor"
|
||||||
stroke-linecap="round"
|
strokeLinecap="round"
|
||||||
stroke-linejoin="round"
|
strokeLinejoin="round"
|
||||||
stroke-width="2"
|
strokeWidth="2"
|
||||||
d="M15 11v4.833A1.166 1.166 0 0 1 13.833 17H2.167A1.167 1.167 0 0 1 1 15.833V4.167A1.166 1.166 0 0 1 2.167 3h4.618m4.447-2H17v5.768M9.111 8.889l7.778-7.778"
|
d="M15 11v4.833A1.166 1.166 0 0 1 13.833 17H2.167A1.167 1.167 0 0 1 1 15.833V4.167A1.166 1.166 0 0 1 2.167 3h4.618m4.447-2H17v5.768M9.111 8.889l7.778-7.778"
|
||||||
/>
|
/>
|
||||||
</svg>
|
</svg>
|
||||||
|
|||||||
@@ -1,20 +1,27 @@
|
|||||||
import React, { useRef } from "react";
|
import React, { useRef, useState } from "react";
|
||||||
import { useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { Link, useNavigate } from "react-router-dom";
|
import { Link, useNavigate, useOutletContext } from "react-router-dom";
|
||||||
import { userSliceActions } from "../../store/userSlice";
|
import { userSliceActions } from "../../store/userSlice";
|
||||||
import { BACKEND_URL } from "../../constants";
|
import { BACKEND_URL } from "../../constants";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
import Message from "../../components/Message"; // Import Message component
|
||||||
|
|
||||||
const LoginPage = () => {
|
const LoginPage = () => {
|
||||||
|
const { language } = useOutletContext();
|
||||||
const emailElement = useRef();
|
const emailElement = useRef();
|
||||||
const passwordElement = useRef();
|
const passwordElement = useRef();
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const [error, setError] = useState(""); // For showing errors
|
||||||
|
|
||||||
|
const navigate = useNavigate();
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
|
||||||
const handleLogin = async (event) => {
|
const handleLogin = async (event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
const responce = await fetch(`${BACKEND_URL}/api/v1/login`, {
|
setError(""); // Clear previous error
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${BACKEND_URL}/api/v1/login`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
credentials: "include",
|
credentials: "include",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -26,15 +33,31 @@ const LoginPage = () => {
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
|
|
||||||
const user = await responce.json();
|
if (response.status === 429) {
|
||||||
|
setError("Too many login attempts. Please try again after 15 minutes.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
dispatch(userSliceActions.addUser(user.data));
|
let data;
|
||||||
|
try {
|
||||||
|
data = await response.json();
|
||||||
|
} catch (jsonError) {
|
||||||
|
setError("Unexpected server response. Please try again.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.success === true) {
|
||||||
|
dispatch(userSliceActions.addUser(data.data));
|
||||||
|
navigate("/");
|
||||||
|
} else {
|
||||||
|
setError(data.message || "Login failed. Please check your credentials.");
|
||||||
|
}
|
||||||
|
|
||||||
emailElement.current.value = "";
|
emailElement.current.value = "";
|
||||||
passwordElement.current.value = "";
|
passwordElement.current.value = "";
|
||||||
|
} catch (err) {
|
||||||
if (user.success == true) {
|
console.error("Login error:", err);
|
||||||
navigate("/");
|
setError("Something went wrong. Please try again.");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -44,45 +67,51 @@ const LoginPage = () => {
|
|||||||
<div className="rounded-lg shadow-md ">
|
<div className="rounded-lg shadow-md ">
|
||||||
<div className="flex flex-col items-center justify-center h-full ">
|
<div className="flex flex-col items-center justify-center h-full ">
|
||||||
<h1 className="text-6xl font-bold text-white mb-4 md:text-6xl lg:text-9xl ml-8">
|
<h1 className="text-6xl font-bold text-white mb-4 md:text-6xl lg:text-9xl ml-8">
|
||||||
Welcome Back!
|
{t("login_welcome_back", language)}
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="backdrop-blur-md bg-gradient-to-tr from-slate-300/10 to-slate-200/30 rounded-lg shadow-md lg:p-36">
|
<div className="backdrop-blur-md bg-gradient-to-tr from-slate-300/10 to-slate-200/30 rounded-lg shadow-md lg:p-36">
|
||||||
<h1 className="text-2xl font-bold text-gray-50 mb-4">Login</h1>
|
<h1 className="text-2xl font-bold text-gray-50 mb-4">{t("login_title", language)}</h1>
|
||||||
<p className="text-gray-100 mb-6">
|
<p className="text-gray-100 mb-6">{t("login_subtitle", language)}</p>
|
||||||
Welcome back! Please login to your account.
|
|
||||||
</p>
|
{/* Show error message */}
|
||||||
|
{error && (
|
||||||
|
<div className="my-4">
|
||||||
|
<Message message={error} type="error" />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<form className="space-y-6" onSubmit={handleLogin}>
|
<form className="space-y-6" onSubmit={handleLogin}>
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label
|
||||||
for="username"
|
htmlFor="username"
|
||||||
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
||||||
>
|
>
|
||||||
Email
|
{t("login_email_label", language)}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="email"
|
type="email"
|
||||||
id="username"
|
id="username"
|
||||||
ref={emailElement}
|
ref={emailElement}
|
||||||
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
||||||
placeholder="username@gmail.com"
|
placeholder={t("login_email_placeholder", language)}
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label
|
||||||
for="password"
|
htmlFor="password"
|
||||||
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
||||||
>
|
>
|
||||||
Password
|
{t("login_password_label", language)}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
id="password"
|
id="password"
|
||||||
ref={passwordElement}
|
ref={passwordElement}
|
||||||
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
||||||
placeholder="********"
|
placeholder={t("login_password_placeholder", language)}
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -95,17 +124,17 @@ const LoginPage = () => {
|
|||||||
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
|
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
|
||||||
/>
|
/>
|
||||||
<label
|
<label
|
||||||
for="remember_me"
|
htmlFor="remember_me"
|
||||||
className="ml-2 text-sm font-medium text-gray-100 dark:text-gray-300"
|
className="ml-2 text-sm font-medium text-gray-100 dark:text-gray-300"
|
||||||
>
|
>
|
||||||
Remember Me
|
{t("login_remember_me", language)}
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
<Link
|
<Link
|
||||||
to={"/user/forgetpassword"}
|
to={"/user/forgetpassword"}
|
||||||
className="text-sm font-medium text-blue-600 hover:underline dark:text-blue-500"
|
className="text-sm font-medium text-blue-600 hover:underline dark:text-blue-500"
|
||||||
>
|
>
|
||||||
Forgot Password?
|
{t("login_forgot_password", language)}
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex justify-center">
|
<div className="flex justify-center">
|
||||||
@@ -113,16 +142,13 @@ const LoginPage = () => {
|
|||||||
type="submit"
|
type="submit"
|
||||||
className="text-white w-1/2 backdrop-blur-lg bg-gradient-to-tr from-slate-100/15 to-slate-200/15 shadow-lg hover:backdrop-blur-lg focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
|
className="text-white w-1/2 backdrop-blur-lg bg-gradient-to-tr from-slate-100/15 to-slate-200/15 shadow-lg hover:backdrop-blur-lg focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
|
||||||
>
|
>
|
||||||
Login
|
{t("login_button", language)}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<p className="text-gray-100 text-center mt-4">
|
<p className="text-gray-100 text-center mt-4">
|
||||||
New User?{" "}
|
{t("login_new_user", language)}{" "}
|
||||||
<Link
|
<Link to={"/user/signup"} className="text-blue-600 hover:underline">
|
||||||
to={"/user/signup"}
|
{t("login_signup", language)}
|
||||||
className="text-blue-600 hover:underline"
|
|
||||||
>
|
|
||||||
Signup
|
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</p>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import Navbar2 from "../../components/Navbar2.jsx";
|
import Navbar2 from "../../components/Navbar2.jsx";
|
||||||
import { Outlet } from "react-router-dom";
|
import { Outlet, useOutletContext } from "react-router-dom";
|
||||||
import Container from "../../components/Container.jsx";
|
import Container from "../../components/Container.jsx";
|
||||||
|
|
||||||
const MainLoginPage = () => {
|
const MainLoginPage = ({ language = "en" }) => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Container>
|
<Container>
|
||||||
<Outlet />
|
{/* Pass language to Outlet context for nested routes */}
|
||||||
|
<Outlet context={{ language }} />
|
||||||
</Container>
|
</Container>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,174 +1,278 @@
|
|||||||
import React, { useRef } from "react";
|
import React, { useRef, useState } from "react";
|
||||||
import { Link, useNavigate } from "react-router-dom";
|
import { Link, useNavigate } from "react-router-dom";
|
||||||
import { BACKEND_URL } from "../../constants";
|
import { BACKEND_URL } from "../../constants";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
import { useOutletContext } from "react-router-dom";
|
||||||
|
import { isPasswordPwned } from "../../utils/passwordUtils";
|
||||||
|
|
||||||
|
const SignupPage = (props) => {
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language = (outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const SignupPage = () => {
|
|
||||||
const firstNameElement = useRef();
|
const firstNameElement = useRef();
|
||||||
const lastNameElement = useRef();
|
const lastNameElement = useRef();
|
||||||
const emailElement = useRef();
|
const emailElement = useRef();
|
||||||
const roleElement = useRef();
|
|
||||||
const passwordElement = useRef();
|
const passwordElement = useRef();
|
||||||
|
const confirmPasswordElement = useRef();
|
||||||
|
|
||||||
|
const [error, setError] = useState("");
|
||||||
|
const [passwordStrength, setPasswordStrength] = useState("");
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [showPassword, setShowPassword] = useState(false);
|
||||||
|
const [showConfirmPassword, setShowConfirmPassword] = useState(false);
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const handleRegisteration = async (event) => {
|
const evaluatePasswordStrength = (password) => {
|
||||||
event.preventDefault();
|
let score = 0;
|
||||||
|
if (password.length >= 8) score++;
|
||||||
|
if (/[a-z]/.test(password)) score++;
|
||||||
|
if (/[A-Z]/.test(password)) score++;
|
||||||
|
if (/\d/.test(password)) score++;
|
||||||
|
if (/[@$!%*?&]/.test(password)) score++;
|
||||||
|
|
||||||
const user = {
|
if (score <= 2) return "Weak";
|
||||||
name:
|
if (score === 3 || score === 4) return "Moderate";
|
||||||
firstNameElement.current.value + " " + lastNameElement.current.value,
|
return "Strong";
|
||||||
email: emailElement.current.value,
|
|
||||||
password: passwordElement.current.value,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
event.preventDefault();
|
const handlePasswordChange = (e) => {
|
||||||
|
const pwd = e.target.value;
|
||||||
|
passwordElement.current.value = pwd;
|
||||||
|
setPasswordStrength(evaluatePasswordStrength(pwd));
|
||||||
|
};
|
||||||
|
|
||||||
const responce = await fetch(`${BACKEND_URL}/api/v1/register`, {
|
const handleRegisteration = async (event) => {
|
||||||
|
event.preventDefault();
|
||||||
|
setError("");
|
||||||
|
|
||||||
|
const password = passwordElement.current.value;
|
||||||
|
const confirmPassword = confirmPasswordElement.current.value;
|
||||||
|
|
||||||
|
const strongPasswordRegex =
|
||||||
|
/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&]).{8,}$/;
|
||||||
|
|
||||||
|
if (!strongPasswordRegex.test(password)) {
|
||||||
|
setError(
|
||||||
|
"Password must be at least 8 characters long and include uppercase, lowercase, number, and special character."
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (password !== confirmPassword) {
|
||||||
|
setError("Passwords do not match.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setLoading(true);
|
||||||
|
try {
|
||||||
|
const pwned = await isPasswordPwned(password);
|
||||||
|
if (pwned) {
|
||||||
|
setError("This password previously appeared in a data breach. Please use a new password.");
|
||||||
|
setLoading(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Password breach check failed:", err);
|
||||||
|
setError("Something went wrong while checking password security. Try again.");
|
||||||
|
setLoading(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = {
|
||||||
|
name: `${firstNameElement.current.value} ${lastNameElement.current.value}`,
|
||||||
|
email: emailElement.current.value,
|
||||||
|
password: password,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(`${BACKEND_URL}/api/v1/register`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
headers: {
|
headers: { "Content-Type": "application/json" },
|
||||||
"Content-Type": "application/json",
|
|
||||||
},
|
|
||||||
body: JSON.stringify(user),
|
body: JSON.stringify(user),
|
||||||
credentials: "include",
|
credentials: "include",
|
||||||
});
|
});
|
||||||
const data = await responce.json();
|
|
||||||
|
const data = await response.json();
|
||||||
|
|
||||||
|
if (data.success === true) {
|
||||||
|
navigate("/user/login");
|
||||||
|
} else {
|
||||||
|
setError(data.message || "Registration failed. Please try again.");
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Registration error:", err);
|
||||||
|
setError("Something went wrong on the server. Please try again later.");
|
||||||
|
}
|
||||||
|
|
||||||
firstNameElement.current.value = "";
|
firstNameElement.current.value = "";
|
||||||
lastNameElement.current.value = "";
|
lastNameElement.current.value = "";
|
||||||
emailElement.current.value = "";
|
emailElement.current.value = "";
|
||||||
passwordElement.current.value = "";
|
passwordElement.current.value = "";
|
||||||
|
confirmPasswordElement.current.value = "";
|
||||||
if (data.success == true) {
|
setPasswordStrength("");
|
||||||
navigate("/user/login");
|
setLoading(false);
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="bg-[url(https://i.pinimg.com/736x/6c/d2/cc/6cd2cc05a7e464a78bdf1124b4ad30f1.jpg)] bg-cover font-sans flex flex-col justify-center min-h-screen max-h-screen">
|
<section className="bg-[url(https://i.pinimg.com/736x/6c/d2/cc/6cd2cc05a7e464a78bdf1124b4ad30f1.jpg)] bg-cover font-sans flex flex-col justify-center min-h-screen max-h-screen">
|
||||||
<div className="flex justify-between items-center w-full h-full p-5">
|
<div className="flex justify-between items-center w-full h-full p-5">
|
||||||
{/* <div className="bg-gradient-to-br from-purple-300 to-pink-200 rounded-lg shadow-md min-h-40 object-center md:hidden">
|
|
||||||
<div className="flex flex-col items-center justify-center h-full relative">
|
|
||||||
<img
|
|
||||||
src="/images/background1.jpg"
|
|
||||||
alt=""
|
|
||||||
className="absolute order-3 w-full h-full"
|
|
||||||
/>
|
|
||||||
<h1 className="text-6xl font-bold text-white mb-4 md:text-6xl lg:text-9xl relative ml-8">
|
|
||||||
Welcome to Crop Compass
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
</div> */}
|
|
||||||
<div className="backdrop-blur-md bg-gradient-to-tr from-slate-300/10 to-slate-200/30 rounded-lg shadow-md lg:p-36 h-[95vh]">
|
<div className="backdrop-blur-md bg-gradient-to-tr from-slate-300/10 to-slate-200/30 rounded-lg shadow-md lg:p-36 h-[95vh]">
|
||||||
<h1 className="text-2xl font-bold text-gray-50 mb-4">
|
<h1 className="text-2xl font-bold text-gray-50 mb-4">
|
||||||
Register Your account
|
{t("signup_register_heading", language)}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-gray-100">Welcome to Crop Compass.</p>
|
<p className="text-gray-100">{t("signup_welcome", language)}</p>
|
||||||
<p className="text-gray-100 mb-6">
|
<p className="text-gray-100 mb-6">{t("signup_subtitle", language)}</p>
|
||||||
Please register your new account.
|
|
||||||
</p>
|
<form className="space-y-6" onSubmit={handleRegisteration}>
|
||||||
<form action="#" className="space-y-6" onSubmit={handleRegisteration}>
|
|
||||||
<div className="flex flex-col gap-5 sm:flex-row">
|
<div className="flex flex-col gap-5 sm:flex-row">
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<label
|
<label htmlFor="firstName" className="block mb-2 text-sm font-medium text-gray-100">
|
||||||
htmlFor="username"
|
{t("signup_first_name_label", language)}
|
||||||
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
|
||||||
>
|
|
||||||
First Name
|
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="firstName"
|
id="firstName"
|
||||||
ref={firstNameElement}
|
ref={firstNameElement}
|
||||||
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg block w-full p-2.5"
|
||||||
placeholder="John"
|
placeholder={t("signup_first_name_placeholder", language)}
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<label
|
<label htmlFor="lastName" className="block mb-2 text-sm font-medium text-gray-100">
|
||||||
htmlFor="username"
|
{t("signup_last_name_label", language)}
|
||||||
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
|
||||||
>
|
|
||||||
Last Name
|
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="LastName"
|
id="lastName"
|
||||||
ref={lastNameElement}
|
ref={lastNameElement}
|
||||||
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg block w-full p-2.5"
|
||||||
placeholder="Doe"
|
placeholder={t("signup_last_name_placeholder", language)}
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label htmlFor="email" className="block mb-2 text-sm font-medium text-gray-100">
|
||||||
htmlFor="username"
|
{t("signup_email_label", language)}
|
||||||
className="block mb-2 text-sm font-medium text-gray-100 dark:text-white"
|
|
||||||
>
|
|
||||||
Email
|
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="email"
|
type="email"
|
||||||
id="email"
|
id="email"
|
||||||
ref={emailElement}
|
ref={emailElement}
|
||||||
className="bg-gray-50 border border-gray-300 text-black text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
className="bg-gray-50 border border-gray-300 text-black text-sm rounded-lg block w-full p-2.5"
|
||||||
placeholder="user@mail.com"
|
placeholder={t("signup_email_placeholder", language)}
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Password */}
|
||||||
<div>
|
<div>
|
||||||
<label
|
<label htmlFor="password" className="block mb-2 text-sm font-medium text-gray-100">
|
||||||
htmlFor="password"
|
{t("signup_password_label", language)}
|
||||||
className="block mb-2 text-sm font-medium text-gray-900 dark:text-white"
|
|
||||||
>
|
|
||||||
Password
|
|
||||||
</label>
|
</label>
|
||||||
|
<div className="relative">
|
||||||
<input
|
<input
|
||||||
type="password"
|
type={showPassword ? "text" : "password"}
|
||||||
id="password"
|
id="password"
|
||||||
ref={passwordElement}
|
ref={passwordElement}
|
||||||
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
|
onChange={handlePasswordChange}
|
||||||
placeholder="At least 6 unique Characters.. "
|
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg block w-full p-2.5 pr-10"
|
||||||
|
placeholder={t("signup_password_placeholder", language)}
|
||||||
required
|
required
|
||||||
/>
|
/>
|
||||||
</div>
|
<button
|
||||||
<div className="flex items-center justify-between">
|
type="button"
|
||||||
<div className="flex items-center">
|
onClick={() => setShowPassword((prev) => !prev)}
|
||||||
<input
|
className="absolute right-2 top-2 text-sm text-blue-500"
|
||||||
id="remember_me"
|
|
||||||
type="checkbox"
|
|
||||||
value=""
|
|
||||||
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
htmlFor="remember_me"
|
|
||||||
className="ml-2 text-sm font-medium text-gray-900 dark:text-gray-300"
|
|
||||||
>
|
>
|
||||||
Remember Me
|
{showPassword ? "Hide" : "Show"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Password Strength */}
|
||||||
|
{passwordStrength && (
|
||||||
|
<>
|
||||||
|
<div className="mt-2 text-sm font-medium">
|
||||||
|
Password strength:{" "}
|
||||||
|
<span
|
||||||
|
className={
|
||||||
|
passwordStrength === "Weak"
|
||||||
|
? "text-red-500"
|
||||||
|
: passwordStrength === "Moderate"
|
||||||
|
? "text-yellow-500"
|
||||||
|
: "text-green-500"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{passwordStrength}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="w-full h-2 rounded bg-gray-200 mt-1">
|
||||||
|
<div
|
||||||
|
className={`h-2 rounded transition-all duration-300 ${
|
||||||
|
passwordStrength === "Weak"
|
||||||
|
? "bg-red-500 w-1/4"
|
||||||
|
: passwordStrength === "Moderate"
|
||||||
|
? "bg-yellow-500 w-2/4"
|
||||||
|
: "bg-green-500 w-full"
|
||||||
|
}`}
|
||||||
|
></div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Confirm Password */}
|
||||||
|
<div>
|
||||||
|
<label htmlFor="confirmPassword" className="block mb-2 text-sm font-medium text-gray-100">
|
||||||
|
Confirm Password
|
||||||
</label>
|
</label>
|
||||||
|
<div className="relative">
|
||||||
|
<input
|
||||||
|
type={showConfirmPassword ? "text" : "password"}
|
||||||
|
id="confirmPassword"
|
||||||
|
ref={confirmPasswordElement}
|
||||||
|
className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg block w-full p-2.5 pr-10"
|
||||||
|
placeholder="Re-enter your password"
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setShowConfirmPassword((prev) => !prev)}
|
||||||
|
className="absolute right-2 top-2 text-sm text-blue-500"
|
||||||
|
>
|
||||||
|
{showConfirmPassword ? "Hide" : "Show"}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<a
|
|
||||||
href="#"
|
|
||||||
className="text-sm font-medium text-blue-600 hover:underline dark:text-blue-500"
|
|
||||||
></a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{error && <p className="text-red-500 text-sm font-medium">{error}</p>}
|
||||||
|
|
||||||
|
{loading && (
|
||||||
|
<div className="flex justify-center text-white font-medium">
|
||||||
|
Checking if password was leaked...
|
||||||
|
<div className="ml-2 animate-spin rounded-full h-5 w-5 border-t-2 border-b-2 border-blue-500"></div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="flex justify-center">
|
<div className="flex justify-center">
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
className="text-white w-1/2 backdrop-blur-lg bg-gradient-to-tr from-slate-100/15 to-slate-200/15 shadow-lg hover:backdrop-blur-lg focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
|
disabled={loading}
|
||||||
|
className={`text-white w-1/2 backdrop-blur-lg bg-gradient-to-tr from-slate-100/15 to-slate-200/15 shadow-lg hover:backdrop-blur-lg focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 ${
|
||||||
|
loading ? "opacity-50 cursor-not-allowed" : ""
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
Register your Account
|
{t("signup_register_button", language)}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p className="text-gray-600 text-center mt-4">
|
<p className="text-gray-600 text-center mt-4">
|
||||||
Already have an Account ?{" "}
|
{t("signup_already_have_account", language)}{" "}
|
||||||
<Link
|
<Link to={"/user/login"} className="text-blue-600 hover:underline">
|
||||||
to={"/user/login"}
|
{t("signup_login", language)}
|
||||||
className="text-blue-600 hover:underline"
|
|
||||||
>
|
|
||||||
Login
|
|
||||||
</Link>
|
</Link>
|
||||||
</p>
|
</p>
|
||||||
</form>
|
</form>
|
||||||
@@ -177,25 +281,14 @@ const SignupPage = () => {
|
|||||||
<div className="rounded-lg shadow-md text-center w-auto">
|
<div className="rounded-lg shadow-md text-center w-auto">
|
||||||
<div className="flex flex-col items-center justify-center h-full">
|
<div className="flex flex-col items-center justify-center h-full">
|
||||||
<h1 className="text-6xl font-bold text-white mb-4 md:text-6xl lg:text-9xl ml-8">
|
<h1 className="text-6xl font-bold text-white mb-4 md:text-6xl lg:text-9xl ml-8">
|
||||||
Start your Journey
|
{t("signup_journey_heading", language)}
|
||||||
|
<br />
|
||||||
|
{t("signup_with", language)}
|
||||||
<br />
|
<br />
|
||||||
with <br />
|
|
||||||
Crop Compass
|
Crop Compass
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/* <div className=" backdrop-blur-sm rounded-lg shadow-md md:block">
|
|
||||||
<div className="flex flex-col items-center justify-center h-full relative text-center">
|
|
||||||
<img
|
|
||||||
src="/images/background1.jpg"
|
|
||||||
alt=""
|
|
||||||
className="absolute order-3 w-full h-full"
|
|
||||||
/>
|
|
||||||
<h1 className="text-5xl font-bold text-white mb-4 md:text-5xl lg:text-8xl relative ml-8 text-center">
|
|
||||||
Welcome to MentorFlux!
|
|
||||||
</h1>
|
|
||||||
</div>
|
|
||||||
</div> */}
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,12 +1,17 @@
|
|||||||
import React, { useRef, useState } from "react";
|
import React, { useRef, useState } from "react";
|
||||||
import { IoIosKey } from "react-icons/io";
|
import { IoIosKey } from "react-icons/io";
|
||||||
import { Link } from "react-router-dom";
|
import { Link, useOutletContext } from "react-router-dom";
|
||||||
import { FaArrowLeft } from "react-icons/fa6";
|
import { FaArrowLeft } from "react-icons/fa6";
|
||||||
import { BACKEND_URL } from "../../constants";
|
import { BACKEND_URL } from "../../constants";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
|
||||||
|
const ForgetPassword = (props) => {
|
||||||
|
// Get language from context or props, default to 'en'
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const ForgetPassword = () => {
|
|
||||||
const emailElement = useRef();
|
const emailElement = useRef();
|
||||||
|
|
||||||
const [status, setStatus] = useState(false);
|
const [status, setStatus] = useState(false);
|
||||||
|
|
||||||
const handleForgetPassword = async (event) => {
|
const handleForgetPassword = async (event) => {
|
||||||
@@ -29,15 +34,18 @@ const ForgetPassword = () => {
|
|||||||
setStatus(true);
|
setStatus(true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full h-[78vh] flex justify-center items-center">
|
<div className="w-full h-[78vh] flex justify-center items-center">
|
||||||
<div className="">
|
<div>
|
||||||
<div className="flex flex-col items-center gap-12">
|
<div className="flex flex-col items-center gap-12">
|
||||||
<div className="flex flex-col items-center gap-3">
|
<div className="flex flex-col items-center gap-3">
|
||||||
<IoIosKey className="text-5xl bg-purple-200 p-2 rounded-full text-purple-500" />
|
<IoIosKey className="text-5xl bg-purple-200 p-2 rounded-full text-purple-500" />
|
||||||
<h2 className="text-3xl font-bold font-sans">Forget Password?</h2>
|
<h2 className="text-3xl font-bold font-sans">
|
||||||
|
{t("forget_password_heading", language)}
|
||||||
|
</h2>
|
||||||
<p className="text-gray-500">
|
<p className="text-gray-500">
|
||||||
No worries, we'll send you resent instructions.
|
{t("forget_password_subtitle", language)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<form
|
<form
|
||||||
@@ -49,7 +57,7 @@ const ForgetPassword = () => {
|
|||||||
<input
|
<input
|
||||||
type="email"
|
type="email"
|
||||||
id="email"
|
id="email"
|
||||||
placeholder="Enter your email"
|
placeholder={t("forget_password_email_placeholder", language)}
|
||||||
className="w-full rounded-md border-gray-400 border-2"
|
className="w-full rounded-md border-gray-400 border-2"
|
||||||
ref={emailElement}
|
ref={emailElement}
|
||||||
/>
|
/>
|
||||||
@@ -58,14 +66,17 @@ const ForgetPassword = () => {
|
|||||||
type="submit"
|
type="submit"
|
||||||
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
||||||
>
|
>
|
||||||
{status === false ? "Send Email" : "Email Sent to your Mail"}
|
{status === false
|
||||||
|
? t("forget_password_send_email", language)
|
||||||
|
: t("forget_password_email_sent", language)}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Link
|
<Link
|
||||||
to={"/user/login"}
|
to={"/user/login"}
|
||||||
className="text-center text-gray-600 inline-flex items-center justify-center gap-2"
|
className="text-center text-gray-600 inline-flex items-center justify-center gap-2"
|
||||||
>
|
>
|
||||||
<FaArrowLeft className="text-lg" /> Back to Login Page
|
<FaArrowLeft className="text-lg" />{" "}
|
||||||
|
{t("forget_password_back_to_login", language)}
|
||||||
</Link>
|
</Link>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
@@ -75,3 +86,4 @@ const ForgetPassword = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default ForgetPassword;
|
export default ForgetPassword;
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,23 @@
|
|||||||
import React, { useRef, useState } from "react";
|
import React, { useRef, useState } from "react";
|
||||||
import { RiLockPasswordFill } from "react-icons/ri";
|
import { RiLockPasswordFill } from "react-icons/ri";
|
||||||
import { Link, useNavigate, useParams } from "react-router-dom";
|
import { Link, useNavigate, useParams, useOutletContext } from "react-router-dom";
|
||||||
import { FaArrowLeft } from "react-icons/fa6";
|
import { FaArrowLeft } from "react-icons/fa6";
|
||||||
import { BACKEND_URL } from "../../constants";
|
import { BACKEND_URL } from "../../constants";
|
||||||
|
import { t } from "../../service/translation";
|
||||||
|
|
||||||
const ResetPassword = () => {
|
const ResetPassword = (props) => {
|
||||||
const [secure, setSecure] = useState(true);
|
const [secure, setSecure] = useState(true);
|
||||||
|
|
||||||
const newPassworElement = useRef();
|
const newPassworElement = useRef();
|
||||||
const confirmPassworElement = useRef();
|
const confirmPassworElement = useRef();
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const { token } = useParams();
|
const { token } = useParams();
|
||||||
|
|
||||||
|
// Get language from context or props, default to 'en'
|
||||||
|
const outletContext = useOutletContext?.();
|
||||||
|
const language =
|
||||||
|
(outletContext && outletContext.language) || props.language || "en";
|
||||||
|
|
||||||
const handleResetPassword = async (event) => {
|
const handleResetPassword = async (event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@@ -41,8 +44,6 @@ const ResetPassword = () => {
|
|||||||
|
|
||||||
const data = await responce.json();
|
const data = await responce.json();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (data.success === true) {
|
if (data.success === true) {
|
||||||
navigate("/user/login");
|
navigate("/user/login");
|
||||||
}
|
}
|
||||||
@@ -50,17 +51,16 @@ const ResetPassword = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<div className="w-full h-[78vh] flex justify-center items-center">
|
<div className="w-full h-[78vh] flex justify-center items-center">
|
||||||
<div className="">
|
<div>
|
||||||
<div className="flex flex-col items-center gap-10">
|
<div className="flex flex-col items-center gap-10">
|
||||||
<div className="flex flex-col items-center gap-3">
|
<div className="flex flex-col items-center gap-3">
|
||||||
<RiLockPasswordFill className="text-5xl bg-purple-200 p-2 rounded-full text-purple-500" />
|
<RiLockPasswordFill className="text-5xl bg-purple-200 p-2 rounded-full text-purple-500" />
|
||||||
<h2 className="text-3xl font-bold font-sans">
|
<h2 className="text-3xl font-bold font-sans">
|
||||||
Create New Password
|
{t("reset_password_heading", language)}
|
||||||
</h2>
|
</h2>
|
||||||
<p className="text-gray-500">
|
<p className="text-gray-500">
|
||||||
Create your new, unique and secure password here.
|
{t("reset_password_subtitle", language)}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<form
|
<form
|
||||||
@@ -72,13 +72,13 @@ const ResetPassword = () => {
|
|||||||
htmlFor="passwordNew"
|
htmlFor="passwordNew"
|
||||||
className="text-gray-500 font-semibold"
|
className="text-gray-500 font-semibold"
|
||||||
>
|
>
|
||||||
New Password :
|
{t("reset_password_new_label", language)}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
id="passwordNew"
|
id="passwordNew"
|
||||||
ref={newPassworElement}
|
ref={newPassworElement}
|
||||||
placeholder="Enter your New Password"
|
placeholder={t("reset_password_new_placeholder", language)}
|
||||||
className="w-full rounded-md border-gray-400 border-2"
|
className="w-full rounded-md border-gray-400 border-2"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -87,13 +87,13 @@ const ResetPassword = () => {
|
|||||||
htmlFor="passwordConfirm"
|
htmlFor="passwordConfirm"
|
||||||
className="text-gray-500 font-semibold"
|
className="text-gray-500 font-semibold"
|
||||||
>
|
>
|
||||||
Confirm Password :
|
{t("reset_password_confirm_label", language)}
|
||||||
</label>
|
</label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
id="passwordConfirm"
|
id="passwordConfirm"
|
||||||
ref={confirmPassworElement}
|
ref={confirmPassworElement}
|
||||||
placeholder="Enter your Confirm Password"
|
placeholder={t("reset_password_confirm_placeholder", language)}
|
||||||
className="w-full rounded-md border-gray-400 border-2"
|
className="w-full rounded-md border-gray-400 border-2"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -103,28 +103,29 @@ const ResetPassword = () => {
|
|||||||
secure && "hidden"
|
secure && "hidden"
|
||||||
} `}
|
} `}
|
||||||
>
|
>
|
||||||
Password and confirm Password is not same.Please Enter new
|
{t("reset_password_error", language)}
|
||||||
password and confirm Password same
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
className="focus:outline-none text-white bg-purple-700 hover:bg-purple-800 focus:ring-4 focus:ring-purple-300 font-medium rounded-lg text-base px-5 py-2.5 mb-2 dark:bg-purple-600 dark:hover:bg-purple-700 dark:focus:ring-purple-900"
|
||||||
>
|
>
|
||||||
Reset Password
|
{t("reset_password_button", language)}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<Link
|
<Link
|
||||||
to={"/user/login"}
|
to={"/user/login"}
|
||||||
className="text-center text-gray-600 inline-flex items-center justify-center gap-2"
|
className="text-center text-gray-600 inline-flex items-center justify-center gap-2"
|
||||||
>
|
>
|
||||||
<FaArrowLeft className="text-lg" /> Back to Login Page
|
<FaArrowLeft className="text-lg" />{" "}
|
||||||
|
{t("reset_password_back_to_login", language)}
|
||||||
</Link>
|
</Link>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ResetPassword;
|
export default ResetPassword;
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ const Ai = () => {
|
|||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("image", selectedFile);
|
formData.append("image", selectedFile);
|
||||||
|
|
||||||
const response = await fetch("http://localhost:3000/predict", {
|
const response = await fetch("${MODEL_URI}/predict", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: formData,
|
body: formData,
|
||||||
});
|
});
|
||||||
@@ -45,6 +45,7 @@ const Ai = () => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<div className="min-h-screen w-full flex items-center justify-center max-h-screen">
|
||||||
<div className="max-w-md mx-auto p-6 bg-white shadow rounded-lg">
|
<div className="max-w-md mx-auto p-6 bg-white shadow rounded-lg">
|
||||||
<h2 className="text-2xl font-bold mb-4 text-center">
|
<h2 className="text-2xl font-bold mb-4 text-center">
|
||||||
Plant disease prediction
|
Plant disease prediction
|
||||||
@@ -72,6 +73,7 @@ const Ai = () => {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
// src/service/translation.js
|
||||||
|
import en from '../locales/en.json';
|
||||||
|
import hi from '../locales/hi.json';
|
||||||
|
import mr from '../locales/mr.json';
|
||||||
|
import fr from '../locales/fr.json';
|
||||||
|
|
||||||
|
const translations = { en, hi, mr, fr };
|
||||||
|
|
||||||
|
export const t = (key, lang = 'en') => {
|
||||||
|
return translations[lang][key] || key; // Fallback to key if missing
|
||||||
|
};
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
export async function isPasswordPwned(password) {
|
||||||
|
const sha1 = await hashPassword(password);
|
||||||
|
const prefix = sha1.substring(0, 5);
|
||||||
|
const suffix = sha1.substring(5);
|
||||||
|
|
||||||
|
const response = await fetch(`https://api.pwnedpasswords.com/range/${prefix}`);
|
||||||
|
const text = await response.text();
|
||||||
|
|
||||||
|
const found = text
|
||||||
|
.split("\n")
|
||||||
|
.some((line) => line.split(":")[0] === suffix.toUpperCase());
|
||||||
|
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function hashPassword(password) {
|
||||||
|
const encoder = new TextEncoder();
|
||||||
|
const data = encoder.encode(password);
|
||||||
|
const hashBuffer = await crypto.subtle.digest("SHA-1", data);
|
||||||
|
const hashArray = Array.from(new Uint8Array(hashBuffer));
|
||||||
|
return hashArray.map((b) => b.toString(16).padStart(2, "0")).join("").toUpperCase();
|
||||||
|
}
|
||||||
@@ -1,6 +1,17 @@
|
|||||||
# Status200
|
# Crop Compass
|
||||||
|
|
||||||
Bhakti's frontend branch.
|
Crop Compass is a centralized management dashboard designed for farmers, enabling them to efficiently oversee their farms while leveraging advanced AI technology for disease identification and more.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- Unified dashboard for comprehensive farm management
|
||||||
|
- Real-time tracking and management of farm operations
|
||||||
|
- Logging of key activities, including sowing, fertilization, and harvesting
|
||||||
|
- Financial planning tools with expense and revenue tracking
|
||||||
|
- AI-powered recommendations and disease detection capabilities
|
||||||
|
- Utilizes Google Gemini for predictive crop health analysis
|
||||||
|
- Multilingual (currently available in English, Hindi, Marathi and French!)
|
||||||
|
|
||||||
|
---
|
||||||
|
|||||||
+156
@@ -0,0 +1,156 @@
|
|||||||
|
# Translation
|
||||||
|
|
||||||
|
This is a guide for translation. Thank you for helping us make our platform accessible in more languages!
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
|
||||||
|
- [1. Files to Modify](#1-files-to-modify)
|
||||||
|
- [2. Step-by-Step Instructions](#2-step-by-step-instructions)
|
||||||
|
- [3. Translation Key Naming](#3-translation-key-naming)
|
||||||
|
- [4. Testing Your Translation](#4-testing-your-translation)
|
||||||
|
- [5. Submitting Your Contribution](#5-submitting-your-contribution)
|
||||||
|
- [6. Tips for Quality Translations](#6-tips-for-quality-translations)
|
||||||
|
- [7. FAQ](#7-faq)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Files to Modify
|
||||||
|
|
||||||
|
To contribute a new language or update an existing one, you **must** modify the following files:
|
||||||
|
|
||||||
|
- **Frontend/src/App.jsx**
|
||||||
|
Update the language dropdown to include your language.
|
||||||
|
- **Frontend/src/LanguageSwitcher.jsx**
|
||||||
|
Add your language to the dropdown options.
|
||||||
|
- **Frontend/src/locales/lang.json**
|
||||||
|
(Replace `lang.json` with your language code, e.g. `es.json` for Spanish.)
|
||||||
|
Add or edit the translation file for your language.
|
||||||
|
- **Frontend/src/service/translation.js**
|
||||||
|
Import your language file and register it in the `translations` object.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Step-by-Step Instructions
|
||||||
|
|
||||||
|
### **A. Add Your Language to the Dropdown**
|
||||||
|
|
||||||
|
#### In `App.jsx`:
|
||||||
|
```jsx
|
||||||
|
function LanguageSwitcher({ language, setLanguage }) {
|
||||||
|
return (
|
||||||
|
{
|
||||||
|
setLanguage(e.target.value);
|
||||||
|
localStorage.setItem("language", e.target.value);
|
||||||
|
}}
|
||||||
|
className="absolute top-2 right-2 p-1 rounded border"
|
||||||
|
aria-label="Select language"
|
||||||
|
>
|
||||||
|
English
|
||||||
|
Hindi (हिंदी)
|
||||||
|
Marathi (मराठी)
|
||||||
|
Français
|
||||||
|
{/* Add your language here, e.g.: */}
|
||||||
|
Español
|
||||||
|
|
||||||
|
);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### In `Frontend/src/LanguageSwitcher.jsx`:
|
||||||
|
```jsx
|
||||||
|
const LanguageSwitcher = ({ currentLanguage, onChangeLanguage }) => (
|
||||||
|
onChangeLanguage(e.target.value)}>
|
||||||
|
English
|
||||||
|
Hindi (हिंदी)
|
||||||
|
Marathi (मराठी)
|
||||||
|
French (Français)
|
||||||
|
{/* Add your language here, e.g.: */}
|
||||||
|
Español
|
||||||
|
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### **B. Add or Update Your Language File**
|
||||||
|
|
||||||
|
- **File location:** `Frontend/src/locales/`
|
||||||
|
- **File name:** Use your language code, e.g. `es.json` for Spanish.
|
||||||
|
- **How:**
|
||||||
|
- Copy `en.json` as a template.
|
||||||
|
- **Do not change the keys!** Only translate the values.
|
||||||
|
|
||||||
|
**Example (`es.json`):**
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"login_button": "Iniciar sesión",
|
||||||
|
"signup_heading": "Registrarse",
|
||||||
|
"...": "..."
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### **C. Register Your Language in the Translation Loader**
|
||||||
|
|
||||||
|
In `Frontend/src/service/translation.js`:
|
||||||
|
|
||||||
|
```js
|
||||||
|
import en from '../locales/en.json';
|
||||||
|
import hi from '../locales/hi.json';
|
||||||
|
import mr from '../locales/mr.json';
|
||||||
|
import fr from '../locales/fr.json';
|
||||||
|
import es from '../locales/es.json'; // {
|
||||||
|
return translations[lang][key] || key; // Fallback to key if missing
|
||||||
|
};
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Translation Key Naming
|
||||||
|
|
||||||
|
- **Keys** must remain unchanged and in English (snake_case).
|
||||||
|
- **Only translate the values**.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Testing Your Translation
|
||||||
|
|
||||||
|
1. **Switch the app** to your language using the dropdown.
|
||||||
|
2. **Browse all screens** and ensure all text is translated and displays correctly.
|
||||||
|
3. If you see any untranslated keys, add them to your language file.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Submitting Your Contribution
|
||||||
|
|
||||||
|
- **Commit your changes** to the files listed above.
|
||||||
|
- **Open a pull request** with a clear title, e.g.
|
||||||
|
`Add Spanish translation (es.json)` or `Update French translation`.
|
||||||
|
- **Describe** what you translated or updated in the PR description.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Tips for Quality Translations
|
||||||
|
|
||||||
|
- Be concise and clear.
|
||||||
|
- Use formal or polite forms if unsure.
|
||||||
|
- Match the tone of the English original.
|
||||||
|
- Double-check spelling and grammar.
|
||||||
|
- If unsure about a term, ask or leave a comment in your PR.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. FAQ
|
||||||
|
|
||||||
|
**Q: What if I see a key in English that isn’t in my language file?**
|
||||||
|
A: Copy it from `en.json` and translate the value.
|
||||||
|
|
||||||
|
**Q: Can I add a new key?**
|
||||||
|
A: Only if you are also updating the code to use it. Otherwise, only translate existing keys.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
If you have any questions, please ask in the project chat or open an issue.
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
services:
|
||||||
|
backend:
|
||||||
|
container_name: cropcompass-backend
|
||||||
|
image: kshitijka/cropcompass-backend:1.1.0
|
||||||
|
restart: no
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
|
user: "nonroot:nonroot"
|
||||||
|
ports:
|
||||||
|
- "8000:8000" # Do not change this unless you have modified it in the Docker image and rebuilt it.
|
||||||
|
environment:
|
||||||
|
- FRONTEND_URI=http://localhost:3000 # Do not change this unless you have modified it in the Docker image and rebuilt it.
|
||||||
|
- MONGODB_URI=${MONGODB_URI}
|
||||||
|
- SMTP_SERVICE=${SMTP_SERVICE}
|
||||||
|
- SMTP_EMAILADDR=${SMTP_EMAILADDR}
|
||||||
|
- SMTP_PASSWORD=${SMTP_PASSWORD}
|
||||||
|
- SMTP_HOST=${SMTP_HOST}
|
||||||
|
- SMTP_PORT=${SMTP_PORT}
|
||||||
|
- CLOUDINARY_CLOUD_NAME=${CLOUDINARY_CLOUD_NAME}
|
||||||
|
- CLOUDINARY_API_KEY=${CLOUDINARY_API_KEY}
|
||||||
|
- CLOUDINARY_API_SECRET=${CLOUDINARY_API_SECRET}
|
||||||
|
- GEMINI_API_KEY=${GEMINI_API_KEY}
|
||||||
|
- REFRESH_TOKEN_SECRET=${REFRESH_TOKEN_SECRET}
|
||||||
|
- NODE_ENV=production
|
||||||
|
networks:
|
||||||
|
- cropcompass-ntwk
|
||||||
|
depends_on:
|
||||||
|
- database
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
container_name: cropcompass-frontend
|
||||||
|
image: kshitijka/cropcompass-frontend:1.1.0
|
||||||
|
restart: no
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
|
user: "nonroot:nonroot"
|
||||||
|
environment:
|
||||||
|
- NODE_ENV=production
|
||||||
|
ports:
|
||||||
|
- "3000:3000" # Do not change this unless you have modified it in the Docker image and rebuilt it.
|
||||||
|
networks:
|
||||||
|
- cropcompass-ntwk
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
|
|
||||||
|
database:
|
||||||
|
container_name: cropcompass-db
|
||||||
|
image: mongo:latest
|
||||||
|
restart: no
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges
|
||||||
|
environment:
|
||||||
|
- MONGO_INITDB_ROOT_USERNAME=${MONGODB_ROOT_USERNAME}
|
||||||
|
- MONGO_INITDB_ROOT_PASSWORD=${MONGODB_ROOT_PASSWORD}
|
||||||
|
- MONGO_INITDB_DATABASE=CropCompass # Do not change this unless you have modified it in the Docker image and rebuilt it.
|
||||||
|
networks:
|
||||||
|
- cropcompass-ntwk
|
||||||
|
volumes:
|
||||||
|
- ./db:/data/db
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
|
|
||||||
|
model:
|
||||||
|
container_name: cropcompass-model
|
||||||
|
image: kshitijka/cropcompass-model:1.1.0
|
||||||
|
restart: no
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
|
ports:
|
||||||
|
- "8081:8081"
|
||||||
|
environment:
|
||||||
|
- FRONTEND_URI=http://localhost:3000
|
||||||
|
- NODE_ENV=production
|
||||||
|
networks:
|
||||||
|
- cropcompass-ntwk
|
||||||
|
depends_on:
|
||||||
|
- frontend
|
||||||
|
|
||||||
|
networks:
|
||||||
|
cropcompass-ntwk:
|
||||||
|
driver: bridge
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
archive/
|
||||||
|
bin/
|
||||||
|
Dockerfile
|
||||||
|
include/
|
||||||
|
lib/
|
||||||
|
lib64 -> lib/
|
||||||
|
node_modules/
|
||||||
|
package-lock.json
|
||||||
|
public/
|
||||||
|
pyvenv.cfg
|
||||||
|
samples/
|
||||||
|
share/
|
||||||
+9
-4
@@ -1,8 +1,13 @@
|
|||||||
# python-venv excluded
|
# Node
|
||||||
include/
|
node_modules/
|
||||||
|
package-lock.json
|
||||||
|
|
||||||
|
# Python venv
|
||||||
bin/
|
bin/
|
||||||
lib/
|
lib/
|
||||||
lib64/
|
|
||||||
share/
|
|
||||||
lib64
|
lib64
|
||||||
pyvenv.cfg
|
pyvenv.cfg
|
||||||
|
share/
|
||||||
|
|
||||||
|
# Misc
|
||||||
|
public/
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# Base image
|
||||||
|
FROM node:22
|
||||||
|
|
||||||
|
# Metadata
|
||||||
|
LABEL maintainer="kshitijka"
|
||||||
|
LABEL version=1.1.0
|
||||||
|
LABEL description="Crop Compass is a centralized management dashboard designed for farmers, enabling them to efficiently oversee their farms while leveraging advanced AI technology for disease identification and more."
|
||||||
|
|
||||||
|
# Update, upgrade + install python3+req
|
||||||
|
RUN apt update && apt upgrade -y && \
|
||||||
|
apt install -y python3 python3-pip python3.11-venv && \
|
||||||
|
apt clean all && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Create working directory
|
||||||
|
RUN mkdir -p /app /app/public/images/
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . .
|
||||||
|
|
||||||
|
# Installing npm packages
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
# Setup virtual env and install stuff
|
||||||
|
RUN pip3 install --break-system-packages -r requirements.txt
|
||||||
|
|
||||||
|
# Expose model port
|
||||||
|
EXPOSE 8081
|
||||||
|
|
||||||
|
# Run model
|
||||||
|
CMD ["node", "server.js"]
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# models/
|
||||||
|
|
||||||
|
This directory holds code for AI model used for disease detection in crops.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
- `${FRONTEND_URI}` is used in [server.js](./server.js). This should be passed when creating the Docker container as an environment variable.
|
||||||
|
- `${FRONTEND_URI}` is essentially the URI where the frontend is hosted.
|
||||||
|
|
||||||
|
## Docker Run
|
||||||
|
|
||||||
|
It is recommended that you use the [docker-compose.yaml](../docker-compose.yaml) file which creates all the required containers, however if you wish to run only the "models" part of this project in Docker run the following docker command.
|
||||||
|
|
||||||
|
```shell
|
||||||
|
docker run -tid \
|
||||||
|
--name cropcompass-model \
|
||||||
|
--restart always \
|
||||||
|
-p "8081:8081" \
|
||||||
|
-e "FRONTEND_URI=<frontend_uri>" \
|
||||||
|
kshitijka/cropcompass-model:<version>
|
||||||
|
```
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> Replace `<frontend_uri>` with the actual frontend URI such as http://localhost:3000 & `<version>` with an actual version number such as `1.1.0`.
|
||||||
|
|
||||||
|
## Manual Run
|
||||||
|
|
||||||
|
To run only the "models" part of this project, you will have to create a python virtual environement, followed by installing all the dependencies and then running the [server.js](./server.js) file using node.
|
||||||
|
|
||||||
|
1. Install required packages (for Debian based systems):
|
||||||
|
|
||||||
|
```shell
|
||||||
|
sudo apt install python3 python3-pip python3.11-venv
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Create a virtual environment:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
python3 -m venv .
|
||||||
|
```
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> Assuming you're in the `models/` directory.
|
||||||
|
|
||||||
|
3. Install required packages using `pip`:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
pip install -r requirements.txt
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Run [server.js](./server.js):
|
||||||
|
|
||||||
|
```shell
|
||||||
|
node server.js
|
||||||
|
```
|
||||||
|
|
||||||
|
> [!NOTE]
|
||||||
|
> Assuming you already have `node` installed on your system.
|
||||||
|
|
||||||
|
---
|
||||||
+1
-3
@@ -5,14 +5,13 @@ from transformers import ViTImageProcessor, ViTForImageClassification
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
# Specify the local directory where the model files are stored
|
# Specify the local directory where the model files are stored
|
||||||
local_model_path = '/home/overnion/Status200/models/pretrained'
|
#local_model_path = './pretrained'
|
||||||
|
|
||||||
# Check if the image path is provided
|
# Check if the image path is provided
|
||||||
if len(sys.argv) < 2:
|
if len(sys.argv) < 2:
|
||||||
print("Error: No image path provided. Please provide the path to the image as an argument.")
|
print("Error: No image path provided. Please provide the path to the image as an argument.")
|
||||||
exit()
|
exit()
|
||||||
|
|
||||||
|
|
||||||
# Load the image processor and model
|
# Load the image processor and model
|
||||||
model_name = 'vishnun0027/Crop_Disease_model_1'
|
model_name = 'vishnun0027/Crop_Disease_model_1'
|
||||||
image_processor = ViTImageProcessor.from_pretrained(model_name)
|
image_processor = ViTImageProcessor.from_pretrained(model_name)
|
||||||
@@ -48,4 +47,3 @@ predicted_class_idx = logits.argmax(-1).item()
|
|||||||
|
|
||||||
# Print the predicted class
|
# Print the predicted class
|
||||||
print(model.config.id2label[predicted_class_idx])
|
print(model.config.id2label[predicted_class_idx])
|
||||||
|
|
||||||
|
|||||||
-1
@@ -1 +0,0 @@
|
|||||||
../mime/cli.js
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
../mkdirp/bin/cmd.js
|
|
||||||
-1008
File diff suppressed because it is too large
Load Diff
-243
@@ -1,243 +0,0 @@
|
|||||||
1.3.8 / 2022-02-02
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.34
|
|
||||||
- deps: mime-db@~1.51.0
|
|
||||||
* deps: negotiator@0.6.3
|
|
||||||
|
|
||||||
1.3.7 / 2019-04-29
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: negotiator@0.6.2
|
|
||||||
- Fix sorting charset, encoding, and language with extra parameters
|
|
||||||
|
|
||||||
1.3.6 / 2019-04-28
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.24
|
|
||||||
- deps: mime-db@~1.40.0
|
|
||||||
|
|
||||||
1.3.5 / 2018-02-28
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.18
|
|
||||||
- deps: mime-db@~1.33.0
|
|
||||||
|
|
||||||
1.3.4 / 2017-08-22
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.16
|
|
||||||
- deps: mime-db@~1.29.0
|
|
||||||
|
|
||||||
1.3.3 / 2016-05-02
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.11
|
|
||||||
- deps: mime-db@~1.23.0
|
|
||||||
* deps: negotiator@0.6.1
|
|
||||||
- perf: improve `Accept` parsing speed
|
|
||||||
- perf: improve `Accept-Charset` parsing speed
|
|
||||||
- perf: improve `Accept-Encoding` parsing speed
|
|
||||||
- perf: improve `Accept-Language` parsing speed
|
|
||||||
|
|
||||||
1.3.2 / 2016-03-08
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.10
|
|
||||||
- Fix extension of `application/dash+xml`
|
|
||||||
- Update primary extension for `audio/mp4`
|
|
||||||
- deps: mime-db@~1.22.0
|
|
||||||
|
|
||||||
1.3.1 / 2016-01-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.9
|
|
||||||
- deps: mime-db@~1.21.0
|
|
||||||
|
|
||||||
1.3.0 / 2015-09-29
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.7
|
|
||||||
- deps: mime-db@~1.19.0
|
|
||||||
* deps: negotiator@0.6.0
|
|
||||||
- Fix including type extensions in parameters in `Accept` parsing
|
|
||||||
- Fix parsing `Accept` parameters with quoted equals
|
|
||||||
- Fix parsing `Accept` parameters with quoted semicolons
|
|
||||||
- Lazy-load modules from main entry point
|
|
||||||
- perf: delay type concatenation until needed
|
|
||||||
- perf: enable strict mode
|
|
||||||
- perf: hoist regular expressions
|
|
||||||
- perf: remove closures getting spec properties
|
|
||||||
- perf: remove a closure from media type parsing
|
|
||||||
- perf: remove property delete from media type parsing
|
|
||||||
|
|
||||||
1.2.13 / 2015-09-06
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.6
|
|
||||||
- deps: mime-db@~1.18.0
|
|
||||||
|
|
||||||
1.2.12 / 2015-07-30
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.4
|
|
||||||
- deps: mime-db@~1.16.0
|
|
||||||
|
|
||||||
1.2.11 / 2015-07-16
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.3
|
|
||||||
- deps: mime-db@~1.15.0
|
|
||||||
|
|
||||||
1.2.10 / 2015-07-01
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.2
|
|
||||||
- deps: mime-db@~1.14.0
|
|
||||||
|
|
||||||
1.2.9 / 2015-06-08
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.1
|
|
||||||
- perf: fix deopt during mapping
|
|
||||||
|
|
||||||
1.2.8 / 2015-06-07
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.1.0
|
|
||||||
- deps: mime-db@~1.13.0
|
|
||||||
* perf: avoid argument reassignment & argument slice
|
|
||||||
* perf: avoid negotiator recursive construction
|
|
||||||
* perf: enable strict mode
|
|
||||||
* perf: remove unnecessary bitwise operator
|
|
||||||
|
|
||||||
1.2.7 / 2015-05-10
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: negotiator@0.5.3
|
|
||||||
- Fix media type parameter matching to be case-insensitive
|
|
||||||
|
|
||||||
1.2.6 / 2015-05-07
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.11
|
|
||||||
- deps: mime-db@~1.9.1
|
|
||||||
* deps: negotiator@0.5.2
|
|
||||||
- Fix comparing media types with quoted values
|
|
||||||
- Fix splitting media types with quoted commas
|
|
||||||
|
|
||||||
1.2.5 / 2015-03-13
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.10
|
|
||||||
- deps: mime-db@~1.8.0
|
|
||||||
|
|
||||||
1.2.4 / 2015-02-14
|
|
||||||
==================
|
|
||||||
|
|
||||||
* Support Node.js 0.6
|
|
||||||
* deps: mime-types@~2.0.9
|
|
||||||
- deps: mime-db@~1.7.0
|
|
||||||
* deps: negotiator@0.5.1
|
|
||||||
- Fix preference sorting to be stable for long acceptable lists
|
|
||||||
|
|
||||||
1.2.3 / 2015-01-31
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.8
|
|
||||||
- deps: mime-db@~1.6.0
|
|
||||||
|
|
||||||
1.2.2 / 2014-12-30
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.7
|
|
||||||
- deps: mime-db@~1.5.0
|
|
||||||
|
|
||||||
1.2.1 / 2014-12-30
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.5
|
|
||||||
- deps: mime-db@~1.3.1
|
|
||||||
|
|
||||||
1.2.0 / 2014-12-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: negotiator@0.5.0
|
|
||||||
- Fix list return order when large accepted list
|
|
||||||
- Fix missing identity encoding when q=0 exists
|
|
||||||
- Remove dynamic building of Negotiator class
|
|
||||||
|
|
||||||
1.1.4 / 2014-12-10
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.4
|
|
||||||
- deps: mime-db@~1.3.0
|
|
||||||
|
|
||||||
1.1.3 / 2014-11-09
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.3
|
|
||||||
- deps: mime-db@~1.2.0
|
|
||||||
|
|
||||||
1.1.2 / 2014-10-14
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: negotiator@0.4.9
|
|
||||||
- Fix error when media type has invalid parameter
|
|
||||||
|
|
||||||
1.1.1 / 2014-09-28
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: mime-types@~2.0.2
|
|
||||||
- deps: mime-db@~1.1.0
|
|
||||||
* deps: negotiator@0.4.8
|
|
||||||
- Fix all negotiations to be case-insensitive
|
|
||||||
- Stable sort preferences of same quality according to client order
|
|
||||||
|
|
||||||
1.1.0 / 2014-09-02
|
|
||||||
==================
|
|
||||||
|
|
||||||
* update `mime-types`
|
|
||||||
|
|
||||||
1.0.7 / 2014-07-04
|
|
||||||
==================
|
|
||||||
|
|
||||||
* Fix wrong type returned from `type` when match after unknown extension
|
|
||||||
|
|
||||||
1.0.6 / 2014-06-24
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: negotiator@0.4.7
|
|
||||||
|
|
||||||
1.0.5 / 2014-06-20
|
|
||||||
==================
|
|
||||||
|
|
||||||
* fix crash when unknown extension given
|
|
||||||
|
|
||||||
1.0.4 / 2014-06-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* use `mime-types`
|
|
||||||
|
|
||||||
1.0.3 / 2014-06-11
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: negotiator@0.4.6
|
|
||||||
- Order by specificity when quality is the same
|
|
||||||
|
|
||||||
1.0.2 / 2014-05-29
|
|
||||||
==================
|
|
||||||
|
|
||||||
* Fix interpretation when header not in request
|
|
||||||
* deps: pin negotiator@0.4.5
|
|
||||||
|
|
||||||
1.0.1 / 2014-01-18
|
|
||||||
==================
|
|
||||||
|
|
||||||
* Identity encoding isn't always acceptable
|
|
||||||
* deps: negotiator@~0.4.0
|
|
||||||
|
|
||||||
1.0.0 / 2013-12-27
|
|
||||||
==================
|
|
||||||
|
|
||||||
* Genesis
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
(The MIT License)
|
|
||||||
|
|
||||||
Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
|
|
||||||
Copyright (c) 2015 Douglas Christopher Wilson <doug@somethingdoug.com>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
'Software'), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
||||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
-140
@@ -1,140 +0,0 @@
|
|||||||
# accepts
|
|
||||||
|
|
||||||
[![NPM Version][npm-version-image]][npm-url]
|
|
||||||
[![NPM Downloads][npm-downloads-image]][npm-url]
|
|
||||||
[![Node.js Version][node-version-image]][node-version-url]
|
|
||||||
[![Build Status][github-actions-ci-image]][github-actions-ci-url]
|
|
||||||
[![Test Coverage][coveralls-image]][coveralls-url]
|
|
||||||
|
|
||||||
Higher level content negotiation based on [negotiator](https://www.npmjs.com/package/negotiator).
|
|
||||||
Extracted from [koa](https://www.npmjs.com/package/koa) for general use.
|
|
||||||
|
|
||||||
In addition to negotiator, it allows:
|
|
||||||
|
|
||||||
- Allows types as an array or arguments list, ie `(['text/html', 'application/json'])`
|
|
||||||
as well as `('text/html', 'application/json')`.
|
|
||||||
- Allows type shorthands such as `json`.
|
|
||||||
- Returns `false` when no types match
|
|
||||||
- Treats non-existent headers as `*`
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
This is a [Node.js](https://nodejs.org/en/) module available through the
|
|
||||||
[npm registry](https://www.npmjs.com/). Installation is done using the
|
|
||||||
[`npm install` command](https://docs.npmjs.com/getting-started/installing-npm-packages-locally):
|
|
||||||
|
|
||||||
```sh
|
|
||||||
$ npm install accepts
|
|
||||||
```
|
|
||||||
|
|
||||||
## API
|
|
||||||
|
|
||||||
```js
|
|
||||||
var accepts = require('accepts')
|
|
||||||
```
|
|
||||||
|
|
||||||
### accepts(req)
|
|
||||||
|
|
||||||
Create a new `Accepts` object for the given `req`.
|
|
||||||
|
|
||||||
#### .charset(charsets)
|
|
||||||
|
|
||||||
Return the first accepted charset. If nothing in `charsets` is accepted,
|
|
||||||
then `false` is returned.
|
|
||||||
|
|
||||||
#### .charsets()
|
|
||||||
|
|
||||||
Return the charsets that the request accepts, in the order of the client's
|
|
||||||
preference (most preferred first).
|
|
||||||
|
|
||||||
#### .encoding(encodings)
|
|
||||||
|
|
||||||
Return the first accepted encoding. If nothing in `encodings` is accepted,
|
|
||||||
then `false` is returned.
|
|
||||||
|
|
||||||
#### .encodings()
|
|
||||||
|
|
||||||
Return the encodings that the request accepts, in the order of the client's
|
|
||||||
preference (most preferred first).
|
|
||||||
|
|
||||||
#### .language(languages)
|
|
||||||
|
|
||||||
Return the first accepted language. If nothing in `languages` is accepted,
|
|
||||||
then `false` is returned.
|
|
||||||
|
|
||||||
#### .languages()
|
|
||||||
|
|
||||||
Return the languages that the request accepts, in the order of the client's
|
|
||||||
preference (most preferred first).
|
|
||||||
|
|
||||||
#### .type(types)
|
|
||||||
|
|
||||||
Return the first accepted type (and it is returned as the same text as what
|
|
||||||
appears in the `types` array). If nothing in `types` is accepted, then `false`
|
|
||||||
is returned.
|
|
||||||
|
|
||||||
The `types` array can contain full MIME types or file extensions. Any value
|
|
||||||
that is not a full MIME types is passed to `require('mime-types').lookup`.
|
|
||||||
|
|
||||||
#### .types()
|
|
||||||
|
|
||||||
Return the types that the request accepts, in the order of the client's
|
|
||||||
preference (most preferred first).
|
|
||||||
|
|
||||||
## Examples
|
|
||||||
|
|
||||||
### Simple type negotiation
|
|
||||||
|
|
||||||
This simple example shows how to use `accepts` to return a different typed
|
|
||||||
respond body based on what the client wants to accept. The server lists it's
|
|
||||||
preferences in order and will get back the best match between the client and
|
|
||||||
server.
|
|
||||||
|
|
||||||
```js
|
|
||||||
var accepts = require('accepts')
|
|
||||||
var http = require('http')
|
|
||||||
|
|
||||||
function app (req, res) {
|
|
||||||
var accept = accepts(req)
|
|
||||||
|
|
||||||
// the order of this list is significant; should be server preferred order
|
|
||||||
switch (accept.type(['json', 'html'])) {
|
|
||||||
case 'json':
|
|
||||||
res.setHeader('Content-Type', 'application/json')
|
|
||||||
res.write('{"hello":"world!"}')
|
|
||||||
break
|
|
||||||
case 'html':
|
|
||||||
res.setHeader('Content-Type', 'text/html')
|
|
||||||
res.write('<b>hello, world!</b>')
|
|
||||||
break
|
|
||||||
default:
|
|
||||||
// the fallback is text/plain, so no need to specify it above
|
|
||||||
res.setHeader('Content-Type', 'text/plain')
|
|
||||||
res.write('hello, world!')
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
res.end()
|
|
||||||
}
|
|
||||||
|
|
||||||
http.createServer(app).listen(3000)
|
|
||||||
```
|
|
||||||
|
|
||||||
You can test this out with the cURL program:
|
|
||||||
```sh
|
|
||||||
curl -I -H'Accept: text/html' http://localhost:3000/
|
|
||||||
```
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
[MIT](LICENSE)
|
|
||||||
|
|
||||||
[coveralls-image]: https://badgen.net/coveralls/c/github/jshttp/accepts/master
|
|
||||||
[coveralls-url]: https://coveralls.io/r/jshttp/accepts?branch=master
|
|
||||||
[github-actions-ci-image]: https://badgen.net/github/checks/jshttp/accepts/master?label=ci
|
|
||||||
[github-actions-ci-url]: https://github.com/jshttp/accepts/actions/workflows/ci.yml
|
|
||||||
[node-version-image]: https://badgen.net/npm/node/accepts
|
|
||||||
[node-version-url]: https://nodejs.org/en/download
|
|
||||||
[npm-downloads-image]: https://badgen.net/npm/dm/accepts
|
|
||||||
[npm-url]: https://npmjs.org/package/accepts
|
|
||||||
[npm-version-image]: https://badgen.net/npm/v/accepts
|
|
||||||
-238
@@ -1,238 +0,0 @@
|
|||||||
/*!
|
|
||||||
* accepts
|
|
||||||
* Copyright(c) 2014 Jonathan Ong
|
|
||||||
* Copyright(c) 2015 Douglas Christopher Wilson
|
|
||||||
* MIT Licensed
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Module dependencies.
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
var Negotiator = require('negotiator')
|
|
||||||
var mime = require('mime-types')
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Module exports.
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
module.exports = Accepts
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new Accepts object for the given req.
|
|
||||||
*
|
|
||||||
* @param {object} req
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
function Accepts (req) {
|
|
||||||
if (!(this instanceof Accepts)) {
|
|
||||||
return new Accepts(req)
|
|
||||||
}
|
|
||||||
|
|
||||||
this.headers = req.headers
|
|
||||||
this.negotiator = new Negotiator(req)
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the given `type(s)` is acceptable, returning
|
|
||||||
* the best match when true, otherwise `undefined`, in which
|
|
||||||
* case you should respond with 406 "Not Acceptable".
|
|
||||||
*
|
|
||||||
* The `type` value may be a single mime type string
|
|
||||||
* such as "application/json", the extension name
|
|
||||||
* such as "json" or an array `["json", "html", "text/plain"]`. When a list
|
|
||||||
* or array is given the _best_ match, if any is returned.
|
|
||||||
*
|
|
||||||
* Examples:
|
|
||||||
*
|
|
||||||
* // Accept: text/html
|
|
||||||
* this.types('html');
|
|
||||||
* // => "html"
|
|
||||||
*
|
|
||||||
* // Accept: text/*, application/json
|
|
||||||
* this.types('html');
|
|
||||||
* // => "html"
|
|
||||||
* this.types('text/html');
|
|
||||||
* // => "text/html"
|
|
||||||
* this.types('json', 'text');
|
|
||||||
* // => "json"
|
|
||||||
* this.types('application/json');
|
|
||||||
* // => "application/json"
|
|
||||||
*
|
|
||||||
* // Accept: text/*, application/json
|
|
||||||
* this.types('image/png');
|
|
||||||
* this.types('png');
|
|
||||||
* // => undefined
|
|
||||||
*
|
|
||||||
* // Accept: text/*;q=.5, application/json
|
|
||||||
* this.types(['html', 'json']);
|
|
||||||
* this.types('html', 'json');
|
|
||||||
* // => "json"
|
|
||||||
*
|
|
||||||
* @param {String|Array} types...
|
|
||||||
* @return {String|Array|Boolean}
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Accepts.prototype.type =
|
|
||||||
Accepts.prototype.types = function (types_) {
|
|
||||||
var types = types_
|
|
||||||
|
|
||||||
// support flattened arguments
|
|
||||||
if (types && !Array.isArray(types)) {
|
|
||||||
types = new Array(arguments.length)
|
|
||||||
for (var i = 0; i < types.length; i++) {
|
|
||||||
types[i] = arguments[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// no types, return all requested types
|
|
||||||
if (!types || types.length === 0) {
|
|
||||||
return this.negotiator.mediaTypes()
|
|
||||||
}
|
|
||||||
|
|
||||||
// no accept header, return first given type
|
|
||||||
if (!this.headers.accept) {
|
|
||||||
return types[0]
|
|
||||||
}
|
|
||||||
|
|
||||||
var mimes = types.map(extToMime)
|
|
||||||
var accepts = this.negotiator.mediaTypes(mimes.filter(validMime))
|
|
||||||
var first = accepts[0]
|
|
||||||
|
|
||||||
return first
|
|
||||||
? types[mimes.indexOf(first)]
|
|
||||||
: false
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return accepted encodings or best fit based on `encodings`.
|
|
||||||
*
|
|
||||||
* Given `Accept-Encoding: gzip, deflate`
|
|
||||||
* an array sorted by quality is returned:
|
|
||||||
*
|
|
||||||
* ['gzip', 'deflate']
|
|
||||||
*
|
|
||||||
* @param {String|Array} encodings...
|
|
||||||
* @return {String|Array}
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Accepts.prototype.encoding =
|
|
||||||
Accepts.prototype.encodings = function (encodings_) {
|
|
||||||
var encodings = encodings_
|
|
||||||
|
|
||||||
// support flattened arguments
|
|
||||||
if (encodings && !Array.isArray(encodings)) {
|
|
||||||
encodings = new Array(arguments.length)
|
|
||||||
for (var i = 0; i < encodings.length; i++) {
|
|
||||||
encodings[i] = arguments[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// no encodings, return all requested encodings
|
|
||||||
if (!encodings || encodings.length === 0) {
|
|
||||||
return this.negotiator.encodings()
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.negotiator.encodings(encodings)[0] || false
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return accepted charsets or best fit based on `charsets`.
|
|
||||||
*
|
|
||||||
* Given `Accept-Charset: utf-8, iso-8859-1;q=0.2, utf-7;q=0.5`
|
|
||||||
* an array sorted by quality is returned:
|
|
||||||
*
|
|
||||||
* ['utf-8', 'utf-7', 'iso-8859-1']
|
|
||||||
*
|
|
||||||
* @param {String|Array} charsets...
|
|
||||||
* @return {String|Array}
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Accepts.prototype.charset =
|
|
||||||
Accepts.prototype.charsets = function (charsets_) {
|
|
||||||
var charsets = charsets_
|
|
||||||
|
|
||||||
// support flattened arguments
|
|
||||||
if (charsets && !Array.isArray(charsets)) {
|
|
||||||
charsets = new Array(arguments.length)
|
|
||||||
for (var i = 0; i < charsets.length; i++) {
|
|
||||||
charsets[i] = arguments[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// no charsets, return all requested charsets
|
|
||||||
if (!charsets || charsets.length === 0) {
|
|
||||||
return this.negotiator.charsets()
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.negotiator.charsets(charsets)[0] || false
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return accepted languages or best fit based on `langs`.
|
|
||||||
*
|
|
||||||
* Given `Accept-Language: en;q=0.8, es, pt`
|
|
||||||
* an array sorted by quality is returned:
|
|
||||||
*
|
|
||||||
* ['es', 'pt', 'en']
|
|
||||||
*
|
|
||||||
* @param {String|Array} langs...
|
|
||||||
* @return {Array|String}
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Accepts.prototype.lang =
|
|
||||||
Accepts.prototype.langs =
|
|
||||||
Accepts.prototype.language =
|
|
||||||
Accepts.prototype.languages = function (languages_) {
|
|
||||||
var languages = languages_
|
|
||||||
|
|
||||||
// support flattened arguments
|
|
||||||
if (languages && !Array.isArray(languages)) {
|
|
||||||
languages = new Array(arguments.length)
|
|
||||||
for (var i = 0; i < languages.length; i++) {
|
|
||||||
languages[i] = arguments[i]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// no languages, return all requested languages
|
|
||||||
if (!languages || languages.length === 0) {
|
|
||||||
return this.negotiator.languages()
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.negotiator.languages(languages)[0] || false
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert extnames to mime.
|
|
||||||
*
|
|
||||||
* @param {String} type
|
|
||||||
* @return {String}
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
function extToMime (type) {
|
|
||||||
return type.indexOf('/') === -1
|
|
||||||
? mime.lookup(type)
|
|
||||||
: type
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if mime is valid.
|
|
||||||
*
|
|
||||||
* @param {String} type
|
|
||||||
* @return {String}
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
function validMime (type) {
|
|
||||||
return typeof type === 'string'
|
|
||||||
}
|
|
||||||
-47
@@ -1,47 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "accepts",
|
|
||||||
"description": "Higher-level content negotiation",
|
|
||||||
"version": "1.3.8",
|
|
||||||
"contributors": [
|
|
||||||
"Douglas Christopher Wilson <doug@somethingdoug.com>",
|
|
||||||
"Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"repository": "jshttp/accepts",
|
|
||||||
"dependencies": {
|
|
||||||
"mime-types": "~2.1.34",
|
|
||||||
"negotiator": "0.6.3"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"deep-equal": "1.0.1",
|
|
||||||
"eslint": "7.32.0",
|
|
||||||
"eslint-config-standard": "14.1.1",
|
|
||||||
"eslint-plugin-import": "2.25.4",
|
|
||||||
"eslint-plugin-markdown": "2.2.1",
|
|
||||||
"eslint-plugin-node": "11.1.0",
|
|
||||||
"eslint-plugin-promise": "4.3.1",
|
|
||||||
"eslint-plugin-standard": "4.1.0",
|
|
||||||
"mocha": "9.2.0",
|
|
||||||
"nyc": "15.1.0"
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"LICENSE",
|
|
||||||
"HISTORY.md",
|
|
||||||
"index.js"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 0.6"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"lint": "eslint .",
|
|
||||||
"test": "mocha --reporter spec --check-leaks --bail test/",
|
|
||||||
"test-ci": "nyc --reporter=lcov --reporter=text npm test",
|
|
||||||
"test-cov": "nyc --reporter=html --reporter=text npm test"
|
|
||||||
},
|
|
||||||
"keywords": [
|
|
||||||
"content",
|
|
||||||
"negotiation",
|
|
||||||
"accept",
|
|
||||||
"accepts"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
node_modules/
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
The MIT License (MIT)
|
|
||||||
|
|
||||||
Copyright (c) 2015 Linus Unnebäck
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
-44
@@ -1,44 +0,0 @@
|
|||||||
# `append-field`
|
|
||||||
|
|
||||||
A [W3C HTML JSON forms spec](http://www.w3.org/TR/html-json-forms/) compliant
|
|
||||||
field appender (for lack of a better name). Useful for people implementing
|
|
||||||
`application/x-www-form-urlencoded` and `multipart/form-data` parsers.
|
|
||||||
|
|
||||||
It works best on objects created with `Object.create(null)`. Otherwise it might
|
|
||||||
conflict with variables from the prototype (e.g. `hasOwnProperty`).
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
```sh
|
|
||||||
npm install --save append-field
|
|
||||||
```
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
var appendField = require('append-field')
|
|
||||||
var obj = Object.create(null)
|
|
||||||
|
|
||||||
appendField(obj, 'pets[0][species]', 'Dahut')
|
|
||||||
appendField(obj, 'pets[0][name]', 'Hypatia')
|
|
||||||
appendField(obj, 'pets[1][species]', 'Felis Stultus')
|
|
||||||
appendField(obj, 'pets[1][name]', 'Billie')
|
|
||||||
|
|
||||||
console.log(obj)
|
|
||||||
```
|
|
||||||
|
|
||||||
```text
|
|
||||||
{ pets:
|
|
||||||
[ { species: 'Dahut', name: 'Hypatia' },
|
|
||||||
{ species: 'Felis Stultus', name: 'Billie' } ] }
|
|
||||||
```
|
|
||||||
|
|
||||||
## API
|
|
||||||
|
|
||||||
### `appendField(store, key, value)`
|
|
||||||
|
|
||||||
Adds the field named `key` with the value `value` to the object `store`.
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
MIT
|
|
||||||
-12
@@ -1,12 +0,0 @@
|
|||||||
var parsePath = require('./lib/parse-path')
|
|
||||||
var setValue = require('./lib/set-value')
|
|
||||||
|
|
||||||
function appendField (store, key, value) {
|
|
||||||
var steps = parsePath(key)
|
|
||||||
|
|
||||||
steps.reduce(function (context, step) {
|
|
||||||
return setValue(context, step, context[step.key], value)
|
|
||||||
}, store)
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = appendField
|
|
||||||
-19
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "append-field",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"license": "MIT",
|
|
||||||
"author": "Linus Unnebäck <linus@folkdatorn.se>",
|
|
||||||
"main": "index.js",
|
|
||||||
"devDependencies": {
|
|
||||||
"mocha": "^2.2.4",
|
|
||||||
"standard": "^6.0.5",
|
|
||||||
"testdata-w3c-json-form": "^0.2.0"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"test": "standard && mocha"
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "http://github.com/LinusU/node-append-field.git"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-19
@@ -1,19 +0,0 @@
|
|||||||
/* eslint-env mocha */
|
|
||||||
|
|
||||||
var assert = require('assert')
|
|
||||||
var appendField = require('../')
|
|
||||||
var testData = require('testdata-w3c-json-form')
|
|
||||||
|
|
||||||
describe('Append Field', function () {
|
|
||||||
for (var test of testData) {
|
|
||||||
it('handles ' + test.name, function () {
|
|
||||||
var store = Object.create(null)
|
|
||||||
|
|
||||||
for (var field of test.fields) {
|
|
||||||
appendField(store, field.key, field.value)
|
|
||||||
}
|
|
||||||
|
|
||||||
assert.deepEqual(store, test.expected)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
The MIT License (MIT)
|
|
||||||
|
|
||||||
Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
-43
@@ -1,43 +0,0 @@
|
|||||||
# Array Flatten
|
|
||||||
|
|
||||||
[![NPM version][npm-image]][npm-url]
|
|
||||||
[![NPM downloads][downloads-image]][downloads-url]
|
|
||||||
[![Build status][travis-image]][travis-url]
|
|
||||||
[![Test coverage][coveralls-image]][coveralls-url]
|
|
||||||
|
|
||||||
> Flatten an array of nested arrays into a single flat array. Accepts an optional depth.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
```
|
|
||||||
npm install array-flatten --save
|
|
||||||
```
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
var flatten = require('array-flatten')
|
|
||||||
|
|
||||||
flatten([1, [2, [3, [4, [5], 6], 7], 8], 9])
|
|
||||||
//=> [1, 2, 3, 4, 5, 6, 7, 8, 9]
|
|
||||||
|
|
||||||
flatten([1, [2, [3, [4, [5], 6], 7], 8], 9], 2)
|
|
||||||
//=> [1, 2, 3, [4, [5], 6], 7, 8, 9]
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
flatten(arguments) //=> [1, 2, 3]
|
|
||||||
})(1, [2, 3])
|
|
||||||
```
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
MIT
|
|
||||||
|
|
||||||
[npm-image]: https://img.shields.io/npm/v/array-flatten.svg?style=flat
|
|
||||||
[npm-url]: https://npmjs.org/package/array-flatten
|
|
||||||
[downloads-image]: https://img.shields.io/npm/dm/array-flatten.svg?style=flat
|
|
||||||
[downloads-url]: https://npmjs.org/package/array-flatten
|
|
||||||
[travis-image]: https://img.shields.io/travis/blakeembrey/array-flatten.svg?style=flat
|
|
||||||
[travis-url]: https://travis-ci.org/blakeembrey/array-flatten
|
|
||||||
[coveralls-image]: https://img.shields.io/coveralls/blakeembrey/array-flatten.svg?style=flat
|
|
||||||
[coveralls-url]: https://coveralls.io/r/blakeembrey/array-flatten?branch=master
|
|
||||||
-64
@@ -1,64 +0,0 @@
|
|||||||
'use strict'
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Expose `arrayFlatten`.
|
|
||||||
*/
|
|
||||||
module.exports = arrayFlatten
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recursive flatten function with depth.
|
|
||||||
*
|
|
||||||
* @param {Array} array
|
|
||||||
* @param {Array} result
|
|
||||||
* @param {Number} depth
|
|
||||||
* @return {Array}
|
|
||||||
*/
|
|
||||||
function flattenWithDepth (array, result, depth) {
|
|
||||||
for (var i = 0; i < array.length; i++) {
|
|
||||||
var value = array[i]
|
|
||||||
|
|
||||||
if (depth > 0 && Array.isArray(value)) {
|
|
||||||
flattenWithDepth(value, result, depth - 1)
|
|
||||||
} else {
|
|
||||||
result.push(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Recursive flatten function. Omitting depth is slightly faster.
|
|
||||||
*
|
|
||||||
* @param {Array} array
|
|
||||||
* @param {Array} result
|
|
||||||
* @return {Array}
|
|
||||||
*/
|
|
||||||
function flattenForever (array, result) {
|
|
||||||
for (var i = 0; i < array.length; i++) {
|
|
||||||
var value = array[i]
|
|
||||||
|
|
||||||
if (Array.isArray(value)) {
|
|
||||||
flattenForever(value, result)
|
|
||||||
} else {
|
|
||||||
result.push(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Flatten an array, with the ability to define a depth.
|
|
||||||
*
|
|
||||||
* @param {Array} array
|
|
||||||
* @param {Number} depth
|
|
||||||
* @return {Array}
|
|
||||||
*/
|
|
||||||
function arrayFlatten (array, depth) {
|
|
||||||
if (depth == null) {
|
|
||||||
return flattenForever(array, [])
|
|
||||||
}
|
|
||||||
|
|
||||||
return flattenWithDepth(array, [], depth)
|
|
||||||
}
|
|
||||||
-39
@@ -1,39 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "array-flatten",
|
|
||||||
"version": "1.1.1",
|
|
||||||
"description": "Flatten an array of nested arrays into a single flat array",
|
|
||||||
"main": "array-flatten.js",
|
|
||||||
"files": [
|
|
||||||
"array-flatten.js",
|
|
||||||
"LICENSE"
|
|
||||||
],
|
|
||||||
"scripts": {
|
|
||||||
"test": "istanbul cover _mocha -- -R spec"
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git://github.com/blakeembrey/array-flatten.git"
|
|
||||||
},
|
|
||||||
"keywords": [
|
|
||||||
"array",
|
|
||||||
"flatten",
|
|
||||||
"arguments",
|
|
||||||
"depth"
|
|
||||||
],
|
|
||||||
"author": {
|
|
||||||
"name": "Blake Embrey",
|
|
||||||
"email": "hello@blakeembrey.com",
|
|
||||||
"url": "http://blakeembrey.me"
|
|
||||||
},
|
|
||||||
"license": "MIT",
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/blakeembrey/array-flatten/issues"
|
|
||||||
},
|
|
||||||
"homepage": "https://github.com/blakeembrey/array-flatten",
|
|
||||||
"devDependencies": {
|
|
||||||
"istanbul": "^0.3.13",
|
|
||||||
"mocha": "^2.2.4",
|
|
||||||
"pre-commit": "^1.0.7",
|
|
||||||
"standard": "^3.7.3"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-672
@@ -1,672 +0,0 @@
|
|||||||
1.20.3 / 2024-09-10
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: qs@6.13.0
|
|
||||||
* add `depth` option to customize the depth level in the parser
|
|
||||||
* IMPORTANT: The default `depth` level for parsing URL-encoded data is now `32` (previously was `Infinity`)
|
|
||||||
|
|
||||||
1.20.2 / 2023-02-21
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Fix strict json error message on Node.js 19+
|
|
||||||
* deps: content-type@~1.0.5
|
|
||||||
- perf: skip value escaping when unnecessary
|
|
||||||
* deps: raw-body@2.5.2
|
|
||||||
|
|
||||||
1.20.1 / 2022-10-06
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: qs@6.11.0
|
|
||||||
* perf: remove unnecessary object clone
|
|
||||||
|
|
||||||
1.20.0 / 2022-04-02
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Fix error message for json parse whitespace in `strict`
|
|
||||||
* Fix internal error when inflated body exceeds limit
|
|
||||||
* Prevent loss of async hooks context
|
|
||||||
* Prevent hanging when request already read
|
|
||||||
* deps: depd@2.0.0
|
|
||||||
- Replace internal `eval` usage with `Function` constructor
|
|
||||||
- Use instance methods on `process` to check for listeners
|
|
||||||
* deps: http-errors@2.0.0
|
|
||||||
- deps: depd@2.0.0
|
|
||||||
- deps: statuses@2.0.1
|
|
||||||
* deps: on-finished@2.4.1
|
|
||||||
* deps: qs@6.10.3
|
|
||||||
* deps: raw-body@2.5.1
|
|
||||||
- deps: http-errors@2.0.0
|
|
||||||
|
|
||||||
1.19.2 / 2022-02-15
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: bytes@3.1.2
|
|
||||||
* deps: qs@6.9.7
|
|
||||||
* Fix handling of `__proto__` keys
|
|
||||||
* deps: raw-body@2.4.3
|
|
||||||
- deps: bytes@3.1.2
|
|
||||||
|
|
||||||
1.19.1 / 2021-12-10
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: bytes@3.1.1
|
|
||||||
* deps: http-errors@1.8.1
|
|
||||||
- deps: inherits@2.0.4
|
|
||||||
- deps: toidentifier@1.0.1
|
|
||||||
- deps: setprototypeof@1.2.0
|
|
||||||
* deps: qs@6.9.6
|
|
||||||
* deps: raw-body@2.4.2
|
|
||||||
- deps: bytes@3.1.1
|
|
||||||
- deps: http-errors@1.8.1
|
|
||||||
* deps: safe-buffer@5.2.1
|
|
||||||
* deps: type-is@~1.6.18
|
|
||||||
|
|
||||||
1.19.0 / 2019-04-25
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: bytes@3.1.0
|
|
||||||
- Add petabyte (`pb`) support
|
|
||||||
* deps: http-errors@1.7.2
|
|
||||||
- Set constructor name when possible
|
|
||||||
- deps: setprototypeof@1.1.1
|
|
||||||
- deps: statuses@'>= 1.5.0 < 2'
|
|
||||||
* deps: iconv-lite@0.4.24
|
|
||||||
- Added encoding MIK
|
|
||||||
* deps: qs@6.7.0
|
|
||||||
- Fix parsing array brackets after index
|
|
||||||
* deps: raw-body@2.4.0
|
|
||||||
- deps: bytes@3.1.0
|
|
||||||
- deps: http-errors@1.7.2
|
|
||||||
- deps: iconv-lite@0.4.24
|
|
||||||
* deps: type-is@~1.6.17
|
|
||||||
- deps: mime-types@~2.1.24
|
|
||||||
- perf: prevent internal `throw` on invalid type
|
|
||||||
|
|
||||||
1.18.3 / 2018-05-14
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Fix stack trace for strict json parse error
|
|
||||||
* deps: depd@~1.1.2
|
|
||||||
- perf: remove argument reassignment
|
|
||||||
* deps: http-errors@~1.6.3
|
|
||||||
- deps: depd@~1.1.2
|
|
||||||
- deps: setprototypeof@1.1.0
|
|
||||||
- deps: statuses@'>= 1.3.1 < 2'
|
|
||||||
* deps: iconv-lite@0.4.23
|
|
||||||
- Fix loading encoding with year appended
|
|
||||||
- Fix deprecation warnings on Node.js 10+
|
|
||||||
* deps: qs@6.5.2
|
|
||||||
* deps: raw-body@2.3.3
|
|
||||||
- deps: http-errors@1.6.3
|
|
||||||
- deps: iconv-lite@0.4.23
|
|
||||||
* deps: type-is@~1.6.16
|
|
||||||
- deps: mime-types@~2.1.18
|
|
||||||
|
|
||||||
1.18.2 / 2017-09-22
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: debug@2.6.9
|
|
||||||
* perf: remove argument reassignment
|
|
||||||
|
|
||||||
1.18.1 / 2017-09-12
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: content-type@~1.0.4
|
|
||||||
- perf: remove argument reassignment
|
|
||||||
- perf: skip parameter parsing when no parameters
|
|
||||||
* deps: iconv-lite@0.4.19
|
|
||||||
- Fix ISO-8859-1 regression
|
|
||||||
- Update Windows-1255
|
|
||||||
* deps: qs@6.5.1
|
|
||||||
- Fix parsing & compacting very deep objects
|
|
||||||
* deps: raw-body@2.3.2
|
|
||||||
- deps: iconv-lite@0.4.19
|
|
||||||
|
|
||||||
1.18.0 / 2017-09-08
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Fix JSON strict violation error to match native parse error
|
|
||||||
* Include the `body` property on verify errors
|
|
||||||
* Include the `type` property on all generated errors
|
|
||||||
* Use `http-errors` to set status code on errors
|
|
||||||
* deps: bytes@3.0.0
|
|
||||||
* deps: debug@2.6.8
|
|
||||||
* deps: depd@~1.1.1
|
|
||||||
- Remove unnecessary `Buffer` loading
|
|
||||||
* deps: http-errors@~1.6.2
|
|
||||||
- deps: depd@1.1.1
|
|
||||||
* deps: iconv-lite@0.4.18
|
|
||||||
- Add support for React Native
|
|
||||||
- Add a warning if not loaded as utf-8
|
|
||||||
- Fix CESU-8 decoding in Node.js 8
|
|
||||||
- Improve speed of ISO-8859-1 encoding
|
|
||||||
* deps: qs@6.5.0
|
|
||||||
* deps: raw-body@2.3.1
|
|
||||||
- Use `http-errors` for standard emitted errors
|
|
||||||
- deps: bytes@3.0.0
|
|
||||||
- deps: iconv-lite@0.4.18
|
|
||||||
- perf: skip buffer decoding on overage chunk
|
|
||||||
* perf: prevent internal `throw` when missing charset
|
|
||||||
|
|
||||||
1.17.2 / 2017-05-17
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: debug@2.6.7
|
|
||||||
- Fix `DEBUG_MAX_ARRAY_LENGTH`
|
|
||||||
- deps: ms@2.0.0
|
|
||||||
* deps: type-is@~1.6.15
|
|
||||||
- deps: mime-types@~2.1.15
|
|
||||||
|
|
||||||
1.17.1 / 2017-03-06
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: qs@6.4.0
|
|
||||||
- Fix regression parsing keys starting with `[`
|
|
||||||
|
|
||||||
1.17.0 / 2017-03-01
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: http-errors@~1.6.1
|
|
||||||
- Make `message` property enumerable for `HttpError`s
|
|
||||||
- deps: setprototypeof@1.0.3
|
|
||||||
* deps: qs@6.3.1
|
|
||||||
- Fix compacting nested arrays
|
|
||||||
|
|
||||||
1.16.1 / 2017-02-10
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: debug@2.6.1
|
|
||||||
- Fix deprecation messages in WebStorm and other editors
|
|
||||||
- Undeprecate `DEBUG_FD` set to `1` or `2`
|
|
||||||
|
|
||||||
1.16.0 / 2017-01-17
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: debug@2.6.0
|
|
||||||
- Allow colors in workers
|
|
||||||
- Deprecated `DEBUG_FD` environment variable
|
|
||||||
- Fix error when running under React Native
|
|
||||||
- Use same color for same namespace
|
|
||||||
- deps: ms@0.7.2
|
|
||||||
* deps: http-errors@~1.5.1
|
|
||||||
- deps: inherits@2.0.3
|
|
||||||
- deps: setprototypeof@1.0.2
|
|
||||||
- deps: statuses@'>= 1.3.1 < 2'
|
|
||||||
* deps: iconv-lite@0.4.15
|
|
||||||
- Added encoding MS-31J
|
|
||||||
- Added encoding MS-932
|
|
||||||
- Added encoding MS-936
|
|
||||||
- Added encoding MS-949
|
|
||||||
- Added encoding MS-950
|
|
||||||
- Fix GBK/GB18030 handling of Euro character
|
|
||||||
* deps: qs@6.2.1
|
|
||||||
- Fix array parsing from skipping empty values
|
|
||||||
* deps: raw-body@~2.2.0
|
|
||||||
- deps: iconv-lite@0.4.15
|
|
||||||
* deps: type-is@~1.6.14
|
|
||||||
- deps: mime-types@~2.1.13
|
|
||||||
|
|
||||||
1.15.2 / 2016-06-19
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: bytes@2.4.0
|
|
||||||
* deps: content-type@~1.0.2
|
|
||||||
- perf: enable strict mode
|
|
||||||
* deps: http-errors@~1.5.0
|
|
||||||
- Use `setprototypeof` module to replace `__proto__` setting
|
|
||||||
- deps: statuses@'>= 1.3.0 < 2'
|
|
||||||
- perf: enable strict mode
|
|
||||||
* deps: qs@6.2.0
|
|
||||||
* deps: raw-body@~2.1.7
|
|
||||||
- deps: bytes@2.4.0
|
|
||||||
- perf: remove double-cleanup on happy path
|
|
||||||
* deps: type-is@~1.6.13
|
|
||||||
- deps: mime-types@~2.1.11
|
|
||||||
|
|
||||||
1.15.1 / 2016-05-05
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: bytes@2.3.0
|
|
||||||
- Drop partial bytes on all parsed units
|
|
||||||
- Fix parsing byte string that looks like hex
|
|
||||||
* deps: raw-body@~2.1.6
|
|
||||||
- deps: bytes@2.3.0
|
|
||||||
* deps: type-is@~1.6.12
|
|
||||||
- deps: mime-types@~2.1.10
|
|
||||||
|
|
||||||
1.15.0 / 2016-02-10
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: http-errors@~1.4.0
|
|
||||||
- Add `HttpError` export, for `err instanceof createError.HttpError`
|
|
||||||
- deps: inherits@2.0.1
|
|
||||||
- deps: statuses@'>= 1.2.1 < 2'
|
|
||||||
* deps: qs@6.1.0
|
|
||||||
* deps: type-is@~1.6.11
|
|
||||||
- deps: mime-types@~2.1.9
|
|
||||||
|
|
||||||
1.14.2 / 2015-12-16
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: bytes@2.2.0
|
|
||||||
* deps: iconv-lite@0.4.13
|
|
||||||
* deps: qs@5.2.0
|
|
||||||
* deps: raw-body@~2.1.5
|
|
||||||
- deps: bytes@2.2.0
|
|
||||||
- deps: iconv-lite@0.4.13
|
|
||||||
* deps: type-is@~1.6.10
|
|
||||||
- deps: mime-types@~2.1.8
|
|
||||||
|
|
||||||
1.14.1 / 2015-09-27
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Fix issue where invalid charset results in 400 when `verify` used
|
|
||||||
* deps: iconv-lite@0.4.12
|
|
||||||
- Fix CESU-8 decoding in Node.js 4.x
|
|
||||||
* deps: raw-body@~2.1.4
|
|
||||||
- Fix masking critical errors from `iconv-lite`
|
|
||||||
- deps: iconv-lite@0.4.12
|
|
||||||
* deps: type-is@~1.6.9
|
|
||||||
- deps: mime-types@~2.1.7
|
|
||||||
|
|
||||||
1.14.0 / 2015-09-16
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Fix JSON strict parse error to match syntax errors
|
|
||||||
* Provide static `require` analysis in `urlencoded` parser
|
|
||||||
* deps: depd@~1.1.0
|
|
||||||
- Support web browser loading
|
|
||||||
* deps: qs@5.1.0
|
|
||||||
* deps: raw-body@~2.1.3
|
|
||||||
- Fix sync callback when attaching data listener causes sync read
|
|
||||||
* deps: type-is@~1.6.8
|
|
||||||
- Fix type error when given invalid type to match against
|
|
||||||
- deps: mime-types@~2.1.6
|
|
||||||
|
|
||||||
1.13.3 / 2015-07-31
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: type-is@~1.6.6
|
|
||||||
- deps: mime-types@~2.1.4
|
|
||||||
|
|
||||||
1.13.2 / 2015-07-05
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: iconv-lite@0.4.11
|
|
||||||
* deps: qs@4.0.0
|
|
||||||
- Fix dropping parameters like `hasOwnProperty`
|
|
||||||
- Fix user-visible incompatibilities from 3.1.0
|
|
||||||
- Fix various parsing edge cases
|
|
||||||
* deps: raw-body@~2.1.2
|
|
||||||
- Fix error stack traces to skip `makeError`
|
|
||||||
- deps: iconv-lite@0.4.11
|
|
||||||
* deps: type-is@~1.6.4
|
|
||||||
- deps: mime-types@~2.1.2
|
|
||||||
- perf: enable strict mode
|
|
||||||
- perf: remove argument reassignment
|
|
||||||
|
|
||||||
1.13.1 / 2015-06-16
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: qs@2.4.2
|
|
||||||
- Downgraded from 3.1.0 because of user-visible incompatibilities
|
|
||||||
|
|
||||||
1.13.0 / 2015-06-14
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Add `statusCode` property on `Error`s, in addition to `status`
|
|
||||||
* Change `type` default to `application/json` for JSON parser
|
|
||||||
* Change `type` default to `application/x-www-form-urlencoded` for urlencoded parser
|
|
||||||
* Provide static `require` analysis
|
|
||||||
* Use the `http-errors` module to generate errors
|
|
||||||
* deps: bytes@2.1.0
|
|
||||||
- Slight optimizations
|
|
||||||
* deps: iconv-lite@0.4.10
|
|
||||||
- The encoding UTF-16 without BOM now defaults to UTF-16LE when detection fails
|
|
||||||
- Leading BOM is now removed when decoding
|
|
||||||
* deps: on-finished@~2.3.0
|
|
||||||
- Add defined behavior for HTTP `CONNECT` requests
|
|
||||||
- Add defined behavior for HTTP `Upgrade` requests
|
|
||||||
- deps: ee-first@1.1.1
|
|
||||||
* deps: qs@3.1.0
|
|
||||||
- Fix dropping parameters like `hasOwnProperty`
|
|
||||||
- Fix various parsing edge cases
|
|
||||||
- Parsed object now has `null` prototype
|
|
||||||
* deps: raw-body@~2.1.1
|
|
||||||
- Use `unpipe` module for unpiping requests
|
|
||||||
- deps: iconv-lite@0.4.10
|
|
||||||
* deps: type-is@~1.6.3
|
|
||||||
- deps: mime-types@~2.1.1
|
|
||||||
- perf: reduce try block size
|
|
||||||
- perf: remove bitwise operations
|
|
||||||
* perf: enable strict mode
|
|
||||||
* perf: remove argument reassignment
|
|
||||||
* perf: remove delete call
|
|
||||||
|
|
||||||
1.12.4 / 2015-05-10
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: debug@~2.2.0
|
|
||||||
* deps: qs@2.4.2
|
|
||||||
- Fix allowing parameters like `constructor`
|
|
||||||
* deps: on-finished@~2.2.1
|
|
||||||
* deps: raw-body@~2.0.1
|
|
||||||
- Fix a false-positive when unpiping in Node.js 0.8
|
|
||||||
- deps: bytes@2.0.1
|
|
||||||
* deps: type-is@~1.6.2
|
|
||||||
- deps: mime-types@~2.0.11
|
|
||||||
|
|
||||||
1.12.3 / 2015-04-15
|
|
||||||
===================
|
|
||||||
|
|
||||||
* Slight efficiency improvement when not debugging
|
|
||||||
* deps: depd@~1.0.1
|
|
||||||
* deps: iconv-lite@0.4.8
|
|
||||||
- Add encoding alias UNICODE-1-1-UTF-7
|
|
||||||
* deps: raw-body@1.3.4
|
|
||||||
- Fix hanging callback if request aborts during read
|
|
||||||
- deps: iconv-lite@0.4.8
|
|
||||||
|
|
||||||
1.12.2 / 2015-03-16
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: qs@2.4.1
|
|
||||||
- Fix error when parameter `hasOwnProperty` is present
|
|
||||||
|
|
||||||
1.12.1 / 2015-03-15
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: debug@~2.1.3
|
|
||||||
- Fix high intensity foreground color for bold
|
|
||||||
- deps: ms@0.7.0
|
|
||||||
* deps: type-is@~1.6.1
|
|
||||||
- deps: mime-types@~2.0.10
|
|
||||||
|
|
||||||
1.12.0 / 2015-02-13
|
|
||||||
===================
|
|
||||||
|
|
||||||
* add `debug` messages
|
|
||||||
* accept a function for the `type` option
|
|
||||||
* use `content-type` to parse `Content-Type` headers
|
|
||||||
* deps: iconv-lite@0.4.7
|
|
||||||
- Gracefully support enumerables on `Object.prototype`
|
|
||||||
* deps: raw-body@1.3.3
|
|
||||||
- deps: iconv-lite@0.4.7
|
|
||||||
* deps: type-is@~1.6.0
|
|
||||||
- fix argument reassignment
|
|
||||||
- fix false-positives in `hasBody` `Transfer-Encoding` check
|
|
||||||
- support wildcard for both type and subtype (`*/*`)
|
|
||||||
- deps: mime-types@~2.0.9
|
|
||||||
|
|
||||||
1.11.0 / 2015-01-30
|
|
||||||
===================
|
|
||||||
|
|
||||||
* make internal `extended: true` depth limit infinity
|
|
||||||
* deps: type-is@~1.5.6
|
|
||||||
- deps: mime-types@~2.0.8
|
|
||||||
|
|
||||||
1.10.2 / 2015-01-20
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: iconv-lite@0.4.6
|
|
||||||
- Fix rare aliases of single-byte encodings
|
|
||||||
* deps: raw-body@1.3.2
|
|
||||||
- deps: iconv-lite@0.4.6
|
|
||||||
|
|
||||||
1.10.1 / 2015-01-01
|
|
||||||
===================
|
|
||||||
|
|
||||||
* deps: on-finished@~2.2.0
|
|
||||||
* deps: type-is@~1.5.5
|
|
||||||
- deps: mime-types@~2.0.7
|
|
||||||
|
|
||||||
1.10.0 / 2014-12-02
|
|
||||||
===================
|
|
||||||
|
|
||||||
* make internal `extended: true` array limit dynamic
|
|
||||||
|
|
||||||
1.9.3 / 2014-11-21
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: iconv-lite@0.4.5
|
|
||||||
- Fix Windows-31J and X-SJIS encoding support
|
|
||||||
* deps: qs@2.3.3
|
|
||||||
- Fix `arrayLimit` behavior
|
|
||||||
* deps: raw-body@1.3.1
|
|
||||||
- deps: iconv-lite@0.4.5
|
|
||||||
* deps: type-is@~1.5.3
|
|
||||||
- deps: mime-types@~2.0.3
|
|
||||||
|
|
||||||
1.9.2 / 2014-10-27
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@2.3.2
|
|
||||||
- Fix parsing of mixed objects and values
|
|
||||||
|
|
||||||
1.9.1 / 2014-10-22
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: on-finished@~2.1.1
|
|
||||||
- Fix handling of pipelined requests
|
|
||||||
* deps: qs@2.3.0
|
|
||||||
- Fix parsing of mixed implicit and explicit arrays
|
|
||||||
* deps: type-is@~1.5.2
|
|
||||||
- deps: mime-types@~2.0.2
|
|
||||||
|
|
||||||
1.9.0 / 2014-09-24
|
|
||||||
==================
|
|
||||||
|
|
||||||
* include the charset in "unsupported charset" error message
|
|
||||||
* include the encoding in "unsupported content encoding" error message
|
|
||||||
* deps: depd@~1.0.0
|
|
||||||
|
|
||||||
1.8.4 / 2014-09-23
|
|
||||||
==================
|
|
||||||
|
|
||||||
* fix content encoding to be case-insensitive
|
|
||||||
|
|
||||||
1.8.3 / 2014-09-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@2.2.4
|
|
||||||
- Fix issue with object keys starting with numbers truncated
|
|
||||||
|
|
||||||
1.8.2 / 2014-09-15
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: depd@0.4.5
|
|
||||||
|
|
||||||
1.8.1 / 2014-09-07
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: media-typer@0.3.0
|
|
||||||
* deps: type-is@~1.5.1
|
|
||||||
|
|
||||||
1.8.0 / 2014-09-05
|
|
||||||
==================
|
|
||||||
|
|
||||||
* make empty-body-handling consistent between chunked requests
|
|
||||||
- empty `json` produces `{}`
|
|
||||||
- empty `raw` produces `new Buffer(0)`
|
|
||||||
- empty `text` produces `''`
|
|
||||||
- empty `urlencoded` produces `{}`
|
|
||||||
* deps: qs@2.2.3
|
|
||||||
- Fix issue where first empty value in array is discarded
|
|
||||||
* deps: type-is@~1.5.0
|
|
||||||
- fix `hasbody` to be true for `content-length: 0`
|
|
||||||
|
|
||||||
1.7.0 / 2014-09-01
|
|
||||||
==================
|
|
||||||
|
|
||||||
* add `parameterLimit` option to `urlencoded` parser
|
|
||||||
* change `urlencoded` extended array limit to 100
|
|
||||||
* respond with 413 when over `parameterLimit` in `urlencoded`
|
|
||||||
|
|
||||||
1.6.7 / 2014-08-29
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@2.2.2
|
|
||||||
- Remove unnecessary cloning
|
|
||||||
|
|
||||||
1.6.6 / 2014-08-27
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@2.2.0
|
|
||||||
- Array parsing fix
|
|
||||||
- Performance improvements
|
|
||||||
|
|
||||||
1.6.5 / 2014-08-16
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: on-finished@2.1.0
|
|
||||||
|
|
||||||
1.6.4 / 2014-08-14
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@1.2.2
|
|
||||||
|
|
||||||
1.6.3 / 2014-08-10
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@1.2.1
|
|
||||||
|
|
||||||
1.6.2 / 2014-08-07
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@1.2.0
|
|
||||||
- Fix parsing array of objects
|
|
||||||
|
|
||||||
1.6.1 / 2014-08-06
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@1.1.0
|
|
||||||
- Accept urlencoded square brackets
|
|
||||||
- Accept empty values in implicit array notation
|
|
||||||
|
|
||||||
1.6.0 / 2014-08-05
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: qs@1.0.2
|
|
||||||
- Complete rewrite
|
|
||||||
- Limits array length to 20
|
|
||||||
- Limits object depth to 5
|
|
||||||
- Limits parameters to 1,000
|
|
||||||
|
|
||||||
1.5.2 / 2014-07-27
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: depd@0.4.4
|
|
||||||
- Work-around v8 generating empty stack traces
|
|
||||||
|
|
||||||
1.5.1 / 2014-07-26
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: depd@0.4.3
|
|
||||||
- Fix exception when global `Error.stackTraceLimit` is too low
|
|
||||||
|
|
||||||
1.5.0 / 2014-07-20
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: depd@0.4.2
|
|
||||||
- Add `TRACE_DEPRECATION` environment variable
|
|
||||||
- Remove non-standard grey color from color output
|
|
||||||
- Support `--no-deprecation` argument
|
|
||||||
- Support `--trace-deprecation` argument
|
|
||||||
* deps: iconv-lite@0.4.4
|
|
||||||
- Added encoding UTF-7
|
|
||||||
* deps: raw-body@1.3.0
|
|
||||||
- deps: iconv-lite@0.4.4
|
|
||||||
- Added encoding UTF-7
|
|
||||||
- Fix `Cannot switch to old mode now` error on Node.js 0.10+
|
|
||||||
* deps: type-is@~1.3.2
|
|
||||||
|
|
||||||
1.4.3 / 2014-06-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: type-is@1.3.1
|
|
||||||
- fix global variable leak
|
|
||||||
|
|
||||||
1.4.2 / 2014-06-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: type-is@1.3.0
|
|
||||||
- improve type parsing
|
|
||||||
|
|
||||||
1.4.1 / 2014-06-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* fix urlencoded extended deprecation message
|
|
||||||
|
|
||||||
1.4.0 / 2014-06-19
|
|
||||||
==================
|
|
||||||
|
|
||||||
* add `text` parser
|
|
||||||
* add `raw` parser
|
|
||||||
* check accepted charset in content-type (accepts utf-8)
|
|
||||||
* check accepted encoding in content-encoding (accepts identity)
|
|
||||||
* deprecate `bodyParser()` middleware; use `.json()` and `.urlencoded()` as needed
|
|
||||||
* deprecate `urlencoded()` without provided `extended` option
|
|
||||||
* lazy-load urlencoded parsers
|
|
||||||
* parsers split into files for reduced mem usage
|
|
||||||
* support gzip and deflate bodies
|
|
||||||
- set `inflate: false` to turn off
|
|
||||||
* deps: raw-body@1.2.2
|
|
||||||
- Support all encodings from `iconv-lite`
|
|
||||||
|
|
||||||
1.3.1 / 2014-06-11
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: type-is@1.2.1
|
|
||||||
- Switch dependency from mime to mime-types@1.0.0
|
|
||||||
|
|
||||||
1.3.0 / 2014-05-31
|
|
||||||
==================
|
|
||||||
|
|
||||||
* add `extended` option to urlencoded parser
|
|
||||||
|
|
||||||
1.2.2 / 2014-05-27
|
|
||||||
==================
|
|
||||||
|
|
||||||
* deps: raw-body@1.1.6
|
|
||||||
- assert stream encoding on node.js 0.8
|
|
||||||
- assert stream encoding on node.js < 0.10.6
|
|
||||||
- deps: bytes@1
|
|
||||||
|
|
||||||
1.2.1 / 2014-05-26
|
|
||||||
==================
|
|
||||||
|
|
||||||
* invoke `next(err)` after request fully read
|
|
||||||
- prevents hung responses and socket hang ups
|
|
||||||
|
|
||||||
1.2.0 / 2014-05-11
|
|
||||||
==================
|
|
||||||
|
|
||||||
* add `verify` option
|
|
||||||
* deps: type-is@1.2.0
|
|
||||||
- support suffix matching
|
|
||||||
|
|
||||||
1.1.2 / 2014-05-11
|
|
||||||
==================
|
|
||||||
|
|
||||||
* improve json parser speed
|
|
||||||
|
|
||||||
1.1.1 / 2014-05-11
|
|
||||||
==================
|
|
||||||
|
|
||||||
* fix repeated limit parsing with every request
|
|
||||||
|
|
||||||
1.1.0 / 2014-05-10
|
|
||||||
==================
|
|
||||||
|
|
||||||
* add `type` option
|
|
||||||
* deps: pin for safety and consistency
|
|
||||||
|
|
||||||
1.0.2 / 2014-04-14
|
|
||||||
==================
|
|
||||||
|
|
||||||
* use `type-is` module
|
|
||||||
|
|
||||||
1.0.1 / 2014-03-20
|
|
||||||
==================
|
|
||||||
|
|
||||||
* lower default limits to 100kb
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
(The MIT License)
|
|
||||||
|
|
||||||
Copyright (c) 2014 Jonathan Ong <me@jongleberry.com>
|
|
||||||
Copyright (c) 2014-2015 Douglas Christopher Wilson <doug@somethingdoug.com>
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining
|
|
||||||
a copy of this software and associated documentation files (the
|
|
||||||
'Software'), to deal in the Software without restriction, including
|
|
||||||
without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
distribute, sublicense, and/or sell copies of the Software, and to
|
|
||||||
permit persons to whom the Software is furnished to do so, subject to
|
|
||||||
the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be
|
|
||||||
included in all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
||||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
-476
@@ -1,476 +0,0 @@
|
|||||||
# body-parser
|
|
||||||
|
|
||||||
[![NPM Version][npm-version-image]][npm-url]
|
|
||||||
[![NPM Downloads][npm-downloads-image]][npm-url]
|
|
||||||
[![Build Status][ci-image]][ci-url]
|
|
||||||
[![Test Coverage][coveralls-image]][coveralls-url]
|
|
||||||
[![OpenSSF Scorecard Badge][ossf-scorecard-badge]][ossf-scorecard-visualizer]
|
|
||||||
|
|
||||||
Node.js body parsing middleware.
|
|
||||||
|
|
||||||
Parse incoming request bodies in a middleware before your handlers, available
|
|
||||||
under the `req.body` property.
|
|
||||||
|
|
||||||
**Note** As `req.body`'s shape is based on user-controlled input, all
|
|
||||||
properties and values in this object are untrusted and should be validated
|
|
||||||
before trusting. For example, `req.body.foo.toString()` may fail in multiple
|
|
||||||
ways, for example the `foo` property may not be there or may not be a string,
|
|
||||||
and `toString` may not be a function and instead a string or other user input.
|
|
||||||
|
|
||||||
[Learn about the anatomy of an HTTP transaction in Node.js](https://nodejs.org/en/docs/guides/anatomy-of-an-http-transaction/).
|
|
||||||
|
|
||||||
_This does not handle multipart bodies_, due to their complex and typically
|
|
||||||
large nature. For multipart bodies, you may be interested in the following
|
|
||||||
modules:
|
|
||||||
|
|
||||||
* [busboy](https://www.npmjs.org/package/busboy#readme) and
|
|
||||||
[connect-busboy](https://www.npmjs.org/package/connect-busboy#readme)
|
|
||||||
* [multiparty](https://www.npmjs.org/package/multiparty#readme) and
|
|
||||||
[connect-multiparty](https://www.npmjs.org/package/connect-multiparty#readme)
|
|
||||||
* [formidable](https://www.npmjs.org/package/formidable#readme)
|
|
||||||
* [multer](https://www.npmjs.org/package/multer#readme)
|
|
||||||
|
|
||||||
This module provides the following parsers:
|
|
||||||
|
|
||||||
* [JSON body parser](#bodyparserjsonoptions)
|
|
||||||
* [Raw body parser](#bodyparserrawoptions)
|
|
||||||
* [Text body parser](#bodyparsertextoptions)
|
|
||||||
* [URL-encoded form body parser](#bodyparserurlencodedoptions)
|
|
||||||
|
|
||||||
Other body parsers you might be interested in:
|
|
||||||
|
|
||||||
- [body](https://www.npmjs.org/package/body#readme)
|
|
||||||
- [co-body](https://www.npmjs.org/package/co-body#readme)
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
```sh
|
|
||||||
$ npm install body-parser
|
|
||||||
```
|
|
||||||
|
|
||||||
## API
|
|
||||||
|
|
||||||
```js
|
|
||||||
var bodyParser = require('body-parser')
|
|
||||||
```
|
|
||||||
|
|
||||||
The `bodyParser` object exposes various factories to create middlewares. All
|
|
||||||
middlewares will populate the `req.body` property with the parsed body when
|
|
||||||
the `Content-Type` request header matches the `type` option, or an empty
|
|
||||||
object (`{}`) if there was no body to parse, the `Content-Type` was not matched,
|
|
||||||
or an error occurred.
|
|
||||||
|
|
||||||
The various errors returned by this module are described in the
|
|
||||||
[errors section](#errors).
|
|
||||||
|
|
||||||
### bodyParser.json([options])
|
|
||||||
|
|
||||||
Returns middleware that only parses `json` and only looks at requests where
|
|
||||||
the `Content-Type` header matches the `type` option. This parser accepts any
|
|
||||||
Unicode encoding of the body and supports automatic inflation of `gzip` and
|
|
||||||
`deflate` encodings.
|
|
||||||
|
|
||||||
A new `body` object containing the parsed data is populated on the `request`
|
|
||||||
object after the middleware (i.e. `req.body`).
|
|
||||||
|
|
||||||
#### Options
|
|
||||||
|
|
||||||
The `json` function takes an optional `options` object that may contain any of
|
|
||||||
the following keys:
|
|
||||||
|
|
||||||
##### inflate
|
|
||||||
|
|
||||||
When set to `true`, then deflated (compressed) bodies will be inflated; when
|
|
||||||
`false`, deflated bodies are rejected. Defaults to `true`.
|
|
||||||
|
|
||||||
##### limit
|
|
||||||
|
|
||||||
Controls the maximum request body size. If this is a number, then the value
|
|
||||||
specifies the number of bytes; if it is a string, the value is passed to the
|
|
||||||
[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults
|
|
||||||
to `'100kb'`.
|
|
||||||
|
|
||||||
##### reviver
|
|
||||||
|
|
||||||
The `reviver` option is passed directly to `JSON.parse` as the second
|
|
||||||
argument. You can find more information on this argument
|
|
||||||
[in the MDN documentation about JSON.parse](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse#Example.3A_Using_the_reviver_parameter).
|
|
||||||
|
|
||||||
##### strict
|
|
||||||
|
|
||||||
When set to `true`, will only accept arrays and objects; when `false` will
|
|
||||||
accept anything `JSON.parse` accepts. Defaults to `true`.
|
|
||||||
|
|
||||||
##### type
|
|
||||||
|
|
||||||
The `type` option is used to determine what media type the middleware will
|
|
||||||
parse. This option can be a string, array of strings, or a function. If not a
|
|
||||||
function, `type` option is passed directly to the
|
|
||||||
[type-is](https://www.npmjs.org/package/type-is#readme) library and this can
|
|
||||||
be an extension name (like `json`), a mime type (like `application/json`), or
|
|
||||||
a mime type with a wildcard (like `*/*` or `*/json`). If a function, the `type`
|
|
||||||
option is called as `fn(req)` and the request is parsed if it returns a truthy
|
|
||||||
value. Defaults to `application/json`.
|
|
||||||
|
|
||||||
##### verify
|
|
||||||
|
|
||||||
The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`,
|
|
||||||
where `buf` is a `Buffer` of the raw request body and `encoding` is the
|
|
||||||
encoding of the request. The parsing can be aborted by throwing an error.
|
|
||||||
|
|
||||||
### bodyParser.raw([options])
|
|
||||||
|
|
||||||
Returns middleware that parses all bodies as a `Buffer` and only looks at
|
|
||||||
requests where the `Content-Type` header matches the `type` option. This
|
|
||||||
parser supports automatic inflation of `gzip` and `deflate` encodings.
|
|
||||||
|
|
||||||
A new `body` object containing the parsed data is populated on the `request`
|
|
||||||
object after the middleware (i.e. `req.body`). This will be a `Buffer` object
|
|
||||||
of the body.
|
|
||||||
|
|
||||||
#### Options
|
|
||||||
|
|
||||||
The `raw` function takes an optional `options` object that may contain any of
|
|
||||||
the following keys:
|
|
||||||
|
|
||||||
##### inflate
|
|
||||||
|
|
||||||
When set to `true`, then deflated (compressed) bodies will be inflated; when
|
|
||||||
`false`, deflated bodies are rejected. Defaults to `true`.
|
|
||||||
|
|
||||||
##### limit
|
|
||||||
|
|
||||||
Controls the maximum request body size. If this is a number, then the value
|
|
||||||
specifies the number of bytes; if it is a string, the value is passed to the
|
|
||||||
[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults
|
|
||||||
to `'100kb'`.
|
|
||||||
|
|
||||||
##### type
|
|
||||||
|
|
||||||
The `type` option is used to determine what media type the middleware will
|
|
||||||
parse. This option can be a string, array of strings, or a function.
|
|
||||||
If not a function, `type` option is passed directly to the
|
|
||||||
[type-is](https://www.npmjs.org/package/type-is#readme) library and this
|
|
||||||
can be an extension name (like `bin`), a mime type (like
|
|
||||||
`application/octet-stream`), or a mime type with a wildcard (like `*/*` or
|
|
||||||
`application/*`). If a function, the `type` option is called as `fn(req)`
|
|
||||||
and the request is parsed if it returns a truthy value. Defaults to
|
|
||||||
`application/octet-stream`.
|
|
||||||
|
|
||||||
##### verify
|
|
||||||
|
|
||||||
The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`,
|
|
||||||
where `buf` is a `Buffer` of the raw request body and `encoding` is the
|
|
||||||
encoding of the request. The parsing can be aborted by throwing an error.
|
|
||||||
|
|
||||||
### bodyParser.text([options])
|
|
||||||
|
|
||||||
Returns middleware that parses all bodies as a string and only looks at
|
|
||||||
requests where the `Content-Type` header matches the `type` option. This
|
|
||||||
parser supports automatic inflation of `gzip` and `deflate` encodings.
|
|
||||||
|
|
||||||
A new `body` string containing the parsed data is populated on the `request`
|
|
||||||
object after the middleware (i.e. `req.body`). This will be a string of the
|
|
||||||
body.
|
|
||||||
|
|
||||||
#### Options
|
|
||||||
|
|
||||||
The `text` function takes an optional `options` object that may contain any of
|
|
||||||
the following keys:
|
|
||||||
|
|
||||||
##### defaultCharset
|
|
||||||
|
|
||||||
Specify the default character set for the text content if the charset is not
|
|
||||||
specified in the `Content-Type` header of the request. Defaults to `utf-8`.
|
|
||||||
|
|
||||||
##### inflate
|
|
||||||
|
|
||||||
When set to `true`, then deflated (compressed) bodies will be inflated; when
|
|
||||||
`false`, deflated bodies are rejected. Defaults to `true`.
|
|
||||||
|
|
||||||
##### limit
|
|
||||||
|
|
||||||
Controls the maximum request body size. If this is a number, then the value
|
|
||||||
specifies the number of bytes; if it is a string, the value is passed to the
|
|
||||||
[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults
|
|
||||||
to `'100kb'`.
|
|
||||||
|
|
||||||
##### type
|
|
||||||
|
|
||||||
The `type` option is used to determine what media type the middleware will
|
|
||||||
parse. This option can be a string, array of strings, or a function. If not
|
|
||||||
a function, `type` option is passed directly to the
|
|
||||||
[type-is](https://www.npmjs.org/package/type-is#readme) library and this can
|
|
||||||
be an extension name (like `txt`), a mime type (like `text/plain`), or a mime
|
|
||||||
type with a wildcard (like `*/*` or `text/*`). If a function, the `type`
|
|
||||||
option is called as `fn(req)` and the request is parsed if it returns a
|
|
||||||
truthy value. Defaults to `text/plain`.
|
|
||||||
|
|
||||||
##### verify
|
|
||||||
|
|
||||||
The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`,
|
|
||||||
where `buf` is a `Buffer` of the raw request body and `encoding` is the
|
|
||||||
encoding of the request. The parsing can be aborted by throwing an error.
|
|
||||||
|
|
||||||
### bodyParser.urlencoded([options])
|
|
||||||
|
|
||||||
Returns middleware that only parses `urlencoded` bodies and only looks at
|
|
||||||
requests where the `Content-Type` header matches the `type` option. This
|
|
||||||
parser accepts only UTF-8 encoding of the body and supports automatic
|
|
||||||
inflation of `gzip` and `deflate` encodings.
|
|
||||||
|
|
||||||
A new `body` object containing the parsed data is populated on the `request`
|
|
||||||
object after the middleware (i.e. `req.body`). This object will contain
|
|
||||||
key-value pairs, where the value can be a string or array (when `extended` is
|
|
||||||
`false`), or any type (when `extended` is `true`).
|
|
||||||
|
|
||||||
#### Options
|
|
||||||
|
|
||||||
The `urlencoded` function takes an optional `options` object that may contain
|
|
||||||
any of the following keys:
|
|
||||||
|
|
||||||
##### extended
|
|
||||||
|
|
||||||
The `extended` option allows to choose between parsing the URL-encoded data
|
|
||||||
with the `querystring` library (when `false`) or the `qs` library (when
|
|
||||||
`true`). The "extended" syntax allows for rich objects and arrays to be
|
|
||||||
encoded into the URL-encoded format, allowing for a JSON-like experience
|
|
||||||
with URL-encoded. For more information, please
|
|
||||||
[see the qs library](https://www.npmjs.org/package/qs#readme).
|
|
||||||
|
|
||||||
Defaults to `true`, but using the default has been deprecated. Please
|
|
||||||
research into the difference between `qs` and `querystring` and choose the
|
|
||||||
appropriate setting.
|
|
||||||
|
|
||||||
##### inflate
|
|
||||||
|
|
||||||
When set to `true`, then deflated (compressed) bodies will be inflated; when
|
|
||||||
`false`, deflated bodies are rejected. Defaults to `true`.
|
|
||||||
|
|
||||||
##### limit
|
|
||||||
|
|
||||||
Controls the maximum request body size. If this is a number, then the value
|
|
||||||
specifies the number of bytes; if it is a string, the value is passed to the
|
|
||||||
[bytes](https://www.npmjs.com/package/bytes) library for parsing. Defaults
|
|
||||||
to `'100kb'`.
|
|
||||||
|
|
||||||
##### parameterLimit
|
|
||||||
|
|
||||||
The `parameterLimit` option controls the maximum number of parameters that
|
|
||||||
are allowed in the URL-encoded data. If a request contains more parameters
|
|
||||||
than this value, a 413 will be returned to the client. Defaults to `1000`.
|
|
||||||
|
|
||||||
##### type
|
|
||||||
|
|
||||||
The `type` option is used to determine what media type the middleware will
|
|
||||||
parse. This option can be a string, array of strings, or a function. If not
|
|
||||||
a function, `type` option is passed directly to the
|
|
||||||
[type-is](https://www.npmjs.org/package/type-is#readme) library and this can
|
|
||||||
be an extension name (like `urlencoded`), a mime type (like
|
|
||||||
`application/x-www-form-urlencoded`), or a mime type with a wildcard (like
|
|
||||||
`*/x-www-form-urlencoded`). If a function, the `type` option is called as
|
|
||||||
`fn(req)` and the request is parsed if it returns a truthy value. Defaults
|
|
||||||
to `application/x-www-form-urlencoded`.
|
|
||||||
|
|
||||||
##### verify
|
|
||||||
|
|
||||||
The `verify` option, if supplied, is called as `verify(req, res, buf, encoding)`,
|
|
||||||
where `buf` is a `Buffer` of the raw request body and `encoding` is the
|
|
||||||
encoding of the request. The parsing can be aborted by throwing an error.
|
|
||||||
|
|
||||||
#### depth
|
|
||||||
|
|
||||||
The `depth` option is used to configure the maximum depth of the `qs` library when `extended` is `true`. This allows you to limit the amount of keys that are parsed and can be useful to prevent certain types of abuse. Defaults to `32`. It is recommended to keep this value as low as possible.
|
|
||||||
|
|
||||||
## Errors
|
|
||||||
|
|
||||||
The middlewares provided by this module create errors using the
|
|
||||||
[`http-errors` module](https://www.npmjs.com/package/http-errors). The errors
|
|
||||||
will typically have a `status`/`statusCode` property that contains the suggested
|
|
||||||
HTTP response code, an `expose` property to determine if the `message` property
|
|
||||||
should be displayed to the client, a `type` property to determine the type of
|
|
||||||
error without matching against the `message`, and a `body` property containing
|
|
||||||
the read body, if available.
|
|
||||||
|
|
||||||
The following are the common errors created, though any error can come through
|
|
||||||
for various reasons.
|
|
||||||
|
|
||||||
### content encoding unsupported
|
|
||||||
|
|
||||||
This error will occur when the request had a `Content-Encoding` header that
|
|
||||||
contained an encoding but the "inflation" option was set to `false`. The
|
|
||||||
`status` property is set to `415`, the `type` property is set to
|
|
||||||
`'encoding.unsupported'`, and the `charset` property will be set to the
|
|
||||||
encoding that is unsupported.
|
|
||||||
|
|
||||||
### entity parse failed
|
|
||||||
|
|
||||||
This error will occur when the request contained an entity that could not be
|
|
||||||
parsed by the middleware. The `status` property is set to `400`, the `type`
|
|
||||||
property is set to `'entity.parse.failed'`, and the `body` property is set to
|
|
||||||
the entity value that failed parsing.
|
|
||||||
|
|
||||||
### entity verify failed
|
|
||||||
|
|
||||||
This error will occur when the request contained an entity that could not be
|
|
||||||
failed verification by the defined `verify` option. The `status` property is
|
|
||||||
set to `403`, the `type` property is set to `'entity.verify.failed'`, and the
|
|
||||||
`body` property is set to the entity value that failed verification.
|
|
||||||
|
|
||||||
### request aborted
|
|
||||||
|
|
||||||
This error will occur when the request is aborted by the client before reading
|
|
||||||
the body has finished. The `received` property will be set to the number of
|
|
||||||
bytes received before the request was aborted and the `expected` property is
|
|
||||||
set to the number of expected bytes. The `status` property is set to `400`
|
|
||||||
and `type` property is set to `'request.aborted'`.
|
|
||||||
|
|
||||||
### request entity too large
|
|
||||||
|
|
||||||
This error will occur when the request body's size is larger than the "limit"
|
|
||||||
option. The `limit` property will be set to the byte limit and the `length`
|
|
||||||
property will be set to the request body's length. The `status` property is
|
|
||||||
set to `413` and the `type` property is set to `'entity.too.large'`.
|
|
||||||
|
|
||||||
### request size did not match content length
|
|
||||||
|
|
||||||
This error will occur when the request's length did not match the length from
|
|
||||||
the `Content-Length` header. This typically occurs when the request is malformed,
|
|
||||||
typically when the `Content-Length` header was calculated based on characters
|
|
||||||
instead of bytes. The `status` property is set to `400` and the `type` property
|
|
||||||
is set to `'request.size.invalid'`.
|
|
||||||
|
|
||||||
### stream encoding should not be set
|
|
||||||
|
|
||||||
This error will occur when something called the `req.setEncoding` method prior
|
|
||||||
to this middleware. This module operates directly on bytes only and you cannot
|
|
||||||
call `req.setEncoding` when using this module. The `status` property is set to
|
|
||||||
`500` and the `type` property is set to `'stream.encoding.set'`.
|
|
||||||
|
|
||||||
### stream is not readable
|
|
||||||
|
|
||||||
This error will occur when the request is no longer readable when this middleware
|
|
||||||
attempts to read it. This typically means something other than a middleware from
|
|
||||||
this module read the request body already and the middleware was also configured to
|
|
||||||
read the same request. The `status` property is set to `500` and the `type`
|
|
||||||
property is set to `'stream.not.readable'`.
|
|
||||||
|
|
||||||
### too many parameters
|
|
||||||
|
|
||||||
This error will occur when the content of the request exceeds the configured
|
|
||||||
`parameterLimit` for the `urlencoded` parser. The `status` property is set to
|
|
||||||
`413` and the `type` property is set to `'parameters.too.many'`.
|
|
||||||
|
|
||||||
### unsupported charset "BOGUS"
|
|
||||||
|
|
||||||
This error will occur when the request had a charset parameter in the
|
|
||||||
`Content-Type` header, but the `iconv-lite` module does not support it OR the
|
|
||||||
parser does not support it. The charset is contained in the message as well
|
|
||||||
as in the `charset` property. The `status` property is set to `415`, the
|
|
||||||
`type` property is set to `'charset.unsupported'`, and the `charset` property
|
|
||||||
is set to the charset that is unsupported.
|
|
||||||
|
|
||||||
### unsupported content encoding "bogus"
|
|
||||||
|
|
||||||
This error will occur when the request had a `Content-Encoding` header that
|
|
||||||
contained an unsupported encoding. The encoding is contained in the message
|
|
||||||
as well as in the `encoding` property. The `status` property is set to `415`,
|
|
||||||
the `type` property is set to `'encoding.unsupported'`, and the `encoding`
|
|
||||||
property is set to the encoding that is unsupported.
|
|
||||||
|
|
||||||
### The input exceeded the depth
|
|
||||||
|
|
||||||
This error occurs when using `bodyParser.urlencoded` with the `extended` property set to `true` and the input exceeds the configured `depth` option. The `status` property is set to `400`. It is recommended to review the `depth` option and evaluate if it requires a higher value. When the `depth` option is set to `32` (default value), the error will not be thrown.
|
|
||||||
|
|
||||||
## Examples
|
|
||||||
|
|
||||||
### Express/Connect top-level generic
|
|
||||||
|
|
||||||
This example demonstrates adding a generic JSON and URL-encoded parser as a
|
|
||||||
top-level middleware, which will parse the bodies of all incoming requests.
|
|
||||||
This is the simplest setup.
|
|
||||||
|
|
||||||
```js
|
|
||||||
var express = require('express')
|
|
||||||
var bodyParser = require('body-parser')
|
|
||||||
|
|
||||||
var app = express()
|
|
||||||
|
|
||||||
// parse application/x-www-form-urlencoded
|
|
||||||
app.use(bodyParser.urlencoded({ extended: false }))
|
|
||||||
|
|
||||||
// parse application/json
|
|
||||||
app.use(bodyParser.json())
|
|
||||||
|
|
||||||
app.use(function (req, res) {
|
|
||||||
res.setHeader('Content-Type', 'text/plain')
|
|
||||||
res.write('you posted:\n')
|
|
||||||
res.end(JSON.stringify(req.body, null, 2))
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
### Express route-specific
|
|
||||||
|
|
||||||
This example demonstrates adding body parsers specifically to the routes that
|
|
||||||
need them. In general, this is the most recommended way to use body-parser with
|
|
||||||
Express.
|
|
||||||
|
|
||||||
```js
|
|
||||||
var express = require('express')
|
|
||||||
var bodyParser = require('body-parser')
|
|
||||||
|
|
||||||
var app = express()
|
|
||||||
|
|
||||||
// create application/json parser
|
|
||||||
var jsonParser = bodyParser.json()
|
|
||||||
|
|
||||||
// create application/x-www-form-urlencoded parser
|
|
||||||
var urlencodedParser = bodyParser.urlencoded({ extended: false })
|
|
||||||
|
|
||||||
// POST /login gets urlencoded bodies
|
|
||||||
app.post('/login', urlencodedParser, function (req, res) {
|
|
||||||
res.send('welcome, ' + req.body.username)
|
|
||||||
})
|
|
||||||
|
|
||||||
// POST /api/users gets JSON bodies
|
|
||||||
app.post('/api/users', jsonParser, function (req, res) {
|
|
||||||
// create user in req.body
|
|
||||||
})
|
|
||||||
```
|
|
||||||
|
|
||||||
### Change accepted type for parsers
|
|
||||||
|
|
||||||
All the parsers accept a `type` option which allows you to change the
|
|
||||||
`Content-Type` that the middleware will parse.
|
|
||||||
|
|
||||||
```js
|
|
||||||
var express = require('express')
|
|
||||||
var bodyParser = require('body-parser')
|
|
||||||
|
|
||||||
var app = express()
|
|
||||||
|
|
||||||
// parse various different custom JSON types as JSON
|
|
||||||
app.use(bodyParser.json({ type: 'application/*+json' }))
|
|
||||||
|
|
||||||
// parse some custom thing into a Buffer
|
|
||||||
app.use(bodyParser.raw({ type: 'application/vnd.custom-type' }))
|
|
||||||
|
|
||||||
// parse an HTML body into a string
|
|
||||||
app.use(bodyParser.text({ type: 'text/html' }))
|
|
||||||
```
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
[MIT](LICENSE)
|
|
||||||
|
|
||||||
[ci-image]: https://badgen.net/github/checks/expressjs/body-parser/master?label=ci
|
|
||||||
[ci-url]: https://github.com/expressjs/body-parser/actions/workflows/ci.yml
|
|
||||||
[coveralls-image]: https://badgen.net/coveralls/c/github/expressjs/body-parser/master
|
|
||||||
[coveralls-url]: https://coveralls.io/r/expressjs/body-parser?branch=master
|
|
||||||
[node-version-image]: https://badgen.net/npm/node/body-parser
|
|
||||||
[node-version-url]: https://nodejs.org/en/download
|
|
||||||
[npm-downloads-image]: https://badgen.net/npm/dm/body-parser
|
|
||||||
[npm-url]: https://npmjs.org/package/body-parser
|
|
||||||
[npm-version-image]: https://badgen.net/npm/v/body-parser
|
|
||||||
[ossf-scorecard-badge]: https://api.scorecard.dev/projects/github.com/expressjs/body-parser/badge
|
|
||||||
[ossf-scorecard-visualizer]: https://ossf.github.io/scorecard-visualizer/#/projects/github.com/expressjs/body-parser
|
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
# Security Policies and Procedures
|
|
||||||
|
|
||||||
## Reporting a Bug
|
|
||||||
|
|
||||||
The Express team and community take all security bugs seriously. Thank you
|
|
||||||
for improving the security of Express. We appreciate your efforts and
|
|
||||||
responsible disclosure and will make every effort to acknowledge your
|
|
||||||
contributions.
|
|
||||||
|
|
||||||
Report security bugs by emailing the current owner(s) of `body-parser`. This
|
|
||||||
information can be found in the npm registry using the command
|
|
||||||
`npm owner ls body-parser`.
|
|
||||||
If unsure or unable to get the information from the above, open an issue
|
|
||||||
in the [project issue tracker](https://github.com/expressjs/body-parser/issues)
|
|
||||||
asking for the current contact information.
|
|
||||||
|
|
||||||
To ensure the timely response to your report, please ensure that the entirety
|
|
||||||
of the report is contained within the email body and not solely behind a web
|
|
||||||
link or an attachment.
|
|
||||||
|
|
||||||
At least one owner will acknowledge your email within 48 hours, and will send a
|
|
||||||
more detailed response within 48 hours indicating the next steps in handling
|
|
||||||
your report. After the initial reply to your report, the owners will
|
|
||||||
endeavor to keep you informed of the progress towards a fix and full
|
|
||||||
announcement, and may ask for additional information or guidance.
|
|
||||||
-156
@@ -1,156 +0,0 @@
|
|||||||
/*!
|
|
||||||
* body-parser
|
|
||||||
* Copyright(c) 2014-2015 Douglas Christopher Wilson
|
|
||||||
* MIT Licensed
|
|
||||||
*/
|
|
||||||
|
|
||||||
'use strict'
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Module dependencies.
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
var deprecate = require('depd')('body-parser')
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cache of loaded parsers.
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
var parsers = Object.create(null)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @typedef Parsers
|
|
||||||
* @type {function}
|
|
||||||
* @property {function} json
|
|
||||||
* @property {function} raw
|
|
||||||
* @property {function} text
|
|
||||||
* @property {function} urlencoded
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Module exports.
|
|
||||||
* @type {Parsers}
|
|
||||||
*/
|
|
||||||
|
|
||||||
exports = module.exports = deprecate.function(bodyParser,
|
|
||||||
'bodyParser: use individual json/urlencoded middlewares')
|
|
||||||
|
|
||||||
/**
|
|
||||||
* JSON parser.
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Object.defineProperty(exports, 'json', {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
get: createParserGetter('json')
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Raw parser.
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Object.defineProperty(exports, 'raw', {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
get: createParserGetter('raw')
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Text parser.
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Object.defineProperty(exports, 'text', {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
get: createParserGetter('text')
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* URL-encoded parser.
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
Object.defineProperty(exports, 'urlencoded', {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
get: createParserGetter('urlencoded')
|
|
||||||
})
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a middleware to parse json and urlencoded bodies.
|
|
||||||
*
|
|
||||||
* @param {object} [options]
|
|
||||||
* @return {function}
|
|
||||||
* @deprecated
|
|
||||||
* @public
|
|
||||||
*/
|
|
||||||
|
|
||||||
function bodyParser (options) {
|
|
||||||
// use default type for parsers
|
|
||||||
var opts = Object.create(options || null, {
|
|
||||||
type: {
|
|
||||||
configurable: true,
|
|
||||||
enumerable: true,
|
|
||||||
value: undefined,
|
|
||||||
writable: true
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
var _urlencoded = exports.urlencoded(opts)
|
|
||||||
var _json = exports.json(opts)
|
|
||||||
|
|
||||||
return function bodyParser (req, res, next) {
|
|
||||||
_json(req, res, function (err) {
|
|
||||||
if (err) return next(err)
|
|
||||||
_urlencoded(req, res, next)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a getter for loading a parser.
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
function createParserGetter (name) {
|
|
||||||
return function get () {
|
|
||||||
return loadParser(name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load a parser module.
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
|
|
||||||
function loadParser (parserName) {
|
|
||||||
var parser = parsers[parserName]
|
|
||||||
|
|
||||||
if (parser !== undefined) {
|
|
||||||
return parser
|
|
||||||
}
|
|
||||||
|
|
||||||
// this uses a switch for static require analysis
|
|
||||||
switch (parserName) {
|
|
||||||
case 'json':
|
|
||||||
parser = require('./lib/types/json')
|
|
||||||
break
|
|
||||||
case 'raw':
|
|
||||||
parser = require('./lib/types/raw')
|
|
||||||
break
|
|
||||||
case 'text':
|
|
||||||
parser = require('./lib/types/text')
|
|
||||||
break
|
|
||||||
case 'urlencoded':
|
|
||||||
parser = require('./lib/types/urlencoded')
|
|
||||||
break
|
|
||||||
}
|
|
||||||
|
|
||||||
// store to prevent invoking require()
|
|
||||||
return (parsers[parserName] = parser)
|
|
||||||
}
|
|
||||||
-56
@@ -1,56 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "body-parser",
|
|
||||||
"description": "Node.js body parsing middleware",
|
|
||||||
"version": "1.20.3",
|
|
||||||
"contributors": [
|
|
||||||
"Douglas Christopher Wilson <doug@somethingdoug.com>",
|
|
||||||
"Jonathan Ong <me@jongleberry.com> (http://jongleberry.com)"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"repository": "expressjs/body-parser",
|
|
||||||
"dependencies": {
|
|
||||||
"bytes": "3.1.2",
|
|
||||||
"content-type": "~1.0.5",
|
|
||||||
"debug": "2.6.9",
|
|
||||||
"depd": "2.0.0",
|
|
||||||
"destroy": "1.2.0",
|
|
||||||
"http-errors": "2.0.0",
|
|
||||||
"iconv-lite": "0.4.24",
|
|
||||||
"on-finished": "2.4.1",
|
|
||||||
"qs": "6.13.0",
|
|
||||||
"raw-body": "2.5.2",
|
|
||||||
"type-is": "~1.6.18",
|
|
||||||
"unpipe": "1.0.0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"eslint": "8.34.0",
|
|
||||||
"eslint-config-standard": "14.1.1",
|
|
||||||
"eslint-plugin-import": "2.27.5",
|
|
||||||
"eslint-plugin-markdown": "3.0.0",
|
|
||||||
"eslint-plugin-node": "11.1.0",
|
|
||||||
"eslint-plugin-promise": "6.1.1",
|
|
||||||
"eslint-plugin-standard": "4.1.0",
|
|
||||||
"methods": "1.1.2",
|
|
||||||
"mocha": "10.2.0",
|
|
||||||
"nyc": "15.1.0",
|
|
||||||
"safe-buffer": "5.2.1",
|
|
||||||
"supertest": "6.3.3"
|
|
||||||
},
|
|
||||||
"files": [
|
|
||||||
"lib/",
|
|
||||||
"LICENSE",
|
|
||||||
"HISTORY.md",
|
|
||||||
"SECURITY.md",
|
|
||||||
"index.js"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 0.8",
|
|
||||||
"npm": "1.2.8000 || >= 1.4.16"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"lint": "eslint .",
|
|
||||||
"test": "mocha --require test/support/env --reporter spec --check-leaks --bail test/",
|
|
||||||
"test-ci": "nyc --reporter=lcov --reporter=text npm test",
|
|
||||||
"test-cov": "nyc --reporter=html --reporter=text npm test"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-21
@@ -1,21 +0,0 @@
|
|||||||
MIT License
|
|
||||||
|
|
||||||
Copyright (c) 2016, 2018 Linus Unnebäck
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
-72
@@ -1,72 +0,0 @@
|
|||||||
/* eslint-disable node/no-deprecated-api */
|
|
||||||
|
|
||||||
var toString = Object.prototype.toString
|
|
||||||
|
|
||||||
var isModern = (
|
|
||||||
typeof Buffer !== 'undefined' &&
|
|
||||||
typeof Buffer.alloc === 'function' &&
|
|
||||||
typeof Buffer.allocUnsafe === 'function' &&
|
|
||||||
typeof Buffer.from === 'function'
|
|
||||||
)
|
|
||||||
|
|
||||||
function isArrayBuffer (input) {
|
|
||||||
return toString.call(input).slice(8, -1) === 'ArrayBuffer'
|
|
||||||
}
|
|
||||||
|
|
||||||
function fromArrayBuffer (obj, byteOffset, length) {
|
|
||||||
byteOffset >>>= 0
|
|
||||||
|
|
||||||
var maxLength = obj.byteLength - byteOffset
|
|
||||||
|
|
||||||
if (maxLength < 0) {
|
|
||||||
throw new RangeError("'offset' is out of bounds")
|
|
||||||
}
|
|
||||||
|
|
||||||
if (length === undefined) {
|
|
||||||
length = maxLength
|
|
||||||
} else {
|
|
||||||
length >>>= 0
|
|
||||||
|
|
||||||
if (length > maxLength) {
|
|
||||||
throw new RangeError("'length' is out of bounds")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return isModern
|
|
||||||
? Buffer.from(obj.slice(byteOffset, byteOffset + length))
|
|
||||||
: new Buffer(new Uint8Array(obj.slice(byteOffset, byteOffset + length)))
|
|
||||||
}
|
|
||||||
|
|
||||||
function fromString (string, encoding) {
|
|
||||||
if (typeof encoding !== 'string' || encoding === '') {
|
|
||||||
encoding = 'utf8'
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Buffer.isEncoding(encoding)) {
|
|
||||||
throw new TypeError('"encoding" must be a valid string encoding')
|
|
||||||
}
|
|
||||||
|
|
||||||
return isModern
|
|
||||||
? Buffer.from(string, encoding)
|
|
||||||
: new Buffer(string, encoding)
|
|
||||||
}
|
|
||||||
|
|
||||||
function bufferFrom (value, encodingOrOffset, length) {
|
|
||||||
if (typeof value === 'number') {
|
|
||||||
throw new TypeError('"value" argument must not be a number')
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isArrayBuffer(value)) {
|
|
||||||
return fromArrayBuffer(value, encodingOrOffset, length)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof value === 'string') {
|
|
||||||
return fromString(value, encodingOrOffset)
|
|
||||||
}
|
|
||||||
|
|
||||||
return isModern
|
|
||||||
? Buffer.from(value)
|
|
||||||
: new Buffer(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = bufferFrom
|
|
||||||
-19
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "buffer-from",
|
|
||||||
"version": "1.1.2",
|
|
||||||
"license": "MIT",
|
|
||||||
"repository": "LinusU/buffer-from",
|
|
||||||
"files": [
|
|
||||||
"index.js"
|
|
||||||
],
|
|
||||||
"scripts": {
|
|
||||||
"test": "standard && node test"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"standard": "^12.0.1"
|
|
||||||
},
|
|
||||||
"keywords": [
|
|
||||||
"buffer",
|
|
||||||
"buffer from"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
-69
@@ -1,69 +0,0 @@
|
|||||||
# Buffer From
|
|
||||||
|
|
||||||
A [ponyfill](https://ponyfill.com) for `Buffer.from`, uses native implementation if available.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
```sh
|
|
||||||
npm install --save buffer-from
|
|
||||||
```
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
```js
|
|
||||||
const bufferFrom = require('buffer-from')
|
|
||||||
|
|
||||||
console.log(bufferFrom([1, 2, 3, 4]))
|
|
||||||
//=> <Buffer 01 02 03 04>
|
|
||||||
|
|
||||||
const arr = new Uint8Array([1, 2, 3, 4])
|
|
||||||
console.log(bufferFrom(arr.buffer, 1, 2))
|
|
||||||
//=> <Buffer 02 03>
|
|
||||||
|
|
||||||
console.log(bufferFrom('test', 'utf8'))
|
|
||||||
//=> <Buffer 74 65 73 74>
|
|
||||||
|
|
||||||
const buf = bufferFrom('test')
|
|
||||||
console.log(bufferFrom(buf))
|
|
||||||
//=> <Buffer 74 65 73 74>
|
|
||||||
```
|
|
||||||
|
|
||||||
## API
|
|
||||||
|
|
||||||
### bufferFrom(array)
|
|
||||||
|
|
||||||
- `array` <Array>
|
|
||||||
|
|
||||||
Allocates a new `Buffer` using an `array` of octets.
|
|
||||||
|
|
||||||
### bufferFrom(arrayBuffer[, byteOffset[, length]])
|
|
||||||
|
|
||||||
- `arrayBuffer` <ArrayBuffer> The `.buffer` property of a TypedArray or ArrayBuffer
|
|
||||||
- `byteOffset` <Integer> Where to start copying from `arrayBuffer`. **Default:** `0`
|
|
||||||
- `length` <Integer> How many bytes to copy from `arrayBuffer`. **Default:** `arrayBuffer.length - byteOffset`
|
|
||||||
|
|
||||||
When passed a reference to the `.buffer` property of a TypedArray instance, the
|
|
||||||
newly created `Buffer` will share the same allocated memory as the TypedArray.
|
|
||||||
|
|
||||||
The optional `byteOffset` and `length` arguments specify a memory range within
|
|
||||||
the `arrayBuffer` that will be shared by the `Buffer`.
|
|
||||||
|
|
||||||
### bufferFrom(buffer)
|
|
||||||
|
|
||||||
- `buffer` <Buffer> An existing `Buffer` to copy data from
|
|
||||||
|
|
||||||
Copies the passed `buffer` data onto a new `Buffer` instance.
|
|
||||||
|
|
||||||
### bufferFrom(string[, encoding])
|
|
||||||
|
|
||||||
- `string` <String> A string to encode.
|
|
||||||
- `encoding` <String> The encoding of `string`. **Default:** `'utf8'`
|
|
||||||
|
|
||||||
Creates a new `Buffer` containing the given JavaScript string `string`. If
|
|
||||||
provided, the `encoding` parameter identifies the character encoding of
|
|
||||||
`string`.
|
|
||||||
|
|
||||||
## See also
|
|
||||||
|
|
||||||
- [buffer-alloc](https://github.com/LinusU/buffer-alloc) A ponyfill for `Buffer.alloc`
|
|
||||||
- [buffer-alloc-unsafe](https://github.com/LinusU/buffer-alloc-unsafe) A ponyfill for `Buffer.allocUnsafe`
|
|
||||||
-5
@@ -1,5 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
extends: '@mscdex/eslint-config',
|
|
||||||
};
|
|
||||||
-24
@@ -1,24 +0,0 @@
|
|||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
tests-linux:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
node-version: [10.16.0, 10.x, 12.x, 14.x, 16.x]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Use Node.js ${{ matrix.node-version }}
|
|
||||||
uses: actions/setup-node@v1
|
|
||||||
with:
|
|
||||||
node-version: ${{ matrix.node-version }}
|
|
||||||
- name: Install module
|
|
||||||
run: npm install
|
|
||||||
- name: Run tests
|
|
||||||
run: npm test
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
name: lint
|
|
||||||
|
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
env:
|
|
||||||
NODE_VERSION: 16.x
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
lint-js:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Use Node.js ${{ env.NODE_VERSION }}
|
|
||||||
uses: actions/setup-node@v1
|
|
||||||
with:
|
|
||||||
node-version: ${{ env.NODE_VERSION }}
|
|
||||||
- name: Install ESLint + ESLint configs/plugins
|
|
||||||
run: npm install --only=dev
|
|
||||||
- name: Lint files
|
|
||||||
run: npm run lint
|
|
||||||
-19
@@ -1,19 +0,0 @@
|
|||||||
Copyright Brian White. All rights reserved.
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to
|
|
||||||
deal in the Software without restriction, including without limitation the
|
|
||||||
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
||||||
sell copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
||||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
||||||
IN THE SOFTWARE.
|
|
||||||
-191
@@ -1,191 +0,0 @@
|
|||||||
# Description
|
|
||||||
|
|
||||||
A node.js module for parsing incoming HTML form data.
|
|
||||||
|
|
||||||
Changes (breaking or otherwise) in v1.0.0 can be found [here](https://github.com/mscdex/busboy/issues/266).
|
|
||||||
|
|
||||||
# Requirements
|
|
||||||
|
|
||||||
* [node.js](http://nodejs.org/) -- v10.16.0 or newer
|
|
||||||
|
|
||||||
|
|
||||||
# Install
|
|
||||||
|
|
||||||
npm install busboy
|
|
||||||
|
|
||||||
|
|
||||||
# Examples
|
|
||||||
|
|
||||||
* Parsing (multipart) with default options:
|
|
||||||
|
|
||||||
```js
|
|
||||||
const http = require('http');
|
|
||||||
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
http.createServer((req, res) => {
|
|
||||||
if (req.method === 'POST') {
|
|
||||||
console.log('POST request');
|
|
||||||
const bb = busboy({ headers: req.headers });
|
|
||||||
bb.on('file', (name, file, info) => {
|
|
||||||
const { filename, encoding, mimeType } = info;
|
|
||||||
console.log(
|
|
||||||
`File [${name}]: filename: %j, encoding: %j, mimeType: %j`,
|
|
||||||
filename,
|
|
||||||
encoding,
|
|
||||||
mimeType
|
|
||||||
);
|
|
||||||
file.on('data', (data) => {
|
|
||||||
console.log(`File [${name}] got ${data.length} bytes`);
|
|
||||||
}).on('close', () => {
|
|
||||||
console.log(`File [${name}] done`);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
bb.on('field', (name, val, info) => {
|
|
||||||
console.log(`Field [${name}]: value: %j`, val);
|
|
||||||
});
|
|
||||||
bb.on('close', () => {
|
|
||||||
console.log('Done parsing form!');
|
|
||||||
res.writeHead(303, { Connection: 'close', Location: '/' });
|
|
||||||
res.end();
|
|
||||||
});
|
|
||||||
req.pipe(bb);
|
|
||||||
} else if (req.method === 'GET') {
|
|
||||||
res.writeHead(200, { Connection: 'close' });
|
|
||||||
res.end(`
|
|
||||||
<html>
|
|
||||||
<head></head>
|
|
||||||
<body>
|
|
||||||
<form method="POST" enctype="multipart/form-data">
|
|
||||||
<input type="file" name="filefield"><br />
|
|
||||||
<input type="text" name="textfield"><br />
|
|
||||||
<input type="submit">
|
|
||||||
</form>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
`);
|
|
||||||
}
|
|
||||||
}).listen(8000, () => {
|
|
||||||
console.log('Listening for requests');
|
|
||||||
});
|
|
||||||
|
|
||||||
// Example output:
|
|
||||||
//
|
|
||||||
// Listening for requests
|
|
||||||
// < ... form submitted ... >
|
|
||||||
// POST request
|
|
||||||
// File [filefield]: filename: "logo.jpg", encoding: "binary", mime: "image/jpeg"
|
|
||||||
// File [filefield] got 11912 bytes
|
|
||||||
// Field [textfield]: value: "testing! :-)"
|
|
||||||
// File [filefield] done
|
|
||||||
// Done parsing form!
|
|
||||||
```
|
|
||||||
|
|
||||||
* Save all incoming files to disk:
|
|
||||||
|
|
||||||
```js
|
|
||||||
const { randomFillSync } = require('crypto');
|
|
||||||
const fs = require('fs');
|
|
||||||
const http = require('http');
|
|
||||||
const os = require('os');
|
|
||||||
const path = require('path');
|
|
||||||
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
const random = (() => {
|
|
||||||
const buf = Buffer.alloc(16);
|
|
||||||
return () => randomFillSync(buf).toString('hex');
|
|
||||||
})();
|
|
||||||
|
|
||||||
http.createServer((req, res) => {
|
|
||||||
if (req.method === 'POST') {
|
|
||||||
const bb = busboy({ headers: req.headers });
|
|
||||||
bb.on('file', (name, file, info) => {
|
|
||||||
const saveTo = path.join(os.tmpdir(), `busboy-upload-${random()}`);
|
|
||||||
file.pipe(fs.createWriteStream(saveTo));
|
|
||||||
});
|
|
||||||
bb.on('close', () => {
|
|
||||||
res.writeHead(200, { 'Connection': 'close' });
|
|
||||||
res.end(`That's all folks!`);
|
|
||||||
});
|
|
||||||
req.pipe(bb);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
res.writeHead(404);
|
|
||||||
res.end();
|
|
||||||
}).listen(8000, () => {
|
|
||||||
console.log('Listening for requests');
|
|
||||||
});
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
# API
|
|
||||||
|
|
||||||
## Exports
|
|
||||||
|
|
||||||
`busboy` exports a single function:
|
|
||||||
|
|
||||||
**( _function_ )**(< _object_ >config) - Creates and returns a new _Writable_ form parser stream.
|
|
||||||
|
|
||||||
* Valid `config` properties:
|
|
||||||
|
|
||||||
* **headers** - _object_ - These are the HTTP headers of the incoming request, which are used by individual parsers.
|
|
||||||
|
|
||||||
* **highWaterMark** - _integer_ - highWaterMark to use for the parser stream. **Default:** node's _stream.Writable_ default.
|
|
||||||
|
|
||||||
* **fileHwm** - _integer_ - highWaterMark to use for individual file streams. **Default:** node's _stream.Readable_ default.
|
|
||||||
|
|
||||||
* **defCharset** - _string_ - Default character set to use when one isn't defined. **Default:** `'utf8'`.
|
|
||||||
|
|
||||||
* **defParamCharset** - _string_ - For multipart forms, the default character set to use for values of part header parameters (e.g. filename) that are not extended parameters (that contain an explicit charset). **Default:** `'latin1'`.
|
|
||||||
|
|
||||||
* **preservePath** - _boolean_ - If paths in filenames from file parts in a `'multipart/form-data'` request shall be preserved. **Default:** `false`.
|
|
||||||
|
|
||||||
* **limits** - _object_ - Various limits on incoming data. Valid properties are:
|
|
||||||
|
|
||||||
* **fieldNameSize** - _integer_ - Max field name size (in bytes). **Default:** `100`.
|
|
||||||
|
|
||||||
* **fieldSize** - _integer_ - Max field value size (in bytes). **Default:** `1048576` (1MB).
|
|
||||||
|
|
||||||
* **fields** - _integer_ - Max number of non-file fields. **Default:** `Infinity`.
|
|
||||||
|
|
||||||
* **fileSize** - _integer_ - For multipart forms, the max file size (in bytes). **Default:** `Infinity`.
|
|
||||||
|
|
||||||
* **files** - _integer_ - For multipart forms, the max number of file fields. **Default:** `Infinity`.
|
|
||||||
|
|
||||||
* **parts** - _integer_ - For multipart forms, the max number of parts (fields + files). **Default:** `Infinity`.
|
|
||||||
|
|
||||||
* **headerPairs** - _integer_ - For multipart forms, the max number of header key-value pairs to parse. **Default:** `2000` (same as node's http module).
|
|
||||||
|
|
||||||
This function can throw exceptions if there is something wrong with the values in `config`. For example, if the Content-Type in `headers` is missing entirely, is not a supported type, or is missing the boundary for `'multipart/form-data'` requests.
|
|
||||||
|
|
||||||
## (Special) Parser stream events
|
|
||||||
|
|
||||||
* **file**(< _string_ >name, < _Readable_ >stream, < _object_ >info) - Emitted for each new file found. `name` contains the form field name. `stream` is a _Readable_ stream containing the file's data. No transformations/conversions (e.g. base64 to raw binary) are done on the file's data. `info` contains the following properties:
|
|
||||||
|
|
||||||
* `filename` - _string_ - If supplied, this contains the file's filename. **WARNING:** You should almost _never_ use this value as-is (especially if you are using `preservePath: true` in your `config`) as it could contain malicious input. You are better off generating your own (safe) filenames, or at the very least using a hash of the filename.
|
|
||||||
|
|
||||||
* `encoding` - _string_ - The file's `'Content-Transfer-Encoding'` value.
|
|
||||||
|
|
||||||
* `mimeType` - _string_ - The file's `'Content-Type'` value.
|
|
||||||
|
|
||||||
**Note:** If you listen for this event, you should always consume the `stream` whether you care about its contents or not (you can simply do `stream.resume();` if you want to discard/skip the contents), otherwise the `'finish'`/`'close'` event will never fire on the busboy parser stream.
|
|
||||||
However, if you aren't accepting files, you can either simply not listen for the `'file'` event at all or set `limits.files` to `0`, and any/all files will be automatically skipped (these skipped files will still count towards any configured `limits.files` and `limits.parts` limits though).
|
|
||||||
|
|
||||||
**Note:** If a configured `limits.fileSize` limit was reached for a file, `stream` will both have a boolean property `truncated` set to `true` (best checked at the end of the stream) and emit a `'limit'` event to notify you when this happens.
|
|
||||||
|
|
||||||
* **field**(< _string_ >name, < _string_ >value, < _object_ >info) - Emitted for each new non-file field found. `name` contains the form field name. `value` contains the string value of the field. `info` contains the following properties:
|
|
||||||
|
|
||||||
* `nameTruncated` - _boolean_ - Whether `name` was truncated or not (due to a configured `limits.fieldNameSize` limit)
|
|
||||||
|
|
||||||
* `valueTruncated` - _boolean_ - Whether `value` was truncated or not (due to a configured `limits.fieldSize` limit)
|
|
||||||
|
|
||||||
* `encoding` - _string_ - The field's `'Content-Transfer-Encoding'` value.
|
|
||||||
|
|
||||||
* `mimeType` - _string_ - The field's `'Content-Type'` value.
|
|
||||||
|
|
||||||
* **partsLimit**() - Emitted when the configured `limits.parts` limit has been reached. No more `'file'` or `'field'` events will be emitted.
|
|
||||||
|
|
||||||
* **filesLimit**() - Emitted when the configured `limits.files` limit has been reached. No more `'file'` events will be emitted.
|
|
||||||
|
|
||||||
* **fieldsLimit**() - Emitted when the configured `limits.fields` limit has been reached. No more `'field'` events will be emitted.
|
|
||||||
-149
@@ -1,149 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
function createMultipartBuffers(boundary, sizes) {
|
|
||||||
const bufs = [];
|
|
||||||
for (let i = 0; i < sizes.length; ++i) {
|
|
||||||
const mb = sizes[i] * 1024 * 1024;
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}`,
|
|
||||||
`content-disposition: form-data; name="field${i + 1}"`,
|
|
||||||
'',
|
|
||||||
'0'.repeat(mb),
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
}
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}--`,
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
return bufs;
|
|
||||||
}
|
|
||||||
|
|
||||||
const boundary = '-----------------------------168072824752491622650073';
|
|
||||||
const buffers = createMultipartBuffers(boundary, [
|
|
||||||
10,
|
|
||||||
10,
|
|
||||||
10,
|
|
||||||
20,
|
|
||||||
50,
|
|
||||||
]);
|
|
||||||
const calls = {
|
|
||||||
partBegin: 0,
|
|
||||||
headerField: 0,
|
|
||||||
headerValue: 0,
|
|
||||||
headerEnd: 0,
|
|
||||||
headersEnd: 0,
|
|
||||||
partData: 0,
|
|
||||||
partEnd: 0,
|
|
||||||
end: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
const moduleName = process.argv[2];
|
|
||||||
switch (moduleName) {
|
|
||||||
case 'busboy': {
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
const parser = busboy({
|
|
||||||
limits: {
|
|
||||||
fieldSizeLimit: Infinity,
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
parser.on('field', (name, val, info) => {
|
|
||||||
++calls.partBegin;
|
|
||||||
++calls.partData;
|
|
||||||
++calls.partEnd;
|
|
||||||
}).on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable': {
|
|
||||||
const { MultipartParser } = require('formidable');
|
|
||||||
|
|
||||||
const parser = new MultipartParser();
|
|
||||||
parser.initWithBoundary(boundary);
|
|
||||||
parser.on('data', ({ name }) => {
|
|
||||||
++calls[name];
|
|
||||||
if (name === 'end')
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'multiparty': {
|
|
||||||
const { Readable } = require('stream');
|
|
||||||
|
|
||||||
const { Form } = require('multiparty');
|
|
||||||
|
|
||||||
const form = new Form({
|
|
||||||
maxFieldsSize: Infinity,
|
|
||||||
maxFields: Infinity,
|
|
||||||
maxFilesSize: Infinity,
|
|
||||||
autoFields: false,
|
|
||||||
autoFiles: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = new Readable({ read: () => {} });
|
|
||||||
req.headers = {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
};
|
|
||||||
|
|
||||||
function hijack(name, fn) {
|
|
||||||
const oldFn = form[name];
|
|
||||||
form[name] = function() {
|
|
||||||
fn();
|
|
||||||
return oldFn.apply(this, arguments);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
hijack('onParseHeaderField', () => {
|
|
||||||
++calls.headerField;
|
|
||||||
});
|
|
||||||
hijack('onParseHeaderValue', () => {
|
|
||||||
++calls.headerValue;
|
|
||||||
});
|
|
||||||
hijack('onParsePartBegin', () => {
|
|
||||||
++calls.partBegin;
|
|
||||||
});
|
|
||||||
hijack('onParsePartData', () => {
|
|
||||||
++calls.partData;
|
|
||||||
});
|
|
||||||
hijack('onParsePartEnd', () => {
|
|
||||||
++calls.partEnd;
|
|
||||||
});
|
|
||||||
|
|
||||||
form.on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
}).on('part', (p) => p.resume());
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
form.parse(req);
|
|
||||||
for (const buf of buffers)
|
|
||||||
req.push(buf);
|
|
||||||
req.push(null);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (moduleName === undefined)
|
|
||||||
console.error('Missing parser module name');
|
|
||||||
else
|
|
||||||
console.error(`Invalid parser module name: ${moduleName}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
-143
@@ -1,143 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
function createMultipartBuffers(boundary, sizes) {
|
|
||||||
const bufs = [];
|
|
||||||
for (let i = 0; i < sizes.length; ++i) {
|
|
||||||
const mb = sizes[i] * 1024 * 1024;
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}`,
|
|
||||||
`content-disposition: form-data; name="field${i + 1}"`,
|
|
||||||
'',
|
|
||||||
'0'.repeat(mb),
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
}
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}--`,
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
return bufs;
|
|
||||||
}
|
|
||||||
|
|
||||||
const boundary = '-----------------------------168072824752491622650073';
|
|
||||||
const buffers = createMultipartBuffers(boundary, (new Array(100)).fill(1));
|
|
||||||
const calls = {
|
|
||||||
partBegin: 0,
|
|
||||||
headerField: 0,
|
|
||||||
headerValue: 0,
|
|
||||||
headerEnd: 0,
|
|
||||||
headersEnd: 0,
|
|
||||||
partData: 0,
|
|
||||||
partEnd: 0,
|
|
||||||
end: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
const moduleName = process.argv[2];
|
|
||||||
switch (moduleName) {
|
|
||||||
case 'busboy': {
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
const parser = busboy({
|
|
||||||
limits: {
|
|
||||||
fieldSizeLimit: Infinity,
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
parser.on('field', (name, val, info) => {
|
|
||||||
++calls.partBegin;
|
|
||||||
++calls.partData;
|
|
||||||
++calls.partEnd;
|
|
||||||
}).on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable': {
|
|
||||||
const { MultipartParser } = require('formidable');
|
|
||||||
|
|
||||||
const parser = new MultipartParser();
|
|
||||||
parser.initWithBoundary(boundary);
|
|
||||||
parser.on('data', ({ name }) => {
|
|
||||||
++calls[name];
|
|
||||||
if (name === 'end')
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'multiparty': {
|
|
||||||
const { Readable } = require('stream');
|
|
||||||
|
|
||||||
const { Form } = require('multiparty');
|
|
||||||
|
|
||||||
const form = new Form({
|
|
||||||
maxFieldsSize: Infinity,
|
|
||||||
maxFields: Infinity,
|
|
||||||
maxFilesSize: Infinity,
|
|
||||||
autoFields: false,
|
|
||||||
autoFiles: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = new Readable({ read: () => {} });
|
|
||||||
req.headers = {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
};
|
|
||||||
|
|
||||||
function hijack(name, fn) {
|
|
||||||
const oldFn = form[name];
|
|
||||||
form[name] = function() {
|
|
||||||
fn();
|
|
||||||
return oldFn.apply(this, arguments);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
hijack('onParseHeaderField', () => {
|
|
||||||
++calls.headerField;
|
|
||||||
});
|
|
||||||
hijack('onParseHeaderValue', () => {
|
|
||||||
++calls.headerValue;
|
|
||||||
});
|
|
||||||
hijack('onParsePartBegin', () => {
|
|
||||||
++calls.partBegin;
|
|
||||||
});
|
|
||||||
hijack('onParsePartData', () => {
|
|
||||||
++calls.partData;
|
|
||||||
});
|
|
||||||
hijack('onParsePartEnd', () => {
|
|
||||||
++calls.partEnd;
|
|
||||||
});
|
|
||||||
|
|
||||||
form.on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
}).on('part', (p) => p.resume());
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
form.parse(req);
|
|
||||||
for (const buf of buffers)
|
|
||||||
req.push(buf);
|
|
||||||
req.push(null);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (moduleName === undefined)
|
|
||||||
console.error('Missing parser module name');
|
|
||||||
else
|
|
||||||
console.error(`Invalid parser module name: ${moduleName}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
-154
@@ -1,154 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
function createMultipartBuffers(boundary, sizes) {
|
|
||||||
const bufs = [];
|
|
||||||
for (let i = 0; i < sizes.length; ++i) {
|
|
||||||
const mb = sizes[i] * 1024 * 1024;
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}`,
|
|
||||||
`content-disposition: form-data; name="file${i + 1}"; `
|
|
||||||
+ `filename="random${i + 1}.bin"`,
|
|
||||||
'content-type: application/octet-stream',
|
|
||||||
'',
|
|
||||||
'0'.repeat(mb),
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
}
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}--`,
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
return bufs;
|
|
||||||
}
|
|
||||||
|
|
||||||
const boundary = '-----------------------------168072824752491622650073';
|
|
||||||
const buffers = createMultipartBuffers(boundary, [
|
|
||||||
10,
|
|
||||||
10,
|
|
||||||
10,
|
|
||||||
20,
|
|
||||||
50,
|
|
||||||
]);
|
|
||||||
const calls = {
|
|
||||||
partBegin: 0,
|
|
||||||
headerField: 0,
|
|
||||||
headerValue: 0,
|
|
||||||
headerEnd: 0,
|
|
||||||
headersEnd: 0,
|
|
||||||
partData: 0,
|
|
||||||
partEnd: 0,
|
|
||||||
end: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
const moduleName = process.argv[2];
|
|
||||||
switch (moduleName) {
|
|
||||||
case 'busboy': {
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
const parser = busboy({
|
|
||||||
limits: {
|
|
||||||
fieldSizeLimit: Infinity,
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
parser.on('file', (name, stream, info) => {
|
|
||||||
++calls.partBegin;
|
|
||||||
stream.on('data', (chunk) => {
|
|
||||||
++calls.partData;
|
|
||||||
}).on('end', () => {
|
|
||||||
++calls.partEnd;
|
|
||||||
});
|
|
||||||
}).on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable': {
|
|
||||||
const { MultipartParser } = require('formidable');
|
|
||||||
|
|
||||||
const parser = new MultipartParser();
|
|
||||||
parser.initWithBoundary(boundary);
|
|
||||||
parser.on('data', ({ name }) => {
|
|
||||||
++calls[name];
|
|
||||||
if (name === 'end')
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'multiparty': {
|
|
||||||
const { Readable } = require('stream');
|
|
||||||
|
|
||||||
const { Form } = require('multiparty');
|
|
||||||
|
|
||||||
const form = new Form({
|
|
||||||
maxFieldsSize: Infinity,
|
|
||||||
maxFields: Infinity,
|
|
||||||
maxFilesSize: Infinity,
|
|
||||||
autoFields: false,
|
|
||||||
autoFiles: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = new Readable({ read: () => {} });
|
|
||||||
req.headers = {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
};
|
|
||||||
|
|
||||||
function hijack(name, fn) {
|
|
||||||
const oldFn = form[name];
|
|
||||||
form[name] = function() {
|
|
||||||
fn();
|
|
||||||
return oldFn.apply(this, arguments);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
hijack('onParseHeaderField', () => {
|
|
||||||
++calls.headerField;
|
|
||||||
});
|
|
||||||
hijack('onParseHeaderValue', () => {
|
|
||||||
++calls.headerValue;
|
|
||||||
});
|
|
||||||
hijack('onParsePartBegin', () => {
|
|
||||||
++calls.partBegin;
|
|
||||||
});
|
|
||||||
hijack('onParsePartData', () => {
|
|
||||||
++calls.partData;
|
|
||||||
});
|
|
||||||
hijack('onParsePartEnd', () => {
|
|
||||||
++calls.partEnd;
|
|
||||||
});
|
|
||||||
|
|
||||||
form.on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
}).on('part', (p) => p.resume());
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
form.parse(req);
|
|
||||||
for (const buf of buffers)
|
|
||||||
req.push(buf);
|
|
||||||
req.push(null);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (moduleName === undefined)
|
|
||||||
console.error('Missing parser module name');
|
|
||||||
else
|
|
||||||
console.error(`Invalid parser module name: ${moduleName}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
-148
@@ -1,148 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
function createMultipartBuffers(boundary, sizes) {
|
|
||||||
const bufs = [];
|
|
||||||
for (let i = 0; i < sizes.length; ++i) {
|
|
||||||
const mb = sizes[i] * 1024 * 1024;
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}`,
|
|
||||||
`content-disposition: form-data; name="file${i + 1}"; `
|
|
||||||
+ `filename="random${i + 1}.bin"`,
|
|
||||||
'content-type: application/octet-stream',
|
|
||||||
'',
|
|
||||||
'0'.repeat(mb),
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
}
|
|
||||||
bufs.push(Buffer.from([
|
|
||||||
`--${boundary}--`,
|
|
||||||
'',
|
|
||||||
].join('\r\n')));
|
|
||||||
return bufs;
|
|
||||||
}
|
|
||||||
|
|
||||||
const boundary = '-----------------------------168072824752491622650073';
|
|
||||||
const buffers = createMultipartBuffers(boundary, (new Array(100)).fill(1));
|
|
||||||
const calls = {
|
|
||||||
partBegin: 0,
|
|
||||||
headerField: 0,
|
|
||||||
headerValue: 0,
|
|
||||||
headerEnd: 0,
|
|
||||||
headersEnd: 0,
|
|
||||||
partData: 0,
|
|
||||||
partEnd: 0,
|
|
||||||
end: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
const moduleName = process.argv[2];
|
|
||||||
switch (moduleName) {
|
|
||||||
case 'busboy': {
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
const parser = busboy({
|
|
||||||
limits: {
|
|
||||||
fieldSizeLimit: Infinity,
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
parser.on('file', (name, stream, info) => {
|
|
||||||
++calls.partBegin;
|
|
||||||
stream.on('data', (chunk) => {
|
|
||||||
++calls.partData;
|
|
||||||
}).on('end', () => {
|
|
||||||
++calls.partEnd;
|
|
||||||
});
|
|
||||||
}).on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable': {
|
|
||||||
const { MultipartParser } = require('formidable');
|
|
||||||
|
|
||||||
const parser = new MultipartParser();
|
|
||||||
parser.initWithBoundary(boundary);
|
|
||||||
parser.on('data', ({ name }) => {
|
|
||||||
++calls[name];
|
|
||||||
if (name === 'end')
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'multiparty': {
|
|
||||||
const { Readable } = require('stream');
|
|
||||||
|
|
||||||
const { Form } = require('multiparty');
|
|
||||||
|
|
||||||
const form = new Form({
|
|
||||||
maxFieldsSize: Infinity,
|
|
||||||
maxFields: Infinity,
|
|
||||||
maxFilesSize: Infinity,
|
|
||||||
autoFields: false,
|
|
||||||
autoFiles: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
const req = new Readable({ read: () => {} });
|
|
||||||
req.headers = {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
};
|
|
||||||
|
|
||||||
function hijack(name, fn) {
|
|
||||||
const oldFn = form[name];
|
|
||||||
form[name] = function() {
|
|
||||||
fn();
|
|
||||||
return oldFn.apply(this, arguments);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
hijack('onParseHeaderField', () => {
|
|
||||||
++calls.headerField;
|
|
||||||
});
|
|
||||||
hijack('onParseHeaderValue', () => {
|
|
||||||
++calls.headerValue;
|
|
||||||
});
|
|
||||||
hijack('onParsePartBegin', () => {
|
|
||||||
++calls.partBegin;
|
|
||||||
});
|
|
||||||
hijack('onParsePartData', () => {
|
|
||||||
++calls.partData;
|
|
||||||
});
|
|
||||||
hijack('onParsePartEnd', () => {
|
|
||||||
++calls.partEnd;
|
|
||||||
});
|
|
||||||
|
|
||||||
form.on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
}).on('part', (p) => p.resume());
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
form.parse(req);
|
|
||||||
for (const buf of buffers)
|
|
||||||
req.push(buf);
|
|
||||||
req.push(null);
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (moduleName === undefined)
|
|
||||||
console.error('Missing parser module name');
|
|
||||||
else
|
|
||||||
console.error(`Invalid parser module name: ${moduleName}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
-101
@@ -1,101 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
const buffers = [
|
|
||||||
Buffer.from(
|
|
||||||
(new Array(100)).fill('').map((_, i) => `key${i}=value${i}`).join('&')
|
|
||||||
),
|
|
||||||
];
|
|
||||||
const calls = {
|
|
||||||
field: 0,
|
|
||||||
end: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
let n = 3e3;
|
|
||||||
|
|
||||||
const moduleName = process.argv[2];
|
|
||||||
switch (moduleName) {
|
|
||||||
case 'busboy': {
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
(function next() {
|
|
||||||
const parser = busboy({
|
|
||||||
limits: {
|
|
||||||
fieldSizeLimit: Infinity,
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'content-type': 'application/x-www-form-urlencoded; charset=utf-8',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
parser.on('field', (name, val, info) => {
|
|
||||||
++calls.field;
|
|
||||||
}).on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
if (--n === 0)
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
else
|
|
||||||
process.nextTick(next);
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
parser.end();
|
|
||||||
})();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable': {
|
|
||||||
const QuerystringParser =
|
|
||||||
require('formidable/src/parsers/Querystring.js');
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
(function next() {
|
|
||||||
const parser = new QuerystringParser();
|
|
||||||
parser.on('data', (obj) => {
|
|
||||||
++calls.field;
|
|
||||||
}).on('end', () => {
|
|
||||||
++calls.end;
|
|
||||||
if (--n === 0)
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
else
|
|
||||||
process.nextTick(next);
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
parser.end();
|
|
||||||
})();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable-streaming': {
|
|
||||||
const QuerystringParser =
|
|
||||||
require('formidable/src/parsers/StreamingQuerystring.js');
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
(function next() {
|
|
||||||
const parser = new QuerystringParser();
|
|
||||||
parser.on('data', (obj) => {
|
|
||||||
++calls.field;
|
|
||||||
}).on('end', () => {
|
|
||||||
++calls.end;
|
|
||||||
if (--n === 0)
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
else
|
|
||||||
process.nextTick(next);
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
parser.end();
|
|
||||||
})();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (moduleName === undefined)
|
|
||||||
console.error('Missing parser module name');
|
|
||||||
else
|
|
||||||
console.error(`Invalid parser module name: ${moduleName}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
-84
@@ -1,84 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
const buffers = [
|
|
||||||
Buffer.from(
|
|
||||||
(new Array(900)).fill('').map((_, i) => `key${i}=value${i}`).join('&')
|
|
||||||
),
|
|
||||||
];
|
|
||||||
const calls = {
|
|
||||||
field: 0,
|
|
||||||
end: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
const moduleName = process.argv[2];
|
|
||||||
switch (moduleName) {
|
|
||||||
case 'busboy': {
|
|
||||||
const busboy = require('busboy');
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
const parser = busboy({
|
|
||||||
limits: {
|
|
||||||
fieldSizeLimit: Infinity,
|
|
||||||
},
|
|
||||||
headers: {
|
|
||||||
'content-type': 'application/x-www-form-urlencoded; charset=utf-8',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
parser.on('field', (name, val, info) => {
|
|
||||||
++calls.field;
|
|
||||||
}).on('close', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
parser.end();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable': {
|
|
||||||
const QuerystringParser =
|
|
||||||
require('formidable/src/parsers/Querystring.js');
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
const parser = new QuerystringParser();
|
|
||||||
parser.on('data', (obj) => {
|
|
||||||
++calls.field;
|
|
||||||
}).on('end', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
parser.end();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 'formidable-streaming': {
|
|
||||||
const QuerystringParser =
|
|
||||||
require('formidable/src/parsers/StreamingQuerystring.js');
|
|
||||||
|
|
||||||
console.time(moduleName);
|
|
||||||
const parser = new QuerystringParser();
|
|
||||||
parser.on('data', (obj) => {
|
|
||||||
++calls.field;
|
|
||||||
}).on('end', () => {
|
|
||||||
++calls.end;
|
|
||||||
console.timeEnd(moduleName);
|
|
||||||
});
|
|
||||||
|
|
||||||
for (const buf of buffers)
|
|
||||||
parser.write(buf);
|
|
||||||
parser.end();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (moduleName === undefined)
|
|
||||||
console.error('Missing parser module name');
|
|
||||||
else
|
|
||||||
console.error(`Invalid parser module name: ${moduleName}`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
{ "name": "busboy",
|
|
||||||
"version": "1.6.0",
|
|
||||||
"author": "Brian White <mscdex@mscdex.net>",
|
|
||||||
"description": "A streaming parser for HTML form data for node.js",
|
|
||||||
"main": "./lib/index.js",
|
|
||||||
"dependencies": {
|
|
||||||
"streamsearch": "^1.1.0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@mscdex/eslint-config": "^1.1.0",
|
|
||||||
"eslint": "^7.32.0"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"test": "node test/test.js",
|
|
||||||
"lint": "eslint --cache --report-unused-disable-directives --ext=.js .eslintrc.js lib test bench",
|
|
||||||
"lint:fix": "npm run lint -- --fix"
|
|
||||||
},
|
|
||||||
"engines": { "node": ">=10.16.0" },
|
|
||||||
"keywords": [ "uploads", "forms", "multipart", "form-data" ],
|
|
||||||
"licenses": [ { "type": "MIT", "url": "http://github.com/mscdex/busboy/raw/master/LICENSE" } ],
|
|
||||||
"repository": { "type": "git", "url": "http://github.com/mscdex/busboy.git" }
|
|
||||||
}
|
|
||||||
-109
@@ -1,109 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
const assert = require('assert');
|
|
||||||
const { inspect } = require('util');
|
|
||||||
|
|
||||||
const mustCallChecks = [];
|
|
||||||
|
|
||||||
function noop() {}
|
|
||||||
|
|
||||||
function runCallChecks(exitCode) {
|
|
||||||
if (exitCode !== 0) return;
|
|
||||||
|
|
||||||
const failed = mustCallChecks.filter((context) => {
|
|
||||||
if ('minimum' in context) {
|
|
||||||
context.messageSegment = `at least ${context.minimum}`;
|
|
||||||
return context.actual < context.minimum;
|
|
||||||
}
|
|
||||||
context.messageSegment = `exactly ${context.exact}`;
|
|
||||||
return context.actual !== context.exact;
|
|
||||||
});
|
|
||||||
|
|
||||||
failed.forEach((context) => {
|
|
||||||
console.error('Mismatched %s function calls. Expected %s, actual %d.',
|
|
||||||
context.name,
|
|
||||||
context.messageSegment,
|
|
||||||
context.actual);
|
|
||||||
console.error(context.stack.split('\n').slice(2).join('\n'));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (failed.length)
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
function mustCall(fn, exact) {
|
|
||||||
return _mustCallInner(fn, exact, 'exact');
|
|
||||||
}
|
|
||||||
|
|
||||||
function mustCallAtLeast(fn, minimum) {
|
|
||||||
return _mustCallInner(fn, minimum, 'minimum');
|
|
||||||
}
|
|
||||||
|
|
||||||
function _mustCallInner(fn, criteria = 1, field) {
|
|
||||||
if (process._exiting)
|
|
||||||
throw new Error('Cannot use common.mustCall*() in process exit handler');
|
|
||||||
|
|
||||||
if (typeof fn === 'number') {
|
|
||||||
criteria = fn;
|
|
||||||
fn = noop;
|
|
||||||
} else if (fn === undefined) {
|
|
||||||
fn = noop;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof criteria !== 'number')
|
|
||||||
throw new TypeError(`Invalid ${field} value: ${criteria}`);
|
|
||||||
|
|
||||||
const context = {
|
|
||||||
[field]: criteria,
|
|
||||||
actual: 0,
|
|
||||||
stack: inspect(new Error()),
|
|
||||||
name: fn.name || '<anonymous>'
|
|
||||||
};
|
|
||||||
|
|
||||||
// Add the exit listener only once to avoid listener leak warnings
|
|
||||||
if (mustCallChecks.length === 0)
|
|
||||||
process.on('exit', runCallChecks);
|
|
||||||
|
|
||||||
mustCallChecks.push(context);
|
|
||||||
|
|
||||||
function wrapped(...args) {
|
|
||||||
++context.actual;
|
|
||||||
return fn.call(this, ...args);
|
|
||||||
}
|
|
||||||
// TODO: remove origFn?
|
|
||||||
wrapped.origFn = fn;
|
|
||||||
|
|
||||||
return wrapped;
|
|
||||||
}
|
|
||||||
|
|
||||||
function getCallSite(top) {
|
|
||||||
const originalStackFormatter = Error.prepareStackTrace;
|
|
||||||
Error.prepareStackTrace = (err, stack) =>
|
|
||||||
`${stack[0].getFileName()}:${stack[0].getLineNumber()}`;
|
|
||||||
const err = new Error();
|
|
||||||
Error.captureStackTrace(err, top);
|
|
||||||
// With the V8 Error API, the stack is not formatted until it is accessed
|
|
||||||
// eslint-disable-next-line no-unused-expressions
|
|
||||||
err.stack;
|
|
||||||
Error.prepareStackTrace = originalStackFormatter;
|
|
||||||
return err.stack;
|
|
||||||
}
|
|
||||||
|
|
||||||
function mustNotCall(msg) {
|
|
||||||
const callSite = getCallSite(mustNotCall);
|
|
||||||
return function mustNotCall(...args) {
|
|
||||||
args = args.map(inspect).join(', ');
|
|
||||||
const argsInfo = (args.length > 0
|
|
||||||
? `\ncalled with arguments: ${args}`
|
|
||||||
: '');
|
|
||||||
assert.fail(
|
|
||||||
`${msg || 'function should not have been called'} at ${callSite}`
|
|
||||||
+ argsInfo);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
module.exports = {
|
|
||||||
mustCall,
|
|
||||||
mustCallAtLeast,
|
|
||||||
mustNotCall,
|
|
||||||
};
|
|
||||||
-94
@@ -1,94 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
const assert = require('assert');
|
|
||||||
const { inspect } = require('util');
|
|
||||||
|
|
||||||
const { mustCall } = require(`${__dirname}/common.js`);
|
|
||||||
|
|
||||||
const busboy = require('..');
|
|
||||||
|
|
||||||
const input = Buffer.from([
|
|
||||||
'-----------------------------paZqsnEHRufoShdX6fh0lUhXBP4k',
|
|
||||||
'Content-Disposition: form-data; '
|
|
||||||
+ 'name="upload_file_0"; filename="テスト.dat"',
|
|
||||||
'Content-Type: application/octet-stream',
|
|
||||||
'',
|
|
||||||
'A'.repeat(1023),
|
|
||||||
'-----------------------------paZqsnEHRufoShdX6fh0lUhXBP4k--'
|
|
||||||
].join('\r\n'));
|
|
||||||
const boundary = '---------------------------paZqsnEHRufoShdX6fh0lUhXBP4k';
|
|
||||||
const expected = [
|
|
||||||
{ type: 'file',
|
|
||||||
name: 'upload_file_0',
|
|
||||||
data: Buffer.from('A'.repeat(1023)),
|
|
||||||
info: {
|
|
||||||
filename: 'テスト.dat',
|
|
||||||
encoding: '7bit',
|
|
||||||
mimeType: 'application/octet-stream',
|
|
||||||
},
|
|
||||||
limited: false,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
const bb = busboy({
|
|
||||||
defParamCharset: 'utf8',
|
|
||||||
headers: {
|
|
||||||
'content-type': `multipart/form-data; boundary=${boundary}`,
|
|
||||||
}
|
|
||||||
});
|
|
||||||
const results = [];
|
|
||||||
|
|
||||||
bb.on('field', (name, val, info) => {
|
|
||||||
results.push({ type: 'field', name, val, info });
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('file', (name, stream, info) => {
|
|
||||||
const data = [];
|
|
||||||
let nb = 0;
|
|
||||||
const file = {
|
|
||||||
type: 'file',
|
|
||||||
name,
|
|
||||||
data: null,
|
|
||||||
info,
|
|
||||||
limited: false,
|
|
||||||
};
|
|
||||||
results.push(file);
|
|
||||||
stream.on('data', (d) => {
|
|
||||||
data.push(d);
|
|
||||||
nb += d.length;
|
|
||||||
}).on('limit', () => {
|
|
||||||
file.limited = true;
|
|
||||||
}).on('close', () => {
|
|
||||||
file.data = Buffer.concat(data, nb);
|
|
||||||
assert.strictEqual(stream.truncated, file.limited);
|
|
||||||
}).once('error', (err) => {
|
|
||||||
file.err = err.message;
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('error', (err) => {
|
|
||||||
results.push({ error: err.message });
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('partsLimit', () => {
|
|
||||||
results.push('partsLimit');
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('filesLimit', () => {
|
|
||||||
results.push('filesLimit');
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('fieldsLimit', () => {
|
|
||||||
results.push('fieldsLimit');
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('close', mustCall(() => {
|
|
||||||
assert.deepStrictEqual(
|
|
||||||
results,
|
|
||||||
expected,
|
|
||||||
'Results mismatch.\n'
|
|
||||||
+ `Parsed: ${inspect(results)}\n`
|
|
||||||
+ `Expected: ${inspect(expected)}`
|
|
||||||
);
|
|
||||||
}));
|
|
||||||
|
|
||||||
bb.end(input);
|
|
||||||
-102
@@ -1,102 +0,0 @@
|
|||||||
'use strict';
|
|
||||||
|
|
||||||
const assert = require('assert');
|
|
||||||
const { randomFillSync } = require('crypto');
|
|
||||||
const { inspect } = require('util');
|
|
||||||
|
|
||||||
const busboy = require('..');
|
|
||||||
|
|
||||||
const { mustCall } = require('./common.js');
|
|
||||||
|
|
||||||
const BOUNDARY = 'u2KxIV5yF1y+xUspOQCCZopaVgeV6Jxihv35XQJmuTx8X3sh';
|
|
||||||
|
|
||||||
function formDataSection(key, value) {
|
|
||||||
return Buffer.from(
|
|
||||||
`\r\n--${BOUNDARY}`
|
|
||||||
+ `\r\nContent-Disposition: form-data; name="${key}"`
|
|
||||||
+ `\r\n\r\n${value}`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function formDataFile(key, filename, contentType) {
|
|
||||||
const buf = Buffer.allocUnsafe(100000);
|
|
||||||
return Buffer.concat([
|
|
||||||
Buffer.from(`\r\n--${BOUNDARY}\r\n`),
|
|
||||||
Buffer.from(`Content-Disposition: form-data; name="${key}"`
|
|
||||||
+ `; filename="${filename}"\r\n`),
|
|
||||||
Buffer.from(`Content-Type: ${contentType}\r\n\r\n`),
|
|
||||||
randomFillSync(buf)
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
const reqChunks = [
|
|
||||||
Buffer.concat([
|
|
||||||
formDataFile('file', 'file.bin', 'application/octet-stream'),
|
|
||||||
formDataSection('foo', 'foo value'),
|
|
||||||
]),
|
|
||||||
formDataSection('bar', 'bar value'),
|
|
||||||
Buffer.from(`\r\n--${BOUNDARY}--\r\n`)
|
|
||||||
];
|
|
||||||
const bb = busboy({
|
|
||||||
headers: {
|
|
||||||
'content-type': `multipart/form-data; boundary=${BOUNDARY}`
|
|
||||||
}
|
|
||||||
});
|
|
||||||
const expected = [
|
|
||||||
{ type: 'file',
|
|
||||||
name: 'file',
|
|
||||||
info: {
|
|
||||||
filename: 'file.bin',
|
|
||||||
encoding: '7bit',
|
|
||||||
mimeType: 'application/octet-stream',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: 'field',
|
|
||||||
name: 'foo',
|
|
||||||
val: 'foo value',
|
|
||||||
info: {
|
|
||||||
nameTruncated: false,
|
|
||||||
valueTruncated: false,
|
|
||||||
encoding: '7bit',
|
|
||||||
mimeType: 'text/plain',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{ type: 'field',
|
|
||||||
name: 'bar',
|
|
||||||
val: 'bar value',
|
|
||||||
info: {
|
|
||||||
nameTruncated: false,
|
|
||||||
valueTruncated: false,
|
|
||||||
encoding: '7bit',
|
|
||||||
mimeType: 'text/plain',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
const results = [];
|
|
||||||
|
|
||||||
bb.on('field', (name, val, info) => {
|
|
||||||
results.push({ type: 'field', name, val, info });
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('file', (name, stream, info) => {
|
|
||||||
results.push({ type: 'file', name, info });
|
|
||||||
// Simulate a pipe where the destination is pausing (perhaps due to waiting
|
|
||||||
// for file system write to finish)
|
|
||||||
setTimeout(() => {
|
|
||||||
stream.resume();
|
|
||||||
}, 10);
|
|
||||||
});
|
|
||||||
|
|
||||||
bb.on('close', mustCall(() => {
|
|
||||||
assert.deepStrictEqual(
|
|
||||||
results,
|
|
||||||
expected,
|
|
||||||
'Results mismatch.\n'
|
|
||||||
+ `Parsed: ${inspect(results)}\n`
|
|
||||||
+ `Expected: ${inspect(expected)}`
|
|
||||||
);
|
|
||||||
}));
|
|
||||||
|
|
||||||
for (const chunk of reqChunks)
|
|
||||||
bb.write(chunk);
|
|
||||||
bb.end();
|
|
||||||
-1053
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user