Merge branch 'main' into footer

Mujtabaa07 · Jan 7, 2025 · e19afa5 · e19afa5
2 parents e8395cb + ed589e3
commit e19afa5
Show file tree

Hide file tree

Showing 17 changed files with 2,369 additions and 771 deletions.
diff --git a/src/App.js b/src/App.js
@@ -1,23 +1,28 @@
-import React from "react";
-import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
-import ScrollToTop from "./componets/ScrollToTop";
-import { Provider } from "react-redux";
-import { store } from "./Store/index";
-import styled from "styled-components";
-import Navbar from "./componets/Navbar";
-import Footer from "./componets/footer";
-import Home from "./Pages/Home";
-import Login from "./Pages/login";
-import Register from "./Pages/Register";
-import Shop from "./Pages/Shop";
-import Cart from "./Pages/cart";
-import About from "./Pages/About";
-import Contact from "./Pages/contact";
-import Profile from "./Pages/profile";
-import Checkout from "./Pages/checkOut";
-import Testimonial from "./Pages/Testimonial";
-import PremiumBeans from "./Pages/PremiumBeans";
 
+import React from 'react';
+import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
+import ScrollToTop from './componets/ScrollToTop';
+import { Provider } from 'react-redux';
+import { store } from './Store/index';
+import styled from 'styled-components';
+import Navbar from './componets/Navbar';
+import Footer from './componets/footer';
+import Home from './Pages/Home';
+import Login from './Pages/login';
+import Register from './Pages/Register';
+import Shop from './Pages/Shop';
+import Cart from './Pages/cart';
+import About from './Pages/About';
+import Contact from './Pages/contact';
+import Profile from './Pages/profile';
+import Checkout from './Pages/checkOut';
+import Testimonial from './Pages/Testimonial';
+
+import Cake from './Pages/cake';
+import Coffee from './Pages/coffee';
+import Soup from './Pages/soup';
+import Milkshakes from './Pages/milkshake';
+import PremiumBeans from './Pages/PremiumBeans';
 import ForgetPassword from "./Pages/ForgetPassword";
 
 import ExpertBaristas from "./Pages/ExpertBaristas";
@@ -55,6 +60,12 @@ function App() {
               <Route path="/contact" element={<Contact />} />
               <Route path="/profile" element={<Profile />} />
               <Route path="/checkout" element={<Checkout />} />
+
+              <Route path="/shop/cake" element={<Cake />} />
+              <Route path="/shop/coffee" element={<Coffee />} />
+              <Route path="/shop/soup" element={<Soup />} />
+              <Route path="/shop/milkshake" element={<Milkshakes />} />
+
               <Route path="/premiumbeans" element={<PremiumBeans />} />
               <Route path="/expertbaristas" element={<ExpertBaristas />} />
             </Routes>

diff --git a/src/Pages/About.js b/src/Pages/About.js
@@ -1,21 +1,31 @@
 import React from 'react';
 import styled from 'styled-components';
-import { motion } from 'framer-motion';
+import { color, motion } from 'framer-motion';
 import Button from '../componets/Button';
 
 const AboutContainer = styled.div`
   padding: 6rem 2rem 4rem 2rem;
   max-width: 1200px;
   margin: 0 auto;
   background-color: #fffbeb;
+
+  background-image: url('https://png.pngtree.com/thumb_back/fh260/background/20231205/pngtree-creamy-textured-milk-colored-background-image_13815875.png');
+  background-size: cover;
+  background-position: center;
+  background-attachment: fixed;
+
+  padding-top: 1.5rem; /* Adjusted padding for top */
+
 `;
 
 const Title = styled(motion.h1)`
-  font-size: 2.5rem;
+  font-size: 3rem;
   margin-bottom: 3rem;
   text-align: center;
-  color: #78350f;
+  color: #7c2214;
+  letter-spacing: 4px;
   font-weight: bold;
+  text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
 `;
 
 const Content = styled(motion.div)`
@@ -38,6 +48,7 @@ const TextContent = styled(motion.div)`
     font-size: 1.1rem;
     line-height: 1.8;
     margin-bottom: 1.5rem;
+    font-weight:bold;
   }
 `;
 
@@ -54,6 +65,15 @@ const Image = styled(motion.img)`
   height: auto;
   border-radius: 12px;
   box-shadow: 0 8px 20px rgba(0, 0, 0, 0.15);
+  filter: grayscale(100%) ;
+  transition: all 0.3s ease;
+  border: 4px solid black;
+  &:hover {
+    filter: grayscale(0%);
+    box-shadow: 0 0 20px rgba(255, 10, 0, 0.8);
+    border-width: 6px;
+    transform: perspective(1000px) rotateX(10deg) rotateY(10deg) scale(1.05);
+  }
 `;
 
 function About() {

diff --git a/src/Pages/Home.js b/src/Pages/Home.js
@@ -19,12 +19,20 @@ const HomeContainer = styled.div`
 
 const HeroSection = styled.section`
   display: flex;
+  padding:0;
+  margin:0;
+  top:-2rem;
   flex-direction: column;
   align-items: center;
   justify-content: center;
   text-align: center;
   height: 100vh;
+
+  width: 100%;
+
+  gap:-0.5rem;
   width: 100vw;
+
   background-image: linear-gradient(
       rgba(44, 19, 11, 0.7),
       rgba(44, 19, 11, 0.7)
@@ -49,8 +57,8 @@ const HeroSection = styled.section`
 
 const Title = styled(motion.h1)`
   font-size: 5rem;
-  margin-bottom: 1.5rem;
-  text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
+  
+  
   font-family: "Playfair Display", serif;
   color: #ffe4b5;
 
@@ -61,23 +69,22 @@ const Title = styled(motion.h1)`
 
 const Subtitle = styled(motion.p)`
   font-size: 1.8rem;
-  margin-bottom: 2.5rem;
-  text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+  
   font-family: "Poppins", sans-serif;
   color: #deb887;
   max-width: 600px;
-  line-height: 1.4;
+  
 
   @media (max-width: 768px) {
     font-size: 1.4rem;
-    padding: 0 20px;
+    
   }
 `;
 
 const StyledButton = styled(Button)`
   background: #d2691e;
   color: #ffe4b5;
-  padding: 1rem 2.5rem;
+  padding:0.8rem;
   font-size: 1.2rem;
   border-radius: 30px;
   border: 2px solid #8b4513;
@@ -91,6 +98,10 @@ const StyledButton = styled(Button)`
     transform: translateY(-3px);
     box-shadow: 0 5px 15px rgba(139, 69, 19, 0.3);
   }
+
+  @media (min-width: 783px) {
+  font-size:0.8rem;
+  padding: 0.5rem}
 `;
 
 const FeaturesSection = styled.section`
@@ -102,15 +113,7 @@ const FeaturesSection = styled.section`
   position: relative;
   overflow: visible;
 
-  &::before {
-    content: "☕";
-    position: absolute;
-    top: -30px;
-    left: 50%;
-    transform: translateX(-50%);
-    font-size: 3rem;
-    color: #8b4513;
-  }
+  
 
   @media (max-width: 768px) {
     padding: 4rem 2rem;
@@ -196,27 +199,40 @@ const SpecialtyImage = styled(motion.img)`
 
 const ScrollIndicator = styled(motion.div)`
   position: absolute;
-  bottom: 40px;
-  left: 50%;
+  bottom:9rem;
+  display:flex,
+  justify-content: center;
+  justify-items: center;
+  left: 49.6%;
   transform: translateX(-50%);
   color: #ffe4b5;
   font-size: 2rem;
   cursor: pointer;
   animation: bounce 2s infinite;
 
+  &::after {
+    content: "☕";
+    position: absolute;
+    top: 40px;
+    left: 56%;
+    transform: translateX(-45%);
+    font-size: 3rem;
+    color: #8b4513;
+  }
+
   @keyframes bounce {
     0%,
     20%,
     50%,
     80%,
     100% {
-      transform: translateY(0) translateX(-50%);
+      transform: translateY(20%) translateX(-50%);
     }
     40% {
-      transform: translateY(-20px) translateX(-50%);
+      transform: translateY(-20%) translateX(-50%);
     }
     60% {
-      transform: translateY(-10px) translateX(-50%);
+      transform: translateY(20%) translateX(-50%);
     }
   }
 `;