resolved merge conflicts

.github/workflows/merge-conflict-check.yml

@@ -0,0 +1,65 @@
+name: Merge Conflict Check Workflow
+
+on:
+  pull_request:
+    branches:
+      - '**'
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  Merge-Conflict-Check:
+    name: Check for Merge Conflicts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Check Mergeable Status via Github API
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+            PR_NUMBER=${{ github.event.pull_request.number }}
+            max_retries=3
+            retry_delay=5
+
+            for ((i=1; i<=max_retries; i++)); do
+              echo "Attempt $i of $max_retries"
+
+              if ! response=$(gh api "repos/${{ github.repository }}/pulls/$PR_NUMBER" --jq '.mergeable'); then
+                if [[ $response == *"rate limit exceeded"* ]]; then
+                  echo "Rate limit exceeded. Waiting before retry..."
+                  sleep 60  # Wait longer for rate limit
+                else
+                  echo "Failed to call GitHub API: $response"
+                  if [ $i -eq $max_retries ]; then
+                    echo "Maximum retries reached. Exiting."
+                    exit 1
+                  fi
+                  sleep $retry_delay
+                fi
+                continue
+              fi
+              
+              case "$response" in
+                "true")
+                  echo "No conflicts detected."
+                  exit 0
+                  ;;
+                "false")
+                  echo "Merge conflicts detected."
+                  exit 1
+                  ;;
+                *)
+                  echo "Mergeable status unknown: $response"
+                  if [ $i -eq $max_retries ]; then
+                    echo "Maximum retries reached. Exiting."
+                    exit 1
+                  fi
+                  sleep $retry_delay
+                  ;;
+              esac
+            done

.github/workflows/pull-request.yml

@@ -97,6 +97,7 @@ jobs:
         with:
           files: |
             .env*
+            vitest.config.js
             src/App.tsx
             .github/**
             env.example
@@ -436,7 +437,7 @@ jobs:
     name: Validate CodeRabbit Approval
     runs-on: ubuntu-latest
     if: github.actor != 'dependabot[bot]'
-    needs: [Code-Quality-Checks, Test-Application, Start-App-Without-Docker, Docker-Start-Check]
+    needs: [Test-Docusaurus-Deployment]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.github/workflows/scripts/validate-coderabbit.sh

@@ -32,6 +32,7 @@ else
   echo "   of the PR web page, add a comment with the"
   echo "   statement below to restart a review"
   echo ""
-  echo "@coderabbitai full review"
+  echo "   @coderabbitai full review"
+  echo ""  
   exit 1
 fi

.github/workflows/stale.yml

@@ -13,17 +13,16 @@ name: Mark stale issues and pull requests
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+  - cron: "0 * * * *"
 
 permissions:
   issues: write
   pull-requests: write  
 
 jobs:
   stale:
-
+    name: Process Stale Issues and PRs 
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/stale@v9
       with:

CODEOWNERS

@@ -1,2 +1,2 @@
 /.github/ @palisadoes
-CODEOWNERS @palisadoes
+# CODEOWNERS @palisadoes

setup.ts

@@ -1,165 +1,48 @@
 import dotenv from 'dotenv';
 import fs from 'fs';
 import inquirer from 'inquirer';
-import { checkConnection } from './src/setup/checkConnection/checkConnection';
-import { askForTalawaApiUrl } from './src/setup/askForTalawaApiUrl/askForTalawaApiUrl';
 import { checkEnvFile } from './src/setup/checkEnvFile/checkEnvFile';
 import { validateRecaptcha } from './src/setup/validateRecaptcha/validateRecaptcha';
-import { askForCustomPort } from './src/setup/askForCustomPort/askForCustomPort';
-
-export async function main(): Promise<void> {
-  console.log('Welcome to the Talawa Admin setup! 🚀');
-
-  if (!fs.existsSync('.env')) {
-    fs.openSync('.env', 'w');
-    const config = dotenv.parse(fs.readFileSync('.env.example'));
-    for (const key in config) {
-      fs.appendFileSync('.env', `${key}=${config[key]}\n`);
-    }
-  } else {
-    checkEnvFile();
-  }
-
-  let shouldSetCustomPort: boolean;
-
-  if (process.env.PORT) {
-    console.log(
-      `\nCustom port for development server already exists with the value:\n${process.env.PORT}`,
-    );
-    shouldSetCustomPort = true;
-  } else {
-    const { shouldSetCustomPortResponse } = await inquirer.prompt({
+import askAndSetDockerOption from './src/setup/askAndSetDockerOption/askAndSetDockerOption';
+import updateEnvFile from './src/setup/updateEnvFile/updateEnvFile';
+import askAndUpdatePort from './src/setup/askAndUpdatePort/askAndUpdatePort';
+import { askAndUpdateTalawaApiUrl } from './src/setup/askForDocker/askForDocker';
+
+// Ask and set up reCAPTCHA
+const askAndSetRecaptcha = async (): Promise<void> => {
+  try {
+    const { shouldUseRecaptcha } = await inquirer.prompt({
       type: 'confirm',
-      name: 'shouldSetCustomPortResponse',
-      message: 'Would you like to set up a custom port?',
+      name: 'shouldUseRecaptcha',
+      message: 'Would you like to set up reCAPTCHA?',
       default: true,
     });
-    shouldSetCustomPort = shouldSetCustomPortResponse;
-  }
-
-  if (shouldSetCustomPort) {
-    const customPort = await askForCustomPort();
-
-    const port = dotenv.parse(fs.readFileSync('.env')).PORT;
-
-    fs.readFile('.env', 'utf8', (err, data) => {
-      const result = data.replace(`PORT=${port}`, `PORT=${customPort}`);
-      fs.writeFileSync('.env', result, 'utf8');
-    });
-  }
-
-  let shouldSetTalawaApiUrl: boolean;
-
-  if (process.env.REACT_APP_TALAWA_URL) {
-    console.log(
-      `\nEndpoint for accessing talawa-api graphql service already exists with the value:\n${process.env.REACT_APP_TALAWA_URL}`,
-    );
-    shouldSetTalawaApiUrl = true;
-  } else {
-    const { shouldSetTalawaApiUrlResponse } = await inquirer.prompt({
-      type: 'confirm',
-      name: 'shouldSetTalawaApiUrlResponse',
-      message: 'Would you like to set up talawa-api endpoint?',
-      default: true,
-    });
-    shouldSetTalawaApiUrl = shouldSetTalawaApiUrlResponse;
-  }
-
-  if (shouldSetTalawaApiUrl) {
-    let isConnected = false,
-      endpoint = '';
-
-    while (!isConnected) {
-      endpoint = await askForTalawaApiUrl();
-      const url = new URL(endpoint);
-      isConnected = await checkConnection(url.origin);
-    }
-    const envPath = '.env';
-    const currentEnvContent = fs.readFileSync(envPath, 'utf8');
-    const talawaApiUrl = dotenv.parse(currentEnvContent).REACT_APP_TALAWA_URL;
-
-    const updatedEnvContent = currentEnvContent.replace(
-      `REACT_APP_TALAWA_URL=${talawaApiUrl}`,
-      `REACT_APP_TALAWA_URL=${endpoint}`,
-    );
-
-    fs.writeFileSync(envPath, updatedEnvContent, 'utf8');
-    const websocketUrl = endpoint.replace(/^http(s)?:\/\//, 'ws$1://');
-    const currentWebSocketUrl =
-      dotenv.parse(updatedEnvContent).REACT_APP_BACKEND_WEBSOCKET_URL;
-
-    const finalEnvContent = updatedEnvContent.replace(
-      `REACT_APP_BACKEND_WEBSOCKET_URL=${currentWebSocketUrl}`,
-      `REACT_APP_BACKEND_WEBSOCKET_URL=${websocketUrl}`,
-    );
-
-    fs.writeFileSync(envPath, finalEnvContent, 'utf8');
-  }
-
-  const { shouldUseRecaptcha } = await inquirer.prompt({
-    type: 'confirm',
-    name: 'shouldUseRecaptcha',
-    message: 'Would you like to set up ReCAPTCHA?',
-    default: true,
-  });
-
-  if (shouldUseRecaptcha) {
-    const useRecaptcha = dotenv.parse(
-      fs.readFileSync('.env'),
-    ).REACT_APP_USE_RECAPTCHA;
-
-    fs.readFile('.env', 'utf8', (err, data) => {
-      const result = data.replace(
-        `REACT_APP_USE_RECAPTCHA=${useRecaptcha}`,
-        `REACT_APP_USE_RECAPTCHA=yes`,
-      );
-      fs.writeFileSync('.env', result, 'utf8');
-    });
-    let shouldSetRecaptchaSiteKey: boolean;
-    if (process.env.REACT_APP_RECAPTCHA_SITE_KEY) {
-      console.log(
-        `\nreCAPTCHA site key already exists with the value ${process.env.REACT_APP_RECAPTCHA_SITE_KEY}`,
-      );
-      shouldSetRecaptchaSiteKey = true;
-    } else {
-      const { shouldSetRecaptchaSiteKeyResponse } = await inquirer.prompt({
-        type: 'confirm',
-        name: 'shouldSetRecaptchaSiteKeyResponse',
-        message: 'Would you like to set up a reCAPTCHA site key?',
-        default: true,
-      });
-      shouldSetRecaptchaSiteKey = shouldSetRecaptchaSiteKeyResponse;
-    }
 
-    if (shouldSetRecaptchaSiteKey) {
+    if (shouldUseRecaptcha) {
       const { recaptchaSiteKeyInput } = await inquirer.prompt([
         {
           type: 'input',
           name: 'recaptchaSiteKeyInput',
           message: 'Enter your reCAPTCHA site key:',
-          validate: async (input: string): Promise<boolean | string> => {
-            if (validateRecaptcha(input)) {
-              return true;
-            }
-            return 'Invalid reCAPTCHA site key. Please try again.';
+          validate: (input: string): boolean | string => {
+            return (
+              validateRecaptcha(input) ||
+              'Invalid reCAPTCHA site key. Please try again.'
+            );
           },
         },
       ]);
 
-      const recaptchaSiteKey = dotenv.parse(
-        fs.readFileSync('.env'),
-      ).REACT_APP_RECAPTCHA_SITE_KEY;
-
-      fs.readFile('.env', 'utf8', (err, data) => {
-        const result = data.replace(
-          `REACT_APP_RECAPTCHA_SITE_KEY=${recaptchaSiteKey}`,
-          `REACT_APP_RECAPTCHA_SITE_KEY=${recaptchaSiteKeyInput}`,
-        );
-        fs.writeFileSync('.env', result, 'utf8');
-      });
+      updateEnvFile('REACT_APP_RECAPTCHA_SITE_KEY', recaptchaSiteKeyInput);
     }
+  } catch (error) {
+    console.error('Error setting up reCAPTCHA:', error);
+    throw new Error(`Failed to set up reCAPTCHA: ${(error as Error).message}`);
   }
+};
 
+// Ask and set up logging errors in the console
+const askAndSetLogErrors = async (): Promise<void> => {
   const { shouldLogErrors } = await inquirer.prompt({
     type: 'confirm',
     name: 'shouldLogErrors',
@@ -169,17 +52,37 @@ export async function main(): Promise<void> {
   });
 
   if (shouldLogErrors) {
-    const logErrors = dotenv.parse(fs.readFileSync('.env')).ALLOW_LOGS;
-
-    fs.readFile('.env', 'utf8', (err, data) => {
-      const result = data.replace(`ALLOW_LOGS=${logErrors}`, 'ALLOW_LOGS=YES');
-      fs.writeFileSync('.env', result, 'utf8');
-    });
+    updateEnvFile('ALLOW_LOGS', 'YES');
   }
+};
 
-  console.log(
-    '\nCongratulations! Talawa Admin has been successfully setup! 🥂🎉',
-  );
+// Main function to run the setup process
+export async function main(): Promise<void> {
+  try {
+    console.log('Welcome to the Talawa Admin setup! 🚀');
+
+    checkEnvFile();
+    await askAndSetDockerOption();
+    const envConfig = dotenv.parse(fs.readFileSync('.env', 'utf8'));
+    const useDocker = envConfig.USE_DOCKER === 'YES';
+
+    // Only run these commands if Docker is NOT used
+    if (!useDocker) {
+      await askAndUpdatePort();
+      await askAndUpdateTalawaApiUrl();
+    }
+
+    await askAndSetRecaptcha();
+    await askAndSetLogErrors();
+
+    console.log(
+      '\nCongratulations! Talawa Admin has been successfully set up! 🥂🎉',
+    );
+  } catch (error) {
+    console.error('\n❌ Setup failed:', error);
+    console.log('\nPlease try again or contact support if the issue persists.');
+    process.exit(1);
+  }
 }
 
 main();