main #31

Merged
Rajendra.Reddy merged 113 commits from main into uat-beta 2026-04-24 14:43:26 +00:00

113 Commits

Author SHA1 Message Date
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
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
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
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
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
aryabenade
191aa3fd54 Merge branch 'hemant' of http://git.wdipl.com/CityCards/CityCards-Website into arya-branch 2026-04-23 20:12:44 +05:30
Hemant Vishwakarma
6a23429131 change card service again 2026-04-23 19:55:21 +05:30
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
Hemant Vishwakarma
a1a5c839dd change payment success page and endpoint 2026-04-23 19:28:13 +05:30
Hemant Vishwakarma
d3bedeb56d Again rechange in payment success 2026-04-23 19:02:42 +05:30
Hemant Vishwakarma
cd7c6ffbaf change payment success file and cards endpoints 2026-04-23 18:33:33 +05:30
aryabenade
cdfcc70e45 integrate api to show itineraries in profile acc to the city selected 2026-04-23 18:24:34 +05:30
aryabenade
977eecd4d8 add indentation in register page 2026-04-23 17:51:12 +05:30
aryabenade
420d2038f2 add validations in register page 2026-04-23 17:48:48 +05:30
aryabenade
27382c45e3 round off the tax amount before adding to cart 2026-04-23 17:00:41 +05:30
aryabenade
0e8045d9a2 add navigation to the footer links 2026-04-23 16:50:09 +05:30
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
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
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
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
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
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
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
Hemant Vishwakarma
d8e1eddb3c Merge branch 'arya-branch' of http://git.wdipl.com/CityCards/CityCards-Website into hemant 2026-04-17 16:44:53 +05:30
aryabenade
cdadee5df4 remove calendar from attraction details page 2026-04-17 15:56:35 +05:30
aryabenade
ce3c095727 show cards on the passes page coming from backend 2026-04-17 14:45:03 +05:30
aryabenade
a7098e81d6 integrate the super savings offer api 2026-04-16 17:24:56 +05:30
aryabenade
8ad18cf7eb show logo image and city on the basis of city selected 2026-04-15 19:25:29 +05:30
aryabenade
929359d7e2 make loading spinner component and pass it to all loading states 2026-04-15 11:34:44 +05:30
aryabenade
743462d088 make the card comparison section in selected city page dynamic 2026-04-15 11:07:13 +05:30
aryabenade
dbdf974475 save the selected city to localstorage 2026-04-14 18:14:13 +05:30
Hemant Vishwakarma
be70d1c65f Merge branch 'main' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-14 17:53:48 +05:30
Hemant Vishwakarma
0cb969df65 Merge branch 'arya-branch' of http://git.wdipl.com/CityCards/CityCards-Website 2026-04-14 17:53:43 +05:30
aryabenade
729f9ffa0d solve errors in tsconfig 2026-04-13 22:04:14 +05:30
aryabenade
6cd2a6dd7e create the slice for getting user passes 2026-04-13 19:10:59 +05:30
aryabenade
9008077709 integrate the APIs for getting and editing user details 2026-04-13 16:15:22 +05:30
aryabenade
0a0cb9f6f1 add loading spinners 2026-04-13 16:13:09 +05:30
aryabenade
439ad4b264 send accessToken to the backend after login 2026-04-13 16:12:05 +05:30
aryabenade
f3b16e8e1a change the duration of the toaster to 2s 2026-04-09 16:06:15 +05:30
aryabenade
169a29f63c change the route according to cityName instead of id 2026-04-09 15:29:17 +05:30
aryabenade
7c9ec2c285 move the pages from components to pages folder 2026-04-09 15:04:27 +05:30
aryabenade
cdb9c7e734 integrate the register user api 2026-04-09 13:04:08 +05:30
aryabenade
f64993a356 integrate send-email,verifyOtp apis 2026-04-08 19:26:08 +05:30
Hemant Vishwakarma
8ea12db388 Merge branch 'main' of http://git.wdipl.com/CityCards/CityCards-Website into hemant 2026-04-07 11:57:39 +05:30
aryabenade
173aad723b remove the space from the top of the navbar 2026-04-02 13:36:46 +05:30
aryabenade
993ccf2c47 add a gradient white shadow effect when showing attractions 2026-04-02 13:11:18 +05:30
aryabenade
e1fb13d4c0 remove the image from postcard hero section 2026-04-02 12:47:07 +05:30
aryabenade
e98a54635b change PostCard to Postcard 2026-04-02 12:18:06 +05:30
ce0c9d6eb2 Merge pull request 'arya-branch' (#3) from arya-branch into main
Reviewed-on: #3
2026-04-02 06:40:03 +00:00
aryabenade
a39404b23d change the layout of postcard gallery in PostCardPage 2026-04-01 18:10:01 +05:30
aryabenade
adde5b0c21 replace the magicIternary page with the landing-magic-iternary page 2026-04-01 16:08:57 +05:30
aryabenade
e793f20d83 refactor the design in PostCradsPage 2026-04-01 16:08:02 +05:30
aryabenade
28f577833b change the port number 2026-04-01 15:04:26 +05:30
aryabenade
66ee65b900 resolve the text getting cut off in checkout 2026-03-31 16:53:57 +05:30
aryabenade
3575712d34 add postcard route in navbar 2026-03-31 16:49:10 +05:30
aryabenade
d22087d5ee resolve the italic span cuttinn off issue with padding 2026-03-31 16:08:21 +05:30
aryabenade
5ca6fada37 resolve the text cutting issue in italic spans 2026-03-31 13:14:14 +05:30
Hemant Vishwakarma
193fe3e722 remove unused code 2026-03-20 14:41:18 +05:30
Hemant Vishwakarma
d51ed87b5f Merge branch 'arya-branch' of http://git.wdipl.com/CityCards/CityCards-Website into hemant 2026-03-20 14:38:51 +05:30