Skip to content
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

Fix X hours in X weeks streak badges #890

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
420 commits
Select commit Hold shift + click to select a range
3600601
merge with development
navneeeth Mar 13, 2024
df6db12
fixes logic to push to the edit time entry history
robertoooc Mar 13, 2024
b418564
resolve conflicts related to eslint in userProfileController
sucheta90 Mar 13, 2024
e97fa9c
Merge pull request #798 from OneCommunityGlobal/Roberto_fix_edit_time…
one-community Mar 14, 2024
d4b6b17
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
navneeeth Mar 14, 2024
4c0f1d6
set up dev mode logging in the logger implementation
navneeeth Mar 14, 2024
0ec5c6f
fix build issue
navneeeth Mar 14, 2024
5eb490a
Merge pull request #799 from OneCommunityGlobal/development
one-community Mar 14, 2024
4aa7363
adds a new property to userProfile model - permissionGrantedToGetWe…
sucheta90 Mar 14, 2024
3c67bef
adds a new property to userProfile model - permissionGrantedToGetWe…
sucheta90 Mar 14, 2024
9c76c68
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
sucheta90 Mar 14, 2024
fb79bcb
Merge pull request #792 from OneCommunityGlobal/Sucheta-refactor-week…
one-community Mar 15, 2024
9d858ce
Merge branch 'development' of github.com:OneCommunityGlobal/HGNRest i…
ptrpengdev Mar 15, 2024
dbb10bf
chore: enforcng eslint and prettier on staged files
DiegoSalas27 Mar 15, 2024
a253daf
Merge pull request #666 from OneCommunityGlobal/Roberto_Fix_Assigning…
one-community Mar 16, 2024
a39a886
Merge pull request #794 from OneCommunityGlobal/xiaow_change_role_to_…
one-community Mar 17, 2024
80beeba
Merge branch 'development' into Chengyan-Phase2-Reusables-List
Mar 18, 2024
3b6650d
Merge pull request #800 from OneCommunityGlobal/shengwei_add_jae_acco…
one-community Mar 18, 2024
82f1e57
fixes caching causing error
robertoooc Mar 19, 2024
02afd3d
fix blue square reason email
abdel-lall Mar 19, 2024
200e358
Merge pull request #801 from OneCommunityGlobal/Fix_blue_square_reaso…
one-community Mar 20, 2024
271c7b0
chore: update prepare command to allow pre-commit hook to be executable
DiegoSalas27 Mar 20, 2024
dde92e4
build: rollback to previous version of eslint-plugin-import
DiegoSalas27 Mar 20, 2024
18efc1a
fix: update package-lock.json
DiegoSalas27 Mar 20, 2024
0a853b1
chore: add conventional commits with husky
DiegoSalas27 Mar 20, 2024
26f92f3
build: update husky dependency
DiegoSalas27 Mar 20, 2024
9839877
build: update linting dependencies
DiegoSalas27 Mar 20, 2024
4ebf91f
build: update linting dependencies
DiegoSalas27 Mar 20, 2024
b76b1e1
merged dependency changes
DiegoSalas27 Mar 20, 2024
f3a1e39
chore: add jest
DiegoSalas27 Mar 20, 2024
167aae3
build: updated dependencies
DiegoSalas27 Mar 21, 2024
2c3087c
Merge pull request #807 from OneCommunityGlobal/development
one-community Mar 22, 2024
7292e3d
Merge pull request #803 from OneCommunityGlobal/diego_add_eslint_and_…
one-community Mar 22, 2024
0839328
Merge branch 'development' into diego_add_conventional_commits_git_hook
DiegoSalas27 Mar 22, 2024
fe35fd2
chore: add unit test for postUserProfile in userProfileController
DiegoSalas27 Mar 22, 2024
4741528
Merge pull request #804 from OneCommunityGlobal/diego_add_conventiona…
one-community Mar 22, 2024
0829dae
chore: merged remove development changes
DiegoSalas27 Mar 22, 2024
719e526
chore: merge development into diego_add_unit_testing_git_hook
DiegoSalas27 Mar 22, 2024
f21673b
Merge pull request #805 from OneCommunityGlobal/diego_add_unit_testin…
DiegoSalas27 Mar 22, 2024
060c1cb
resolving merge conflicts
navneeeth Mar 22, 2024
aefc6ed
resolving merge conflicts
navneeeth Mar 22, 2024
02acda6
fixed build issues
navneeeth Mar 23, 2024
820cc5f
Merge pull request #729 from OneCommunityGlobal/navneeth_add_google_d…
one-community Mar 23, 2024
4e17648
fix: update jest and lint-staged versions
DiegoSalas27 Mar 23, 2024
667b4ce
fix: update jest and lint-staged versions
DiegoSalas27 Mar 23, 2024
0407d47
build: solve conflict
DiegoSalas27 Mar 23, 2024
a54ae65
chore: merge development into diego_fix_dependency_changes
DiegoSalas27 Mar 23, 2024
150cbd2
Merge pull request #810 from OneCommunityGlobal/diego_fix_dependency_…
one-community Mar 23, 2024
09785d8
docs: update readme
DiegoSalas27 Mar 24, 2024
9640088
test: Ensures postactionItem returns 400 if any error occurs during s…
Abi-Liu Mar 25, 2024
81b8509
test: Returns 200 if postactionItem is saved correctly
Abi-Liu Mar 26, 2024
6e3c56f
test: finished adding tests to postUserProfile
DiegoSalas27 Mar 26, 2024
2bb578e
fixed time off email confirmation format and style
abdel-lall Mar 26, 2024
a3b2752
make user role changes affect user visibility when changing from or t…
wang9hu Mar 26, 2024
1399b69
Merge pull request #811 from OneCommunityGlobal/diego_update_readme
one-community Mar 26, 2024
718e850
Merge pull request #815 from OneCommunityGlobal/xiaow_make_user_visib…
one-community Mar 26, 2024
2b53202
Merge pull request #750 from OneCommunityGlobal/Chengyan-Phase2-Reusa…
one-community Mar 26, 2024
a8a0718
Merge pull request #814 from OneCommunityGlobal/Fix_date_time_off_con…
one-community Mar 26, 2024
bd135d7
test: Returns 400 if notificationcreated method throws an error.
Abi-Liu Mar 26, 2024
432df58
chore: cleaning up unused imports
Abi-Liu Mar 26, 2024
141d5fd
chore: created requirements file for getactionItem method
Abi-Liu Mar 26, 2024
ed34ec1
fix: merge conflicts
ilyaflaks Mar 26, 2024
7c0421f
refactor: refactored getactionItem method in the actionItemController
Abi-Liu Mar 26, 2024
7ca4541
test: Returns 400 if any error occurs when finding an ActionItem.
Abi-Liu Mar 26, 2024
623f5cf
test: Returns 200 if get actionItem successfully finds a matching Act…
Abi-Liu Mar 26, 2024
2d7471e
test: add integration test to postUserProfile
DiegoSalas27 Mar 27, 2024
643a8d2
test: add integration test to postUserProfile
DiegoSalas27 Mar 27, 2024
791d2f1
test: Ensure getUserProfiles returns 400 if the user doesn't have get…
DiegoSalas27 Mar 27, 2024
02f2dc9
refactor: refactored server.js to be make integration testing easier …
Abi-Liu Mar 27, 2024
9dd8052
test: Integration tests for postactionItem route
Abi-Liu Mar 27, 2024
1fcfbe6
chore: removed unnecessary comments
Abi-Liu Mar 27, 2024
8f12e08
test: integration tests for getActionItem routes
Abi-Liu Mar 27, 2024
d948ef5
test: Ensure getUserProfiles returns 500 if there are no users in the…
DiegoSalas27 Mar 27, 2024
d3fd05e
refactor: refactored deleteactionItem method
Abi-Liu Mar 27, 2024
b6c65fe
test: deleteactionItem unit tests
Abi-Liu Mar 27, 2024
31e33f8
test: Ensure getUserProfiles returns 404 if any error occurs while ge…
DiegoSalas27 Mar 27, 2024
01bea8b
refactor: refactored editactionItem method
Abi-Liu Mar 27, 2024
843c91c
test: unit tests for the editactionItem method inside the actionItemC…
Abi-Liu Mar 27, 2024
b589c86
test: Ensure getUserProfiles returns 200 if there are no users in the…
DiegoSalas27 Mar 27, 2024
9fe7990
chore: removed .only from actionItemController unit tests
Abi-Liu Mar 27, 2024
739c5c3
test: Ensure getUserProfiles returns 200 if there are users in the da…
DiegoSalas27 Mar 27, 2024
58d8e78
Merge pull request #813 from OneCommunityGlobal/diego_add_unit_test_p…
one-community Mar 28, 2024
b686bcb
Merge pull request #823 from OneCommunityGlobal/development
one-community Mar 28, 2024
1f642f7
Revert "Backend Release to Main [1.56]"
one-community Mar 28, 2024
3388dc0
Merge pull request #824 from OneCommunityGlobal/revert-823-development
one-community Mar 28, 2024
5dc6295
test: delete action item route integration tests
Abi-Liu Mar 28, 2024
ef339ec
test: putActionItem integration tests
Abi-Liu Mar 28, 2024
ae6198a
test: ensure notificationcreated method is called with the proper arg…
Abi-Liu Mar 28, 2024
7737e2e
test: testing arguments that dependencies are called with to ensure c…
Abi-Liu Mar 28, 2024
8d8daf5
test: assert that all dependencies in editactionItem method are calle…
Abi-Liu Mar 28, 2024
75ec8a2
refactor: update tests to cover dependencies being called with correc…
DiegoSalas27 Mar 28, 2024
2e2e121
chore: merge development into diego_add_unit_test_getUserProfiles
DiegoSalas27 Mar 28, 2024
9048f37
chore: merged development into abi_getactionItem_tests
DiegoSalas27 Mar 28, 2024
e936017
Merge pull request #817 from OneCommunityGlobal/abi_getactionItem_tests
DiegoSalas27 Mar 28, 2024
e2b998f
test: adding missing integration test for getUserProfiles
DiegoSalas27 Mar 28, 2024
6c6c015
docs: update getUserProfiles-usecase
DiegoSalas27 Mar 29, 2024
b3599a4
Merge pull request #822 from OneCommunityGlobal/diego_add_unit_test_g…
DiegoSalas27 Mar 29, 2024
2a85548
refactor: refactored postBadge to use async await instead of promise …
Abi-Liu Mar 29, 2024
7b5554a
test: setting up tests for badgeController
Abi-Liu Mar 29, 2024
d172972
refactor: use default import for permissions
Abi-Liu Mar 29, 2024
a5846cc
chore: revert test case back to normal
Abi-Liu Mar 29, 2024
b89c417
test: complete unit tests for postBadge method
Abi-Liu Mar 29, 2024
191a70e
Merge branch 'development' into Roberto_Create_Notification_For_Owner…
robertoooc Mar 30, 2024
3012439
fix: merged package-lock json
ilyaflaks Apr 1, 2024
dbb7a98
fix logging when updating permissions with presets
nathanah Apr 1, 2024
e84b647
Merge pull request #737 from OneCommunityGlobal/ilya_consumables_add_…
one-community Apr 1, 2024
42121ca
test: integration test for the post badge route
Abi-Liu Apr 1, 2024
c2074af
Merge branch 'development' into nathan-hofix--fix-logging-for-presets
nathanah Apr 2, 2024
3109803
Your commit message
chrischenlixing Apr 2, 2024
0286372
Merge pull request #830 from OneCommunityGlobal/nathan-hofix--fix-log…
one-community Apr 2, 2024
a7425bb
test: testing cache funciton calls
Abi-Liu Apr 2, 2024
4be7ff9
chore: update values in tests
Abi-Liu Apr 2, 2024
3a8f7f4
Revert "Revert "Backend Release to Main [1.56]""
one-community Apr 2, 2024
b1fdbab
Merge pull request #831 from OneCommunityGlobal/revert-824-revert-823…
one-community Apr 2, 2024
d6cf38d
Revert "Revert "Revert "Backend Release to Main [1.56]"""
one-community Apr 2, 2024
8818479
Merge pull request #832 from OneCommunityGlobal/revert-831-revert-824…
one-community Apr 2, 2024
ee33ef7
test: added assertions to ensure the cache functions are called with …
Abi-Liu Apr 2, 2024
41088a3
build: updated husky preparation script for macos and linux users
DiegoSalas27 Apr 2, 2024
86f1f81
Merge pull request #825 from OneCommunityGlobal/abi_badgeController_p…
DiegoSalas27 Apr 3, 2024
5c320e8
docs: update readme to expand the get started section
DiegoSalas27 Apr 3, 2024
c2dc7ae
test: tests for getAllBadges
Abi-Liu Apr 3, 2024
b948137
Merge pull request #834 from OneCommunityGlobal/diego_update_husky_pr…
one-community Apr 3, 2024
9d70b82
Merge pull request #835 from OneCommunityGlobal/diego_update_readme_g…
one-community Apr 4, 2024
f90d83d
adding dummy file to have some difference
Apr 4, 2024
805dc0f
Merge pull request #803 from OneCommunityGlobal/diego_add_eslint_and_…
one-community Mar 22, 2024
ff8ed9a
Merge pull request #838 from OneCommunityGlobal/ramya-jae-troubleshoot
one-community Apr 4, 2024
238e4c5
Revert " Troubleshoot by Ramya and Jae"
ramyaram2092 Apr 4, 2024
ee00a99
Merge pull request #840 from OneCommunityGlobal/revert-838-ramya-jae-…
ramyaram2092 Apr 4, 2024
13d6092
test: unit tests for getAllBadgesMethod
Abi-Liu Apr 4, 2024
1e150e2
Merge pull request #804 from OneCommunityGlobal/diego_add_conventiona…
one-community Mar 22, 2024
d2e2fd9
test: integration tests for badgeRouter getAllBadges
Abi-Liu Apr 4, 2024
f015fea
fix: removed .only in badgeController tests and fixed a test case
Abi-Liu Apr 4, 2024
cbb1dd5
Merge pull request #841 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 4, 2024
730f9b7
Merge pull request #805 from OneCommunityGlobal/diego_add_unit_testin…
DiegoSalas27 Mar 22, 2024
9efc10c
Revert "Revert " Troubleshoot by Ramya and Jae""
ramyaram2092 Apr 4, 2024
ae71f7c
Merge pull request #842 from OneCommunityGlobal/revert-840-revert-838…
ramyaram2092 Apr 4, 2024
f47c67e
Merge pull request #843 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 4, 2024
07e6978
Merge pull request #729 from OneCommunityGlobal/navneeth_add_google_d…
one-community Mar 23, 2024
9c95aba
Merge pull request #844 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 4, 2024
5e44eb7
Merge pull request #810 from OneCommunityGlobal/diego_fix_dependency_…
one-community Mar 23, 2024
23db832
Merge pull request #845 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 4, 2024
cc35f85
Merge pull request #811 from OneCommunityGlobal/diego_update_readme
one-community Mar 26, 2024
fffd137
Merge pull request #846 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 5, 2024
7850616
Merge pull request #815 from OneCommunityGlobal/xiaow_make_user_visib…
one-community Mar 26, 2024
0ebf447
Merge pull request #847 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 5, 2024
1490ad6
Merge pull request #750 from OneCommunityGlobal/Chengyan-Phase2-Reusa…
one-community Mar 26, 2024
399b9e4
Merge pull request #848 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 5, 2024
ead6f00
Merge pull request #814 from OneCommunityGlobal/Fix_date_time_off_con…
one-community Mar 26, 2024
badb770
Merge pull request #849 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 5, 2024
e4c1e95
Merge pull request #813 from OneCommunityGlobal/diego_add_unit_test_p…
one-community Mar 28, 2024
40b806b
Merge pull request #850 from OneCommunityGlobal/ramya-jae-troubleshoot
ramyaram2092 Apr 5, 2024
3c09ccc
Revert "Troubleshoot : 10th PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
2623c48
Merge pull request #851 from OneCommunityGlobal/revert-850-ramya-jae-…
ramyaram2092 Apr 5, 2024
3635145
Revert "Troubleshoot : 9th PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
e767bbd
Merge pull request #852 from OneCommunityGlobal/revert-849-ramya-jae-…
ramyaram2092 Apr 5, 2024
b55e4e5
Revert "Troubleshoot : 8th PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
807769d
Merge pull request #853 from OneCommunityGlobal/revert-848-ramya-jae-…
ramyaram2092 Apr 5, 2024
7abd031
Revert "Troubleshoot : 7th PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
250ed3c
Merge pull request #854 from OneCommunityGlobal/revert-847-ramya-jae-…
ramyaram2092 Apr 5, 2024
fd285ae
Revert "Troubleshoot : 6th PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
bbbd843
Merge pull request #855 from OneCommunityGlobal/revert-846-ramya-jae-…
ramyaram2092 Apr 5, 2024
72f8b6c
Revert "Troubleshoot : 5th PR added to the troubleshoot branch "
ramyaram2092 Apr 5, 2024
327184d
Merge pull request #856 from OneCommunityGlobal/revert-845-ramya-jae-…
ramyaram2092 Apr 5, 2024
4f7e808
Revert "Troubleshoot : 4th PR added to the troubleshoot branch "
ramyaram2092 Apr 5, 2024
588e0f5
Merge pull request #857 from OneCommunityGlobal/revert-844-ramya-jae-…
ramyaram2092 Apr 5, 2024
d673119
Revert "Troubleshoot : 3rd PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
005d122
Merge pull request #858 from OneCommunityGlobal/revert-843-ramya-jae-…
ramyaram2092 Apr 5, 2024
582d725
Revert " Troubleshoot : 2nd PR added to the troubleshoot branch"
ramyaram2092 Apr 5, 2024
64507b0
Merge pull request #859 from OneCommunityGlobal/revert-841-ramya-jae-…
ramyaram2092 Apr 5, 2024
bec4ece
Revert "Adding 838 back to main "
ramyaram2092 Apr 5, 2024
65fda18
Merge pull request #860 from OneCommunityGlobal/revert-842-revert-840…
ramyaram2092 Apr 5, 2024
d92eee9
changes made in userProfileController.js, authorized user emails now …
sucheta90 Apr 5, 2024
c27ac3f
refactor: refactored assignBadges method
Abi-Liu Apr 5, 2024
4bb5f5f
test: badge controller tests
Abi-Liu Apr 5, 2024
3c0bbbe
test: Returns 500 if an error occurs when saving edited user profile
Abi-Liu Apr 5, 2024
5326413
test: Returns 200 and removes appropriate user from cache if successf…
Abi-Liu Apr 5, 2024
b061cad
test: Returns 201 and if successful and user does not exist in cache
Abi-Liu Apr 5, 2024
57aa07c
fix: remove .only from test case
Abi-Liu Apr 5, 2024
4b58c75
test: integration tests for assign badge route
Abi-Liu Apr 5, 2024
8de1a0d
fix: remove .only from test case
Abi-Liu Apr 5, 2024
c61a1b2
build: updated .babelrc to exclude test files at build time
DiegoSalas27 Apr 6, 2024
daf55fe
Merge pull request #863 from OneCommunityGlobal/diego_babel_build_update
one-community Apr 6, 2024
d47b1b7
merge main to development
DiegoSalas27 Apr 6, 2024
f2f36ef
chore: updated userProfileController.js
DiegoSalas27 Apr 6, 2024
f6c9271
chore: update config
DiegoSalas27 Apr 6, 2024
1b54b0c
Merge pull request #864 from OneCommunityGlobal/diego_new_dev
one-community Apr 6, 2024
a656396
Revert "Diego new dev"
one-community Apr 6, 2024
5e75b5c
Merge pull request #865 from OneCommunityGlobal/revert-864-diego_new_dev
one-community Apr 6, 2024
49a14a1
Revert "Revert "Revert "Revert "Backend Release to Main [1.56]""""
one-community Apr 6, 2024
5d7d068
Merge pull request #866 from OneCommunityGlobal/revert-832-revert-831…
one-community Apr 6, 2024
cdd4726
Revert "Revert "Revert "Revert "Revert "Backend Release to Main [1.56…
one-community Apr 6, 2024
982d046
Merge pull request #867 from OneCommunityGlobal/revert-866-revert-832…
one-community Apr 6, 2024
d14f121
adds jae as an authorized user
sucheta90 Apr 6, 2024
543d36a
Merge pull request #569 from OneCommunityGlobal/Roberto_Create_Notifi…
one-community Apr 6, 2024
1bb4416
chore: update eslint rules
DiegoSalas27 Apr 7, 2024
dc17350
build: updated babelrc to not include test folder
DiegoSalas27 Apr 7, 2024
575c16d
Merge pull request #868 from OneCommunityGlobal/diego_new_dev_2
one-community Apr 7, 2024
bcb029f
revert: revert source code back to original
Abi-Liu Apr 8, 2024
c5669aa
Merge pull request #862 from OneCommunityGlobal/abi_badge_assignBadge…
DiegoSalas27 Apr 8, 2024
1c57a22
changed authorized user email for testing purpose
sucheta90 Apr 9, 2024
4ad98af
resolved issue on package.json
sucheta90 Apr 9, 2024
888365b
Merge pull request #861 from OneCommunityGlobal/Sucheta-add-users-abi…
one-community Apr 9, 2024
0342da5
Merge pull request #870 from OneCommunityGlobal/development
one-community Apr 10, 2024
92b0d6c
chore: delete mongo memory server
DiegoSalas27 Apr 10, 2024
d23eb88
chore: delete mongo memory server
DiegoSalas27 Apr 10, 2024
664778f
Merge branch 'diego_new_dev_2' of https://github.com/OneCommunityGlob…
DiegoSalas27 Apr 10, 2024
1f9d0b5
Merge pull request #871 from OneCommunityGlobal/diego_new_dev_2
DiegoSalas27 Apr 10, 2024
99edcc2
Merge pull request #872 from OneCommunityGlobal/development
one-community Apr 10, 2024
73bf342
Revert "Backend Release to Main [1.59]"
one-community Apr 10, 2024
f1e3001
Merge pull request #873 from OneCommunityGlobal/revert-872-development
one-community Apr 10, 2024
e79e7ad
Revert "Backend Release to Main [1.58]"
one-community Apr 10, 2024
71b8418
Merge pull request #874 from OneCommunityGlobal/revert-870-development
one-community Apr 10, 2024
ecd6e0f
chore: update package-lock.json
DiegoSalas27 Apr 10, 2024
3735e72
Merge pull request #875 from OneCommunityGlobal/diego_new_dev_3
one-community Apr 10, 2024
b838bcc
update userProfileController
DiegoSalas27 Apr 10, 2024
96d2239
Merge pull request #876 from OneCommunityGlobal/diego_postUserProfile…
one-community Apr 10, 2024
7f03b52
chore: update package json
DiegoSalas27 Apr 10, 2024
4a6c470
Merge pull request #877 from OneCommunityGlobal/diego_new_dev_4
one-community Apr 10, 2024
c468559
Revert "update userProfileController"
one-community Apr 10, 2024
5a80f1f
Revert "chore: update package-lock.json"
one-community Apr 10, 2024
4bfa4fb
Merge pull request #878 from OneCommunityGlobal/revert-876-diego_post…
one-community Apr 10, 2024
baafff6
Merge pull request #879 from OneCommunityGlobal/revert-875-diego_new_…
one-community Apr 10, 2024
1c6f027
chore: updates
DiegoSalas27 Apr 10, 2024
abab27d
Merge pull request #880 from OneCommunityGlobal/diego_new_dev_4
one-community Apr 10, 2024
aa46bb7
Update userProfileController.js
one-community Apr 10, 2024
3ab63ee
Merge pull request #882 from OneCommunityGlobal/one-community-patch-1
one-community Apr 10, 2024
be5fd0c
Revert "Update userProfileController.js"
one-community Apr 10, 2024
d8978b2
Revert "chore: updates"
one-community Apr 10, 2024
899525b
Revert "chore: update package json"
one-community Apr 10, 2024
59823b9
Merge pull request #885 from OneCommunityGlobal/revert-880-diego_new_…
one-community Apr 10, 2024
f551aab
Merge pull request #886 from OneCommunityGlobal/revert-877-diego_new_…
one-community Apr 10, 2024
49a2807
Merge pull request #884 from OneCommunityGlobal/revert-882-one-commun…
one-community Apr 10, 2024
fdd11bf
chore: deleted all related test changes leaving current functionality
DiegoSalas27 Apr 10, 2024
e74066d
build: resolved conflicting dependency
DiegoSalas27 Apr 10, 2024
009905f
feat: prevent user from deleting self
nathanah Apr 10, 2024
66f601e
fix: update package-lock.json
nathanah Apr 10, 2024
77283fb
update dependencies
DiegoSalas27 Apr 10, 2024
dd91bb4
Merge pull request #888 from OneCommunityGlobal/diego_before_tests
one-community Apr 10, 2024
d614ac7
chore: solved merged conflict
DiegoSalas27 Apr 10, 2024
33c2cfa
Merge pull request #892 from OneCommunityGlobal/diego_merge_conflict_…
one-community Apr 10, 2024
d5cb721
Merge pull request #837 from OneCommunityGlobal/chris_equipment_detai…
one-community Apr 11, 2024
8001895
Merge branch 'development' into jingyi_rehireable_checkbox_user_profi…
Jingyii800 Apr 12, 2024
35f26bb
Merge pull request #789 from OneCommunityGlobal/jingyi_rehireable_che…
one-community Apr 12, 2024
6484cfd
Merge branch 'development' into Nathan-prevent-deleting-self
nathanah Apr 12, 2024
1d7a1ec
fix: package lock
nathanah Apr 12, 2024
f4bdf04
Merge pull request #889 from OneCommunityGlobal/Nathan-prevent-deleti…
one-community Apr 12, 2024
ef6ff5a
fixed time off request notification not being sent to the owner
abdel-lall Apr 13, 2024
b1d8f0a
Merge pull request #897 from OneCommunityGlobal/Fix_time_off_request_…
one-community Apr 13, 2024
d472d9e
Merge branch 'development' into Aish_purchase_consumables_request_for…
Aishwaryak01 Apr 13, 2024
8f988fc
Merge pull request #784 from OneCommunityGlobal/Aish_purchase_consuma…
one-community Apr 14, 2024
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
Binary file modified .DS_Store
Binary file not shown.
32 changes: 18 additions & 14 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
{
"presets" : ["@babel/preset-env"],
"plugins":
["@babel/plugin-transform-async-to-generator",
["@babel/plugin-transform-runtime",
{
"corejs": false,
"helpers": true,
"regenerator": true,
"useESModules": false
}
],
["module-resolver", {
"presets": ["@babel/preset-env"],
"plugins": [
"@babel/plugin-transform-async-to-generator",
[
"@babel/plugin-transform-runtime",
{
"corejs": false,
"helpers": true,
"regenerator": true,
"useESModules": false
}
],
[
"module-resolver",
{
"root": "./src"
}]
}
]
}
]
}
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ testem.log

#IDE specific

/.vscode

/.vscode
31 changes: 16 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# HGNRest

'npm install' to install the dependencies. 'npm start' to run the application
`npm install` to install the dependencies. `npm start` to run the application

To get started, make sure you have:
To get started, make sure you have:

1. Node v9.5 or higher installed on your machine.
2. A decent code editor like VS Code or Atom.
3. Git

Step1: Clone the App
To clone the code, navigate to the source directory where you want to maintain the code and via terminal or GUI of your choice, run : git clone https://github.com/OneCommunityGlobal/HGNRest.git . You can also setup SSH and then use that for working with remote.
To clone the code, navigate to the source directory where you want to maintain the code and via terminal or GUI of your choice, run : git clone https://github.com/OneCommunityGlobal/HGNRest.git . You can also setup SSH and then use that for working with remote.

Step2: Run npm install. Best way is to open the code in the editor and open integrated teminal. Run npm install.

Step3: Start the app: To start the app, you need to set up several process.env variables. These variables are:
Step3: If running on MacOS or Linux, run `npm run prepare-macos-linux`. This will install husky and allow integration with git hooks. Windows users don't need and should not run this command.

Step4: Start the app: To start the app, you need to set up several process.env variables. These variables are:
user=<user>
password=<password>
cluster=<clustername>
Expand All @@ -26,28 +28,27 @@ SMTPPort=<smtp port>
SMTPUser=<smtp user>
TOKEN_LIFETIME=<number>
TOKEN_LIFETIME_UNITS=<unit like days, second, hours etc>
JWT_SECRET=<secret value>
JWT_SECRET=<secret value>

To make the process easy create a .env file and put the above text in the file and replace values with the correct values, which you can get from your teammates. Then do an npm run-script build followed by an npm start. By default, the services will start on port 4500 and you can http://localhost:4500/api/<routename> to access the methods. A tools like Postman will be your best friend here, you will need to have an auth token placed in the 'Authorization' header which you can get through the networking tab of the local frontend when you login.

* `npm run lint` -- fix lint
* `npm run build` -- build src server and save in dist
* `npm run buildw` -- auto rebuild upon change of src
* `npm run start` -- run the server in dist
* `npm run serve` -- run the server in src without build
* `npm run dev` -- run the server in src and auto restart upon change of src
- `npm run lint` -- fix lint
- `npm run build` -- build src server and save in dist
- `npm run buildw` -- auto rebuild upon change of src
- `npm run start` -- run the server in dist
- `npm run serve` -- run the server in src without build
- `npm run dev` -- run the server in src and auto restart upon change of src

Note: Once you check in the code in github, the application will be publsihed to the following:
Developement : https://hgn-rest-dev.herokuapp.com
Note: Once you check in the code in github, the application will be publsihed to the following:
Developement : https://hgn-rest-dev.herokuapp.com
Master: https://hgn-rest.azurewebsites.net/

## BIG THANKS

- Monitoring and logging provided by [Sentry.io](https://sentry.io/welcome/)
- Hosting provided by [Microsoft Azure](https://azure.microsoft.com/en-us/) and [Heroku](https://www.heroku.com/)


Other key touchpoints:

Build and hosting: Azure and Heroku
Build and hosting: Azure and Heroku
Monitoring and logging: Sentry.io
Loading
Loading