Merge branch 'main' into fix/misalignment-of-testimonials-images

README.md

@@ -59,13 +59,13 @@ Once the server is running, you can view the app at (http://localhost:3000).
 
 ## ScreenShots:
 ## **Home Page:** 
-![homepage](https://github.com/user-attachments/assets/36a7852c-dd6d-40b2-9652-4c4a3f9d46fc)
+![homepage](https://github.com/user-attachments/assets/2dc9b51d-ce06-4eb6-89fb-774867ede12c)
 ## **Coffee Menu:**
-![coffeemenu](https://github.com/user-attachments/assets/0f9583d8-e2a8-4797-8e13-9d8325f58764)
+![coffeemenu](https://github.com/user-attachments/assets/014c6a7a-03ab-4bdf-88e1-bb3c11d66447)
 ## **Login Page**
-![coffeelogin](https://github.com/user-attachments/assets/e29ee634-69c4-45a3-978c-a797cf62487f)
+![coffeelogin](https://github.com/user-attachments/assets/c6c7c645-475d-4658-a47c-f0ada0b177d1)
 ## **Testimonials**
-![testimonials](https://github.com/user-attachments/assets/af0b4e1f-5363-4b71-8c5c-fe1ba244edb3)
+![testimonials](https://github.com/user-attachments/assets/38d811e3-4acc-4901-9a3d-8e4185c96a2c)
 ## Contributing
 We welcome contributions! Follow the steps below to contribute to this project:
 ```bash

package.json

@@ -6,13 +6,15 @@
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@headlessui/react": "^2.1.8",
     "@heroicons/react": "^2.1.5",
+    "@lottiefiles/dotlottie-react": "^0.12.0",
     "@reduxjs/toolkit": "^2.2.7",
     "@tailwindcss/typography": "^0.5.15",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
     "framer-motion": "^11.9.0",
     "gsap": "^3.12.5",
+    "lottie-react": "^2.4.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-locomotive-scroll": "^0.2.2",

src/App.js

@@ -17,6 +17,11 @@ import Checkout from './Pages/checkOut';
 import Testimonial from './Pages/Testimonial';
 import PremiumBeans from './Pages/PremiumBeans';
 
+import ForgetPassword from './Pages/ForgetPassword';
+
+
+import ExpertBaristas from './Pages/ExpertBaristas';
+import Reviews from './componets/Reviews'
 
 
 const AppContainer = styled.div`
@@ -41,6 +46,7 @@ function App() {
               <Route path="/" element={<Home />} />
               <Route path="/login" element={<Login />} />
               <Route path="/register" element={<Register />} />
+              <Route path="/forget-password" element={<ForgetPassword />} />
               <Route path="/home" element={<Home />} />
               <Route path="/shop" element={<Shop />} />
               <Route path="/cart" element={<Cart />} />
@@ -50,10 +56,12 @@ function App() {
               <Route path="/profile" element={<Profile />} />
               <Route path="/checkout" element={<Checkout />} />
               <Route path="/premiumbeans" element={<PremiumBeans />} />
+              <Route path="/expertbaristas" element={<ExpertBaristas />} />
+
 
             </Routes>
           </ContentContainer>
-
+          <Reviews />
           <Footer />
         </AppContainer>
       </Router>