Skip to content

Commit 027b14a

Browse files
codervivek5codervivek5
authored
Merge pull request codervivek5#2097 from SadafKausar2025/shipping
Created Shipping page of vigybag
2 parents e2d1c49 + 69d9aef commit 027b14a

File tree

4 files changed

+327
-33
lines changed

4 files changed

+327
-33
lines changed

‎src/App.jsx

+36-19
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import NotificationPage from "./User/pages/Dashboard/NotificationPage";
3636
import ProfilePage from "./User/pages/Dashboard/ProfilePage";
3737
import CareerPage from "./User/pages/Career-Page/careerPage.jsx";
3838
import ServicePage from "./User/pages/Service-Page/service.jsx";
39-
39+
import Shipping from "./User/pages/Shipping/shipping";
4040
// Admin components
4141
import AdminVerificationPage from "./User/pages/Admin-Verification/Admin.jsx";
4242
import AdminLayout from "./Admin/AdminLayout";
@@ -126,13 +126,20 @@ export default function App() {
126126
<Route path="team" element={<Team />} /> {/* Team page route */}
127127
<Route path="auth" element={<UserAuth />} /> {/* User authentication page route */}
128128
<Route path="faq" element={<FAQ />} /> {/* FAQ page route */}
129-
<Route path="termsAndCondition" element={<TermsAndConditions />} /> {/* Terms and Conditions page route */}
130-
<Route path="feedback" element={<FeedbackModal />} /> {/* Feedback page route */}
131-
<Route path="returnAndCancellation" element={<ReturnAndCancellation />} /> {/* Return and Cancellation page route */}
129+
<Route path="termsAndCondition" element={<TermsAndConditions />} />
130+
{/* Terms and Conditions page route */}
131+
<Route path="feedback" element={<FeedbackModal />} />
132+
{/* Feedback page route */}
133+
<Route
134+
path="returnAndCancellation"
135+
element={<ReturnAndCancellation />}
136+
/>
137+
{/* Return and Cancellation page route */}
132138
<Route path="EPR_Page" element={<EPRPage />} /> {/* EPR page route */}
133-
<Route path="career" element={<CareerPage />} /> {/* Career page route */}
134-
<Route path="service" element={<ServicePage />} /> {/* Service page route */}
135-
139+
<Route path="career" element={<CareerPage />} />{" "}
140+
<Route path="service" element={<ServicePage />} />{" "}
141+
<Route path="shipping" element={<Shipping />} />{" "}
142+
{/* EPR page route */}
136143
{/* Private routes requiring authentication */}
137144
<Route element={<PrivateRoute />}>
138145
<Route path="/admin" element={<AdminLayout />}>
@@ -148,18 +155,28 @@ export default function App() {
148155
<Route path="checkout" element={<Checkout />} /> {/* Checkout route */}
149156
<Route path="productDetails" element={<ProductDetails />} /> {/* Product details route */}
150157
<Route path="payment" element={<Payment />} /> {/* Payment route */}
151-
<Route path="dashboard-order" element={<DashboardOrders />} /> {/* Dashboard orders route */}
152-
<Route path="dashboard-cart" element={<DashboardCart />} /> {/* Dashboard cart route */}
153-
<Route path="dashboard-wishlist" element={<DashboardWishlist />} /> {/* Dashboard wishlist route */}
154-
<Route path="dashboard-notifications" element={<NotificationPage />} /> {/* Dashboard notifications route */}
155-
<Route path="blog" element={<Blog />} /> {/* Blog page route */}
156-
<Route path="giftcard" element={<GiftcardPage />} /> {/* Gift card page route */}
157-
<Route path="sponsorships" element={<Sponsorships />} /> {/* Sponsorships page route */}
158-
<Route path="warranty" element={<Warranty />} /> {/* Warranty page route */}
159-
<Route path="productCare" element={<ProductCare />} /> {/* Product care page route */}
160-
<Route path="subscription" element={<Subscription />} /> {/* Subscription page route */}
161-
<Route path="events" element={<Events />} /> {/* Events page route */}
162-
<Route path="profile" element={<ProfilePage />} /> {/* Profile page route */}
158+
<Route path="dashboard-order" element={<DashboardOrders />} />
159+
{/* Dashboard orders route */}
160+
<Route path="dashboard-cart" element={<DashboardCart />} />
161+
{/* Dashboard cart route */}
162+
<Route path="dashboard-wishlist" element={<DashboardWishlist />} />
163+
{/* Dashboard wishlist route */}
164+
<Route
165+
path="dashboard-notifications"
166+
element={<NotificationPage />}
167+
/>
168+
{/* Dashboard notifications route */}
169+
{/* Not in use routes */}
170+
<Route path="blog" element={<Blog />} />
171+
{/* additional routes */}
172+
<Route path="giftcard" element={<GiftcardPage />} />
173+
<Route path="sponsorships" element={<Sponsorships />} />
174+
<Route path="warranty" element={<Warranty />} />
175+
<Route path="productCare" element={<ProductCare />} />
176+
<Route path="subscription" element={<Subscription />} />
177+
<Route path="events" element={<Events />} />
178+
<Route path="profile" element={<ProfilePage />} />
179+
{/* Dashboard Profile route */}
163180
</Route>
164181

165182
{/* Certifications page route */}

‎src/User/components/FeedbackForm/Feedback.jsx

+8-2
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,20 @@ const FeedbackModal = () => {
109109
});
110110
};
111111

112-
const emojis = ["😡", "☹️", "😐", "🙂", "😄"];
112+
const emojis = [
113+
"/src/User/components/FeedbackForm/emoji1.gif",
114+
"/src/User/components/FeedbackForm/emoji2.gif",
115+
"/src/User/components/FeedbackForm/emoji3.gif",
116+
"/src/User/components/FeedbackForm/emoji4.gif",
117+
"/src/User/components/FeedbackForm/emoji5.gif",
118+
];
113119
const getEmoji = (ratingValue) => emojis[ratingValue - 1] || "😐";
114120
const gifs = [
115121
"/src/User/components/FeedbackForm/emoji1.gif",
116122
"/src/User/components/FeedbackForm/emoji2.gif",
117123
"/src/User/components/FeedbackForm/emoji3.gif",
118-
"/src/User/components/FeedbackForm/emoji5.gif",
119124
"/src/User/components/FeedbackForm/emoji4.gif",
125+
"/src/User/components/FeedbackForm/emoji5.gif",
120126
];
121127
const getGif = (ratingValue) => gifs[ratingValue - 1] || "emoji3.gif"; // default to emoji3.gif if ratingValue is invalid
122128

‎src/User/components/Footer/Footer.jsx

+28-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from "react";
22
import "./Footer.css";
3-
import { FaDiscord } from 'react-icons/fa';
4-
import { FaInstagram } from 'react-icons/fa';
5-
import { BsTwitterX } from 'react-icons/bs';
3+
import { FaDiscord } from "react-icons/fa";
4+
import { FaInstagram } from "react-icons/fa";
5+
import { BsTwitterX } from "react-icons/bs";
66
import { Link } from "react-router-dom";
77
import Logo from "../../../assets/images/Logo.svg";
88
import googlePlay from "../../../assets/google-play.png";
@@ -19,7 +19,11 @@ const Footer = () => {
1919
<div className="footer-top">
2020
<div className="flex-shrink-0 ">
2121
<Link to="/" className="flex items-center">
22-
<img src={Logo} alt="VigyBag Logo" style={{ height: "12vh", zIndex: "1", marginLeft: "40px" }} />
22+
<img
23+
src={Logo}
24+
alt="VigyBag Logo"
25+
style={{ height: "12vh", zIndex: "1", marginLeft: "40px" }}
26+
/>
2327
</Link>
2428

2529
<div
@@ -64,7 +68,7 @@ const Footer = () => {
6468
<Link to="/contact" onClick={scrollToTop}>
6569
Contact us
6670
</Link>
67-
<Link to="/our-services" onClick={scrollToTop}>
71+
<Link to="/service" onClick={scrollToTop}>
6872
Our Services
6973
</Link>
7074
<Link to="/about" onClick={scrollToTop}>
@@ -96,6 +100,9 @@ const Footer = () => {
96100
<Link to="/termsAndCondition" onClick={scrollToTop}>
97101
Terms & Conditions
98102
</Link>
103+
<Link to="/shipping" onClick={scrollToTop}>
104+
shipping
105+
</Link>
99106
</div>
100107
<div className="flex flex-col justify-items-end items-start md:justify-center">
101108
<p className="text-center text-gray-400 text-sm md:justify-center underline">
@@ -106,8 +113,7 @@ const Footer = () => {
106113
<a
107114
href="https://www.google.com/maps?q=Kanpur,+Uttar+Pradesh+208025"
108115
target="_blank"
109-
rel="noopener noreferrer"
110-
>
116+
rel="noopener noreferrer">
111117
<p>
112118
<lord-icon
113119
style={{
@@ -155,11 +161,18 @@ const Footer = () => {
155161
SOCIALS:
156162
</p>
157163
<div className="social-icons">
158-
<a href="https://www.instagram.com/vigybag/" target="_blank" rel="noopener noreferrer">
159-
<FaInstagram size={30} style={{ color: '#E4405F' }} />
164+
<a
165+
href="https://www.instagram.com/vigybag/"
166+
target="_blank"
167+
rel="noopener noreferrer">
168+
<FaInstagram size={30} style={{ color: "#E4405F" }} />
160169
</a>
161-
<a href="https://www.x.com" target="_blank" rel="noopener noreferrer">
162-
<BsTwitterX size={25} style={{ color: '#ffffff' }} /> {/* X color */}
170+
<a
171+
href="https://www.x.com"
172+
target="_blank"
173+
rel="noopener noreferrer">
174+
<BsTwitterX size={25} style={{ color: "#ffffff" }} />{" "}
175+
{/* X color */}
163176
</a>
164177
<a
165178
href="https://www.linkedin.com/posts/codervivek_startup-teamwork-innovation-activity-7211097005408890880-haWJ?"
@@ -199,7 +212,10 @@ const Footer = () => {
199212
src="https://cdn.lordicon.com/fjuachvi.json"
200213
trigger="hover"></lord-icon>
201214
</a>
202-
<a href="https://discord.com/invite/xujgQevyZ4" target="_blank" rel="noopener noreferrer">
215+
<a
216+
href="https://discord.com/invite/xujgQevyZ4"
217+
target="_blank"
218+
rel="noopener noreferrer">
203219
<FaDiscord size={30} />
204220
</a>
205221
</div>

0 commit comments

Comments
 (0)