Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
0b39075
fix hyperlink
suaniii Feb 8, 2025
32ba5be
fix
suaniii Feb 8, 2025
4890555
Added regex to filter if timelog notes has correct link format
AurHubertMax Feb 26, 2025
8cc2d46
updated regex to better filter dropbox share link
AurelianoMaximus Feb 26, 2025
db318ec
Updated regex in TimeEntryForm to better exclude localhost and specif…
AurHubertMax Mar 4, 2025
b04603c
unit test
suaniii Mar 8, 2025
0922fe7
feat: WIP added functionality to aknowledge the new permission added
vinayv-456 Mar 14, 2025
57abe35
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
vinayv-456 Mar 14, 2025
ebbe2e6
feat: added popup for notifying permission change
vinayv-456 Mar 19, 2025
1e717be
Revert "feat: WIP added functionality to aknowledge the new permissio…
vinayv-456 Mar 19, 2025
308009e
feat: show modal when there is update in permission
vinayv-456 Mar 19, 2025
049d382
test: update testcase for popupbar
vinayv-456 Mar 20, 2025
1c06096
test update
vinayv-456 Mar 20, 2025
3b786ed
rollback test
vinayv-456 Mar 20, 2025
4de2976
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
vinayv-456 Mar 22, 2025
91340de
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
vinayv-456 Mar 27, 2025
9136185
Checked why team members data is not being rendered using logging.
angad363 Apr 2, 2025
2dcf61c
Added console log to check if data is being passed correctly.
angad363 Apr 2, 2025
9f9bd5a
TSAForm Page 1: Initial draft
Amalesh-A Apr 2, 2025
1b5a651
TSAForm Frontend
Amalesh-A Apr 3, 2025
1c12619
Fixed members not showing in popup.
angad363 Apr 3, 2025
8fb0a11
Changed code to match with prettier conditions.
angad363 Apr 3, 2025
361ff69
Enhance link validation in TimeEntryForm to include specific Dropbox …
AurHubertMax Apr 3, 2025
730f0ee
Fix dropdown options visibility in Weekly Summaries report
Nayakar-Rohith Apr 3, 2025
4258c7c
Implementing changes to Pages 1, 2, 3
Amalesh-A Apr 3, 2025
a5952bf
Implementing Changes to Pages 4, 5, 6, 7, and 8
Amalesh-A Apr 3, 2025
9a05386
Made changes in CSS styles and fixed the style.
angad363 Apr 4, 2025
bb3ca3a
Made changes in edit and delete buttons within the teams table. Also …
angad363 Apr 5, 2025
f2a312a
Made changes to match prettier conditions.
angad363 Apr 5, 2025
1536339
Clean PR: Dashboard UI fixes and Weekly Summary updates
TanviAnantula Apr 5, 2025
8738b06
Fix: Moved misplaced files to correct folders and removed extra file
TanviAnantula Apr 5, 2025
5bbcaa3
Edited the size of Team Overview cards, edited the logic of team memb…
angad363 Apr 5, 2025
9707117
Made changes for unit tests.
angad363 Apr 5, 2025
21b2458
fix
suaniii Nov 9, 2024
e9cf572
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
Nayakar-Rohith Apr 5, 2025
02cf509
Implementing the changes
Amalesh-A Apr 5, 2025
6cf4e68
update eslint ignore file list
EvianTan Apr 5, 2025
642405d
Merge pull request #3377 from OneCommunityGlobal/Yiyun-update-eslinti…
EvianTan Apr 5, 2025
b519a02
Made changes to avoid NaN warning
angad363 Apr 6, 2025
78ced25
Made changes to avoid NaN warning (fixed prettier issue)
angad363 Apr 6, 2025
c1d2d14
Merge pull request #3356 from OneCommunityGlobal/amalesh-tsaform-fron…
one-community Apr 6, 2025
5b54bac
Merge pull request #3136 from OneCommunityGlobal/yili_task_link
one-community Apr 6, 2025
56827df
Merge pull request #3252 from OneCommunityGlobal/yili_unit_test_forma…
one-community Apr 6, 2025
974610e
hotfix for 3345
deepthikannan Apr 6, 2025
5031795
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
Nayakar-Rohith Apr 6, 2025
be995b3
Fix: Final checkbox alignment using labels and flex
TanviAnantula Apr 7, 2025
338e972
Merge pull request #3372 from OneCommunityGlobal/clean-fix-feature
one-community Apr 7, 2025
69d8541
Update dropdown to display 20+ team codes without scrolling
Nayakar-Rohith Apr 8, 2025
4aa59d4
Fix dropdown to show 20+ team codes with aligned counts using monospa…
Nayakar-Rohith Apr 8, 2025
f534727
Spacing Fix
Nayakar-Rohith Apr 8, 2025
1d285ff
Spacing Fix
Nayakar-Rohith Apr 8, 2025
369920e
Changed the members' active status slider to a button.
angad363 Apr 9, 2025
ebb9435
UI fixes
CodewithKoushica Apr 9, 2025
b76373b
fix duplicate label
suaniii Apr 9, 2025
d47a20b
Merge pull request #2583 from OneCommunityGlobal/yili_user_management…
one-community Apr 9, 2025
19a5b83
Merge pull request #3386 from OneCommunityGlobal/Koushica_hotfix_UI
one-community Apr 9, 2025
18b71b2
Merge pull request #3366 from OneCommunityGlobal/Angad_fix_members_mo…
one-community Apr 9, 2025
504ee80
Merge pull request #3358 from OneCommunityGlobal/Rohith_fix_dropdown_…
one-community Apr 10, 2025
769a161
UI hot fixes
CodewithKoushica Apr 10, 2025
c3746d3
Merge pull request #3389 from OneCommunityGlobal/Koushica_hotfix_UI
one-community Apr 10, 2025
26ab563
Merge branch 'development' into vinay/notify-user-new-permission
vinayv-456 Apr 10, 2025
a88dd20
rm log in header.jsx
vinayv-456 Apr 10, 2025
b318f94
New Changes
SammanBaidya Apr 10, 2025
021d999
New Changes
SammanBaidya Apr 10, 2025
1df0a50
Merge pull request #3390 from OneCommunityGlobal/Deepthi-hotfix2
one-community Apr 10, 2025
233eb7f
Merge pull request #3294 from OneCommunityGlobal/vinay/notify-user-ne…
one-community Apr 10, 2025
c2b17d2
Merge pull request #3392 from OneCommunityGlobal/aureliano_improve_li…
one-community Apr 10, 2025
923e049
Merge pull request #3391 from OneCommunityGlobal/Samman-reNavbar
one-community Apr 10, 2025
c510328
Revert "Vinay: Let a user know through a popup that Permissions have …
one-community Apr 11, 2025
ad2aa77
Merge pull request #3395 from OneCommunityGlobal/revert-3294-vinay/no…
one-community Apr 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 26 additions & 15 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -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/**
10 changes: 5 additions & 5 deletions src/components/Collaboration/JobFormBuilder.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ h2 {
margin-top: 15px;
}

input,
/* input,
textarea,
select {
/* width: 95%; */
width: 95%;
padding: 10px;
margin-top: 5px;
margin-bottom: 15px;
Expand All @@ -94,7 +94,7 @@ select {
textarea {
height: 80px;
resize: vertical;
}
} */

.new-field-section {
background-color: #d9d9d9;
Expand Down Expand Up @@ -142,10 +142,10 @@ textarea {
/* gap: 10px; */
}

.field-options input,
/* .field-options input,
textarea {
width: 95%;
}
} */

/* Individual Option Item */
.option-item {
Expand Down
27 changes: 3 additions & 24 deletions src/components/CommunityPortal/CPDashboard.jsx
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down Expand Up @@ -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">
Expand All @@ -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>
Expand All @@ -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>

Expand Down
64 changes: 64 additions & 0 deletions src/components/CommunityPortal/CPHeader/CPHeader.css
Original file line number Diff line number Diff line change
@@ -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;
}
}
Loading