Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/MonalikaPatnaik/SheEARNS in…
Browse files Browse the repository at this point in the history
…to Priyansh
  • Loading branch information
PSS2134 committed Dec 28, 2023
2 parents 453839c + a5a58e8 commit 5debd4e
Show file tree
Hide file tree
Showing 21 changed files with 1,247 additions and 509 deletions.
1,262 changes: 782 additions & 480 deletions client/package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"assert": "^2.1.0",
"axios": "^1.6.1",
"cors": "^2.8.5",
"framer-motion": "^10.16.16",
"http": "^0.0.1-security",
"https": "^1.0.0",
"npm": "^10.2.5",
Expand All @@ -28,10 +29,12 @@
"react-redux": "^8.0.5",
"react-router-dom": "^6.8.1",
"react-scripts": "^5.0.1",
"react-slick": "^0.29.0",
"react-toastify": "^9.1.3",
"redux": "^4.2.1",
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^2.4.2",
"slick-carousel": "^1.8.1",
"start": "^5.1.0",
"stream": "^0.0.2",
"url": "^0.11.3",
Expand Down
13 changes: 12 additions & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@ import ExploreProducts from "./pages/ExploreProducts";
import OpenStore from "./pages/OpenStore";
import CreateItem from "./pages/CreateItem";
import ErrorPage from "./components/ErrorPage";
import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css";

import { ToastContainer, toast } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";

import FAQ from "./pages/FAQ";



// import SingleBlog from "./pages/SingleBlog
import Wishlist from "./pages/Wishlist";

Expand Down Expand Up @@ -42,7 +49,7 @@ function App() {
<Route path="/shops/:keyword" element={<SpecialProduct/>}/>
<Route path="/shops/:location" element={<SpecialProduct/>}/>

<Route path="contact" element={<Contact/>}/>
<Route path="/contact" element={<Contact/>}/>
<Route path="openStore" element={<OpenStore/>}/>


Expand All @@ -64,6 +71,10 @@ function App() {
<Route path="shipping-policy" element={<ShippingPolicy />} />
<Route path="term-conditions" element={<TermAndCondition />} />

<Route path="contact" element={<Contact />} />
<Route path="about" element={<About />} />
<Route path="faq" element={<FAQ />} />

<Route path="blog/:id" element={<SingleBlog />} />


Expand Down
68 changes: 68 additions & 0 deletions client/src/components/CardBanner.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@

.card-item {
width: 90% ;
height: 350px;
margin-right: 20px;
margin-top: 20px;
margin-bottom: 30px;
position: relative;
border-radius: 20px;
overflow: hidden;
box-shadow: 0 4px 8px #c15feb;
transition: transform 0.5s ,box-shadow 0.5s;

}
.card-item:hover {
transform: scale(1.1);
box-shadow: 0 6px 12px #c15feb;
}
.title,
.description {
font-family: sans-serif;
}
.card-image {
width: 100%;
height: 100%;

object-fit: cover;
border-top-left-radius: 20px;
border-top-right-radius: 20px;
}

.title,
.description {
width: 100%;
text-align: center;
color: black;
font-size: 1.2rem;
opacity: 0.7;
}

.title {
top: 7%;
text-align: left;
left: 10px;
font-size: 1rem;
font-weight: 200;
}

.description {
top: 22%;
text-align: left;
left: 10px;
font-size: 1.5rem;
font-weight: 500;

}
.title,
.description {
display: flex;
position: absolute;
z-index: 10;
flex-direction: column;
padding: 10px;
gap: 0.5rem;
backdrop-filter: blur(25px);
background-color: #c15feb77;
border-radius: 1rem;
}
61 changes: 61 additions & 0 deletions client/src/components/CardBanner.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import React, { Component } from "react";
import Slider from "react-slick";
import './CardBanner.css';

class CardBanner extends Component {
render() {
const { data } = this.props;

const settings = {
className: "center",
infinite: true,
centerPadding: "60px",
slidesToShow: 3,
swipeToSlide: true,
afterChange: function(index) {
console.log(
`Slider Changed to: ${index + 1}, background: #222; color: #bada55`
);
},
responsive: [
{
breakpoint: 1190,
settings: {
slidesToShow: 2,
infinite: true,
dots: true
}
},
{
breakpoint: 600,
settings: {
slidesToShow: 1,
}
}
]
};
return (
<div style={{marginTop:25}}>
<Slider {...settings}>
{data.map((item, index) => (
<div key={index} style={{marginTop:20}}>
<div className="card-item" style={{marginLeft:10}}>

<img
src={item.image}

alt={`Item ${index + 1}`}
className="card-image"
/>
<div className="title">{item.title}</div>
<div className="description">{item.description}</div>
</div>
</div>
))}
</Slider>
</div>
);
}
}

export default CardBanner;
24 changes: 24 additions & 0 deletions client/src/components/Footer.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.social_icons a {
color: #ffffff !important;
text-decoration: none;
}

.social_icons a:hover {
color: #c05093 !important;
transition: all 0.3s ease-in-out;
scale: 1.15;

}

.contact_links:hover{
color: #961663 !important;
scale: 1.03;
margin-left: 7px;
transition: all 0.2s ease-in-out;
}

#basic-addon2:hover{
cursor: pointer !important;
color: #be87d5 !important;
}

41 changes: 19 additions & 22 deletions client/src/components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import React from "react";
import { Link } from "react-router-dom";
import { BsLinkedin, BsGithub, BsYoutube, BsInstagram } from "react-icons/bs";
import newsletter from "../images/newsletter.png";
import "./Footer.css"
import SubmitEmail from './SubmitEmail'



const Footer = () => {
return (
Expand All @@ -17,16 +21,8 @@ const Footer = () => {
</div>
<div className="col-7">
<div className="input-group">
<input
type="text"
className="form-control py-1"
placeholder="Your Email Address"
aria-label="Your Email Address"
aria-describedby="basic-addon2"
/>
<span className="input-group-text p-2" id="basic-addon2">
Subscribe
</span>
<SubmitEmail/>
<span id="msg"></span>
</div>
</div>
</div>
Expand Down Expand Up @@ -57,36 +53,37 @@ const Footer = () => {
<div className="col-3">
<h4 className="text-dark mb-4">Information</h4>
<div className="footer-link d-flex flex-column">
<Link to="/privacy-policy" className="text-dark py-2 mb-1">
<Link to="/privacy-policy" className="contact_links text-dark py-2 mb-1">
Privacy Policy
</Link>
<Link to="/refund-policy" className="text-dark py-2 mb-1">
<Link to="/refund-policy" className="contact_links text-dark py-2 mb-1">
Refund Policy
</Link>
<Link to="/shipping-policy" className="text-dark py-2 mb-1">
<Link to="/shipping-policy" className="contact_links text-dark py-2 mb-1">
Shipping Policy
</Link>
<Link to="/term-conditions" className="text-dark py-2 mb-1">
<Link to="/term-conditions" className="contact_links text-dark py-2 mb-1">
Terms & Conditions
</Link>
<Link className="text-dark py-2 mb-1">Blogs</Link>
<Link className="contact_links text-dark py-2 mb-1">Blogs</Link>
</div>
</div>
<div className="col-3">
<h4 className="text-dark mb-4">Account</h4>
<div className="footer-link d-flex flex-column">
<Link className="text-dark py-2 mb-1">Contact</Link>
<Link className="text-dark py-2 mb-1">About Us</Link>
<Link className="text-dark py-2 mb-1">Faq</Link>

<Link to="/contact" className="contact_links text-dark py-2 mb-1">Contact</Link>
<Link to="/about" className="contact_links text-dark py-2 mb-1">About Us</Link>
<Link to="/faq" className="contact_links text-dark py-2 mb-1">Faq</Link>
</div>
</div>
<div className="col-2">
<h4 className="text-dark mb-4">Quick Links</h4>
<div className="footer-link d-flex flex-column">
<Link className="text-dark py-2 mb-1">Laptops</Link>
<Link className="text-dark py-2 mb-1">Headphones</Link>
<Link className="text-dark py-2 mb-1">Tablets</Link>
<Link className="text-dark py-2 mb-1">Watch</Link>
<Link className="contact_links text-dark py-2 mb-1">Laptops</Link>
<Link className="contact_links text-dark py-2 mb-1">Headphones</Link>
<Link className="contact_links text-dark py-2 mb-1">Tablets</Link>
<Link className="contact_links text-dark py-2 mb-1">Watch</Link>
</div>
</div>
</div>
Expand Down
54 changes: 53 additions & 1 deletion client/src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,63 @@ import { Outlet } from 'react-router-dom';
import Header from "./Header";
import Footer from "./Footer";
import Navbar from './Navbar';

import img1 from '../images/B1.webp';
import img2 from '../images/B2.png';
import img3 from '../images/B3.jpeg';
import img4 from '../images/B4.webp';
import img5 from '../images/B5.jpg';
import img6 from '../images/B6.jpg';
import img7 from '../images/B7.jpg';
import { motion } from "framer-motion";
import CardBanner from "./CardBanner"
const Layout = () => {
const bannerData = [
{
title: "Empowering Homepreneurs",
description: 'Explore and support the inspiring stories and creations of women entrepreneurs working from home.',
image: img1,
},
{
title: 'Artistry Unveiled',
description: 'Discover and support local women crafting unique handmade and artisanal products.',
image: img2,
},
{
title: 'Women Supporting Women',
description: "Dive into the vibrant SheEarns community where women uplift and celebrate each other's businesses.",
image: img3,
},
{
title: 'Culinary Queens Haven',
description: 'From homemade delights to gourmet wonders, savor the flavors of local female chefs.',
image: img4,
},
{
title: 'Green Goddess Creations',
description: ' Support women entrepreneurs creating eco-friendly products. ',
image: img5,
},
{
title: 'Tech Brilliance Hub',
description: 'Explore innovative solutions, apps, and gadgets designed by tech-savvy female entrepreneurs!!!',
image: img6,
},
{
title: 'Mindful Motherhood Treasures',
description: ' Discover products and Support women-owned businesses catering to the unique needs of moms and families.',
image: img7,
},
];
return (
<>
<Navbar/>
<motion.div
initial={{ opacity: 0, scale: 0.5 }}
animate={{ opacity: 1, scale: 1 }}
transition={{ duration: 0.3 }}
>
<CardBanner data={bannerData} />
</motion.div>
<Outlet />
<Footer />
</>
Expand Down
36 changes: 36 additions & 0 deletions client/src/components/SubmitEmail.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
form{
display: flex;
background-color: white;
width: fit-content;
align-items: center;
}

form input{
border: 0;
outline: 0;
padding: 10px 20px;
height:50px;
width: 600px;
font-size: 18px;
}

form button{
background: #a77eb9;
border: none;
outline: none;
height: 50px;
width: 100px;
cursor: pointer;
}
span{
color: #ffffff;
margin-top: 10px;
display: block;
}
form button:hover{
color: #ffffff;
}

span #msg{
color: black;
}
Loading

0 comments on commit 5debd4e

Please sign in to comment.