feat(salary): ui and integration#217
Open
athulyarchandra wants to merge 196 commits into
Open
Conversation
Update code
Initial commit
Husky check
- Resolved 106 conflicts (81 AA, 17 UU, 5 DU, 2 UD) - Merged package.json files with combined dependencies - backend/index.ts: added all Sahileyy routes while preserving athulya CORS + AdminAccountant router - connectDatabase.ts: UTC timestamp parser, lazy pool, background reconnect - attendance_service.ts: both class-based admin service and functional GPS service - tasks_service.ts: transactional + incentive engine - tasks_controller.ts: GPS validation, supervisor notifications, task verification, collections - auth_controller.ts: kept sendWelcomeMail + flat input, added audit logging, toggleStatus, resetPassword - New files from Sahileyy: fraud, notifications, system, floors modules - gitignore: merged dist/* entries - Lock files + CI/deploy.yml: kept athulya (ours)
…bal gradient backgrounds, hover animations, and auth
…permissions error
…uild on small EC2s
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.