Resolve Conflict

.github/workflows/auto-comment.yml

@@ -0,0 +1,75 @@
+name: Automate Issue and PR Responses
+
+on:
+ issues:
+ types:
+ - opened
+ - closed
+ pull_request:
+ types:
+ - opened
+ - closed
+
+jobs:
+ respond-to-events:
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Respond to new issues
+ - name: Respond to new issues
+ if: ${{ github.event_name == 'issues' && github.event.action == 'opened' }}
+ run: |
+ echo "Hey @${{ github.actor }}, Welcome to 💖coffeeShop! 🎊" > comment.txt
+ echo "Thanks for opening an issue! 🙌 Please wait for the issue to be assigned." >> comment.txt
+ echo "Happy Coding!! ✨" >> comment.txt
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ uses: peter-evans/create-or-update-comment@v3
+ with:
+ issue-number: ${{ github.event.issue.number }}
+ body-path: comment.txt
+
+ # Respond to closed issues
+ - name: Respond to closed issues
+ if: ${{ github.event_name == 'issues' && github.event.action == 'closed' }}
+ run: |
+ echo "Hello @${{ github.event.issue.user.login }}! Your issue #${{ github.event.issue.number }} has been closed." > comment.txt
+ echo "Thank you for your contribution to 💖coffeeShop!!! 🙌" >> comment.txt
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ uses: peter-evans/create-or-update-comment@v3
+ with:
+ issue-number: ${{ github.event.issue.number }}
+ body-path: comment.txt
+
+ # Respond to new PRs
+ - name: Respond to new PRs
+ if: ${{ github.event_name == 'pull_request' && github.event.action == 'opened' }}
+ run: |
+ echo "Hey @${{ github.actor }}, Welcome to 💖coffeeShop 🎊" > comment.txt
+ echo "Thanks for your contribution! Your effort makes this project better. Keep it up! 🙌" >> comment.txt
+ echo "Please wait for the PR to be reviewed." >> comment.txt
+ echo "Happy Coding!! ✨" >> comment.txt
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ uses: peter-evans/create-or-update-comment@v3
+ with:
+ issue-number: ${{ github.event.pull_request.number }}
+ body-path: comment.txt
+
+ # Respond to merged PRs
+ - name: Respond to merged PRs
+ if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged }}
+ run: |
+ echo "@${{ github.event.pull_request.user.login }} Congrats, Your pull request has been successfully merged 🥳🎉" > comment.txt
+ echo "Thank you for your contribution to 💖coffeeShop!!" >> comment.txt
+ echo "Happy coding 🎊, Keep Contributing 🙌 !!!" >> comment.txt
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ uses: peter-evans/create-or-update-comment@v3
+ with:
+ issue-number: ${{ github.event.pull_request.number }}
+ body-path: comment.txt

package.json

@@ -12,14 +12,12 @@
     "@babel/plugin-transform-private-property-in-object": "^7.25.9",
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-react": "^7.26.3",
-
-
     "@dotlottie/react-player": "^1.6.19",
-
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
     "@eslint/config-array": "^0.19.1",
     "@eslint/object-schema": "^2.1.5",
+    "@fortawesome/fontawesome-free": "^6.7.2",
     "@headlessui/react": "^2.1.8",
     "@heroicons/react": "^2.1.5",
     "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -36,11 +34,11 @@
     "glob": "^11.0.0",
     "gsap": "^3.12.5",
     "lottie-react": "^2.4.0",
-
     "openai": "^4.78.0",
-
     "react": "^18.3.1",
+    "react-animated-cursor": "^2.11.2",
     "react-dom": "^18.3.1",
+    "react-icons": "^5.4.0",
     "react-locomotive-scroll": "^0.2.2",
     "react-redux": "^9.1.2",
     "react-router-dom": "^6.26.2",

src/App.js

@@ -1,8 +1,8 @@
-import React from 'react';
+import React, {useState} from 'react';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
-import ScrollToTop from './componets/ScrollToTop';
+import ScrollToTop from './componets/ScrollToTop'; 
 import { Provider } from 'react-redux';
 import { store } from './Store/index';
 import styled from 'styled-components';
@@ -25,11 +25,11 @@ 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";
 import CozyAmbiance from "./Pages/CozyAmbiance";
 import Reviews from "./componets/Reviews";
-
+import AnimatedCursor from "react-animated-cursor";
+import Feedback from './Pages/Feedback';
 const AppContainer = styled.div`
   display: flex;
   flex-direction: column;
@@ -48,7 +48,14 @@ function App() {
         <ScrollToTop />
         <AppContainer>
           <Navbar />
-
+          <AnimatedCursor 
+            innerSize={20}
+            outerSize={20}
+            color='104, 225, 239'
+            outerAlpha={0.2}
+            innerScale={0.7}
+            outerScale={5}
+          />
           <ToastContainer position="top-right" autoClose={3000} />
           <ContentContainer>
             <Routes>
@@ -69,8 +76,8 @@ function App() {
               <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="/feedback" element={<Feedback />} />
               <Route path="/expertbaristas" element={<ExpertBaristas />} />
               <Route path="/cozyambiance" element={<CozyAmbiance />} />
             </Routes>
@@ -84,4 +91,3 @@ function App() {
 }
 
 export default App;
-

src/Pages/About.js

@@ -156,7 +156,6 @@ function About() {
               src="https://i.ytimg.com/vi/DyJTVkRP1vY/maxresdefault.jpg" 
               alt="Zumar Cafe Interior" 
             />
-            <div className="overlay"></div>
           </HoverImage>
         </ImageContent>
       </Content>