-
Notifications
You must be signed in to change notification settings - Fork 48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Roberto- changes open cage api call to backend #1640
Roberto- changes open cage api call to backend #1640
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested all the functionality described. Please see attached videos. Great job!
Uploading PR 1640+639.mov…
I tested this PR everything is working correctly. I changed a team location, my own location, and another user's location successfully. Please watch the overview video below: 2023-12-08.16-56-11.mov |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything works as it should. Nice!
pr.review.1640.mp4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested the PR. Updated the API key.
In View Profile page, updating location to Vatican, Zagreb, Podgorica in Basic Info is causing the page to crash. See the video for details.
Uploading HGN APP and 11 more pages - Personal - Microsoft Edge 2024-01-25 21-51-03.mp4…
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested PR.
All the Timezone features are working as expected in all three pages.
Attaching video from basic info page.
HGN.APP.and.11.more.pages.-.Personal.-.Microsoft.Edge.2024-01-25.22-01-09.mp4
However, the basic info page is crashing if we try to get Time Zone for Vatican, Zagreb, Podgorica.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @robertoooc, i tested your application and it´s correct, nice.
2024-01-26-09-17-53.mov
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey! I just tested this PR for both the backend and frontend. I tested the PR for changing the timezone with the backend development and Opencage API just before this test and everything working fine. However, I changed to this backend of PR#639. The API call is not working and shows an error like this. I am not sure what the problem is but looks like the API for https://opencagedata.com is not connected.
Hi @robertoooc, I tested the PR and works well! PR1640+639.mov |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested this PR everything works as expected. I used an owner account and changed a team location, my own location, and another user's location successfully.
Screen.Recording.2024-01-29.at.3.40.34.PM.mov
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Followed the testing instructions, and the backend PR steps. Functionality works as intended. The timezone is updated based on the location typed in the text box.
Screen.Recording.2024-01-30.at.6.42.45.PM.mov
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested using an owner account and everything works as expected. I was able to update my location and retrieve available time zones in my profile, from the team page, and from the location page.
2024-02-02.18-12-48.mp4
See comment on backend repo: OneCommunityGlobal/HGNRest#639 (comment) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested this PR everything is working correctly.
editar.online-video-cutter.com.mp4
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello Roberto,
I have added the api key to my env variables in my backend and I have tested all the cases presented in the PR. Here are my results:
7c25d2c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1640_result.mov
Everything works as intended! I tested this using the Owner account, attempting to change my location, the team location, add a user with a location, and edit locations in the user list. The only thing to note is that the map requires some time to update with the new location for the user.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi i have reviewed your PR and checking functionality:
- [Y] go to any user profile → Location → Enter a valid location → Click get timezone→ make sure the function works and timezone is appropriate
- [Y] dashboard→ reports→ team locations→ select a user → edit location → verify it reflects well
- [Y] dashboard → user management → create new user → verify location input works
All works as intended, well done!
Thank you all, moving this to final review! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello @robertoooc
Nice work!
everything works as intended except for one thing I noticed
When creating a user via user management the users location isnt displayed on the map
see video below. I tried making a few users with no luck. refreshing and editing location after creating but they dont display on the map.
2024-02-15.22-49-24.mp4
Maybe I am missing something so let me know if its just my end
here is me updating my profile location successfully
2024-02-15.22-25-25.mp4
Overall awesome job!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lacnoskillz, Hi about your comment of the user not showing up on the map after immediately creating them, I'm not too sure as I was not the creator of the map functionality but I'm pretty sure you would need to clock at least a week's worth of tangible time for the user to show up as seen here: #1503 |
Hi @ramyaram2092, I haven't encountered that problem myself during testing this pr. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello, @robertoooc! Reviewed your work and it looks ready to be merged! Excellent implementation throughout.
Test No. 1: Updating the Timezone for an existing user
location.get.timezone.mp4
Test No. 2: Updating an existing user's location on Reports -> Team Locations
location.edit.mp4
Test No. 3: Verifying a new user's location input
create.new.user.mp4
In addition to the functionality working as expected, the implementation that ports a major portion of the relevant functionality, with the OpenCage HTTP Request, to the backend, is well-written.
You're absolutely correct regarding the security risks posed when the API call is being done in the frontend, an example as you've mentioned being viewing the Network tab and retrieving the API key. This fix should eliminate such risks.
I was looking for the change you have mentioned in timeZones.js
but then realized when reviewing the codebase on the IDE that the exact changes that you've mentioned were implemented & pulled in from a recent push to development
from another PR and thus does not reflect in the Files changed
tab here. Safe to remove that bullet point from the Main changes explained
section in the PR's Description.
LGTM! Approving!
Thank you all, merging! |
commit 9b732747c35da5b1446adc70c2e6e1e1c6eb979e Merge: 10ceaa377 26133f858 Author: One Community <[email protected]> Date: Thu Apr 4 14:54:51 2024 -0700 Merge pull request #2113 from OneCommunityGlobal/luis-hours_logged_should_be_red added red text and removed conosle.log in roleInfoModal commit 26133f8583e314018390ab9c285ef054ccac5744 Author: luisarevalo21 <[email protected]> Date: Wed Apr 3 21:55:40 2024 -0700 added red text and removed conosle.log in roleInfoModal commit 10ceaa3777589bb7e6e012a58373869ff7e8354d Merge: 537166226 84724f161 Author: One Community <[email protected]> Date: Tue Apr 2 13:36:43 2024 -0700 Merge pull request #2108 from OneCommunityGlobal/revert-2107-revert-2104-Nathan-Hotfix-presets Revert "Revert "Nathan Hotfix presets"" commit 84724f1619d0aca3678b6d74838f5c08c21d8b10 Author: One Community <[email protected]> Date: Tue Apr 2 13:36:33 2024 -0700 Revert "Revert "Nathan Hotfix presets"" commit 537166226476519893267cb834d78f87753a8b3d Merge: f7807bf83 27bcd5f1f Author: One Community <[email protected]> Date: Tue Apr 2 12:19:18 2024 -0700 Merge pull request #2107 from OneCommunityGlobal/revert-2104-Nathan-Hotfix-presets Revert "Nathan Hotfix presets" commit 27bcd5f1f9333f68f34d0d7c93f63b5e62e96bb5 Author: One Community <[email protected]> Date: Tue Apr 2 12:19:02 2024 -0700 Revert "Nathan Hotfix presets" commit f7807bf83c4d362be7b387a6da50a088af0795de Merge: 838224631 8e18d02a9 Author: One Community <[email protected]> Date: Tue Apr 2 12:18:36 2024 -0700 Merge pull request #2104 from OneCommunityGlobal/Nathan-Hotfix-presets Nathan Hotfix presets commit 83822463101ff52248c3fa63d5261ab61fbe0356 Merge: de7b5fea2 0062e2f7f Author: One Community <[email protected]> Date: Tue Apr 2 09:46:59 2024 -0700 Merge pull request #2091 from OneCommunityGlobal/Nahiyan_Fix-white-screen-dashboard-error Nahiyan_Fixed white screen error on dashboard and timelog commit de7b5fea2aef50b92eb4a85bf97080012d108105 Merge: 25fe37cd2 5ba25a35a Author: One Community <[email protected]> Date: Tue Apr 2 09:09:26 2024 -0700 Merge pull request #1940 from OneCommunityGlobal/Zuhang_fix_blue_circle_for_three_digit_numbers Zuhang_fix_blue_circle_for_three_digit_numbers commit 25fe37cd253a7e23776ff279d232f7aa702b7dcf Merge: f27afcfb7 05c413cf1 Author: Yiyun Tan <[email protected]> Date: Mon Apr 1 22:16:18 2024 -0600 Merge pull request #2046 from OneCommunityGlobal/Yiyun-lint-fix-badge-folder Yiyun lint fix badge folder commit 05c413cf16f3548fa75b21c007b4c57205eca92b Merge: 76ce9fb68 f27afcfb7 Author: Yiyun Tan <[email protected]> Date: Mon Apr 1 22:03:04 2024 -0600 Merge branch 'development' into Yiyun-lint-fix-badge-folder commit f27afcfb797a45a658956f60554b0f644f45ef0b Merge: 81e343a8d ac9543de5 Author: One Community <[email protected]> Date: Mon Apr 1 12:12:42 2024 -0700 Merge pull request #1926 from OneCommunityGlobal/ilya_consumables_add_page Ilya consumables add page commit 8e18d02a9a9063e561621a3d1d6232e0b3e223a0 Author: Nathan Hoffman <[email protected]> Date: Mon Apr 1 10:56:07 2024 -0700 fix updateRole arguments for presets commit 81e343a8db676b98e79325fd1f718757574fcc4a Merge: a6ed92685 6da800202 Author: One Community <[email protected]> Date: Sun Mar 31 22:07:17 2024 -0700 Merge pull request #1923 from OneCommunityGlobal/kaikanes-reportspage-consoleErrorsQuickFix Kaikanes Reports page console errors fix commit a6ed926858e5e9ca5bbd6171303f3c71f04119e6 Merge: 0acb2c929 4cce23648 Author: One Community <[email protected]> Date: Sun Mar 31 21:03:06 2024 -0700 Merge pull request #2103 from OneCommunityGlobal/Fix_edit_time_off_request_on_user_management fixed the edit time off request validation commit 0acb2c929cdac36ab95fd4bdf80624c3a124f967 Merge: d5d6f550a 79a0a1736 Author: One Community <[email protected]> Date: Sun Mar 31 07:51:34 2024 -0700 Merge pull request #2073 from OneCommunityGlobal/Nahiyan_Add-confirm-password-field-to-new-user-setup Nahiyan_Added a confirm password input commit d5d6f550a073e1645df788fc6b1c35de39f93bef Merge: 6029706c1 23d831d9d Author: One Community <[email protected]> Date: Sun Mar 31 07:29:17 2024 -0700 Merge pull request #2076 from OneCommunityGlobal/shiwani_UserRoleTab_Unit_Test Shiwani UserRoleTab unit test commit 4cce23648b56bbb03e93360de408719d9384ce1e Author: abdelmounaim lallouache <[email protected]> Date: Sun Mar 31 00:36:22 2024 -0500 fixed the edit time off request validation commit 6029706c1c702c8b94a518e2b850d43c05cba3e0 Merge: 6b2186135 01b9f1a3d Author: One Community <[email protected]> Date: Sat Mar 30 17:20:18 2024 -0700 Merge pull request #1845 from OneCommunityGlobal/Roberto_Fix_View_Other_User_Dashboard Roberto fix view other user dashboard commit 01b9f1a3dff8fe47ae2c225b91e01a64f7d06021 Merge: bc7f91ce1 6b2186135 Author: robertoooc <[email protected]> Date: Sat Mar 30 15:22:38 2024 -0700 fixes merge conflict commit 79a0a173602ede732b0a890c87b4a9b4317eb041 Merge: d923fadbe eaa265401 Author: Nahiyan16 <[email protected]> Date: Sat Mar 30 13:31:20 2024 -0400 Merge branch 'Nahiyan_Add-confirm-password-field-to-new-user-setup' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into Nahiyan_Add-confirm-password-field-to-new-user-setup commit d923fadbe85f5d89750b9b2811c60e2e2409a488 Author: Nahiyan16 <[email protected]> Date: Sat Mar 30 13:30:50 2024 -0400 Update ForcePasswordUpdate.test.js.snap commit eaa265401a66fa6c55a966d8e9746b57e8de197b Merge: d9d3c402c 6b2186135 Author: Nahiyan Ahmed <[email protected]> Date: Sat Mar 30 13:12:35 2024 -0400 Merge branch 'development' into Nahiyan_Add-confirm-password-field-to-new-user-setup commit 0062e2f7f7db612e3bcf9bafbe770911aac55b51 Author: Nahiyan16 <[email protected]> Date: Sat Mar 30 12:55:24 2024 -0400 Revert WBS and tasks deletion commit 6b2186135751f4825d550b173f52fd612e00789c Merge: 3edef91f4 b961f77ed Author: One Community <[email protected]> Date: Fri Mar 29 19:12:22 2024 -0700 Merge pull request #2069 from OneCommunityGlobal/Tareq-Fix-Map-Component-Scrolling Tareq - Fix map component scrolling commit 3edef91f463dc3aa763519307e563e233450cf16 Merge: c7188d46f 71f781002 Author: One Community <[email protected]> Date: Fri Mar 29 16:49:31 2024 -0700 Merge pull request #2042 from OneCommunityGlobal/jerry_unit_test_assignBadge Jerry - Unit test AssignBadge.jsx commit c7188d46f6ffcf8536ecae7536a2eada4201c1c1 Merge: 6d4e6b0f9 a5f76b66c Author: One Community <[email protected]> Date: Fri Mar 29 16:48:14 2024 -0700 Merge pull request #2072 from OneCommunityGlobal/jerry_unit_test_NewRolePopUp Jerry - Unit test NewRolePopUp.jsx commit 6d4e6b0f99512562558c2d4ce8d27644479ccbef Merge: 5a5970c7b d847c21d7 Author: One Community <[email protected]> Date: Fri Mar 29 16:16:52 2024 -0700 Merge pull request #2074 from OneCommunityGlobal/navneeth_create_view_and_interact_with_task_tick_on_dashboards Navneeth add implementation for resolveTask permission commit d9d3c402c00a6efad43b9a703842f84f8d47f373 Author: Nahiyan16 <[email protected]> Date: Thu Mar 28 13:40:34 2024 -0400 Update UserProfileAdd.jsx commit 50321701933726b5f568c312184f2bb28a2c0183 Author: Nahiyan16 <[email protected]> Date: Thu Mar 28 13:36:51 2024 -0400 Added eye icon commit 5a5970c7b94b9692ba09a12fdd4ed70b2d33c679 Merge: 7916aa13c 3e7a2eec0 Author: One Community <[email protected]> Date: Thu Mar 28 08:57:41 2024 -0700 Merge pull request #2095 from OneCommunityGlobal/Fix_user_initial_setup_style_and_home_country_modal Fix user initial setup style and home country modal commit 3e7a2eec010ddab7595e2139b751f85e1405956b Author: abdelmounaim lallouache <[email protected]> Date: Thu Mar 28 02:49:35 2024 -0500 fix test fail issue commit fe5a7bb545aae008f02bb9a62dc4cc4cfe617a5d Merge: 5321dbcfe 7916aa13c Author: abdelmounaim lallouache <[email protected]> Date: Thu Mar 28 00:57:30 2024 -0500 Merge remote-tracking branch 'origin' into Fix_user_initial_setup_style_and_home_country_modal commit 5321dbcfe943f030ab8efe463a77d64b18f71a03 Author: abdelmounaim lallouache <[email protected]> Date: Thu Mar 28 00:57:13 2024 -0500 fixed home country modal style commit 45a33f258155b9a6196f0c4ca31d39f774176d6a Merge: c1740bbb7 22a239bf7 Author: Nahiyan16 <[email protected]> Date: Wed Mar 27 21:17:01 2024 -0400 Merge branch 'Nahiyan_add_view_password_eye' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into Nahiyan_Add-confirm-password-field-to-new-user-setup commit 3aa746e9cddac8c10af210e258d83fb3acf7a5c5 Author: Nahiyan16 <[email protected]> Date: Wed Mar 27 12:48:27 2024 -0400 Fixed white screen crash commit ac9543de5b3e1656d68e066d791d9302da280a9b Author: ilyaflaks <[email protected]> Date: Tue Mar 26 15:02:18 2024 -0700 fix: removed console logs commit c4b14c58f9d9e67316794c05570bc21bd2994218 Author: ilyaflaks <[email protected]> Date: Tue Mar 26 14:18:42 2024 -0700 fix: minor eslint fix commit 5ae4210488ffbbf551ae97a45f0906b6d8d0c380 Author: ilyaflaks <[email protected]> Date: Tue Mar 26 14:01:06 2024 -0700 fix: removed unnecessary changes commit 7916aa13cf990a0246caac8f6eba820154877a22 Merge: 1d38e42d3 3170c4187 Author: One Community <[email protected]> Date: Tue Mar 26 08:46:47 2024 -0700 Merge pull request #2047 from OneCommunityGlobal/Nahiyan_Fix_Badge_Development_Table_UI Nahiyan_Fix the badge development table so it displays correctly on smaller screen sizes. commit 1d38e42d313dee883d0d96900a0be9e61b017eeb Merge: 0560c2b06 4a708ca8e Author: One Community <[email protected]> Date: Mon Mar 25 23:14:47 2024 -0700 Merge pull request #2088 from OneCommunityGlobal/xiaow_make_mentor_role_not_access_to_visibility_toggle XiaoW_Hotfix of making mentor not access to visibility toggle commit 4a708ca8eec4f3757af193cc62ca8618727aa110 Author: wang9hu <[email protected]> Date: Mon Mar 25 20:20:12 2024 -0700 add mentor to cannot edit visibility check commit 0560c2b06bbf61626d8419cbe5bb66ec398e6f47 Merge: 2743e1567 2ed2b10ad Author: One Community <[email protected]> Date: Fri Mar 22 14:31:35 2024 -0700 Merge pull request #2068 from OneCommunityGlobal/shengjie_newBadges_unitTest_cont Shengjie new badges unit test cont commit 2743e1567a6edb45db7a5cbda10e0a2b77012871 Merge: ed69d21a4 d8fef657e Author: One Community <[email protected]> Date: Fri Mar 22 14:30:13 2024 -0700 Merge pull request #1908 from OneCommunityGlobal/john_add_new_row_to_leadership John Add new total row to Leaderboard commit ed69d21a485ff3e9c9127b4f4c68de49f561f419 Merge: 07525cdf8 5fbe52db6 Author: One Community <[email protected]> Date: Fri Mar 22 14:15:23 2024 -0700 Merge pull request #2082 from OneCommunityGlobal/Fix_leaderboard_time_off_indicator Fix leaderboard time off indicator commit 5fbe52db6cf1e7471757523acb37c3fa4301b30c Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 22 14:37:29 2024 -0500 fix test fail2 commit b06f33cdf8ad473f8e310a99f3c7ad973078fa8e Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 22 14:28:24 2024 -0500 fix test fail commit 3ffe7cae1c36d2ffe0bee9e6830505ea0dc15a5f Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 22 14:23:06 2024 -0500 fix linter issue commit 8570fb2494ca7e56ebe5c93e4fffd671fea6fbf7 Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 22 13:57:04 2024 -0500 Added scroll bar commit f79e0c83f07c9a9b5b29a26b229d3d2353b80ca4 Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 22 13:20:52 2024 -0500 update leaderboard time off indicator, updated time off detail modal commit 07525cdf8d2d9e1d12e13eb15daa40f8e8574f66 Merge: f662de616 e01f6ade5 Author: One Community <[email protected]> Date: Thu Mar 21 20:35:37 2024 -0700 Merge pull request #2080 from OneCommunityGlobal/Fix_Invalid_Date_in_Blue_Square_Description fix invalid date in the blue square description commit e01f6ade542589b3973e54cb896d1e36ff76a2d5 Author: abdelmounaim lallouache <[email protected]> Date: Thu Mar 21 20:55:57 2024 -0500 fix invalid date blue square description commit d847c21d72ba8637951eb730a5c0c3a063652726 Author: navneeeth <[email protected]> Date: Wed Mar 20 10:51:16 2024 -0700 remove unnecessary comments commit 7bbf323687a4560bf716802692693869b35f9e2d Author: navneeeth <[email protected]> Date: Wed Mar 20 10:49:52 2024 -0700 cleaned code by removing unnecessary state commit 7fed8a53ad7faf339e0dd9a4aff1de76718d1352 Author: navneeeth <[email protected]> Date: Tue Mar 19 19:40:50 2024 -0700 fixed bug in Timelog.jsx commit aa868e1d83bbeedd1a1d1c89913e7f1a4a7e104f Author: navneeeth <[email protected]> Date: Mon Mar 18 16:20:11 2024 -0700 remove deprecated changes in src/components/Teams/ commit ee96cd5a80451cd341fd1259d4e7b827c9a49cf3 Merge: 22855bc6e f662de616 Author: navneeeth <[email protected]> Date: Mon Mar 18 16:15:20 2024 -0700 Merge branch 'development' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into navneeth_create_view_and_interact_with_task_tick_on_dashboards commit 22855bc6eb633597289d7a338bbcbfa00f96fff5 Author: navneeeth <[email protected]> Date: Mon Mar 18 16:08:02 2024 -0700 removed testing code in TeamMemberTask commit f662de616ab3116082acb6b0286989ea7e26de58 Merge: b11df1cb6 22a239bf7 Author: One Community <[email protected]> Date: Mon Mar 18 14:55:16 2024 -0700 Merge pull request #2066 from OneCommunityGlobal/Nahiyan_add_view_password_eye Nahiyan_Add view password eye commit 22a239bf765df92849c986d45db2da6a3b9f6fc9 Author: Nahiyan16 <[email protected]> Date: Mon Mar 18 17:44:28 2024 -0400 Updated password input fields For Update Password page and the reset popup for the user management table commit 5a130c1a3fc9f5e68d995e2a597d2d92a90f8e5b Merge: b4e944541 b11df1cb6 Author: navneeeth <[email protected]> Date: Mon Mar 18 14:25:49 2024 -0700 Merge branch 'development' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into navneeth_create_view_and_interact_with_task_tick_on_dashboards commit b11df1cb699b5150f1fd1eaeed4156049c50862b Merge: b9cb2cee6 15e17b483 Author: One Community <[email protected]> Date: Mon Mar 18 14:23:51 2024 -0700 Merge pull request #2026 from OneCommunityGlobal/shengwei_add_jae_account_edit_permission_for_timelog_and_timeoff Shengwei add Jae related account edit permission for timelog and timeoff commit b9cb2cee6629b255f60690f998a86096db0181b3 Merge: 4a926e38c 821b02d9c Author: One Community <[email protected]> Date: Mon Mar 18 13:53:52 2024 -0700 Merge pull request #1979 from OneCommunityGlobal/Chengyan-Phase2-Reusable-Purchase-Item-Form-Frontend Chengyan phase2 reusable purchase item form frontend commit 4a926e38c9be8831f33bb1a0a6f9829e0d6f8474 Merge: 59b6a8738 ffd7c107a Author: One Community <[email protected]> Date: Mon Mar 18 13:51:56 2024 -0700 Merge pull request #1843 from OneCommunityGlobal/changhao_usertablesearchheader_unit_test Changhao - added new unit tests for usertablesearchheader commit c1740bbb7132f1d54b562cf9da5adc86809b582c Author: Nahiyan16 <[email protected]> Date: Mon Mar 18 16:05:10 2024 -0400 Added a confirm password input commit 15e17b48317a7f1217997dd7be81dd9f486681ad Author: Shengwei Peng <[email protected]> Date: Mon Mar 18 15:35:04 2024 -0400 Remove debugger line from UserManagement.jsx commit 821b02d9cfb7db8c24b29403304725e2ad7cc69c Merge: adf34b399 59b6a8738 Author: Chengyan Wang <[email protected]> Date: Mon Mar 18 12:26:16 2024 +0800 Merge branch 'development' into Chengyan-Phase2-Reusable-Purchase-Item-Form-Frontend commit a5f76b66c1077bb59f23fad63fc660191097bac4 Author: Jerry Ren <[email protected]> Date: Sun Mar 17 18:13:58 2024 -0400 Removed console logs commit b961f77ed8e92fcd826dec8947c01a34fb08b577 Author: Tareq <[email protected]> Date: Sat Mar 16 16:03:53 2024 -0400 Adjusted MapContainer height to prevent scrolling. commit d8fef657e1c3dde918db7b511aa97d3053b90622 Author: johnmuthua <[email protected]> Date: Sat Mar 16 23:01:27 2024 +0300 chore: changed css naming convention commit 52b4495717b605199c2fcc06573496180af08c7f Author: johnmuthua <[email protected]> Date: Sat Mar 16 23:00:09 2024 +0300 chore: changed css naming convention commit 6090dc3d5789577c48aeb3a4426d804889a400db Author: johnmuthua <[email protected]> Date: Sat Mar 16 22:40:22 2024 +0300 chore: changed css class names to use hyphens commit 59b6a8738c2c25e7ee1e5c829f021cb2a73f0f44 Merge: 37285dd62 9b823470a Author: One Community <[email protected]> Date: Sat Mar 16 09:37:16 2024 -0700 Merge pull request #1588 from OneCommunityGlobal/Roberto_Adds_Waiting_Message_To_UserProfile_SaveChanges_Modal Roberto - enhances save changes modal to notify request is still processing commit 37285dd62a9bdbc7242cc800b0c269448e468d0e Merge: bb65b22a0 cffcda3c1 Author: One Community <[email protected]> Date: Sat Mar 16 09:03:44 2024 -0700 Merge pull request #1935 from OneCommunityGlobal/yixiao_form_unit Yixiao_form_unittest commit bb65b22a044d8cd922b7582db71ead9b92171d1b Merge: 70b6d9ed0 2f13bed63 Author: One Community <[email protected]> Date: Sat Mar 16 09:02:53 2024 -0700 Merge pull request #1511 from OneCommunityGlobal/yixiao_TaskEditSuggestionRow_unit Yixiao_TaskEditSuggestionRow_unittest commit 2ed2b10ad70d700cedb0ddc3f2c949bc9c602553 Author: ShengjieMao <[email protected]> Date: Sat Mar 16 04:23:40 2024 -0700 unit test codes for NewBadges component commit b4e944541e6fbddb6e393032898f5c5851d29cc3 Merge: bbd976993 70b6d9ed0 Author: navneeeth <[email protected]> Date: Fri Mar 15 20:51:21 2024 -0700 Merge branch 'development' of https://github.com/OneCommunityGlobal/HighestGoodNetworkApp into navneeth_create_view_and_interact_with_task_tick_on_dashboards commit bbd976993aa6c6ebd37cea410af1bd3fba985a75 Author: navneeeth <[email protected]> Date: Fri Mar 15 20:51:10 2024 -0700 update task resolution permission check commit 70b6d9ed004b69486ce18b3a8c1f3c37ab5adce1 Merge: 437b071f1 689c040c1 Author: One Community <[email protected]> Date: Fri Mar 15 19:40:58 2024 -0700 Merge pull request #2063 from OneCommunityGlobal/Shereen_unit_test_UserProfile_TimeEntryEditHistory Shereen - Unit tests for Time Entry Edit History component commit 883f8c505d5c68afb6ba0892ca7861381995b471 Author: Nahiyan16 <[email protected]> Date: Fri Mar 15 16:18:30 2024 -0400 Update ForcePasswordUpdate.test.js.snap commit 1ccd53a020e6cf3957e3ebe762fed1f47414a373 Author: Nahiyan16 <[email protected]> Date: Fri Mar 15 15:18:51 2024 -0400 Update input.css commit da925d7f5ae9aa4ccece4be6a167ee6de4e0b81e Author: Nahiyan16 <[email protected]> Date: Fri Mar 15 15:17:16 2024 -0400 Update input.css commit f1287ebf65611593ddf6a9286bdadeafc10808f6 Author: Nahiyan16 <[email protected]> Date: Fri Mar 15 15:08:34 2024 -0400 Added password eye commit fedb192ae385f873f5f9dbe867ba5ca97cf395ce Author: Shengwei Peng <[email protected]> Date: Fri Mar 15 13:13:21 2024 -0400 Update user table for permission validation commit c1f47c26807b5656b6c7ed53c16118b51d1b57f2 Author: Shengwei Peng <[email protected]> Date: Fri Mar 15 12:52:09 2024 -0400 Add validations to blue sqaure assignment and permission management commit dadba55c59b446c2f18c742357f039fc9e8191ce Merge: 09509c6e0 437b071f1 Author: Shengwei Peng <[email protected]> Date: Fri Mar 15 11:58:58 2024 -0400 Merge branch 'development' of github.com:OneCommunityGlobal/HighestGoodNetworkApp into shengwei_add_jae_account_edit_permission_for_timelog_and_timeoff commit 689c040c1bebed643db970e1d9213e24041ef046 Author: Shereen Punnassery <[email protected]> Date: Thu Mar 14 20:04:25 2024 -0700 Create TimeEntryEditHistory.test.js Created TimeEntryEditHistory.test.js for unit testing TimeEntryEditHistory component. commit 437b071f12407fe3f35235d6ff1e61ec062db831 Merge: 927763de9 0ee3519e5 Author: One Community <[email protected]> Date: Thu Mar 14 17:15:01 2024 -0700 Merge pull request #2061 from OneCommunityGlobal/Sucheta-refactor-recipients-button-functionality Sucheta- Refactor WeeklySummaryRecipient Button Functionality commit 0ee3519e54a2e5ef65f399c55c44198161bcc209 Author: Sucheta Mukherjee <[email protected]> Date: Thu Mar 14 14:04:25 2024 -0400 removed unused state commit c58f81ff7ebebca1bbe4769178a899f09f2c5bb3 Author: Sucheta Mukherjee <[email protected]> Date: Thu Mar 14 13:16:23 2024 -0400 sets authorized user's emails in env variables and makes the authorization process simple commit 927763de9b91c7bbae8ed21264aa7253893faf53 Merge: 3931789de 695d003df Author: One Community <[email protected]> Date: Wed Mar 13 18:24:58 2024 -0700 Merge pull request #2056 from OneCommunityGlobal/Fix_add_thank_you_message_home_country_option Fix thank you message for home country option not showing commit 3931789de2fb502c04efe56b3dfa28bd48764445 Merge: beb0f98b3 40b4d8017 Author: One Community <[email protected]> Date: Wed Mar 13 17:27:59 2024 -0700 Merge pull request #2058 from OneCommunityGlobal/Roberto_hotfix_userProfile_projects_section Roberto-hotfix-helps restore old logic to fix the userprofile tasks section to normal commit 40b4d8017209f094096d4c035eb802311f747efe Author: robertoooc <[email protected]> Date: Wed Mar 13 16:12:46 2024 -0700 helps restore old logic to fix the userprofile projects section to normal commit beb0f98b3742a30fc18dd00d0db7f330f363f7cc Merge: 9a8095f99 84107df86 Author: One Community <[email protected]> Date: Wed Mar 13 14:56:45 2024 -0700 Merge pull request #2057 from OneCommunityGlobal/Sucheta-Remove-Scroll-From-TeamMemberTask-DashBoard Sucheta- Remove Scroll From Team Member Task -DashBoard (Hotfix) commit 84107df86dfa73e33d9821e61920e36cffc0653b Author: Sucheta Mukherjee <[email protected]> Date: Wed Mar 13 17:24:51 2024 -0400 changed class name from table-container to task_table-container in TeamMemberTasks.jsx and its corresponding style.css commit 8dcf911198c80f6ed77251df6b5d2400ac45c453 Merge: 362c4c65b 9a8095f99 Author: John Muthua <[email protected]> Date: Wed Mar 13 22:44:56 2024 +0300 Merge branch 'development' into john_add_new_row_to_leadership commit 695d003df8ddcdbfc8f8b02c5af9c5343256e085 Author: abdelmounaim lallouache <[email protected]> Date: Tue Mar 12 23:23:39 2024 -0500 Fix thank you message for home country option not showing commit 9a8095f99679f0e6123fac5dba71a3fed692f1f2 Merge: 2f4ff99f6 0d9cfd029 Author: One Community <[email protected]> Date: Tue Mar 12 19:37:03 2024 -0700 Merge pull request #2055 from OneCommunityGlobal/Fix_explanation_modal_error fixed explanation modal commit 0d9cfd0293f7822011b37404dcbba8ce62c6cc46 Author: abdelmounaim lallouache <[email protected]> Date: Tue Mar 12 21:28:14 2024 -0500 fixed explanation modal commit 2f4ff99f6d30574ddd5e6a4708808d9841bc4b24 Merge: 8bf5656fe 277ffaec1 Author: One Community <[email protected]> Date: Tue Mar 12 17:50:41 2024 -0700 Merge pull request #2053 from OneCommunityGlobal/Roberto_adds_more_optional_chaining_to_userProjectsTable Roberto-adds more optional chaining to userProfile page crash commit 277ffaec105dad5e2a8132837e0512faf990c636 Author: robertoooc <[email protected]> Date: Tue Mar 12 17:28:43 2024 -0700 adds more optional chaining commit 23d831d9d2ac63786f5ed129264f745f36b47862 Author: Shiwani Rajagopalan <[email protected]> Date: Tue Mar 12 19:29:02 2024 -0400 added unit test for UserRoleTab commit 8bf5656fe7d7464b44b78805e736d948f0c22fa2 Merge: c902b4619 18d5140dd Author: One Community <[email protected]> Date: Tue Mar 12 15:42:35 2024 -0700 Merge pull request #2051 from OneCommunityGlobal/Abdel_new_blue_square_scheduler Abdel Rebuilding the new blue square scheduler commit 18d5140ddf1eeeaed606ebf4e8f2470083b9bab5 Author: abdelmounaim lallouache <[email protected]> Date: Tue Mar 12 17:15:53 2024 -0500 fixed overlap function commit c902b46192252eb97b5a7914cfa67c5cf95f22ba Merge: fd9a046f7 dd1389641 Author: One Community <[email protected]> Date: Tue Mar 12 11:30:48 2024 -0700 Merge pull request #2049 from OneCommunityGlobal/Shuhua-fix_reference_errors_in_User_Management_page Shuhua - hotfix of creating new users in user management page commit dd138964146cea87860759fac816d2747a23f8c9 Author: Shuhua-L <[email protected]> Date: Tue Mar 12 14:19:17 2024 -0400 comment out console.logs commit e813e289e8ae869138975bed02dbaf9735561f94 Author: Shuhua-L <[email protected]> Date: Tue Mar 12 14:14:14 2024 -0400 add optional chaining to prevent reference errors commit 3170c41875297b6901e16f424f23fa9c51325780 Author: Nahiyan16 <[email protected]> Date: Tue Mar 12 13:50:30 2024 -0400 Got rid of unnecessary element commit cc2264b7296b215232bd38a6fe862b930c3d85a1 Author: Nahiyan16 <[email protected]> Date: Tue Mar 12 13:13:28 2024 -0400 Fixed unit test failing commit e75762b087242b730f3115ccef80542696bdc64f Merge: dcb657d8a fd9a046f7 Author: navneeeth <[email protected]> Date: Mon Mar 11 19:16:41 2024 -0700 merge development commit fd9a046f7ed5d101372d168d1ab72ad1065b79d9 Merge: ada46584d c6ab05b50 Author: One Community <[email protected]> Date: Mon Mar 11 15:14:19 2024 -0700 Merge pull request #1993 from OneCommunityGlobal/yixiao_protectedroute_unittest yixiao_protectedroute_unittest commit ada46584da778807cae62f8d9426d5190dd910d1 Merge: 70c4b57a0 fec5324eb Author: One Community <[email protected]> Date: Mon Mar 11 15:07:57 2024 -0700 Merge pull request #1991 from OneCommunityGlobal/renanluiz_add_missing_shadow_style Renanluiz add missing shadow style commit 86237a2f838ca442d908ba4adf8150348b301f08 Merge: 9c3167238 70c4b57a0 Author: abdelmounaim lallouache <[email protected]> Date: Mon Mar 11 15:39:44 2024 -0500 Merge remote-tracking branch 'origin' into Abdel_new_blue_square_scheduler commit 21f6ac42a2548553e75a653df9ba23273d88862f Author: Nahiyan16 <[email protected]> Date: Mon Mar 11 16:26:26 2024 -0400 Fixed table UI issues commit 76ce9fb6839fc5b4a8c9a9ccc16da951e3a1159d Author: Yiyun Tan <[email protected]> Date: Sun Mar 10 22:32:48 2024 -0600 trim codes commit 70c4b57a0ca096c64297cc24a019baded3fc777d Merge: b4c4e9c8f 16f64eb56 Author: One Community <[email protected]> Date: Sun Mar 10 10:31:16 2024 -0700 Merge pull request #2045 from OneCommunityGlobal/xiaow_Hotfix_of_timeentry_not_showing_correctly_due_to_missing_task_resources XiaoW_Hotfix of adding a temporary fix to the task check for displaying timeentry correctly commit b4c4e9c8fd61447c297add8bc01e0af8fcdc47cb Merge: 5a31347db 37346d186 Author: One Community <[email protected]> Date: Sun Mar 10 10:24:25 2024 -0700 Merge pull request #2039 from OneCommunityGlobal/christy_make_wbs_names_active_links_with_tests_update Christy make wbs names active links with tests update commit 6cb4aae88cc613c6ca4c5d5f650e9c7a7e124a45 Author: Yiyun Tan <[email protected]> Date: Sat Mar 9 23:40:28 2024 -0700 fix all commit 16f64eb56621d0bd6846a96e54909f2d3fdb8097 Author: wang9hu <[email protected]> Date: Sat Mar 9 22:20:45 2024 -0800 add a temporary fix to the task check for displaying timeentry correctly commit 9c31672385f49ac5a3e7eb2a1ef27ba9e5fda7b8 Merge: e1b793403 5a31347db Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 9 22:11:55 2024 -0600 Merge remote-tracking branch 'origin' into Abdel_new_blue_square_scheduler commit 5a31347db80e4790a9f6947c3aaa3307140de230 Merge: 9f264b8b8 b3a0661f1 Author: One Community <[email protected]> Date: Sat Mar 9 18:59:40 2024 -0800 Merge pull request #1956 from OneCommunityGlobal/Chengyan-Phase2-Reusables-List-UI Chengyan phase2 reusables list UI commit 9f264b8b881d2ff8931340c01b3fe4753894453a Merge: 48948c5ee 1bd87b752 Author: One Community <[email protected]> Date: Sat Mar 9 18:11:19 2024 -0800 Merge pull request #1970 from OneCommunityGlobal/Anirudh_conditional_formatting_multiwordnames Anirudh conditional formatting multiwordnames commit 48948c5ee6cba29df1c7dd8385a5df007f91c4de Merge: 92b574083 b9b793e57 Author: One Community <[email protected]> Date: Sat Mar 9 17:24:04 2024 -0800 Merge pull request #2014 from OneCommunityGlobal/Shereen_unit_test_UserProfileEdit_EditConfirmModal Shereen - Unit tests for EditConfirmModal component within UserProfileModal commit bc7f91ce186c013cba6c8a31f29964d53e84eed6 Merge: 8a663fff2 92b574083 Author: robertoooc <[email protected]> Date: Sat Mar 9 15:34:32 2024 -0800 fixes merge conflict commit 92b574083ead3482c6808e9f0e4bbfd4ec1f8530 Merge: 94d5956b8 055079c98 Author: Haoj1 <[email protected]> Date: Sat Mar 9 16:55:00 2024 -0600 Merge pull request #1962 from OneCommunityGlobal/Haoji-non-HGN-user-Email-subscribe Haoji non hgn user email subscribe commit e1b793403667c0b50228c761429fc19cb0dd2e57 Merge: 7a89f5da1 94d5956b8 Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 9 15:11:46 2024 -0600 Merge remote-tracking branch 'origin' into Abdel_new_blue_square_scheduler commit 7a89f5da16a8b690afd83685dfe85eaa131efaf4 Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 9 15:11:06 2024 -0600 rebuilt blue square scheduler commit 71f781002efe2a34e505768b5d79d39ce5d662c5 Author: Jerry Ren <[email protected]> Date: Sat Mar 9 15:43:05 2024 -0500 added beforeEach() commit 37346d18694732a2469a2ce71b8d93439cf94d78 Author: mianmiantea2019 <[email protected]> Date: Sat Mar 9 10:19:43 2024 -0500 Update ProjectReport.test.js commit 0d495073323b3017bc9069ab0976b8f8a007c3a5 Author: mianmiantea2019 <[email protected]> Date: Sat Mar 9 10:04:08 2024 -0500 fix ProjectReport test file and add new tests cases commit 794d3146ac72461d0750ebba424508e52ece1b5e Author: mianmiantea2019 <[email protected]> Date: Sat Mar 9 08:39:35 2024 -0500 update mock store setup commit b7ba02bc65ba684547a8de28004d5e194828ef24 Author: mianmiantea2019 <[email protected]> Date: Sat Mar 9 08:34:18 2024 -0500 init commit commit cffcda3c1a5b44b4241d053533bf1ad6e4c07cfd Author: xiao <[email protected]> Date: Sat Mar 9 02:06:48 2024 -0500 update commit c6ab05b5010808add7676726ce61c56f9b586b32 Author: xiao <[email protected]> Date: Sat Mar 9 01:28:08 2024 -0500 update commit a1be6a7aacb7adbc37f92198db8a7fbf7787dbab Author: Jerry Ren <[email protected]> Date: Sat Mar 9 01:26:20 2024 -0500 Added 'Error message appears when adding a duplicate role' commit 2f13bed633b8e1efbd41cf8fde72821bf9cabc07 Merge: b16bc2d53 94d5956b8 Author: xiao <[email protected]> Date: Sat Mar 9 01:07:11 2024 -0500 Merge branch 'development' into yixiao_TaskEditSuggestionRow_unit commit 50a9566e3b3a294aede9d5951e5ac9325af74ec5 Merge: 7c73d1480 94d5956b8 Author: Jerry Ren <[email protected]> Date: Fri Mar 8 19:26:05 2024 -0500 Merge branch 'development' into jerry_unit_test_NewRolePopUp commit 94d5956b8d5aa81a4b23f53d8f5a43e490cfff71 Merge: dda7bcc3e 32c848ee8 Author: One Community <[email protected]> Date: Thu Mar 7 21:08:50 2024 -0800 Merge pull request #2033 from OneCommunityGlobal/revert-1985-christy_make_wbs_names_active_links Revert "Christy - make WBS names active links" commit 32c848ee8193498c8e83711c4f4579f89ad3c600 Author: One Community <[email protected]> Date: Thu Mar 7 21:05:58 2024 -0800 Revert "Christy - make WBS names active links" commit dda7bcc3e3c860af9eb831fb3f8db7cf2fb0bd88 Merge: 1dfb8b5a6 eec1f002d Author: One Community <[email protected]> Date: Thu Mar 7 18:51:30 2024 -0800 Merge pull request #2024 from OneCommunityGlobal/yi_remove_inactive_accounts_from_summary_intro Yi - User Profile: Remove inactive accounts from summary intro commit 1dfb8b5a6c6446643d4b6263797a85772dce3645 Merge: e2d170815 5a19404b9 Author: One Community <[email protected]> Date: Thu Mar 7 17:00:20 2024 -0800 Merge pull request #2006 from OneCommunityGlobal/Sucheta-create-summary-report-recipient-button Sucheta - Create Summary Report Recipient Button commit e2d170815578b2cb9720c316e28911a6251a0bab Merge: c00d55c02 e449d5f11 Author: One Community <[email protected]> Date: Thu Mar 7 16:54:10 2024 -0800 Merge pull request #1999 from OneCommunityGlobal/Roberto_fixes_duplicate_badge_on_frontend Roberto - alters returnUpdatedBadgesCollection function to take into account duplicate badges commit c00d55c02ccda629872ef7646fe79877990abd32 Merge: 3e2f7f147 e33145881 Author: One Community <[email protected]> Date: Thu Mar 7 14:48:35 2024 -0800 Merge pull request #1985 from OneCommunityGlobal/christy_make_wbs_names_active_links Christy - make WBS names active links commit 3e2f7f147094f2c18779d6e2bc1c22c4122a342d Merge: 1e3eefd5c f0da5ce34 Author: One Community <[email protected]> Date: Wed Mar 6 15:25:25 2024 -0800 Merge pull request #2029 from OneCommunityGlobal/xiaow_add_failure_limits_to_heartbeat_in_timer XiaoW_Allow up to 3 failed connection attempts for the heartbeat in Timer commit f0da5ce34d557af655d2f94066e59ca423f7d52c Author: wang9hu <[email protected]> Date: Wed Mar 6 13:05:47 2024 -0800 allow up to 3 failed connection attempts for the heartbeat in Timer commit b3a0661f10b1c630364093b79599f1c29579a6ee Merge: 37acd8bc3 1e3eefd5c Author: Chengyan Wang <[email protected]> Date: Wed Mar 6 13:00:49 2024 -0500 Merge branch 'development' into Chengyan-Phase2-Reusables-List-UI commit adf34b399929bb813fc4dbdb77e3dca0f554edc4 Merge: ab03a6e92 1e3eefd5c Author: Chengyan Wang <[email protected]> Date: Wed Mar 6 13:00:31 2024 -0500 Merge branch 'development' into Chengyan-Phase2-Reusable-Purchase-Item-Form-Frontend commit b9b793e577fb86290094752d892a45d1b5474ceb Author: Shereen Punnassery <[email protected]> Date: Tue Mar 5 21:22:31 2024 -0800 Update EditConfirmModal.test.js Removed unused sleep function. commit e449d5f1190298839b26ea3164dd3ced6844b667 Author: robertoooc <[email protected]> Date: Tue Mar 5 15:57:25 2024 -0800 fixes badge report edit count on duplicate instances commit 1e3eefd5cae27577d0b9fcb7f788e94daae0e119 Merge: fab2ac83c dbd6d6e28 Author: One Community <[email protected]> Date: Tue Mar 5 15:30:37 2024 -0800 Merge pull request #2028 from OneCommunityGlobal/revert-2027-revert-2021-revert-2009-Abdel_update_bleu_square_scheduler Revert "Revert "Revert "Abdel update bleu square scheduler""" commit dbd6d6e28b9cb9d35cbe3bef52f5478487ce4118 Author: One Community <[email protected]> Date: Tue Mar 5 15:28:10 2024 -0800 Revert "Revert "Revert "Abdel update bleu square scheduler""" commit 3de0d51b06190cb12e5b87c8d1c3e4abd7d2f3ae Author: Yiyun Tan <[email protected]> Date: Mon Mar 4 23:09:22 2024 -0700 add a few files commit fab2ac83cbfa10c164c6508ded28e5e4cf123695 Merge: ea5ab7977 ee82f65a7 Author: One Community <[email protected]> Date: Mon Mar 4 21:13:43 2024 -0800 Merge pull request #2027 from OneCommunityGlobal/revert-2021-revert-2009-Abdel_update_bleu_square_scheduler Revert "Revert "Abdel update bleu square scheduler"" commit ee82f65a7c6c7a379af14f4b248e8d595264f2e9 Author: One Community <[email protected]> Date: Mon Mar 4 21:06:42 2024 -0800 Revert "Revert "Abdel update bleu square scheduler"" commit 09509c6e0eb8f2e4c103d8b8c6769a985fec084f Author: Shengwei Peng <[email protected]> Date: Mon Mar 4 20:58:38 2024 -0500 Disable lint for certain lines commit 500a1755340faa0ed69aa966c2c1d36fe11aca8d Merge: 557c74911 ea5ab7977 Author: Shengwei Peng <[email protected]> Date: Mon Mar 4 20:51:09 2024 -0500 Merge branch 'development' of github.com:OneCommunityGlobal/HighestGoodNetworkApp into shengwei_add_jae_account_edit_permission_for_timelog_and_timeoff commit ea5ab7977cfb9364c55a893e84d076a35986e186 Merge: 6e3feaabb d59d3d911 Author: One Community <[email protected]> Date: Mon Mar 4 17:49:07 2024 -0800 Merge pull request #2025 from OneCommunityGlobal/revert-2020-revert-2017-xiaow_make_timer_only_send_heartbeat_when_running Revert "Revert "XiaoW_Make timer only send hearbeat when running"" commit d59d3d9118fdc88ad6b92eeea25cf4929a55b751 Author: One Community <[email protected]> Date: Mon Mar 4 17:48:57 2024 -0800 Revert "Revert "XiaoW_Make timer only send hearbeat when running"" commit eec1f002d3b965b010635b75cc8886c4abb0ca53 Author: fyisfe <[email protected]> Date: Mon Mar 4 18:09:46 2024 -0500 Remove inactive accounts from summary intro commit a6fb7130207080545c5c72c643bd433ef5358787 Author: Yiyun Tan <[email protected]> Date: Sun Mar 3 23:22:14 2024 -0700 finished fix the last 8 files commit 6e3feaabbfb9347b39510b2a5407af65b3216951 Merge: 3ca04523b 7d0f4475a Author: One Community <[email protected]> Date: Sun Mar 3 20:13:11 2024 -0800 Merge pull request #2021 from OneCommunityGlobal/revert-2009-Abdel_update_bleu_square_scheduler Revert "Abdel update bleu square scheduler" commit 7d0f4475aea3d5e0185d2958b48d5b2f75cf3055 Author: One Community <[email protected]> Date: Sun Mar 3 20:11:13 2024 -0800 Revert "Abdel update bleu square scheduler" commit 3ca04523b6dd8006f5b3c9da37a558ab3b27cf15 Merge: ea1509d92 a797b71a0 Author: Yiyun Tan <[email protected]> Date: Sun Mar 3 19:48:41 2024 -0700 Merge pull request #2019 from OneCommunityGlobal/Yiyun-lint-fix-store.js lint fix store.js commit ea1509d924d0b9a0302f00d6509690a292895fd3 Merge: 3d5001485 ae1f80f08 Author: One Community <[email protected]> Date: Sun Mar 3 18:27:47 2024 -0800 Merge pull request #2020 from OneCommunityGlobal/revert-2017-xiaow_make_timer_only_send_heartbeat_when_running Revert "XiaoW_Make timer only send hearbeat when running" commit ae1f80f087b95e146f1f9ecbf719a35e529947f0 Author: One Community <[email protected]> Date: Sun Mar 3 18:27:37 2024 -0800 Revert "XiaoW_Make timer only send hearbeat when running" commit 3d5001485f464fa8528ab9e3bac68171e29e39e5 Merge: a5136c331 5ec6b981e Author: One Community <[email protected]> Date: Sun Mar 3 15:52:34 2024 -0800 Merge pull request #1980 from OneCommunityGlobal/Shuhua-Add_Google_Doc_Icon Shuhua add google doc icon commit a5136c3318e10aa76cc8dc0c7c163558d042dedd Merge: 04454e870 de0664695 Author: One Community <[email protected]> Date: Sun Mar 3 15:21:00 2024 -0800 Merge pull request #1560 from OneCommunityGlobal/TuanDinh_TeamsReportLogs_UnitTest TuanDinh_TeamsReportLogs_UnitTest commit a797b71a0643af92ae045f59eb5b3483dd6fc406 Author: Yiyun Tan <[email protected]> Date: Sun Mar 3 16:04:44 2024 -0700 lint fix store commit fec5324eb846d0e6216e1318fdc59a43105c7984 Merge: 14380cfc3 0f5b568d7 Author: Renanluizssx <[email protected]> Date: Sun Mar 3 20:00:06 2024 -0300 Resolved conflicts in files AddProjectPopUp.jsx, UserProjectsTable.jsx, and UserProfile.jsx During the merging process, resolved conflicts in files AddProjectPopUp.jsx, UserProjectsTable.jsx, and UserProfile.jsx, ensuring that changes from different branches were integrated coherently. The modifications were reviewed and tested to ensure the functionality and integrity of the code. commit 055079c9845074e2e8adbb431881f7aa7959ce84 Author: Haoj1 <[email protected]> Date: Sun Mar 3 00:25:47 2024 -0600 Update Header.jsx commit b7a5f61082d270924e80bb68a8cb895fa54f3666 Merge: 5d854eba3 04454e870 Author: Haoj1 <[email protected]> Date: Sun Mar 3 00:18:07 2024 -0600 Merge branch 'development' into Haoji-non-HGN-user-Email-subscribe commit de0664695530c99ed4da92ea858872a57a4e166d Merge: 316b9d600 6c553e032 Author: Ramya Non-IU <[email protected]> Date: Sat Mar 2 20:03:00 2024 -0800 merge conflict with dev ressolved commit 316b9d600c6ba64e367f7dbe95255d4a42b26d1d Author: Ramya Non-IU <[email protected]> Date: Sat Mar 2 19:58:08 2024 -0800 Removed the first unit test case commit f4d2c1a65c70236b1a41141c27614600a51867dd Author: Ramya Non-IU <[email protected]> Date: Sat Mar 2 19:57:19 2024 -0800 moved the unit test case path commit 04454e870e7b2e0c58fc1dcf1db05e14fa7d5b84 Merge: 06b177c4a 7a1dd9db3 Author: One Community <[email protected]> Date: Sat Mar 2 18:25:33 2024 -0800 Merge pull request #1676 from OneCommunityGlobal/palak_assign_table_row_unit_test Palak - AssignTableRow Unit Test Cases commit 06b177c4ac4fa3de035f803bb9dd203cda0c45e4 Merge: d6709a67c 6f5e036b6 Author: One Community <[email protected]> Date: Sat Mar 2 17:04:24 2024 -0800 Merge pull request #2009 from OneCommunityGlobal/Abdel_update_bleu_square_scheduler Abdel update bleu square scheduler commit d6709a67c333a043564c9ee793fbf3f48de51c07 Merge: 0f5b568d7 ff54f24f0 Author: One Community <[email protected]> Date: Sat Mar 2 17:01:07 2024 -0800 Merge pull request #2017 from OneCommunityGlobal/xiaow_make_timer_only_send_heartbeat_when_running XiaoW_Make timer only send hearbeat when running commit 6f5e036b6fafc261ee2b588711558687f780a3b4 Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 2 18:32:27 2024 -0600 fixed explanation modal overflow commit 233192c184216ad39e58193390425574436b6aa9 Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 2 17:47:21 2024 -0600 hide view blue square reasons when there are no reasons commit ff54f24f01a761b943018620f87c5b5b5502b644 Author: wang9hu <[email protected]> Date: Sat Mar 2 14:33:25 2024 -0800 add check condition to make timer send heartbeat only when running commit 4b0fff46ac86eea499fc39d4673d055debe2ca31 Merge: 70b3f69f6 0f5b568d7 Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 2 15:28:59 2024 -0600 Merge remote-tracking branch 'origin' into Abdel_update_bleu_square_scheduler commit 70b3f69f6764fc4f69d2cf65c7d2b7e79dd6fdc1 Author: abdelmounaim lallouache <[email protected]> Date: Sat Mar 2 15:28:37 2024 -0600 fixed typos and style commit 362c4c65b8e0769fc112ccbaf17690795881593d Merge: d357a5664 0f5b568d7 Author: John Muthua <[email protected]> Date: Sat Mar 2 22:47:46 2024 +0300 Merge branch 'development' into john_add_new_row_to_leadership commit d357a566462ef14c2d0c2ac604937b4d997231db Author: johnmuthua <[email protected]> Date: Sat Mar 2 22:35:51 2024 +0300 Add css commit 952ee75b220c00599ba3f66cd82135e6ddb7847b Author: johnmuthua <[email protected]> Date: Sat Mar 2 11:05:07 2024 +0300 Add change weekly hours commit cd444fffe64c7afb923e0449b288e6bc11c88f7b Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 1 23:58:00 2024 -0600 fixed explanation modal, fixed text on allowed duration modal commit 0f5b568d786e6751469d791b545ee1d9890ef215 Merge: 46de2863b 5e3ffe4ee Author: One Community <[email protected]> Date: Fri Mar 1 21:12:23 2024 -0800 Merge pull request #1773 from OneCommunityGlobal/shiwani_AddNewTeamModal_Unit_Test Shiwani AddNewTeamModal Unit Test commit 46de2863bd4b7b945611771db4234a773580b04c Merge: 6565445bc b50d7aeee Author: One Community <[email protected]> Date: Fri Mar 1 21:08:09 2024 -0800 Merge pull request #1967 from OneCommunityGlobal/Nahiyan_right-side-formatting-of-the-Projects-and-Teams-report-pages Nahiyan_Added padding to the projects and teams report container commit 6323a7cd24c905d28a9bba58d81cc4f2e602563d Author: Shereen Punnassery <[email protected]> Date: Fri Mar 1 19:49:15 2024 -0800 Create EditConfirmModal.test.js Created EditConfirmModal.test.jsa file to test the modal popped after pressing save changes button in edit profile page. commit d66ef4c570b77b5f5180ef4573ff8157c9a7e1e0 Author: abdelmounaim lallouache <[email protected]> Date: Fri Mar 1 20:32:37 2024 -0600 Updated timeOffDetailModal, added expand compress to time off indicator commit 6565445bcac44631bbd9ef2a40a52ca065ee18cf Merge: 4df23d25a e0349905e Author: One Community <[email protected]> Date: Fri Mar 1 15:47:46 2024 -0800 Merge pull request #2003 from OneCommunityGlobal/Masasa_Enable_active_option Masasa_Fixed the inactive and active issue sorting commit 4df23d25ad48480fb8aa3d87fafe6e0b3a676076 Merge: a0abb0fce 74e87b5a2 Author: One Community <[email protected]> Date: Fri Mar 1 15:08:14 2024 -0800 Merge pull request #1978 from OneCommunityGlobal/shiwani_ProjectReport_Unit_Test Shiwani ProjectReport unit test commit a0abb0fcee916d7cd4b1cada3b65c67e3665e4bd Merge: 6832d9f9e 1da6a6785 Author: One Community <[email protected]> Date: Fri Mar 1 15:07:18 2024 -0800 Merge pull request #1977 from OneCommunityGlobal/shereen_unit_test_UserProfileEdit_SaveButton Shereen - Unit tests for SaveButton component. commit 6832d9f9e3c022fd9e0b5d3b384a0afec90164dc Merge: 0f8b2eaec 5e421737b Author: One Community <[email protected]> Date: Fri Mar 1 15:06:22 2024 -0800 Merge pull request #1969 from OneCommunityGlobal/shiwani_WBSItem_Unit_Test Shiwani WBSItem unit test commit ce513c4651276d45a6cb8f3b6b4311ab553e03fd Merge: 4889d89e5 0f8b2eaec Author: robertoooc <[email protected]> Date: Fri Mar 1 12:43:37 2024 -0800 Merge branch 'development' into Roberto_fixes_duplicate_badge_on_frontend commit 0f8b2eaec47803b28266576400493a953195b098 Merge: 6c553e032 2c7ea37a6 Author: One Community <[email protected]> Date: Fri Mar 1 11:36:11 2024 -0800 Merge pull request #2002 from OneCommunityGlobal/Masasa_fix_scroll_II Masasa_Handled the scroll issue_II commit 557c749117d2e44583678ee692a78a4622469896 Author: Shengwei Peng <[email protected]> Date: Thu Feb 29 20:06:00 2024 -0500 Add permission check in dashboard and user profile page commit 8ba503e24b8b2fe2b9a59ae1632686374df89e82 Author: abdelmounaim lallouache <[email protected]> Date: Thu Feb 29 19:03:19 2024 -0600 fix linter issue commit 6c553e032190c60a8a56c541d7551bfa833a61c0 Merge: 5f7fd82e2 fc2f55a89 Author: One Community <[email protected]> Date: Thu Feb 29 15:33:48 2024 -0800 Merge pull request #2007 from OneCommunityGlobal/xiaow_hotfix_of_tooltip_text_in_weeklysummary_form XiaoW_Hotfix of a tooltip text format issue in weeklysummary form commit fc2f55a89627560462d5791cbd1c3d7efb468fd0 Author: wang9hu <[email protected]> Date: Thu Feb 29 14:59:45 2024 -0800 fix a text format issue commit 5a19404b9f27d6a72eba4868e652d5a5711306b8 Author: Sucheta Mukherjee <[email protected]> Date: Thu Feb 29 17:59:20 2024 -0500 added eslint disable for state destructuring commit 53a19b7e732745c5e23c66f496e65df92e714790 Author: Sucheta Mukherjee <[email protected]> Date: Thu Feb 29 17:45:51 2024 -0500 replaced a function in weeklySummaryReport.jsx commit a2a5d848de8fdba1df46ecec4b95412292c244a5 Merge: c0aef9cb0 5f7fd82e2 Author: abdelmounaim lallouache <[email protected]> Date: Thu Feb 29 16:40:58 2024 -0600 Merge remote-tracking branch 'origin' into Abdel_update_bleu_square_scheduler commit 198ca8b16a169a536675b55c05dbefa4b599a753 Author: Sucheta Mukherjee <[email protected]> Date: Thu Feb 29 17:38:23 2024 -0500 creates function to add weekly summary report recipients commit 5f7fd82e2188981ca60b76e1dbf2d93aa1a80eb9 Merge: 0bde7bf63 613f38fd1 Author: One Community <[email protected]> Date: Thu Feb 29 08:27:35 2024 -0800 Merge pull request #2004 from OneCommunityGlobal/xiaow_hotfix_of_invisibility_toggle_and_tooltip_text_change XiaoW_Hotfix of visibility toggle in userprofile page commit 613f38fd1cf6c0273ef8ff4ea1bc82ed7f7f6124 Author: wang9hu <[email protected]> Date: Wed Feb 28 20:50:09 2024 -0800 fix visibility toggle in userprofile, change one of the weekly summary form tooltip commit c0aef9cb0a1bc99a74a8d885494fd848f4bbc3a3 Merge: 32f16c57c 0bde7bf63 Author: abdelmounaim lallouache <[email protected]> Date: Wed Feb 28 21:45:55 2024 -0600 Merge remote-tracking branch 'origin' into Abdel_update_bleu_square_scheduler commit 0bde7bf632139109e51ca7847caaaa9d838a3c16 Merge: a5d96055d e4ae71b5f Author: One Community <[email protected]> Date: Wed Feb 28 13:10:24 2024 -0800 Merge pull request #1810 from OneCommunityGlobal/Jacob-fix-badge-development-checkbox Jacob fix badge development checkbox commit ab03a6e9214d4e85ab47b9b49748850a4cbf47c4 Merge: 5def63916 a5d96055d Author: Chengyan Wang <[email protected]> Date: Wed Feb 28 13:19:05 2024 -0500 Merge branch 'development' into Chengyan-Phase2-Reusable-Purchase-Item-Form-Frontend commit e0349905e66695174a08647340dadc2d3f9de80b Author: ThapeloMasasa <[email protected]> Date: Wed Feb 28 08:43:17 2024 -0800 Fixed the inactive and active issue sorting commit 37acd8bc3a9e5c9e25031e105688e8e117cb6b1b Merge: 037c2ca95 a5d96055d Author: Chengyan Wang <[email protected]> Date: Wed Feb 28 11:13:31 2024 -0500 Merge branch 'development' into Chengyan-Phase2-Reusables-List-UI commit 037c2ca959ac198283d865cbcac445b21bf744e9 Author: Chengyan Wang <[email protected]> Date: Wed Feb 28 11:13:06 2024 -0500 lint fixed commit b6d91168460798af000caa184b5c25f13169e49e Author: Chengyan Wang <[email protected]> Date: Wed Feb 28 10:19:43 2024 -0500 Fix blank screen issue on view button in reusable component This commit resolves the problem where pressing the view button in the purchases column of the reusable component led to a blank screen, instead of displaying a modal. This issue was specific to the reusable component and did not affect the other two components. The fix ensures all components now behave consistently with the sorting and filtering functionalities working as expected. commit a5d96055d4c674ea84682396cf04a71c61a87871 Merge: b6b36c80f 856c51753 Author: One Community <[email protected]> Date: Tue Feb 27 18:38:34 2024 -0800 Merge pull request #2001 from OneCommunityGlobal/revert-1996-revert-1995-xiaow_add_websocket_heartbeat_check_for_timer Revert "Revert "XiaoW_Add heartbeat support for checking websocket connection"" commit 2c7ea37a600808eee86fd8d329432b6b4d05f50c Author: ThapeloMasasa <[email protected]> Date: Tue Feb 27 18:13:38 2024 -0800 Handled the scroll issue commit 856c51753a0216218248675e1987154b0008f6e3 Author: One Community <[email protected]> Date: Tue Feb 27 18:01:31 2024 -0800 Revert "Revert "XiaoW_Add heartbeat support for checking websocket connection"" commit 8a663fff2623c9b00c3e747c831604c3ec87f2ce Merge: 21bfa02eb b6b36c80f Author: robertoooc <[email protected]> Date: Tue Feb 27 16:36:30 2024 -0800 solves merge conflict commit 1bd87b752b277866ff3ad6fd9b22341a2ae807a0 Author: Anirudh Dutt <[email protected]> Date: Tue Feb 27 15:37:09 2024 -0800 Added a function to get initials commit 4889d89e5e514936e34f85b36fe49e4fa8b6107b Author: robertoooc <[email protected]> Date: Tue Feb 27 14:25:00 2024 -0800 alters returnUpdatedBadgesCollection function to take into account duplicate badges commit b6b36c80feb5acd979cd557f1eca449625927b2d Merge: a57a627a9 987836627 Author: One Community <[email protected]> Date: Tue Feb 27 08:47:53 2024 -0800 Merge pull request #1996 from OneCommunityGlobal/revert-1995-xiaow_add_websocket_heartbeat_check_for_timer Revert "XiaoW_Add heartbeat support for checking websocket connection" commit 9878366275453cee9c35dfad4a134b2fae71e87b Author: One Community <[email protected]> Date: Tue Feb 27 08:44:00 2024 -0800 Revert "XiaoW_Add heartbeat support for checking websocket connection" commit a57a627a9bc3d0ff54d97fa9cafcd558b789d4f4 Merge: bffb5d030 1b50266ae Author: One Community <[email protected]> Date: Mon Feb 26 17:39:41 2024 -0800 Merge pull request #1459 from OneCommunityGlobal/shiwani_new_permission_for_total_valid_weekly_summary Shiwani Make permission for "total valid weekly summaries" number editable commit bffb5d030422069fad253f5ac288dfaff91c3b0e Merge: 3b046afc5 33d1b5b3d Author: One Community <[email protected]> Date: Mon Feb 26 16:42:33 2024 -0800 Merge pull request #1995 from OneCommunityGlobal/xiaow_add_websocket_heartbeat_check_for_timer XiaoW_Add heartbeat support for checking websocket connection commit 7b949db127085f7d124e253d3b1efe3048113692 Merge: a1ecaea96 3b046afc5 Author: Chengyan Wang <[email protected]> Date: Mon Feb 26 17:17:52 2024 -0500 Merge branch 'development' into Chengyan-Phase2-Reusables-List-UI commit 33d1b5b3da071d5a9a70f27efa2bf6c831da576b Author: wang9hu <[email protected]> Date: Mon Feb 26 14:10:09 2024 -0800 add heartbeat support for checking websocket connection commit a1ecaea960b9d7ba0673667a73cc045dc7acc17a Author: Chengyan Wang <[email protected]> Date: Mon Feb 26 16:45:18 2024 -0500 lint fixed commit 076a0e984951b0ade1ef2030463abdb58e099339 Author: Chengyan Wang <[email protected]> Date: Mon Feb 26 16:38:22 2024 -0500 refactor finished, need lint fix commit 3f861cdad0c9f5bf782dda50ab1bd751f58d3f60 Author: Chengyan Wang <[email protected]> Date: Mon Feb 26 14:35:29 2024 -0500 material and consumables lists are refactored! commit d98a98fad66870065d9dc7850b66e063254f2a8a Author: Chengyan Wang <[email protected]> Date: Mon Feb 26 13:06:27 2024 -0500 ItemsTable is ready commit d418a0197c6dd43f9e5e56de6da017149fe9a1a5 Author: Chengyan Wang <[email protected]> Date: Mon Feb 26 09:57:53 2024 -0500 ItemListView works now, fixing sort logic and refractor code commit 3b046afc590e73826146e19727ece257330aedd8 Merge: 35daa1bd1 82fcf315c Author: One Community <[email protected]> Date: Sun Feb 25 17:38:03 2024 -0800 Merge pull request #1989 from OneCommunityGlobal/shivansh_v2_security_recheck Shivansh Added Security rechecks for Delete Team and User commit 32f16c57c5553dc10634c178a5ac6a8d0d670a8c Merge: 469c58a65 35daa1bd1 Author: abdelmounaim lallouache <[email protected]> Date: Sun Feb 25 19:22:30 2024 -0600 merge to development commit 7c73d14808e954496826dee64ad2db544847c340 Author: Jerry Ren <[email protected]> Date: Sun Feb 25 17:02:20 2024 -0500 Added 'Create button on click dispatches action to store' commit 5ba25a35a52aab89d18a40d05ec92134c10d2d79 Merge: 3fffe6bc4 35daa1bd1 Author: zuhang2000 <[email protected]> Date: Sat Feb 24 23:58:22 2024 -0800 Merge branch 'development' into Zuhang_fix_blue_circle_for_three_digit_numbers commit 0d42f0dff6bcd7c175dc06e2cada9da8d4de82bc Author: xiao <[email protected]> Date: Sat Feb 24 20:26:31 2024 -0500 update commit 469c58a651de654f0770045834461fae737c4d7a Author: abdelmounaim lallouache <[email protected]> Date: Sat Feb 24 18:52:38 2024 -0600 added new blue square scheduler commit 14380cfc31545c5b501d86bcc9d0469acac39e61 Author: Renanluizssx <[email protected]> Date: Sat Feb 24 16:23:05 2024 -0300 the following changes were implemented the box-shadow was changed in reports.css and LeaderBoard.css commit 907dde0615ae103e679eae0eb0b5235e27fa843a Author: xiao <[email protected]> Date: Sat Feb 24 13:05:23 2024 -0500 new commit 35daa1bd13c1009f42a5558056ed916cb8c87afc Merge: 7e131fb07 07abd1434 Author: One Community <[email protected]> Date: Sat Feb 24 08:48:12 2024 -0800 Merge pull request #1640 from OneCommunityGlobal/Roberto_Change_OpenCage_API_Call_To_Backend Roberto- changes open cage api call to backend commit 7e131fb07570334409601a19cee4ace3e7da1629 Merge: 3f87b98a8 5ac2dcec5 Author: One Community <[email protected]> Date: Sat Feb 24 08:42:52 2024 -0800 Merge pull request #1988 from OneCommunityGlobal/xiaow_task_status_indicator_more_obvious XiaoW_Fix Task Loading indicator commit 82fcf315c042d05d6d914cb0c4cb399b02817fb3 Author: Shivansh Sharma <[email protected]> Date: Fri Feb 23 22:05:06 2024 -0800 Added Security rechecks for Delete Team and User commit 5ac2dcec5c16d38100f6a5b1401fecee674555e6 Author: wang9hu <[email protected]> Date: Fri Feb 23 21:27:07 2024 -0800 fix Task Loading indicator commit 3f87b98a8506e32b7d5c23182126d31da6174950 Merge: 44d455485 bfe4577bf Author: One Community <[email protected]> Date: Fri Feb 23 20:02:46 2024 -0800 Merge pull request #1936 from OneCommunityGlobal/ramya-unit-test-addprojectpopup Ramya Unit Test :UsersProfile/ TeamsAndProject/AddProjectPopup commit 44d4554850743a51624031799d3f7cd562932464 Merge: f318ee948 7e339659b Author: One Community <[email protected]> Date: Fri Feb 23 20:01:17 2024 -0800 Merge pull request #1951 from OneCommunityGlobal/shereen_unit_test_PauseAndResumeButton Shereen - Unit tests for pause and resume button component. commit f318ee9484e49b8f175abf2372a7c8bb8e996e2c Merge: e099f2d70 19c19bdd9 Author: One Community <[email protected]> Date: Fri Feb 23 20:00:24 2024 -0800 Merge pull request #1939 from OneCommunityGlobal/ramya-unit-test-teamreport-reportcharts Ramya unit test : Reports/TeamReport/ReportCharts commit e099f2d70af2c83163fb2b1529b6e8620900f719 Merge: 4bf950bb6 fafe70202 Author: One Community <[email protected]> Date: Fri Feb 23 17:45:03 2024 -0800 Merge pull request #1950 from OneCommunityGlobal/nathan-let-assignProjectToUsers-see-Projects-page Nathan fix route permissions commit fafe7020200563861e60d230e77817ddc6038ed4 Merge: 4d93ad74a 4bf950bb6 Author: Nathan Hoffman <[email protected]> Date: Fri Feb 23 13:36:44 2024 -0800 Merge branch 'development' into nathan-let-assignProjectToUsers-see-Projects-page commit d24292b6bdec27478d39b307aca72129a6c3aa7e Author: Chengyan Wang <[email protected]> Date: Fri Feb 23 12:57:46 2024 -0500 working on ItemsTable commit a069522999ddfc0db11edd12c6c2e162a5be724a Author: Chengyan Wang <[email protected]> Date: Fri Feb 23 12:06:01 2024 -0500 Create folder for materialList view, keep refactoring listview commit 05f2df6eed3e55f7f4f7d0aa30656e6875390908 Author: Chengyan Wang <[email protected]> Date: Fri Feb 23 11:16:57 2024 -0500 Create itemListView as the first step of refactoring code commit 4675a55f96347916fc94d8340d9be12e8dc6b8bd Author: Renanluizssx <[email protected]> Date: Fri Feb 23 07:55:40 2024 -0300 Implemented another version of box shadow - Added box shadow in other necessary places Details: - Implemented a new version of the box shadow to improve aesthetics and visual consistency. - Box shadow has been added in various areas of the code where necessary to enhance user experience and interface clarity. commit 4bf950bb6d03c5bcc39621496b4ae9b4b09fc4f3 Merge: e90b128b3 7a1e91dc5 Author: One Community <[email protected]> Date: Thu Feb 22 22:05:18 2024 -0800 Merge pull request #1983 from OneCommunityGlobal/xiaow_hotfix_of_cannot_update_password XiaoW_Hotfix of cannot update password commit e331458818a861282e2d38d26706edaec34aa964 Author: mianmiantea2019 <[email protected]> Date: Fri Feb 23 01:02:29 2024 -0500 make WBS names active links commit 7a1e91dc53aad83d82406920733712029b1084bd Author: wang9hu <[email protected]> Date: Thu Feb 22 20:48:31 2024 -0800 simplify regex for password validation commit c8ad9445b3120305d6b7ad3d1444562f7c867541 Author: wang9hu <[email protected]> Date: Thu Feb 22 19:02:21 2024 -0800 correct test file description commit c8079ae3f85c205cefc6433e68f7c799e0c9bf77 Author: wang9hu <[email protected]> Date: Thu Feb 22 18:57:22 2024 -0800 correct description of password rules commit e90b128b324725db1a3f39d227323d771fbe3a5e Merge: 763263dcd ccf6d3206 Author: One Community <[email protected]> Date: Thu Feb 22 16:20:05 2024 -0800 Merge pull request #1981 from OneCommunityGlobal/fix_reverted_pr_1830 Shengwei fix reverted PR1830 commit ccf6d3206b56cc872e175f4ad41854fe015f0e3c Author: Shengwei Peng <[email protected]> Date: Fri Feb 16 18:45:07 2024 -0500 Added asterisk mark for badges impacted by deletion commit 5ec6b981ed1d9f823e8ffebfff862e941500988c Author: Shuhua-L <[email protected]> Date: Thu Feb 22 14:27:17 2024 -0500 fix google icon link being objects commit 99f86524e0922aecef68a3cb14aa5c1aded18233 Merge: 24089cae5 763263dcd Author: Shuhua-L <[email protected]> Date: Thu Feb 22 11:54:58 2024 -0500 Merge branch 'development' into Shuhua-Add_Google_Doc_Icon commit 5def639166f6b3e0a36340c4022d7c866fe8f076 Author: Chengyan Wang <[email protected]> Date: Thu Feb 22 11:51:34 2024 -0500 lint fixed commit fffec6b67e9a1803af610a5e2f06c48d36b2f508 Merge: 94183901d 763263dcd Author: Chengyan Wang <[email protected]> Date: Thu Feb 22 10:29:34 2024 -0500 Merge branch 'development' into Chengyan-Phase2-Reusable-Purchase-Item-Form-Frontend commit 94183901d7090402a72ef2b1b616beb125366033 Author: Chengyan Wang <[email protected]> Date: Thu Feb 22 10:28:10 2024 -0500 Completed UI development for reusable purchase request form, streamlined Redux workflow, and enhanced naming conventions for clarity commit 1da6a6785cffe0781fd0fe306b7894c0c4a7dc23 Author: Shereen Punnassery <[email protected]> Date: Wed Feb 21 21:09:17 2024 -0800 Create SaveButton.test.js Created SavButton.test.js to test Save Changes Button in User Profile Edit page. commit 763263dcd7a07a1fe7f8246dbf61298be0ab33d3 Merge: 4cc486fcf c1aea38f6 Author: One Community <[email protected]> Date: Wed Feb 21 17:25:02 2024 -0800 Merge pull request #1975 from OneCommunityGlobal/revert-1830-shengwei_update_code_logic_for_badge_assignment_and_update Revert "Shengwei Enhancement: badge assignment and modification will not remove earned date" commit c1aea38f6d41671dec7bc17a4858476fbb51124e Au…
Description
Changing the OpenCage http request to happen on backend rather than client. Keeping the get request on the client allows for security risks since anyone can view the network tab and see the api key. By transitioning the request to happen on backend the api key can stay secure and concealed while just returning needed information to client.
Related PRS (if any):
This frontend PR is paired with the #639 backend PR.
Main changes explained:
How to test:
npm install
andnpm run start:local
to run this PR locallyScreenshots or videos of changes:
Screen.Recording.2023-12-04.at.2.24.16.PM.mov
Screen.Recording.2023-12-04.at.9.38.48.PM.mov
Screen.Recording.2023-12-04.at.9.37.21.PM.mov
Note:
Include the information the reviewers need to know.