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.

Sign up for GitHub

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

Created My Service Page of vigybag #2036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ab5ec
Created My Service Page of vigybag
SadafKausar2025 Jul 29, 2024
e0e463e
conflict solved
SadafKausar2025 Jul 29, 2024
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
190 changes: 128 additions & 62 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import FeedbackModal from "./User/components/FeedbackForm/Feedback";

import NotificationPage from "./User/pages/Dashboard/NotificationPage";
import ProfilePage from "./User/pages/Dashboard/ProfilePage";
import CareerPage from "./User/pages/Career-Page/careerPage.jsx";
import ServicePage from "./User/pages/Service-Page/service.jsx";
// Admin components
import AdminVerificationPage from "./User/pages/Admin-Verification/Admin.jsx";
import AdminLayout from "./Admin/AdminLayout";
Expand Down Expand Up @@ -67,7 +69,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 All @@ -88,96 +89,161 @@ export default function App() {
<Route index element={<Home />} /> {/* Home page route */}
{/* Latest in the Market routes */}
<Route path="latestInMarket" element={<LatestInMarket />} />
<Route path="latestInMarket/handMadeSoaps" element={<HandMadeSoaps />} />
<Route
path="latestInMarket/handMadeSoaps"
element={<HandMadeSoaps />}
/>
<Route path="latestInMarket/artSupplies" element={<ArtSupplies />} />
<Route path="latestInMarket/ceramicDinnerware" element={<CeramicDinnerware />} />
<Route path="latestInMarket/bambooProducts" element={<BambooProducts />} />
<Route path="latestInMarket/storageBaskets" element={<StorageBaskets />} />
<Route path="latestInMarket/organicSoaps" element={<OrganicSoaps />} />
<Route
path="latestInMarket/ceramicDinnerware"
element={<CeramicDinnerware />}
/>
<Route
path="latestInMarket/bambooProducts"
element={<BambooProducts />}
/>
<Route
path="latestInMarket/storageBaskets"
element={<StorageBaskets />}
/>
<Route
path="latestInMarket/organicSoaps"
element={<OrganicSoaps />}
/>
<Route path="latestInMarket/organicTea" element={<OrganicTea />} />
<Route path="latestInMarket/naturalCosmetics" element={<NaturalCosmetics />} />

<Route
path="latestInMarket/naturalCosmetics"
element={<NaturalCosmetics />}
/>
{/* Popular Categories routes */}
<Route path="popularCategories" element={<PopularCategories />} />
<Route path="popularCategories/beautyWellness" element={<BeautyWellness />} />
<Route
path="popularCategories/beautyWellness"
element={<BeautyWellness />}
/>
<Route path="popularCategories/bodyCare" element={<BodyCare />} />
<Route path="popularCategories/customizedGifts" element={<CustomizedGifts />} />
<Route path="popularCategories/fashionAccessories" element={<FashionAccessories />} />
<Route path="popularCategories/foodBeverages" element={<FoodBeverages />} />
<Route path="popularCategories/furnitureDecor" element={<FurnitureDecor />} />
<Route path="popularCategories/healthSupplements" element={<HealthSupplements />} />
<Route path="popularCategories/printingStationery" element={<PrintingStationery />} />

<Route path="about" element={<AboutUs />} /> {/* About Us page route */}
<Route
path="popularCategories/customizedGifts"
element={<CustomizedGifts />}
/>
<Route
path="popularCategories/fashionAccessories"
element={<FashionAccessories />}
/>
<Route
path="popularCategories/foodBeverages"
element={<FoodBeverages />}
/>
<Route
path="popularCategories/furnitureDecor"
element={<FurnitureDecor />}
/>
<Route
path="popularCategories/healthSupplements"
element={<HealthSupplements />}
/>
<Route
path="popularCategories/printingStationery"
element={<PrintingStationery />}
/>
<Route path="about" element={<AboutUs />} />{" "}
{/* About Us page route */}
<Route path="help" element={<Help />} /> {/* Help page route */}
<Route path="privacy" element={<Privacy />} /> {/* Privacy policy page route */}
<Route path="privacy" element={<Privacy />} />{" "}
{/* Privacy policy page route */}
<Route path="cart" element={<Cart />} /> {/* Cart page route */}
<Route path="wishlist" element={<Wishlist />} /> {/* Wishlist page route */}
<Route path="contact" element={<Contact />} /> {/* Contact page route */}
<Route path="forgot-password" element={<ForgotPasswordForm />} /> {/* Forgot password page route */}

<Route path="wishlist" element={<Wishlist />} />{" "}
{/* Wishlist page route */}
<Route path="contact" element={<Contact />} />{" "}
{/* Contact page route */}
<Route path="forgot-password" element={<ForgotPasswordForm />} />{" "}
{/* Forgot password page route */}
<Route path="team" element={<Team />} /> {/* Team page route */}
<Route path="auth" element={<UserAuth />} /> {/* User authentication page route */}
<Route path="auth" element={<UserAuth />} />{" "}
{/* User authentication page route */}
<Route path="faq" element={<FAQ />} /> {/* FAQ page route */}
<Route path="termsAndCondition" element={<TermsAndConditions />} /> {/* Terms and Conditions page route */}
<Route path="feedback" element={<FeedbackModal />} /> {/* Feedback page route */}
<Route path="returnAndCancellation" element={<ReturnAndCancellation />} /> {/* Return and Cancellation page route */}
<Route
path="termsAndCondition"
element={<TermsAndConditions />}
/>{" "}
{/* Terms and Conditions page route */}
<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 */}

<Route path="career" element={<CareerPage />} />{" "}
<Route path="service" element={<ServicePage />} />{" "}
{/* EPR page route */}
{/* Private routes requiring authentication */}
<Route element={<PrivateRoute />}>
<Route path="/admin" element={<AdminLayout />}>
<Route index element={<AdminPanel />} /> {/* Admin panel route */}
{/* <Route path="dashboard" element={<AdminDashboard />} /> */}
<Route path="vigy_form" element={<VigyForm />} /> {/* Admin Vigy form route */}
<Route path="product_form" element={<ProductForm />} /> {/* Admin product form route */}
<Route path="vigy_form" element={<VigyForm />} />{" "}
{/* Admin Vigy form route */}
<Route path="product_form" element={<ProductForm />} />{" "}
{/* Admin product form route */}
</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="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="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 />} />
//additional routes
//additional routes
<Route path="giftcard" element={<GiftcardPage />} />


////

<Route path="profile" element={<ProfilePage />} /> {/* Dashboard Profile route */}
<Route path="profile" element={<ProfilePage />} />{" "}
{/* Dashboard Profile route */}
</Route>
{/* private route ends */}
<Route path="certificate" element={<Certifications />} /> {/* Certifications page route */}
{/* private route ends */}
<Route path="certificate" element={<Certifications />} />{" "}
{/* Certifications page route */}
<Route path="*" element={<Error />} /> {/* 404 Error page route */}
</Route>


{/* Admin routes */}
<Route path="/admin" element={<AdminLayout />}>
<Route index element={<AdminPanel />} /> {/* Admin panel route */}
{/* <Route path="dashboard" element={<AdminDashboard />} /> */}
<Route path="vigy_form" element={<VigyForm />} /> {/* Admin Vigy form route */}
<Route path="product_form" element={<ProductForm />} /> {/* Admin product form route */}
<Route path="vigy_form" element={<VigyForm />} />{" "}
{/* Admin Vigy form route */}
<Route path="product_form" element={<ProductForm />} />{" "}
{/* Admin product form route */}
</Route>

<Route path="admin-verification" element={<AdminVerificationPage />} /> {/* Admin verification page route */}
<Route path="/admin/login" element={<AdminLogin />} /> {/* Admin login page route */}


<Route path="admin-verification" element={<AdminVerificationPage />} />{" "}
{/* Admin verification page route */}
<Route path="/admin/login" element={<AdminLogin />} />{" "}
{/* Admin login page route */}
<Route path="admin-verification" element={<AdminVerificationPage />} />
<Route path="/admin/login" element={<AdminLogin />} />

</Routes>
</AuthProvider>
);
Expand Down
44 changes: 44 additions & 0 deletions src/User/components/About/CarrerHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React from "react";
import { FaSearch } from "react-icons/fa";

function Header() {
return (
<>
<header className="relative h-96 md:h-[100vh] flex items-center justify-center overflow-hidden">
<div className="absolute inset-0 z-0">
<img
src="https://image-assets.eu-2.volcanic.cloud/api/v1/assets/images/67b76b0e206f4f5656559b5c96208131?size=2000x600%3C"
alt="Background"
className="w-full h-full object-cover filter "
/>
<div className="absolute inset-0 bg-black opacity-50"></div>
</div>
<div className="relative z-10 text-center text-white px-4">
<h1 className="text-4xl md:text-6xl font-bold mb-2 md:mb-4">
Career VigyBag 🌱
</h1>
<p className="text-5xl max-w-3xl mx-auto">
<span className="text-yellow-200">Innovate,</span>{" "}
<span className="text-blue-400">inspire,</span> and{" "}
<span className="text-green-200">grow</span> with{" "}
<span className="text-5xl text-green-300 font-bold">VigyBag.</span>
</p>
<div className="flex items-center rounded-full border-green-800 border-2 bg-gray-200 px-4 py-2 w-100 mt-7">
<input
type="text"
placeholder="Explore jobs"
className="bg-transparent outline-none w-full text-green-700"
/>
<FaSearch className="text-green-800" />
</div>
<p className="text-white text-left pl-2 mt-2">
<span className="text-yellow-300">197</span> opportunities available
to be a maximiser.
</p>
</div>
</header>
</>
);
}

export default Header;
27 changes: 27 additions & 0 deletions src/User/components/About/ServiceHeader.jsx
View file
Open in desktop
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;
Loading