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.

Sign up for GitHub

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

Jump to bottom

UI update #25

Merged
merged 51 commits into from
Sep 20, 2024
Merged

UI update #25

merged 51 commits into from
Sep 20, 2024

Conversation

Divyakumar21202
Copy link
Collaborator

  1. I've locally merged the uiUpdate branch with main ,also resolve its conflicts and after resolving all the conflicts, I've manually tested the current branch uiUpdate code and also run it locally. It works smooth.
  2. I'd made several changes to the BL like set up the sign Up Errors and added Success Dialog UI.
  3. Other than that I've also implement the BL for the SkipLoadMore feature for Coupons List.

Divyakumar21202 and others added 30 commits August 9, 2024 20:32
@Divyakumar21202
Chore : Pulled
d9b267a
@Divyakumar21202
Chore : Added Business Logic
ac15d65
@samarth-thaker
Login ui updated
e2a1401
@Divyakumar21202
Chore : Added Major Backend Api Service
ea78f4f
@Divyakumar21202
Merge pull request p-society#4 from Divyakumar21202/backendUpdate
7e8ca99 
Backend update
@samarth-thaker
Backend integrated
d043bc2
@Divyakumar21202
Merge branch 'uiUpdate'
010cdc7
@ekansh0unofficial
Commit 1 - Validation logic and connectivity check
875a19e
@ekansh0unofficial
Validation Error handled
6dc7d6e
@samarth-thaker
Merge pull request p-society#7 from ekansh0unofficial/UiChanges
4b769de 
UI changes
@samarth-thaker
Login validate dialog box
88c76e0
@samarth-thaker
Co-authored-by: DIVYAKUMAR PATEL <[email protected]…
d0df6a0 
…b.com>
@Divyakumar21202
Chore :Added CI CD with github
951e1f5
@Divyakumar21202
Merge pull request p-society#8 from p-society/uiUpdate
68ac3cd 
Ui Updated branch pull
@Divyakumar21202
Merge branch 'p-society:main' into main
3895d05
@Divyakumar21202
Chore merge the PR
4015b93
@samarth-thaker
Merge pull request p-society#9 from Divyakumar21202/main
8352111 
Created CI CD Major
@samarth-thaker
Show validate undo
99314dc
@samarth-thaker
Merge branch 'main' of https://github.com/p-society/coupon-aggregator…
d9f58bd 
…-client
@Divyakumar21202
"Chore : Added App Filter Logic "
d6a5139
@Divyakumar21202
Update build_apk.yml
a59cb15 
Changes to apk_yml for github workflows
@Divyakumar21202
"Chore : Corrected login and initialization logic"
10eb019
@Divyakumar21202
Merge branch 'main' into main
0bfff4e
@Divyakumar21202
Merge pull request p-society#10 from Divyakumar21202/main
2683713 
"Chore : Added App Filter Logic "
@Divyakumar21202
Chore : Added Auth Error Business Logic
1c8480f
@Divyakumar21202
"Chore : Added Delete Coupon System"
cb3a75b
@Divyakumar21202
"Chore : Added Shimmer for profile Loading"
de094fe
@samarth-thaker
Authentication and ui modified
40cdbef
@samarth-thaker
App drawer modified, OTP verification screen added, My coupons view
5514905
@Divyakumar21202
Chore: added edit and delete feature in user profile list
3a07948
@Divyakumar21202
Chore : Removed Connectivty Plus.
aec7e52
@Divyakumar21202
Merge branch 'main' into main
7708dff
@Divyakumar21202
Merge pull request p-society#19 from Divyakumar21202/main
7dcc631 
Chore : Added Auth Error Business Logic
@Divyakumar21202
chore : updated coupon edit dialog
0f6ae23
@Divyakumar21202
Merge branch 'main' of https://github.com/divyakumar21202/coupon-aggr…
fd516ec 
…egator-client into HEAD
@Divyakumar21202
"Chore : Resolve the merge error"
9916330
@Divyakumar21202
Merge pull request p-society#21 from Divyakumar21202/main
545251f 
Resolved the merged APP error
@Divyakumar21202
Chore : Updated Auth Error Part
786276e
@Divyakumar21202
Merge pull request p-society#22 from Divyakumar21202/main
5d4eea4 
Chore : Updated Auth Error Part
@Divyakumar21202
Chore : Added Pagination logic
3b3ee7b
@Divyakumar21202
Update README.md
3fa438d
@Divyakumar21202
Chore Added Pagination logic for User Selling Coupon List
d9ed1ab
@Divyakumar21202
Merge branch 'p-society:main' into main
bf4ae03
@Divyakumar21202
Merge branch 'main' of https://github.com/divyakumar21202/coupon-aggr…
895580f 
…egator-client
@Divyakumar21202
Chore Minor changes
3fafd61
@Divyakumar21202
Chore: uiUpdate has been merged and tested locally
4787844
@Divyakumar21202
Chore Updated error handling in Signup Page
56f2e9f
@Divyakumar21202
Chore : Minor Changes
1ed10fc
@Divyakumar21202
Chore : Merged the uiUpdate branch with main and tested
0c94071
@Divyakumar21202
Chore Merges the main branch to uiUpdate
99b41cf
@Divyakumar21202
Update README.md
64d8aec
@Divyakumar21202 Divyakumar21202 merged commit a58a303 into p-society:uiUpdate Sep 20, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Divyakumar21202 @samarth-thaker @ekansh0unofficial