Commit Graph

183 Commits

Author SHA1 Message Date
eea8eb52f3 Merge pull request 'main' (#36) from main into testing
Some checks failed
CityCards-Website / Build-CityCards-Website (push) Has been cancelled
Reviewed-on: #36
2026-04-27 06:07:32 +00:00
3a5d6b0724 Merge pull request 'arya-branch' (#35) from arya-branch into main
Reviewed-on: #35
2026-04-27 06:07:12 +00:00
aryabenade
05f134fdba change the padding of navbar 2026-04-27 11:22:54 +05:30
aryabenade
13780803ba add the ScrollToTop Component
Co-authored-by: Copilot <copilot@github.com>
2026-04-26 23:43:33 +05:30
aryabenade
0dbba7f80e select the same card on checkout page which we select on the buy cards page
Co-authored-by: Copilot <copilot@github.com>
2026-04-26 19:52:31 +05:30
7cdaa43e5b Merge pull request 'main' (#34) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #34
2026-04-24 16:42:03 +00:00
7b3833e5f7 Merge pull request 'arya-branch' (#32) from arya-branch into main
Reviewed-on: #32
2026-04-24 16:40:46 +00:00
aryabenade
d8976a29b4 remove the booking section in supersavings details page 2026-04-24 22:03:36 +05:30
aryabenade
1be37e098b show login modal when clicked on ctabutton if logged out 2026-04-24 22:03:11 +05:30
aryabenade
e3fde4bb17 add validations for spaces in the forms 2026-04-24 21:58:34 +05:30
aryabenade
33a782ca54 show cityName on basis of citySelected 2026-04-24 21:45:49 +05:30
aryabenade
a651186276 add validations in forms 2026-04-24 21:30:04 +05:30
cc9bc18bef Merge pull request 'main' (#30) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 24s
Reviewed-on: #30
2026-04-24 14:32:20 +00:00
b276dec0f5 Merge pull request 'arya-branch' (#29) from arya-branch into main
Reviewed-on: #29
2026-04-24 14:30:49 +00:00
aryabenade
e9ccc78bb0 add protected routes 2026-04-24 19:59:02 +05:30
aryabenade
962d4283e6 remove commented code 2026-04-24 19:09:20 +05:30
aryabenade
67d7f977b7 show attractions from backend on cityHomePage 2026-04-24 19:02:51 +05:30
566afcfd75 Merge pull request 'main' (#28) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #28
2026-04-24 12:41:52 +00:00
e9f404e4df Merge pull request 'fix issues according to client feedback' (#27) from arya-branch into main
Reviewed-on: #27
2026-04-24 12:41:32 +00:00
aryabenade
848c33edbd fix issues according to client feedback 2026-04-24 18:10:03 +05:30
1438178535 Merge pull request 'main' (#26) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #26
2026-04-24 11:26:40 +00:00
c8729848fb Merge pull request 'enable the download itinerary feature in itinerary summary page' (#25) from arya-branch into main
Reviewed-on: #25
2026-04-24 11:26:03 +00:00
aryabenade
668a183123 enable the download itinerary feature in itinerary summary page 2026-04-24 16:44:43 +05:30
d0c02f4fb9 Merge pull request 'main' (#24) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 21s
Reviewed-on: #24
2026-04-24 11:10:06 +00:00
dd5e49bcc1 Merge pull request 'arya-branch' (#23) from arya-branch into main
Reviewed-on: #23
2026-04-24 11:09:38 +00:00
aryabenade
c3d3d0c751 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-24 16:38:03 +05:30
aryabenade
340de94a5d add blogs from backend in the homepage after city selected 2026-04-24 16:37:32 +05:30
Hemant Vishwakarma
54f33c2d34 Implement download itinerary pdf in my profile 2026-04-24 16:32:35 +05:30
ebff7f1887 Merge pull request 'main' (#22) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 24s
Reviewed-on: #22
2026-04-24 10:00:23 +00:00
103511eadb Merge pull request 'arya-branch' (#21) from arya-branch into main
Reviewed-on: #21
2026-04-24 09:59:15 +00:00
aryabenade
8a462b599e change the border and field colors of recipient details in payment page 2026-04-24 15:11:44 +05:30
aryabenade
627137427d add proper navigations in melbourneAttractions and Profile Page 2026-04-24 14:51:27 +05:30
aryabenade
f01a5e0630 remove blank spaces 2026-04-24 14:41:58 +05:30
aryabenade
40ff761104 add navbar and footer in itinerary summary page 2026-04-24 14:23:24 +05:30
aryabenade
ff76d9a370 navigate to create-itinerary 2026-04-24 14:23:01 +05:30
aryabenade
ecd2fb2719 add optional operators to prevent crashing when no cards for a city 2026-04-24 13:52:56 +05:30
aryabenade
c0a2c448e5 replace melbourne with the selected cityname 2026-04-24 13:52:27 +05:30
a2e0eb5e14 Merge pull request 'main' (#20) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #20
2026-04-23 14:44:18 +00:00
aryabenade
191aa3fd54 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-23 20:12:44 +05:30
1575690684 Merge pull request 'change card service again' (#19) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 21s
Reviewed-on: #19
2026-04-23 14:26:01 +00:00
Hemant Vishwakarma
6a23429131 change card service again 2026-04-23 19:55:21 +05:30
132ceccbdd Merge pull request 'change card service file' (#18) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #18
2026-04-23 14:21:57 +00:00
aryabenade
2c9bf7da83 show toast error when not able to create itinerary with the error msg from backend 2026-04-23 19:50:48 +05:30
Hemant Vishwakarma
8279715f2c change card service file 2026-04-23 19:50:43 +05:30
aryabenade
37601dd51d round off the basePrice and strikedPrice 2026-04-23 19:31:26 +05:30
aryabenade
16fe56913d debug the cityId issue in getting user itineraries 2026-04-23 19:29:18 +05:30
46f5533028 Merge pull request 'change payment success page and endpoint' (#17) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 22s
Reviewed-on: #17
2026-04-23 13:59:11 +00:00
Hemant Vishwakarma
a1a5c839dd change payment success page and endpoint 2026-04-23 19:28:13 +05:30
87a8749f10 Merge pull request 'Again rechange in payment success' (#16) from main into testing
All checks were successful
CityCards-Website / Build-CityCards-Website (push) Successful in 23s
Reviewed-on: #16
2026-04-23 13:35:28 +00:00
Hemant Vishwakarma
d3bedeb56d Again rechange in payment success 2026-04-23 19:02:42 +05:30