Commit Graph

126 Commits

Author SHA1 Message Date
5efc22d150 Merge pull request 'main' (#14) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 25s
Reviewed-on: #14
2026-04-23 10:01:47 +00:00
b3bb9f08cd Merge pull request 'arya-branch' (#13) from arya-branch into main
Reviewed-on: #13
2026-04-23 10:01:05 +00:00
aryabenade
b1fb01a2a6 refactor the api call by passing cityId when getting user city cards 2026-04-23 15:25:52 +05:30
aryabenade
ef1408fe2a change the label of passes route to Buy Cards 2026-04-23 14:43:07 +05:30
aryabenade
23d1eaa43a add favicon to the app 2026-04-23 14:02:57 +05:30
aryabenade
cee671cf32 replace passes with cards in profile page 2026-04-23 13:56:30 +05:30
aryabenade
517a7c0446 remove the register button from logout modal 2026-04-23 13:34:58 +05:30
aryabenade
0d83118938 remove from local and session storage when signing out 2026-04-23 13:31:46 +05:30
aryabenade
0cb3d6c326 replace the registration modal with the registration page 2026-04-23 12:38:39 +05:30
aryabenade
0c7667bf26 remove console logs from checkout page 2026-04-23 00:13:37 +05:30
aryabenade
4c15fa597d remove the unused secure checkout file 2026-04-22 23:52:06 +05:30
aryabenade
617b494249 rename and replace the design files with actual page names 2026-04-22 23:49:59 +05:30
aryabenade
351c767104 replace the citySelected condition from local to session storage 2026-04-22 23:20:26 +05:30
2fa8f86d62 Merge pull request 'main' (#12) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 25s
Reviewed-on: #12
2026-04-22 14:26:44 +00:00
aryabenade
61f8202fe1 Merge branch 'main' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 19:55:31 +05:30
aryabenade
ef15941484 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-22 19:54:37 +05:30
aryabenade
8f3698b41f show purchased card details using api in the profile page 2026-04-22 19:44:21 +05:30
aryabenade
beae316bc0 integrate api in viewIternary page 2026-04-22 18:33:09 +05:30
3ee552dccc Merge pull request 'main' (#11) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #11
2026-04-22 12:31:47 +00:00
Hemant Vishwakarma
16c6161520 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 18:01:03 +05:30
Hemant Vishwakarma
03dabde979 New changes in paymentsuccesspage 2026-04-22 18:00:33 +05:30
11714bc1e4 Merge pull request 'main' (#10) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #10
2026-04-22 12:21:36 +00:00
Hemant Vishwakarma
d8d3ac1bfb Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 17:50:55 +05:30
Hemant Vishwakarma
b7767053e7 Stripe again changes 2026-04-22 17:50:30 +05:30
c9ed8f5628 Merge pull request 'main' (#9) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 21s
Reviewed-on: #9
2026-04-22 12:15:33 +00:00
Hemant Vishwakarma
690a59d8a9 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 17:44:57 +05:30
Hemant Vishwakarma
043b575a7b change cancel page of stripe and navbar profile changes 2026-04-22 17:44:34 +05:30
Hemant Vishwakarma
65e7b53a84 Again changes in success page 2026-04-22 17:37:24 +05:30
473902a2ae Merge pull request 'main' (#8) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #8
2026-04-22 11:47:22 +00:00
Hemant Vishwakarma
1691396eea Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 17:16:32 +05:30
Hemant Vishwakarma
7455f8afb5 change stripe success page 2026-04-22 17:15:55 +05:30
aryabenade
adbf30a0c2 show the created itinerary summary on the summary page 2026-04-22 17:04:34 +05:30
fdd86a44b7 Merge pull request 'main' (#7) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 25s
Reviewed-on: #7
2026-04-22 11:23:27 +00:00
Hemant Vishwakarma
7394025add Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-22 16:52:16 +05:30
Hemant Vishwakarma
205b19ae50 Implement stripe and add success and cancel page 2026-04-22 16:51:15 +05:30
aryabenade
e3ee51f70b replace all the files in imports folder from the design code 2026-04-21 19:15:57 +05:30
aryabenade
7aa9f833c0 add the view card details design code 2026-04-21 19:14:39 +05:30
aryabenade
37f50275a3 integrate the show purchased passes api in the profile page 2026-04-21 19:14:21 +05:30
aryabenade
4c199f721a integrate the create iternary api in the CreateIternaryPage 2026-04-21 19:12:52 +05:30
aryabenade
6e20b8a544 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-21 12:04:11 +05:30
aryabenade
c490a820e4 integrate add to cart api in the checkoutConfig card 2026-04-21 11:51:35 +05:30
aryabenade
0543627f42 render the offers and attractions in checkoutPage2 2026-04-20 23:46:22 +05:30
aryabenade
5933e33d6d refactor the code in checkout2Page 2026-04-20 19:34:20 +05:30
aryabenade
a88958603e change the heading of paymentPage 2026-04-20 16:25:27 +05:30
aryabenade
b19d3194cf integrate storeRecipentData api in the payment page 2026-04-20 16:08:50 +05:30
aryabenade
326d5e5871 integrate userdetails api in the payment page 2026-04-20 12:11:12 +05:30
aryabenade
fca33f55a7 integrate api in the checkoutpage2 component 2026-04-20 12:10:46 +05:30
aryabenade
99811b1e87 integrate showCartItems api in the CartPage 2026-04-19 20:14:44 +05:30
aryabenade
40a513eb9e import cart page and payment page code from figma 2026-04-19 11:46:13 +05:30
Hemant Vishwakarma
27d73fa90c super savings details page added 2026-04-17 19:13:43 +05:30