attempt to resolve merge conflict

.github/workflows/build-web.yml

@@ -0,0 +1,27 @@
+name: Build DEV
+
+on:
+  push:
+    branches-ignore:
+      - "main"
+
+jobs:
+  BuildApp:
+    runs-on: ubuntu-latest
+    environment: DEV
+    defaults:
+      run:
+        working-directory: ./web
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - run: yarn
+
+      - run: yarn test
+
+      - name: Build
+        run: yarn build

.github/workflows/notification.yml

@@ -0,0 +1,26 @@
+name: Pull Request Notification
+
+on:
+  pull_request:
+    types: [opened, reopened, closed]
+
+jobs:
+  pull_request_created:
+    if: github.event_name == 'pull_request' && github.event.action == 'opened' || github.event.action == 'reopened'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Discord Webhook Action
+        uses: tsickert/[email protected]
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          content: "Pull request opened: ${{ github.event.pull_request.title }} | Link: [View Pull Request](${{ github.event.pull_request.html_url }})"
+
+  pull_request_merged:
+    if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Discord Webhook Action
+        uses: tsickert/[email protected]
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          content: "Pull request merged: ${{ github.event.pull_request.title }}"

README.md

@@ -10,3 +10,4 @@ Credits (Add your name here for the first commit):
 - Diya
 - Gury
 - Sai Kiran
+- Naren

tailwind.config.js

@@ -0,0 +1,9 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: [],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
+

web/README.md

@@ -1,3 +1,25 @@
+# How To Run
+
+The following web application is built using React + Vite. To run the application in development environment follow the commands below
+
+```bash
+yarn 
+```
+```bash
+yarn dev
+```
+
+To build the application run the following command below
+```bash
+yarn build
+```
+
+To run the test, follow the command below
+```bash
+yarn test
+```
+
+
 # React + TypeScript + Vite
 
 This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

web/__test__/ExecScreen.test.tsx

@@ -0,0 +1,15 @@
+import { expect, it } from "vitest";
+import { render, screen } from "@testing-library/react";
+import React from "react";
+import ExecScreen from "../src/screens/ExecScreen";
+import { describe } from "node:test";
+import { execs } from "../src/data/data";
+
+describe("ExecScreen component", () => {
+  it("should display President", () => {
+    render(<ExecScreen execs={execs} />);
+    const message = screen.getAllByText(/President/i);
+    const president = message[0];
+    expect(president).toBeInTheDocument();
+  });
+});

web/__test__/TestScreen.test.tsx

@@ -0,0 +1,13 @@
+import { expect, it } from "vitest";
+import { render, screen } from "@testing-library/react";
+import React from "react";
+import TestScreen from "../src/screens/Test";
+import { describe } from "node:test";
+
+describe("TestScreen component", () => {
+  it("should display the 'Test' message", () => {
+    render(<TestScreen />);
+    const message = screen.getByText(/Test/i);
+    expect(message).toBeInTheDocument();
+  });
+});