Merge branch 'main' into Sowdarjya

.github/workflows/welcome.yml

@@ -0,0 +1,19 @@
+name: Welcome New Contributors
+
+on:
+  issues:
+    types: [opened]
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  welcome:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/first-interaction@v1
+        with:
+          repo-token: ${{ secrets.COFFEE_SHOP_GITHUB_TOKEN }}
+          issue-message: |
+            Congratulations! 🎉 Thank you for creating your issue. Your contribution is greatly appreciated and we look forward to working with you to resolve the issue. Keep up the great work!
+          pr-message: |
+            Great job! 🎉 Thank you for submitting your pull request. Your contribution is valuable and we appreciate your efforts to improve our project.

Dockerfile

@@ -0,0 +1,32 @@
+# Stage 1: Build the React application
+FROM node:18 AS builder
+
+# Set working directory inside the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package.json ./
+
+# Install dependencies
+RUN npm install
+
+# Copy all source code
+COPY . .
+
+# Build the React app
+RUN npm run build
+
+# Stage 2: Serve the application with Nginx
+FROM nginx:stable-alpine
+
+# Copy the built files from the previous stage
+COPY --from=builder /app/build /usr/share/nginx/html
+
+# Copy the Nginx configuration
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
+# Expose the port
+EXPOSE 80
+
+# Start the Nginx server
+CMD ["nginx", "-g", "daemon off;"]

nginx.conf

@@ -0,0 +1,15 @@
+server {
+    listen 80;
+
+    server_name localhost;
+
+    root /usr/share/nginx/html;
+
+    index index.html;
+
+    location / {
+        try_files $uri /index.html;
+    }
+
+    error_page 404 /index.html;
+}

package.json

@@ -18,7 +18,7 @@
     "react-locomotive-scroll": "^0.2.2",
     "react-redux": "^9.1.2",
     "react-router-dom": "^6.26.2",
-    "react-scripts": "5.0.1",
+    "react-scripts": "^5.0.1",
     "scrolltrigger": "^1.0.1",
     "styled-components": "^6.1.13",
     "web-vitals": "^2.1.4"

public/index.html

@@ -28,6 +28,7 @@
     <link href="./App.css" rel="stylesheet">
     <link href="./index.css" rel="stylesheet">
     <title>MsCafe</title>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css" rel="stylesheet">
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
   </head>
   </head>
@@ -44,6 +45,12 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
+
+    <!-- Scroll to Top Button -->
+    <button id="scrollToTop" title="Go to top">
+      <i class="fa-solid fa-arrow-up fa-lg"></i>
+    </button>
+
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
   </body>
 </html>

src/Pages/Home.css

@@ -1,12 +1,12 @@
 /* CafeHome.css */
-@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;600;700&family=Poppins:wght@300;400;500;600&display=swap');
+@import url("https://fonts.googleapis.com/css2?family=Playfair+Display:wght@400;600;700&family=Poppins:wght@300;400;500;600&display=swap");
 
 :root {
-  --primary-coffee: #8B4513;
-  --secondary-coffee: #D2691E;
-  --cream: #FFE4B5;
-  --light-cream: #FDF5E6;
-  --dark-coffee: #2C130B;
+  --primary-coffee: #8b4513;
+  --secondary-coffee: #d2691e;
+  --cream: #ffe4b5;
+  --light-cream: #fdf5e6;
+  --dark-coffee: #2c130b;
 }
 
 /* Custom Scrollbar */
@@ -79,11 +79,11 @@ html {
   .hero-section {
     background-attachment: scroll;
   }
-  
+
   .feature-card {
     margin: 1rem;
   }
-  
+
   .specialty-image {
     width: 250px;
     height: 250px;
@@ -95,4 +95,4 @@ html {
 ::selection {
   background: var(--secondary-coffee);
   color: var(--cream);
-}
+}

src/Pages/Home.js

@@ -1,3 +1,4 @@
+
 import React, { useEffect, useRef } from "react";
 import { Link } from "react-router-dom";
 import { gsap } from "gsap";
@@ -7,6 +8,16 @@ import { motion } from "framer-motion";
 import Button from "../componets/Button";
 import "./Home.css";
 
+import { motion } from 'framer-motion';
+import { gsap } from 'gsap';
+import { ScrollTrigger } from 'gsap/ScrollTrigger';
+import React, { useEffect, useRef } from 'react';
+import { Link } from 'react-router-dom';
+import styled from 'styled-components';
+import Button from '../componets/Button';
+import './Home.css';
+
+
 gsap.registerPlugin(ScrollTrigger);
 
 const HomeContainer = styled.div`
@@ -284,6 +295,7 @@ function Home() {
         </Link>
         <ScrollIndicator>↓</ScrollIndicator>
       </HeroSection>
+
       <FeaturesSection
         ref={featuresRef}
         className="grid md:grid-cols-3 sm:grid-cols-2 gap-4 grid-cols-1"
@@ -293,6 +305,11 @@ function Home() {
             src="https://img.freepik.com/free-photo/side-view-fresh-coffee-beans-falling-out-black-basket-red-background_141793-27586.jpg?t=st=1727759694~exp=1727763294~hmac=661c2c2b8c561df98b21f74effb9bb02a0875b0584c062f076bceafa5d6f7eda&w=1380"
             alt="Quality Beans"
           />
+
+      <FeaturesSection ref={featuresRef} className="hover:cursor-pointer">
+        <FeatureCard >
+          <FeatureIcon src="https://img.freepik.com/free-photo/side-view-fresh-coffee-beans-falling-out-black-basket-red-background_141793-27586.jpg?t=st=1727759694~exp=1727763294~hmac=661c2c2b8c561df98b21f74effb9bb02a0875b0584c062f076bceafa5d6f7eda&w=1380" alt="Quality Beans" />
+
           <FeatureTitle>Premium Beans</FeatureTitle>
           <FeatureDescription>
             We source the finest coffee beans from around the world.