Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
505f382
logistics
AnshulGupta-14 Feb 2, 2025
c1eea45
Merge pull request #18 from AnshulGupta-14/main
AnshulGupta-14 Feb 2, 2025
77e6fba
Merge branch 'ankush270:main' into main
AnshulGupta-14 Feb 2, 2025
96ee9b9
add readme
AnshulGupta-14 Feb 2, 2025
765ce6a
Merge pull request #19 from AnshulGupta-14/main
AnshulGupta-14 Feb 2, 2025
8d64ffa
some change
AnshulGupta-14 Feb 2, 2025
adf5b00
Merge pull request #20 from AnshulGupta-14/main
AnshulGupta-14 Feb 2, 2025
7490512
some changes
AnshulGupta-14 Feb 2, 2025
dbb9107
Merge pull request #21 from AnshulGupta-14/main
AnshulGupta-14 Feb 2, 2025
bb2d065
create logistics model
AnshulGupta-14 Feb 2, 2025
d892112
Merge pull request #22 from AnshulGupta-14/main
AnshulGupta-14 Feb 2, 2025
b60ade9
buyer dashboard frontend
AnshulGupta-14 Feb 3, 2025
f552e02
Merge pull request #26 from AnshulGupta-14/main
AnshulGupta-14 Feb 3, 2025
6a11df2
seller page frontend
AnshulGupta-14 Feb 3, 2025
1afca83
Merge pull request #27 from AnshulGupta-14/main
AnshulGupta-14 Feb 3, 2025
45b895c
log in as seller/buy
UditJain2622004 Feb 3, 2025
f6dadf7
merge conflicts resolved
UditJain2622004 Feb 3, 2025
c4a6307
Merge pull request #25 from ankush270/profile-apis
UditJain2622004 Feb 3, 2025
d6307d9
something
UditJain2622004 Feb 3, 2025
6028867
merge conflicts resolved
UditJain2622004 Feb 3, 2025
321cb2a
merge conflictssssssssssssssssssss
UditJain2622004 Feb 3, 2025
9068993
Merge pull request #29 from ankush270/anshul
UditJain2622004 Feb 3, 2025
8147301
some
ankush270 Feb 3, 2025
9b42bcd
some
ankush270 Feb 3, 2025
5ff8823
ekyc integrate
ankush270 Feb 3, 2025
1c73bfd
something integrated
UditJain2622004 Feb 3, 2025
9efe46b
Merge branch 'main' of https://github.com/ankush270/CrossWave
UditJain2622004 Feb 3, 2025
1eb2b0c
document upload verification integration done
UditJain2622004 Feb 4, 2025
6a4cf05
Merge branch 'profile-apis' into main
UditJain2622004 Feb 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added backend/eng.traineddata
Binary file not shown.
3 changes: 0 additions & 3 deletions backend/models/chat.model.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@ import mongoose, {Schema} from 'mongoose';
const chatSchema = new Schema({
seller_id:{
type: Schema.Types.ObjectId,
ref: 'User',
required: true
},
buyer_id:{
type: Schema.Types.ObjectId,
ref: 'User',
required: true
},
messages:[{
sender:{
type: Schema.Types.ObjectId,
ref: 'User',
required: true
},
text:{
Expand Down
130 changes: 130 additions & 0 deletions backend/models/logistics.model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
import mongoose, { Schema } from "mongoose";

const logisticsSchema = new Schema(
{
trackingNumber: {
type: String,
required: true,
},
shipmentDocuments: {
type: [String],
required: true,
},
carrierCode: {
type: String,
required: true,
},
serviceId: {
type: String,
required: true,
},
serviceType: {
type: String,
required: true,
},
serviceCategory: {
type: String,
required: true,
},
totalBillingWeight: {
units: {
type: String,
enum: ["LB", "KG"],
required: true,
},
value: {
type: Number,
required: true,
},
},
surcharges: [
{
surchargeType: {
type: String,
required: true,
},
level: {
type: String,
required: true,
},
amount: {
type: Number,
required: true,
},
description: {
type: String,
// required: true,
},
},
],
totalBaseCharge: {
type: Number,
required: true,
},
totalFreightDiscounts: {
type: Number,
required: true,
},
totalNetFreight: {
type: Number,
required: true,
},
totalSurcharges: {
type: Number,
required: true,
},
totalNetFedExCharge: {
type: Number,
required: true,
},
totalTaxes: {
type: Number,
required: true,
},
totalNetCharge: {
type: Number,
required: true,
},
totalRebates: {
type: Number,
required: true,
},
totalDutiesAndTaxes: {
type: Number,
required: true,
},
totalAncillaryFeesAndTaxes: {
type: Number,
required: true,
},
totalDutiesTaxesAndFees: {
type: Number,
required: true,
},
totalNetChargeWithDutiesAndTaxes: {
type: Number,
required: true,
},
trackingIds: [
{
trackingIdType: {
type: String,
required: true,
},
formId: {
type: String,
required: true,
},
trackingNumber: {
type: String,
required: true,
},
},
],
},
{
timestamps: true,
}
);

export const Logistics = mongoose.model("Logistics", logisticsSchema);
93 changes: 0 additions & 93 deletions backend/models/order.model.js

This file was deleted.

32 changes: 31 additions & 1 deletion backend/package-lock.json

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

1 change: 1 addition & 0 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"bcrypt": "^5.1.1",
"canvas": "^3.1.0",
"child_process": "^1.0.2",
"cloudinary": "^2.5.1",
"cookie-parser": "^1.4.7",
"cors": "^2.8.5",
"dotenv": "^16.4.7",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "is_company_docs_done" BOOLEAN NOT NULL DEFAULT false,
ADD COLUMN "is_kyc_done" BOOLEAN NOT NULL DEFAULT false,
ADD COLUMN "is_personal_docs_done" BOOLEAN NOT NULL DEFAULT false;
3 changes: 3 additions & 0 deletions backend/prisma/schema.prisma
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ model User {
order_seller Order[] @relation(name: "SellerRelation")
userReview UserReview[] @relation(name: "ReviewReceiver")
userReviwed UserReview[] @relation(name: "ReviewGiver")
is_kyc_done Boolean @default(false)
is_personal_docs_done Boolean @default(false)
is_company_docs_done Boolean @default(false)
}

model UserProfile {
Expand Down
Binary file added backend/processedImage.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 7 additions & 4 deletions backend/server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dotenv/config';

import express from "express";
import prisma from "./src/config/prisma_db.js";
import connectMongoDB from "./src/config/mongo_db.js";
Expand All @@ -11,11 +10,14 @@ import cookieParser from "cookie-parser";
import cors from "cors";
import kycRouter from "./src/routes/kyc.js";
// import { extractText } from "./src/microservices/kyc/aadhaar.js";

// payment routes
import PaymentRoutes from "./src/routes/PaymentRoutes.js";
// chat routes
import ChatRoutes from "./src/routes/ChatRoutes.js";

import DocUploadRoutes from "./src/routes/doc_upload.js"

import {
verifyProduct,
upload,
Expand Down Expand Up @@ -45,7 +47,8 @@ connectMongoDB();

app.use(
cors({
origin: ['http://localhost:5173'], // Allow all origins
origin: ["http://localhost:5173", "http://localhost:5174"],
exposedHeaders: ['set-cookie'],
methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
allowedHeaders: ["Content-Type", "Authorization"],
credentials: true // Allow cookies, if needed
Expand All @@ -66,7 +69,7 @@ app.use('/user-review',reviewRouter)

app.use("/payment", PaymentRoutes);
app.use('/chat', ChatRoutes);

app.use("/docs",DocUploadRoutes);


// Start server
Expand Down Expand Up @@ -98,4 +101,4 @@ const gracefulShutdown = async () => {

// Handle shutdown signals
process.on("SIGTERM", gracefulShutdown);
process.on("SIGINT", gracefulShutdown);
process.on("SIGINT", gracefulShutdown);
Loading