Merge confilcts resolving

Author: preethamdnr

.eslintignore

@@ -1,25 +1,36 @@
-*.png
-*.svg
-*.test.js
-*.test.jsx
-src/actions/**
-src/App.css
-src/config.json
+# =======================================================================
+# ⚠️ DO NOT ADD NEW ENTRIES ⚠️
+# Only the files and folders listed below are allowed to be ignored.
+# This .gitignore is locked down to maintain consistency across the team.
+# To propose changes, please open a discussion or PR with justification.
+# =======================================================================
+
+# Ignore build folders
+/node_modules/
+/public/
 
+# Ignore test files inside /src/components
 src/__tests__/**
+/src/components/**/__test__/**/*
+/src/components/**/__tests__/**/*
+/src/reducers/**/__tests__/**/*
 
-/public/
-/build/
-/node_modules/
+src/components/BMDashboard/_tests_/BMDashboard.test.jsx
+src/components/Login/ForgotPassword.test.jsx
+src/components/Login/LoginPage.test.js
+src/components/PermissionsManagement/PermissionsManagement.test.js
+src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx
+
+# Ignore folders in /src
+src/actions/**
 src/components/Badge/**
 src/components/common/**
+src/components/Dashboard/**
+src/components/EmailSubscribeForm/**
 src/components/Projects/**
 src/components/SummaryManagement/**
 src/components/TaskEditSuggestions/**
 src/components/TeamMemberTasks/**
-src/components/Timelog/**
+src/components/Teams/TeamMembersPopup.jsx
 src/components/UserManagement/**
-src/components/UserProfile/**
-src/components/EmailSubscribeForm/**
-src/components/Dashboard/**
-src/components/Teams/TeamMembersPopup.jsx
+src/components/UserProfile/**

src/components/Collaboration/JobFormBuilder.css

@@ -73,16 +73,16 @@ h2 {
   font-weight: bold;
 }
 
-label {
+.jbform-label {
   display: block;
   font-weight: bold;
   margin-top: 15px;
 }
 
-input,
+/* input,
 textarea,
 select {
-  /* width: 95%; */
+  width: 95%;
   padding: 10px;
   margin-top: 5px;
   margin-bottom: 15px;
@@ -94,7 +94,7 @@ select {
 textarea {
   height: 80px;
   resize: vertical;
-}
+} */
 
 .new-field-section {
   background-color: #d9d9d9;
@@ -142,10 +142,10 @@ textarea {
   /* gap: 10px;  */
 }
 
-.field-options input,
+/* .field-options input,
 textarea {
   width: 95%;
-}
+} */
 
 /* Individual Option Item */
 .option-item {

src/components/Collaboration/JobFormbuilder.jsx

@@ -192,7 +192,7 @@ function JobFormBuilder() {
                   key={index + 1}
                   className="form-field"
                 >
-                  <label className="field-label">{field.questionText}</label>
+                  <label className="field-label jbform-label">{field.questionText}</label>
                   <div className="field-options">
                     {field.questionType === 'textbox' && (
                       <input type="text" placeholder="Enter Text here" />
@@ -209,7 +209,7 @@ function JobFormBuilder() {
                           className="option-item"
                         >
                           <input type={field.questionType} name={`field-${index}`} />
-                          <label>{option}</label>
+                          <label className="jbform-label">{option}</label>
                         </div>
                       ))}
                     {field.questionType === 'dropdown' && (
@@ -232,7 +232,7 @@ function JobFormBuilder() {
           </form>
           <div className="new-field-section">
             <div>
-              <label>
+              <label className="jbform-label">
                 Field Label:
                 <input
                   type="text"
@@ -246,7 +246,7 @@ function JobFormBuilder() {
               </label>
             </div>
             <div>
-              <label>
+              <label className="jbform-label">
                 Input Type:
                 <select
                   value={newField.questionType}
@@ -272,7 +272,7 @@ function JobFormBuilder() {
             {/* Options Section */}
             {['checkbox', 'radio', 'dropdown'].includes(newField.questionType) && (
               <div className="options-section">
-                <label>
+                <label className="jbform-label">
                   Add Option:
                   <input
                     type="text"

src/components/CommunityPortal/CPDashboard.jsx

@@ -1,26 +1,11 @@
 import { useState, useEffect } from 'react';
-import {
-  Container,
-  Row,
-  Col,
-  Card,
-  CardBody,
-  Button,
-  Input,
-  Dropdown,
-  DropdownToggle,
-  DropdownMenu,
-  DropdownItem,
-} from 'reactstrap';
-import { useHistory } from 'react-router-dom'; // For React Router v5
+import { Container, Row, Col, Card, CardBody, Button, Input } from 'reactstrap';
 import './CPDashboard.css';
 import { FaCalendarAlt, FaMapMarkerAlt, FaUserAlt } from 'react-icons/fa';
 
 export function CPDashboard() {
   const [events, setEvents] = useState([]);
   const [search, setSearch] = useState('');
-  const [dropdownOpen, setDropdownOpen] = useState(false);
-  const history = useHistory(); // Use useHistory for navigation
 
   useEffect(() => {
     const mockEvents = [
@@ -52,12 +37,6 @@ export function CPDashboard() {
     setEvents(mockEvents);
   }, []);
 
-  const toggleDropdown = () => setDropdownOpen(!dropdownOpen);
-
-  const handleNavigation = path => {
-    history.push(path); // Navigate to the selected path
-  };
-
   return (
     <Container fluid className="dashboard-container">
       <header className="dashboard-header">
@@ -72,7 +51,7 @@ export function CPDashboard() {
               className="dashboard-search"
             />
           </div>
-          <Dropdown isOpen={dropdownOpen} toggle={toggleDropdown} className="community-dropdown">
+          {/* <Dropdown isOpen={dropdownOpen} toggle={toggleDropdown} className="community-dropdown">
             <DropdownToggle caret color="secondary">
               Community Portal
             </DropdownToggle>
@@ -82,7 +61,7 @@ export function CPDashboard() {
               <DropdownItem onClick={() => handleNavigation('/about')}>About Us</DropdownItem>
               <DropdownItem onClick={() => handleNavigation('/contact')}>Contact</DropdownItem>
             </DropdownMenu>
-          </Dropdown>
+          </Dropdown> */}
         </div>
       </header>
 

src/components/CommunityPortal/CPHeader/CPHeader.css

@@ -0,0 +1,64 @@
+.header-wrapper {
+  height: fit-content;
+  width: clamp(100vw, 0.1rem + 1vw, 100%);
+}
+
+.navbar {
+  z-index: 100;
+  white-space: nowrap;
+}
+
+.timer-message-section {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  gap: 1rem;
+}
+
+.nav-links {
+  align-items: center;
+}
+
+.redBackGroupHeader {
+  z-index: 10;
+  bottom: 0;
+  right: 0;
+  position: relative;
+  height: 30px;
+  text-align: center;
+  vertical-align: middle;
+  background: #ff4d4f;
+  border-radius: 40px;
+  color: #fff;
+  padding: 3px 6px;
+  max-width: 39px;
+  font-size: 1rem;
+  min-width: 29px;
+}
+
+.owner-message {
+  margin-right: 3rem;
+}
+
+@media (max-width: 1500px) {
+  .dashboard-text-link {
+    font-size: 14px;
+  }
+
+  .owner-message {
+    margin-right: 0;
+  }
+}
+
+@media (max-width: 1400px) {
+  .timer-message-section {
+    display: flex;
+    width: 0;
+    margin-right: 0;
+  }
+
+  .owner-message {
+    display: none;
+  }
+}