Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
9a725ed
fix: dropdown overlay
pavanputti May 17, 2025
65b6328
Merge branch 'development' into SIVA_FIX_OVERLAY
pavanputti May 24, 2025
891e375
Update style.css
pavanputti Jun 29, 2025
c34937e
applicant source donut chart
Charitha2009 Jul 21, 2025
eb641eb
Update z-index in dropdown-content to use !important for better styli…
pavanputti Jul 25, 2025
0e17288
added filter logic
Charitha2009 Jul 31, 2025
9dac41f
updated final code
Charitha2009 Aug 1, 2025
f395ef4
updated final code
Charitha2009 Aug 1, 2025
5cd70a9
Refactor of jsx and css complete
ShravyaKudlu Aug 19, 2025
b8c6076
Some bug fixes related to dark mode styling-needs some more work
ShravyaKudlu Aug 19, 2025
f1d942f
Fixed UI
ShravyaKudlu Aug 20, 2025
ea69631
fix: Cleanup Mock data and add preferences
ShravyaKudlu Sep 27, 2025
4dc9d99
Fix: Better UI, in dark and light mode
ShravyaKudlu Oct 2, 2025
874ddcd
Fix: The cards are now better to view, Work to be done to fix the hei…
ShravyaKudlu Oct 3, 2025
cfb1fcf
Final Fix
ShravyaKudlu Oct 3, 2025
48f99de
Completed implementing an accordian, a better way to represent skills…
ShravyaKudlu Oct 5, 2025
ea2b421
Modified the User Profile to use correct module.css
ShravyaKudlu Oct 7, 2025
4dd82a9
New accordian style, for better visibility
ShravyaKudlu Oct 7, 2025
385dc6e
fix: Prefernces with correct names from DBSchema
ShravyaKudlu Oct 7, 2025
3655003
Merge branch 'development' into Shravya/Feature/UserProfile_3449
ShravyaKudlu Oct 8, 2025
2566b41
fix: linting after merge
ShravyaKudlu Oct 8, 2025
81c5320
Merge development branch with applicant source donut chart feature
Oct 16, 2025
c52c7ee
Fix duplicate import errors in routes.jsx
Oct 16, 2025
0b819d7
Fix: inline sonarcube
ShravyaKudlu Oct 25, 2025
d34abdb
Fix: sonarcube issue fix
ShravyaKudlu Oct 25, 2025
e2a161f
Fix: sonarcube validation issue
ShravyaKudlu Oct 25, 2025
b497c89
Fix: sonarcube remove unused imports and commented code
ShravyaKudlu Oct 25, 2025
a068247
Merge branch 'development' into shravya_bugfix/css-modules-#3829
ShravyaKudlu Oct 25, 2025
119a4f0
Fix: Merge Conflicts
ShravyaKudlu Oct 25, 2025
8cc2b9b
Revert yarn.lock to version from before merge conflict fix
ShravyaKudlu Oct 26, 2025
9fe4103
feat: improve applicant source chart responsiveness
Nov 13, 2025
49431c8
fix: guard start/end date selection
Nov 13, 2025
e00409a
Dark mode fix and error msg fix
SwathiAngadi Dec 24, 2025
afeeaf7
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Dec 24, 2025
7682bc6
Swathi Fix for page not found error in PR Review Team Analytics Dashb…
SwathiAngadi Dec 24, 2025
e455075
Reverting the unrelated changes, accidentally added to this PR
SwathiAngadi Dec 27, 2025
40c82a7
Fix dark mode color coding for Weekly Requirements in Promotion Eligi…
Dec 27, 2025
e4a645d
changed
uhakruthi1 Dec 31, 2025
7bddee5
Merge development branch into veda_applicant_source_donut_chart
Jan 10, 2026
7c056d3
Fix authentication and endpoint URL for ApplicantSourceDonutChart - u…
Jan 10, 2026
dace212
Remove disallowed ApplicantSourceDonutChart.css file - only module CS…
Jan 12, 2026
14d7c73
Fix SonarQube quality gate issues: reduce code duplication and improv…
Jan 12, 2026
035b994
Merge development branch - resolve conflict in Timelog.jsx and fix du…
Jan 12, 2026
fc7ef7a
Fix reliability issues: add null checks, division by zero protection,…
Jan 12, 2026
b94148f
Fix redundant conditionals on lines 446-447 that return same value
Jan 12, 2026
9d2d29c
fix: add dark mode support for tooltip hover state
Jan 13, 2026
8b56618
css
uhakruthi1 Jan 18, 2026
07b9e1b
chore: merge development into veda_applicant_source_donut_chart
Jan 22, 2026
2acd6f4
chore: update baseline-browser-mapping to latest version
Jan 23, 2026
dfa288e
chore: ensure routes.jsx has correct line endings
Jan 23, 2026
0deffdd
fix: add eslint-disable for timelogTrackingReducer import and ensure …
Jan 23, 2026
a76ed65
chore: ensure routes.jsx formatting matches CI requirements
Jan 23, 2026
306baf3
fix: remove duplicate route definitions in routes.jsx
Jan 23, 2026
c3506c4
fix: format CPProtectedRoute to single line per Prettier
Jan 23, 2026
573322f
fixed prettier error
Jan 23, 2026
7334e98
Upgrade Node.js from 14 to 20
pavanputti Jan 23, 2026
f88585b
Update GitHub Actions workflows and .nvmrc to Node 20
pavanputti Jan 23, 2026
276d982
Merge development branch into SIVA_FIX_OVERLAY - resolved conflicts, …
pavanputti Jan 23, 2026
155cc8b
prettier fix
Jan 23, 2026
3b62832
Dark mode styles for labor hours filters
uhakruthi1 Jan 24, 2026
8c282af
changes
uhakruthi1 Jan 24, 2026
4821b9f
Update yarn.lock
uhakruthi1 Jan 24, 2026
e0d9cb0
Merge development into veda_applicant_source_donut_chart
Jan 24, 2026
39527a4
chore: add missing mdn-data dependency for stylelint
Jan 24, 2026
2e4e571
Merge latest development into veda_applicant_source_donut_chart - res…
Jan 24, 2026
d261d97
fixed prettier issues
Jan 24, 2026
cf0402d
Merge development into veda_applicant_source_donut_chart (resolve con…
Jan 30, 2026
07f0da3
Remove package-lock.json and ignore it; fix yarn CI frozen-lockfile
Jan 30, 2026
aa9b13d
Fix yarn.lock: add baseline-browser-mapping@^2.9.17 and mdn-data@^2.2…
Jan 30, 2026
ae6c447
Merge development into veda_applicant_source_donut_chart
Jan 30, 2026
b8a8e01
Resolved merge conflicts
SwathiAngadi Feb 2, 2026
11078b7
Added dummy commit
SwathiAngadi Feb 6, 2026
bf57c62
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Feb 6, 2026
2ffa0e9
Merge branch 'development' into fix-ui-visibility-4279
uhakruthi1 Feb 7, 2026
9bf82a6
Merge remote-tracking branch 'origin' into shravya_bugfix/css-modules…
ShravyaKudlu Feb 8, 2026
79b36fe
fix: responsiveness
ShravyaKudlu Feb 8, 2026
3fc91d9
Merge remote-tracking branch 'origin' into Shravya/Feature/UserProfil…
ShravyaKudlu Feb 8, 2026
a14eaae
Merge development into veda_applicant_source_donut_chart (resolve con…
Feb 8, 2026
6a5a0a3
fix: use logService.logError instead of logService.log
Feb 8, 2026
53ca71f
Fix Timer WebSocket onError and react-toastify object type errors
Feb 9, 2026
38a8244
Merge pull request #3842 from OneCommunityGlobal/veda_applicant_sourc…
one-community Feb 9, 2026
f888bc7
Merge pull request #3921 from OneCommunityGlobal/shravya_bugfix/css-m…
one-community Feb 9, 2026
8059ceb
Merge pull request #4129 from OneCommunityGlobal/Shravya/Feature/User…
one-community Feb 9, 2026
4771833
Merge pull request #4617 from OneCommunityGlobal/Swathi_PR_Review_Tea…
one-community Feb 9, 2026
a160b93
Merge origin/development into veda-promotion-eligibility-color-coding…
Feb 9, 2026
886341f
fix: resolve vitest setupTests path so unit tests run from submodule
pavanputti Feb 9, 2026
eea47d3
Merge pull request #3571 from OneCommunityGlobal/SIVA_FIX_OVERLAY
one-community Feb 9, 2026
eb66b46
Merge pull request #4732 from OneCommunityGlobal/fix-ui-visibility-4279
one-community Feb 9, 2026
ca45c0f
Merge pull request #4638 from OneCommunityGlobal/veda-promotion-eligi…
one-community Feb 10, 2026
0b4dcd7
Fix: weekly summary report styling issues
Feb 10, 2026
002106f
Merge pull request #4819 from OneCommunityGlobal/venkataramanan_fix_w…
one-community Feb 10, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ jobs:
domain: ${{ vars.SURGE_DOMAIN }}
project: './build'
login: ${{ secrets.SURGE_LOGIN }}
token: ${{ secrets.SURGE_TOKEN }}
token: ${{ secrets.SURGE_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:
- name: Run Unit Tests for Changed Files Only
run: yarn run test:changed
- name: Run Lint
run: yarn run lint
run: yarn run lint
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# dependencies
/node_modules
package-lock.json
# testing
/coverage
*.code-snippets
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Define a imagem base
FROM node:14-alpine
FROM node:20-alpine
# Set the working directory to /app
WORKDIR /app
# Copy the package.json and yarn.lock files to the container
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
"@vitejs/plugin-react": "^4.5.0",
"@vitest/ui": "3.2.2",
"babel-jest": "^29.7.0",
"baseline-browser-mapping": "^2.9.17",
"cross-env": "^5.2.1",
"eslint": "^8.57.1",
"eslint-config-prettier": "^5.1.0",
Expand All @@ -189,6 +190,7 @@
"joi-browser": "^13.4.0",
"jsdom": "^26.1.0",
"lint-staged": "^16.1.5",
"mdn-data": "^2.26.0",
"msw": "^2.10.4",
"prettier": "^1.19.1",
"redux-mock-store": "^1.5.4",
Expand Down
94 changes: 94 additions & 0 deletions public/index.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* public/index.css */

#root {
background-color: #ffffff;
}
Expand Down Expand Up @@ -179,3 +181,95 @@ body:not(.dark-mode) textarea {
transform: translateY(-4px);
opacity: 0.9;
}

/* Allow the page content to scroll horizontally */
.container-fluid {
overflow-x: auto;
}

/* Hide the horizontal scrollbar */
.container-fluid::-webkit-scrollbar {
display: none;
}

/* Explicit targeting for all input types and selects */
body.dark-mode .form-control,
body.bm-dashboard-dark .form-control,
body.dark-mode select,
body.bm-dashboard-dark select,
body.dark-mode input[type="text"] {
background-color: #1e293b !important;
color: #ffffff !important;
border: 1px solid #334155 !important;
}

/* Fix for the Project and Tool dropdown arrows and internal padding */
body.dark-mode select.form-control,
body.bm-dashboard-dark select.form-control {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23ffffff' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e") !important;
background-repeat: no-repeat !important;
background-position: right 0.75rem center !important;
background-size: 16px 12px !important;
}

body.dark-mode .form-control::placeholder {
color: #94a3b8 !important;
}

body.dark-mode option,
body.bm-dashboard-dark option {
background-color: #1e293b !important;
color: #ffffff !important;
}

body.dark-mode .modal-content,
body.bm-dashboard-dark .modal-content {
background-color: #1b2a41 !important;
border: 1px solid #2e3d55 !important;
color: #ffffff !important;
}

body.dark-mode .modal-header,
body.dark-mode .modal-body,
body.dark-mode .modal-footer,
body.bm-dashboard-dark .modal-header,
body.bm-dashboard-dark .modal-body,
body.bm-dashboard-dark .modal-footer {
background-color: #1b2a41 !important;
color: #ffffff !important;
border-color: #2e3d55 !important;
}

body.dark-mode .form-control,
body.dark-mode select,
body.dark-mode input {
background-color: #1e293b !important;
color: #ffffff !important;
border: 1px solid #334155 !important;
}

body.dark-mode select.form-control {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23ffffff' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M2 5l6 6 6-6'/%3e%3c/svg%3e") !important;
}

body.dark-mode .modal-header,
body.bm-dashboard-dark .modal-header {
background-color: #24344d !important;
border-bottom: 1px solid #334155 !important;
color: #ffffff !important;
padding: 1rem 1.5rem;
}

body.dark-mode .modal-title,
body.bm-dashboard-dark .modal-title {
font-weight: 600;
letter-spacing: 0.5px;
}

body.dark-mode .modal-content .table thead th {
background-color: #2d3d5a !important;
color: #ffffff !important;
border-bottom: 2px solid #334155 !important;
font-size: 0.85rem;
letter-spacing: 1px;
}
6 changes: 5 additions & 1 deletion src/actions/allTeamsAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,11 @@ export const updateTeamMemeberVisibility = (teamId, userId, visibility) => {
.catch(error => {
if (error.response) {
// The request was made and the server responded with a status code
toast.error('Error updating visibility:', error.response.data);
const msg =
error.response?.data?.message ||
error.response?.data?.error ||
(typeof error.response?.data === 'string' ? error.response.data : 'Unknown error');
toast.error(`Error updating visibility: ${msg}`);
} else if (error.request) {
// The request was made but no response was received
toast.error('Error updating visibility: No response received');
Expand Down
6 changes: 5 additions & 1 deletion src/actions/blueSquareEmailBCCAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ export const deleteBlueSquareEmailAssignement = id => {
try {
const response = await axios.delete(url);
if (response.status === 200) {
toast.info(response.data);
const msg =
typeof response.data === 'string'
? response.data
: response.data?.message || JSON.stringify(response.data);
toast.info(msg);
dispatch(deleteBlueSquareEmailBcc(response.data.id));
} else {
dispatch(blueSquareEmailBccError(response.data));
Expand Down
6 changes: 3 additions & 3 deletions src/actions/rolePermissionPresets.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const createNewPreset = newPreset => {
}
return 0;
} catch (error) {
toast.error(error);
toast.error(error?.message || String(error));
return 1;
}
};
Expand All @@ -60,7 +60,7 @@ export const updatePresetById = updatedPreset => {
dispatch(updatePreset(updatedPreset));
}
} catch (err) {
toast.info(err);
toast.info(err?.message || String(err));
}
};
};
Expand All @@ -75,7 +75,7 @@ export const deletePresetById = presetId => {
}
return 1;
} catch (error) {
toast.info(error);
toast.info(error?.message || String(error));
return 1;
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/actions/task.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const deleteChildrenTasks = taskId => {
try {
await axios.post(ENDPOINTS.DELETE_CHILDREN(taskId));
} catch (error) {
toast.info(error);
toast.info(error?.message || String(error));
}
};
};
Expand Down Expand Up @@ -257,7 +257,7 @@ export const updateTask = (taskId, updatedTask, hasPermission, prevTask) => asyn
}
} catch (error) {
// dispatch(fetchTeamMembersTaskError());
toast.info(error);
toast.info(error?.message || String(error));
status = 400;
}
// TODO: DISPATCH TO TASKEDITSUGGESETIONS REDUCER TO UPDATE STATE
Expand Down
2 changes: 1 addition & 1 deletion src/actions/team.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export const fetchAllManagingTeams = (userId, managingTeams) => async dispatch =
await dispatch(setTeamsStart());
dispatch(setTeams(allManagingTeams));
} catch (err) {
toast.error(err);
toast.error(err?.message || String(err));
dispatch(setTeamsError(err));
}
};
Expand Down
6 changes: 3 additions & 3 deletions src/actions/timeOffRequestAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export const addTimeOffRequestThunk = request => async dispatch => {
const AddedRequest = response.data;
dispatch(addTimeOffRequest(AddedRequest));
} catch (error) {
toast.info(error);
toast.info(error?.message || String(error));
}
};

Expand All @@ -220,7 +220,7 @@ export const updateTimeOffRequestThunk = (id, data) => async dispatch => {
const updatedRequest = response.data;
dispatch(updateTimeOffRequest(updatedRequest));
} catch (error) {
toast.info(error);
toast.info(error?.message || String(error));
}
};

Expand All @@ -230,6 +230,6 @@ export const deleteTimeOffRequestThunk = id => async dispatch => {
const deletedRequest = response.data;
dispatch(deleteTimeOffRequest(deletedRequest));
} catch (error) {
toast.info(error);
toast.info(error?.message || String(error));
}
};
2 changes: 1 addition & 1 deletion src/actions/userProfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const getUserTasks = userId => {
toast.info(`Get user task request status is not 200, status message: ${res.statusText}`);
}
} catch (error) {
toast.error(error);
toast.error(error?.message || String(error));
}
};
};
Expand Down
Loading