Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Created My Service Page of vigybag #2036

Merged
merged 2 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 47 additions & 1 deletion src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ import FeedbackModal from "./User/components/FeedbackForm/Feedback";

import NotificationPage from "./User/pages/Dashboard/NotificationPage";
import ProfilePage from "./User/pages/Dashboard/ProfilePage";
<<<<<<< Updated upstream
=======
import CareerPage from "./User/pages/Career-Page/careerPage.jsx";
import ServicePage from "./User/pages/Service-Page/service.jsx";
>>>>>>> Stashed changes
codervivek5 marked this conversation as resolved.
Show resolved Hide resolved
// Admin components
import AdminVerificationPage from "./User/pages/Admin-Verification/Admin.jsx";
import AdminLayout from "./Admin/AdminLayout";
Expand Down Expand Up @@ -67,7 +72,6 @@ import FurnitureDecor from "./User/pages/Popular_Categories/Furniture-Decor";
import HealthSupplements from "./User/pages/Popular_Categories/Health-Supplements";
import PrintingStationery from "./User/pages/Popular_Categories/Printing-Stationery";


import { Helmet } from "react-helmet";

// not required imports
Expand Down Expand Up @@ -123,7 +127,13 @@ export default function App() {
<Route path="feedback" element={<FeedbackModal />} /> {/* Feedback page route */}
<Route path="returnAndCancellation" element={<ReturnAndCancellation />} /> {/* Return and Cancellation page route */}
<Route path="EPR_Page" element={<EPRPage />} /> {/* EPR page route */}
<<<<<<< Updated upstream

=======
<Route path="Career" element={<CareerPage />} />{" "}
<Route path="service" element={<ServicePage />} />{" "}
{/* EPR page route */}
>>>>>>> Stashed changes
codervivek5 marked this conversation as resolved.
Show resolved Hide resolved
{/* Private routes requiring authentication */}
<Route element={<PrivateRoute />}>
<Route path="/admin" element={<AdminLayout />}>
Expand All @@ -132,6 +142,7 @@ export default function App() {
<Route path="vigy_form" element={<VigyForm />} /> {/* Admin Vigy form route */}
<Route path="product_form" element={<ProductForm />} /> {/* Admin product form route */}
</Route>
<<<<<<< Updated upstream

<Route path="dashboard" element={<Dashboard />} /> {/* User dashboard route */}
<Route path="confirm" element={<Confirmation />} /> {/* Order confirmation route */}
Expand All @@ -155,6 +166,41 @@ export default function App() {
////

<Route path="profile" element={<ProfilePage />} /> {/* Dashboard Profile route */}
=======
<Route path="dashboard" element={<Dashboard />} />{" "}
{/* User dashboard route */}
<Route path="confirm" element={<Confirmation />} />{" "}
{/* Order confirmation route */}
<Route path="cancel" element={<Cancellation />} />{" "}
{/* Order cancellation route */}
<Route path="orderDetails" element={<OrderDetails />} />{" "}
{/* Order details route */}
<Route path="myOrders" element={<MyOrders />} />{" "}
{/* My orders route */}
<Route path="checkout" element={<Checkout />} />{" "}
{/* Checkout route */}
<Route path="productDetails" element={<ProductDetails />} />{" "}
{/* Product details route */}
<Route path="payment" element={<Payment />} /> {/* Payment route */}
<Route path="dashboard-order" element={<DashboardOrders />} />{" "}
{/* Dashboard orders route */}
<Route path="dashboard-cart" element={<DashboardCart />} />{" "}
{/* Dashboard cart route */}
<Route
path="dashboard-wishlist"
element={<DashboardWishlist />}
/>{" "}
{/* Dashboard wishlist route */}
<Route
path="dashboard-notifications"
element={<NotificationPage />}
/>{" "}
{/* Dashboard notifications route */}
//Not in use routes
<Route path="blog" element={<Blog />} />
<Route path="profile" element={<ProfilePage />} />{" "}
{/* Dashboard Profile route */}
>>>>>>> Stashed changes
</Route>
{/* private route ends */}

Expand Down
27 changes: 27 additions & 0 deletions src/User/components/About/ServiceHeader.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from "react";
import background from "../../../assets/back.jpg";

function Header() {
return (
<>
<header className="relative h-96 md:h-[100vh] overflow-hidden">
<div className="absolute inset-0 z-0">
<img
// src="https://img.freepik.com/premium-photo/abstract-11-light-background-wallpaper-colorful-gradient-blurry-soft-smooth-motion-bright-shine_792836-34993.jpg"
src={background}
alt="Background"
className="w-full h-full object-cover filter "
/>
<div className="absolute inset-0"></div>
</div>
<div className="relative z-10 text-center text-green px- mt-32">
<h1 className="text-4xl text-white md:text-5xl font-bold mb-2 md:mb-4">
Our Service
</h1>
</div>
</header>
Comment on lines +7 to +22
Copy link
Contributor

Choose a reason for hiding this comment

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

Optimize class names for readability.

The class names could be optimized for better readability and maintainability.

-      <header className="relative h-96 md:h-[100vh] overflow-hidden">
+      <header className="relative h-96 md:h-full overflow-hidden">
-        <div className="relative z-10 text-center text-green px- mt-32">
+        <div className="relative z-10 text-center text-green px-4 mt-32">
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<header className="relative h-96 md:h-[100vh] overflow-hidden">
<div className="absolute inset-0 z-0">
<img
// src="https://img.freepik.com/premium-photo/abstract-11-light-background-wallpaper-colorful-gradient-blurry-soft-smooth-motion-bright-shine_792836-34993.jpg"
src={background}
alt="Background"
className="w-full h-full object-cover filter "
/>
<div className="absolute inset-0"></div>
</div>
<div className="relative z-10 text-center text-green px- mt-32">
<h1 className="text-4xl text-white md:text-5xl font-bold mb-2 md:mb-4">
Our Service
</h1>
</div>
</header>
<header className="relative h-96 md:h-full overflow-hidden">
<div className="absolute inset-0 z-0">
<img
// src="https://img.freepik.com/premium-photo/abstract-11-light-background-wallpaper-colorful-gradient-blurry-soft-smooth-motion-bright-shine_792836-34993.jpg"
src={background}
alt="Background"
className="w-full h-full object-cover filter "
/>
<div className="absolute inset-0"></div>
</div>
<div className="relative z-10 text-center text-green px-4 mt-32">
<h1 className="text-4xl text-white md:text-5xl font-bold mb-2 md:mb-4">
Our Service
</h1>
</div>
</header>

</>
);
}

export default Header;
149 changes: 149 additions & 0 deletions src/User/pages/Service-Page/service.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
import React from "react";
import accounting from "../../../assets/accounting.jpeg";
import accountManagement from "../../../assets/accountMangement.jpeg";
import advertising from "../../../assets/advertising.jpeg";
import cataloging from "../../../assets/cataloging.jpeg";
import imaging from "../../../assets/imaging.jpeg";
import liquadation from "../../../assets/liquadation.jpeg";
import sellerAcount from "../../../assets/sellerAcount.jpeg";
import sellerTaining from "../../../assets/sellerTaining.jpeg";
Comment on lines +7 to +9
Copy link
Contributor

Choose a reason for hiding this comment

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

Correct typographical errors in image filenames.

The image filenames liquadation and sellerTaining should be corrected to liquidation and sellerTraining.

- import liquadation from "../../../assets/liquadation.jpeg";
- import sellerTaining from "../../../assets/sellerTaining.jpeg";
+ import liquidation from "../../../assets/liquidation.jpeg";
+ import sellerTraining from "../../../assets/sellerTraining.jpeg";
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
import liquadation from "../../../assets/liquadation.jpeg";
import sellerAcount from "../../../assets/sellerAcount.jpeg";
import sellerTaining from "../../../assets/sellerTaining.jpeg";
import liquidation from "../../../assets/liquidation.jpeg";
import sellerAcount from "../../../assets/sellerAcount.jpeg";
import sellerTraining from "../../../assets/sellerTraining.jpeg";

import sourcing from "../../../assets/sourcing.jpeg";
import taxation from "../../../assets/taxation.jpeg";
import warehouse from "../../../assets/warehouse.jpeg";

import Header from "../../components/About/ServiceHeader";

const ServicePage = () => {
const leadershipData = [
{
name: "Account Management",
image: accounting,
description:
"Provide end-to-end services to a host of sellers. Help the sellers build a long term relationship with their customers.",
},
{
name: "Accounting",
image: accountManagement,
description:
"Provide payment reconciliation and integrated accounting services to sellers and help them with enhanced product profitability analysis.",
},
{
name: "Advertising",
image: advertising,
description:
"Lend your advertising services to sellers across the country. Help them promote their products and boost their sales. ",
},
{
name: "Cataloging",
image: cataloging,
description:
"Connect with a host of sellers and help them build an appealing catalogue with compelling content that attracts customers.",
},
{
name: "Imaging",
image: imaging,
description:
"Provide photoshoot and editing services to sellers across the country and help them boost their sales.",
},
{
name: "Liquidation",
image: liquadation,
description:
"Offer your liquidation services to sellers who are willing to sell-off their dead inventory or excess returns.",
},
{
name: "Seller Account Reinstatement",
image: sellerAcount,
description:
"Help sellers in reinstating their suspended accounts and ensure their accounts don't get suspended in future",
Comment on lines +56 to +58
Copy link
Contributor

Choose a reason for hiding this comment

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

Correct typographical error in service description.

The word "suspended" is repeated in the service description. It should be corrected for readability.

-        "Help sellers in reinstating their suspended accounts and ensure their accounts don't get suspended in future",
+        "Help sellers in reinstating their suspended accounts and ensure their accounts don't get suspended in the future",
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
image: sellerAcount,
description:
"Help sellers in reinstating their suspended accounts and ensure their accounts don't get suspended in future",
image: sellerAcount,
description:
"Help sellers in reinstating their suspended accounts and ensure their accounts don't get suspended in the future",

},
{
name: "Seller Training",
image: sellerTaining,
description:
"Provide in-person classroom / online training to new sellers & recently onboarded sellers on how to manage and grow their business on VigyBag",
},
{
name: "Software Solutions",
image: sellerAcount,
description:
"Discover software solutions to bring efficiency in your operations.",
},
{
name: "Sourcing",
image: sourcing,
description:
"Have a wide assortment of quality products to offer to the sellers? Connect with sellers across the country who need your services.",
},
{
name: "Taxation",
image: taxation,
description:
"Connect with sellers across India and provide and lend them your assistance in filing taxes and handling money.",
},
{
name: "Warehousing Services",
image: warehouse,
description:
"Provide storage & inventory handling services to recent and existing sellers for non-FBF fulfillment on VigyBag platform at your warehouse locations.",
},

// Add more leadership members as needed
];

return (
<div className="bg-gradient-to-b from-[#fff0e3] to-white min-h-screen">
{/*Header Section */}
<Header />

{/* Leadership Section */}
<section className="py-12 bg-green-50 md:py-20">
<h2 className="text-2xl md:text-2xl font-bold text-center mb-8 md:mb-16 text-green-800 ">
SERVICES THAT YOU CAN PROVIDE
</h2>
<div className="container mx-auto px-16">
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 md:gap-8">
{leadershipData.map((leader, index) => (
<div
key={index}
className="bg-white rounded-lg shadow-xl overflow-hidden transform transition duration-500 hover:scale-105 h-[50vh] w-[20vw]">
<div className="relative h-48 md:h-50">
<img
src={leader.image}
alt={leader.name}
className="w-full h-full object-cover"
/>
<div className="absolute inset-0 bg-gradient-to-t from-black to-transparent opacity-70"></div>
<div className="absolute bottom-0 left-0 right-0 p-4 md:p-6">
<h3 className="text-xl md:text-xl font-semibold text-white">
{leader.name}
</h3>
</div>
</div>
<div className="p-4 md:p-6">
<p className="text-sm md:text-base text-gray-600 mb-4">
{leader.description}
</p>
<p className="text-sm text-blue-500">
List Your Service{" "}
<lord-icon
style={{
height: "20px",
width: "20px",
paddingTop: "5px",
}}
src="https://cdn.lordicon.com/vduvxizq.json"
trigger="hover"
colors="primary:#1663c7"></lord-icon>
</p>
</div>
</div>
))}
</div>
</div>
</section>
Comment on lines +99 to +144
Copy link
Contributor

Choose a reason for hiding this comment

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

Optimize class names for readability.

The class names could be optimized for better readability and maintainability.

-      <section className="py-12 bg-green-50 md:py-20">
+      <section className="py-12 bg-green-50 md:py-20">
-        <h2 className="text-2xl md:text-2xl font-bold text-center mb-8 md:mb-16 text-green-800 ">
+        <h2 className="text-2xl md:text-4xl font-bold text-center mb-8 md:mb-16 text-green-800">
-          <div className="container mx-auto px-16">
+          <div className="container mx-auto px-4 md:px-16">
-            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 md:gap-8">
+            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 md:gap-8">
-                className="bg-white rounded-lg shadow-xl overflow-hidden transform transition duration-500 hover:scale-105 h-[50vh] w-[20vw]">
+                className="bg-white rounded-lg shadow-xl overflow-hidden transform transition duration-500 hover:scale-105 h-64 md:h-80 w-full md:w-1/4">
Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{/* Leadership Section */}
<section className="py-12 bg-green-50 md:py-20">
<h2 className="text-2xl md:text-2xl font-bold text-center mb-8 md:mb-16 text-green-800 ">
SERVICES THAT YOU CAN PROVIDE
</h2>
<div className="container mx-auto px-16">
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 md:gap-8">
{leadershipData.map((leader, index) => (
<div
key={index}
className="bg-white rounded-lg shadow-xl overflow-hidden transform transition duration-500 hover:scale-105 h-[50vh] w-[20vw]">
<div className="relative h-48 md:h-50">
<img
src={leader.image}
alt={leader.name}
className="w-full h-full object-cover"
/>
<div className="absolute inset-0 bg-gradient-to-t from-black to-transparent opacity-70"></div>
<div className="absolute bottom-0 left-0 right-0 p-4 md:p-6">
<h3 className="text-xl md:text-xl font-semibold text-white">
{leader.name}
</h3>
</div>
</div>
<div className="p-4 md:p-6">
<p className="text-sm md:text-base text-gray-600 mb-4">
{leader.description}
</p>
<p className="text-sm text-blue-500">
List Your Service{" "}
<lord-icon
style={{
height: "20px",
width: "20px",
paddingTop: "5px",
}}
src="https://cdn.lordicon.com/vduvxizq.json"
trigger="hover"
colors="primary:#1663c7"></lord-icon>
</p>
</div>
</div>
))}
</div>
</div>
</section>
{/* Leadership Section */}
<section className="py-12 bg-green-50 md:py-20">
<h2 className="text-2xl md:text-4xl font-bold text-center mb-8 md:mb-16 text-green-800">
SERVICES THAT YOU CAN PROVIDE
</h2>
<div className="container mx-auto px-4 md:px-16">
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6 md:gap-8">
{leadershipData.map((leader, index) => (
<div
key={index}
className="bg-white rounded-lg shadow-xl overflow-hidden transform transition duration-500 hover:scale-105 h-64 md:h-80 w-full md:w-1/4">
<div className="relative h-48 md:h-50">
<img
src={leader.image}
alt={leader.name}
className="w-full h-full object-cover"
/>
<div className="absolute inset-0 bg-gradient-to-t from-black to-transparent opacity-70"></div>
<div className="absolute bottom-0 left-0 right-0 p-4 md:p-6">
<h3 className="text-xl md:text-xl font-semibold text-white">
{leader.name}
</h3>
</div>
</div>
<div className="p-4 md:p-6">
<p className="text-sm md:text-base text-gray-600 mb-4">
{leader.description}
</p>
<p className="text-sm text-blue-500">
List Your Service{" "}
<lord-icon
style={{
height: "20px",
width: "20px",
paddingTop: "5px",
}}
src="https://cdn.lordicon.com/vduvxizq.json"
trigger="hover"
colors="primary:#1663c7"></lord-icon>
</p>
</div>
</div>
))}
</div>
</div>
</section>

</div>
);
};

export default ServicePage;
Binary file added src/assets/accountMangement.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/accounting.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/advertising.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/back.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/cataloging.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imaging.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/liquadation.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/sellerAcount.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/sellerTaining.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/sourcing.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/taxation.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/warehouse.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/www.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.