Release

.github/workflows/docker-build-publish.yml

@@ -0,0 +1,48 @@
+name: Build and Publish Docker Image
+
+# Trigger the workflow on push or pull request to the main branch
+on:
+  push:
+    # branches:
+    #   - main
+    #   - release
+    tags:
+      - 'v*.*.*'
+  # pull_request:
+  #   branches:
+  #     - main
+  #     - release
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Checkout the repository code
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Step 2: Set up Docker Buildx
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # Step 3: Log in to Docker Hub (or GHCR if you prefer)
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+            registry: ghcr.io
+            username: ${{ github.actor }}  # Docker Hub username (use GitHub actor if using GHCR)
+            password: ${{ secrets.GITHUB_TOKEN }}  # Docker Hub password (use GitHub token if using GHCR)
+
+      # Step 4: Build and push the backend Docker image
+      - name: Build and push backend Docker image
+        run: |
+          docker build -t ghcr.io/${{ github.repository_owner }}/farmcart-api:latest -f ./backend/Dockerfile.prod ./backend
+          docker push ghcr.io/${{ github.repository_owner }}/farmcart-api:latest
+
+      # Step 5: Build and push the frontend Docker image
+      - name: Build and push frontend Docker image
+        run: |
+          docker build --build-arg VITE_STRIPE_PUBLIC_KEY=${{ secrets.VITE_STRIPE_PUBLIC_KEY }} -t ghcr.io/${{ github.repository_owner }}/farmcart-app:latest -f ./frontend/Dockerfile.prod ./frontend
+          docker push ghcr.io/${{ github.repository_owner }}/farmcart-app:latest

.gitignore

@@ -34,3 +34,5 @@ dist-ssr
 .env.prod
 
 certs
+
+docker-compose.caddy.yml

backend/.dockerignore

@@ -0,0 +1,4 @@
+.env
+.env.example
+.node_modules
+.editorconfig

backend/.env.example

@@ -1,38 +1,20 @@
-
-<<<<<<< HEAD
-
-PORT=3000
-NODE_ENV=development
-MONGODB_URI=mongodb+srv://hansagayashan7:kaG2HyFucHLzVAWD@admin.jtibwek.mongodb.net/adminDB?retryWrites=true&w=majority&appName=Admin
-=======
-PORT=3000
+PORT=5000
 NODE_ENV=development
-MONGODB_URI=mongodb+srv://imashi:ima1234@test1.n9dxa8d.mongodb.net/ITP?retryWrites=true&w=majority&appName=Test1
->>>>>>> 20440c0c5b14ddeacdd8253c03be7a8f21b4202f
-MONGODB_URI_ME=mongodb://root:1234@localhost:27017/FarmCart?authSource=admin
-JWT_SECRET=4V@qJn!yGg6QtS
+MONGODB_URI=<your_mongodb_uri>
+JWT_SECRET=<your_jwt_secret>
 
-CLOUDINARY_CLOUD_NAME=dqhdxkfvk
-CLOUDINARY_API_KEY=553548617729688
-CLOUDINARY_API_SECRET=5QoMfPIgAucfaDz4YHDhE-BBQe0
-<<<<<<< HEAD
+CLOUDINARY_CLOUD_NAME=<your_cloudinary_cloud_name>
+CLOUDINARY_API_KEY=<your_cloudinary_api_key>
+CLOUDINARY_API_SECRET=<your_cloudinary_api_secret>
 
-EMAIL_USER=<>
-EMAIL_PASS=<>
+EMAIL_USER=<your_email_user>
+EMAIL_PASS=<your_email_password>
 EMAIL_SERVICE=gmail
-SITE_URL=http://localhost:5173
-=======
->>>>>>> 20440c0c5b14ddeacdd8253c03be7a8f21b4202f
-
-PAYHERE_MERCHANT_ID=1228062
-PAYHERE_MERCHANT_SECRET=Mzc4NDA4Mjg3OTkzNzg0MDE3NTkwNTg3Mjc0NjM2Njc4MjU3OTg=
-
-CRYPTO_SECRET_KEY=5QoMfPIgAucfaDz4Y
+SITE_URL=http://0.0.0.0:3000
 
-<<<<<<< HEAD
-STRIPE_SECRET_KEY=sk_test_51LMEvTC05RrpHY1zrPQtFPDNvm7ljFOIX6Xx0dRFDWEEjVoUD0mBVgGx0jaScbTtiXDcQvNqkJpXyC4ZcQrR8zbT00e7fsuvyX
+PAYHERE_MERCHANT_ID=<your_payhere_merchant_id>
+PAYHERE_MERCHANT_SECRET=<your_payhere_merchant_secret>
 
-=======
+CRYPTO_SECRET_KEY=<your_crypto_secret_key>
 
-STRIPE_SECRET_KEY=sk_test_51LMEvTC05RrpHY1zrPQtFPDNvm7ljFOIX6Xx0dRFDWEEjVoUD0mBVgGx0jaScbTtiXDcQvNqkJpXyC4ZcQrR8zbT00e7fsuvyX
->>>>>>> 20440c0c5b14ddeacdd8253c03be7a8f21b4202f
+STRIPE_SECRET_KEY=<your_stripe_secret_key>

backend/Dockerfile

@@ -1,13 +1,29 @@
-FROM node:22-alpine3.20
+# Stage 1: Build and install only production dependencies
+FROM node:22-alpine3.20 AS builder
 
+# Set the working directory
 WORKDIR /app
 
+# Copy only package.json and package-lock.json to install dependencies first
 COPY package*.json ./
 
-RUN npm install
+# Install dependencies only, leveraging cache
+RUN npm install --omit=dev && npm prune --production
 
+# Copy the rest of the application code
 COPY . .
 
+# Stage 2: Final lightweight image for runtime
+FROM node:22-alpine3.20
+
+# Set the working directory
+WORKDIR /app
+
+# Copy only the necessary files from the builder stage
+COPY --from=builder /app /app
+
+# Expose the application on port 5001
 EXPOSE 5001
 
-CMD ["npm", "run", "dev"]
+# Run the application in development mode
+CMD ["npm", "run", "watch"]

backend/Dockerfile.prod

@@ -0,0 +1,29 @@
+# Stage 1: Build the React app
+FROM node:22-alpine3.20 AS builder
+
+# Set the working directory
+WORKDIR /app
+
+# Copy package.json and package-lock.json
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install --omit=dev
+
+# Copy all other files and build the React app
+COPY . .
+
+# Stage 2: Serve the app 
+FROM node:22-alpine3.20
+
+# Set the working directory
+WORKDIR /app
+
+# Copy the built files from the builder stage
+COPY --from=builder /app /app
+
+# Expose the application port
+EXPOSE 5002
+
+# Command to run the application
+CMD ["node", "--watch", "--env-file=.env.prod", "server.js"] 

backend/controllers/orderController.js

@@ -117,30 +117,34 @@ export const DeleteOrder = async (req, res) => {
 
 export const getShopByFarmerId = async (req, res) => {
     try {
-        const { id } = req.params;
+        const { id } = req.params
 
-        console.log("farmerid", id)
+        console.log('farmerid', id)
         // Optional: Validate the ID format (assuming MongoDB ObjectId)
         if (!id.match(/^[0-9a-fA-F]{24}$/)) {
-            return res.status(400).json({ message: 'Invalid farmer ID format' });
+            return res.status(400).json({ message: 'Invalid farmer ID format' })
         }
 
         // Find shops associated with the given farmer ID
-        const shops = await Shop.find({ farmer: id });
+        const shops = await Shop.find({ farmer: id })
 
         // Check if any shop is found
         if (!shops.length) {
-            return res.status(404).json({ message: 'No shops found for this farmer' });
+            return res
+                .status(404)
+                .json({ message: 'No shops found for this farmer' })
         }
 
         // Return the shop(s) found
-        res.status(200).json(shops);
+        res.status(200).json(shops)
     } catch (error) {
         // Return an error with a 500 status for internal server issues
-        res.status(500).json({ message: 'Failed to retrieve shops', error: error.message });
+        res.status(500).json({
+            message: 'Failed to retrieve shops',
+            error: error.message,
+        })
     }
-};
-
+}
 
 export const getOrderById = async (req, res) => {
     const { id: orderId } = req.params // Destructure orderId from request query

backend/controllers/userController.js

@@ -59,6 +59,7 @@ export const updateUser = async (req, res, next) => {
         defaultAddress,
         contactNumber,
         pic,
+        birthday,
     } = req.body
 
     try {
@@ -78,6 +79,7 @@ export const updateUser = async (req, res, next) => {
         user.defaultAddress = defaultAddress || user.defaultAddress
         user.contactNumber = contactNumber || user.contactNumber
         user.pic = pic || user.pic
+        user.birthday = birthday || user.birthday
 
         // Save updated user
         const updatedUser = await user.save()
@@ -96,6 +98,8 @@ export const updateUser = async (req, res, next) => {
                     defaultAddress: updatedUser.defaultAddress,
                     contactNumber: updatedUser.contactNumber,
                     pic: updatedUser.pic,
+                    isVerified: updatedUser.isVerified,
+                    birthday: updatedUser.birthday,
                 },
             })
         } else {
@@ -136,6 +140,8 @@ export const authUser = async (req, res, next) => {
                 defaultAddress: user.defaultAddress,
                 contactNumber: user.contactNumber,
                 membershipExpires: user.membershipExpires,
+                isVerified: user.isVerified,
+                birthday: user.birthday,
             })
         } else {
             res.status(401).json({ message: 'Invalid Password or Email' })
@@ -191,6 +197,8 @@ export const upgradeMembership = async (req, res, next) => {
                 defaultAddress: updatedUser.defaultAddress,
                 contactNumber: updatedUser.contactNumber,
                 membershipExpires: updatedUser.membershipExpires,
+                isVerified: updatedUser.isVerified,
+                birthday: updatedUser.birthday,
             },
         })
     } catch (error) {

backend/controllers/userShopController.js

@@ -93,3 +93,18 @@ export const getShopProductById = asyncHandler(async (req, res) => {
         throw new Error('Shop not found')
     }
 })
+
+export const getRandomProducts = asyncHandler(async (req, res) => {
+    try {
+        // Get random 6 products
+        const randomProducts = await Shop.aggregate([
+            { $unwind: '$products' },
+            { $sample: { size: 6 } }, // Fetch 6 random products
+        ])
+
+        res.json(randomProducts)
+    } catch (error) {
+        console.error('Error fetching products:', error)
+        res.status(500).json({ message: 'Failed to fetch products' })
+    }
+})

backend/models/userModel.js

@@ -50,6 +50,10 @@ const userSchema = new mongoose.Schema(
                 message: '{VALUE} is not a valid contact number!',
             },
         },
+        birthday: {
+            type: Date,
+            required: false, // Ensure birth date is provided
+        },
         isVerified: {
             type: Boolean,
             default: false,

backend/routes/userShopRoute.js

@@ -1,31 +1,34 @@
-import express from 'express';
+import express from 'express'
 import {
     getShopById,
     getShopProducts,
     getShopProductById,
     getShops,
-} from '../controllers/userShopController.js'; // Import the controller functions
-import apicache from 'apicache';
+    getRandomProducts,
+} from '../controllers/userShopController.js' // Import the controller functions
+import apicache from 'apicache'
 
 // Configure apicache
-let cache = apicache.middleware;
+let cache = apicache.middleware
 
-const router = express.Router();
+const router = express.Router()
 
 // Route to fetch all shops with caching
 // GET /api/shops/
-router.get('/', cache('5 minutes'), getShops);
+router.get('/', cache('5 minutes'), getShops)
 
 // Route to fetch details of a specific shop by ID with caching
 // GET /api/shops/:id
-router.get('/:id', cache('5 minutes'), getShopById);
+router.get('/random', cache('3 minutes'), getRandomProducts)
+
+router.get('/:id', cache('5 minutes'), getShopById)
 
 // Route to fetch all products for a specific shop with caching
 // GET /api/shops/:id/products
-router.get('/:id/products', cache('10 minutes'), getShopProducts);
+router.get('/:id/products', cache('5 minutes'), getShopProducts)
 
 // Route to fetch a specific product from a shop by product ID with caching
 // GET /api/shops/:id/products/:productId
-router.get('/:id/products/:productId', cache('10 minutes'), getShopProductById);
+router.get('/:id/products/:productId', cache('5 minutes'), getShopProductById)
 
-export default router;
+export default router

backend/utils/generateToken.js

@@ -2,12 +2,12 @@ import jwt from 'jsonwebtoken'
 
 export const generateToken = (res, userId) => {
     const token = jwt.sign({ userId }, process.env.JWT_SECRET, {
-        expiresIn: '24h',
+        expiresIn: '72h',
     })
 
     // Set the token as a cookie in the response
     res.cookie('jwt', token, {
-        expires: new Date(Date.now() + 48 * 60 * 60 * 1000), // 2 days
+        expires: new Date(Date.now() + 144 * 60 * 60 * 1000), // 2 days
         httpOnly: true, // Prevents client-side JavaScript from accessing the cookie
         secure: process.env.NODE_ENV !== 'development', // Cookie sent only over HTTPS if not in development
         sameSite: 'strict', // Prevents CSRF attacks