dev-jaanvi #1

Open
jaanvi wants to merge 155 commits from dev-jaanvi into main

155 commits

Author SHA1 Message Date
jaanvi 95a673bd68 Merge branch 'dev-jaanvi' of https://git.digimantra.com/jaanvi/bulk-email into dev-jaanvi 2025-06-02 15:37:24 +05:30
jaanvi ce27136096 resolved comments 2025-06-02 15:29:41 +05:30
jaanvi 407ae41da1 resolved comments 2025-06-02 15:25:10 +05:30
jaanvi 0d1d786bcc first commit 2025-05-30 16:40:41 +05:30
jaanvi 554b74a174 first commit 2025-05-30 16:23:54 +05:30
jaanvi bf8799c396 Profile Image Added and Edit Api integration in profiePage , Vehicle Image bug fixed 2025-05-01 17:30:15 +05:30
jaanvi 570faa40d4 ProfilePage Edit api integration and Create EditProfile Modal 2025-04-29 18:34:34 +05:30
jaanvi e717d6c58c ManagerDashboard Ui changes and fontFamily updation 2025-04-28 18:25:52 +05:30
jaanvi 156925abfa charging Prices API integration 2025-04-25 13:38:52 +05:30
jaanvi 99e3f8c9f9 manager modal changes, dashboard apis implemented and add dashboard page for user created 2025-04-24 18:26:22 +05:30
jaanvi 7f4914c695 Updation of Modals Ui for Manager and User panel 2025-04-24 11:41:34 +05:30
jaanvi 6dc26bf6af Update All modals of all panel design and Dashboard statCards ui and sidemenu ui minor changes 2025-04-23 18:23:54 +05:30
jaanvi b2945a83f5 Table UI changes and manager , charging station modals ui chnaged 2025-04-22 18:34:59 +05:30
jaanvi f353befab5 dashboard login page and table ui changes 2025-04-18 18:36:20 +05:30
jaanvi 13d1b584c2 theme of app changes in dashboard 2025-04-17 18:43:21 +05:30
jaanvi 5f9f4960b1 Manager Station Details ApI Integration Completed 2025-04-17 12:05:08 +05:30
jaanvi 15fc16ffa9 Manager station Details API integration 2025-04-16 18:41:21 +05:30
jaanvi f9cda402aa minor table ui changes and create Station details modals for add edit in manager panel 2025-04-15 18:27:10 +05:30
jaanvi 8aed8993ac update the slotbooking ui 2025-04-14 17:40:19 +05:30
jaanvi 1ddae7164f admin panel ui changes as per feedback 2025-04-14 14:17:02 +05:30
jaanvi 62777a67de image slotbooking integration and ui changes 2025-04-11 18:30:41 +05:30
jaanvi 36f6df429a addslot and images in vehicle added 2025-04-10 18:36:07 +05:30
jaanvi 769239b349 minor change 2025-04-09 16:16:31 +05:30
jaanvi a90c9b643d minor frontend changes 2025-04-09 15:43:56 +05:30
jaanvi 0fdbcb0f42 minor change 2025-04-08 18:34:42 +05:30
jaanvi 196b9c2775 Merge branch 'develop' of https://git.digimantra.com/DigiMantra/digiev_frontend into frontend/apiIntegration 2025-04-08 18:30:20 +05:30
jaanvi 99cb62735a change the font-family from Inter to Gilory to make it same in all pages 2025-04-08 18:14:41 +05:30
Mohit kalshan 9a09d588a6 Merge pull request 'Latest changes as per UI requirement' (#31) from bugfixes into develop
Reviewed-on: DigiMantra/digiev_frontend#31
2025-04-08 12:24:08 +00:00
jaanvi 6e445da965 Merge branch 'bugfixes' of https://git.digimantra.com/DigiMantra/digiev_frontend into frontend/apiIntegration 2025-04-08 17:45:14 +05:30
jaanvi d8816431ef Complete the responsiveness and UI for all screens of landinPage 2025-04-08 17:43:04 +05:30
Eknoor Singh 4835cfcebe Latest changes as per UI requirement 2025-04-08 16:59:06 +05:30
Mohit kalshan 276d1c4616 Merge pull request 'bugfixes' (#30) from bugfixes into develop
Reviewed-on: DigiMantra/digiev_frontend#30
2025-04-08 05:45:46 +00:00
Mohit kalshan 195559d0f4 Merge pull request 'frontend/apiIntegration' (#29) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#29
2025-04-08 05:44:59 +00:00
jaanvi 6c69c361bd Update landingPage Ui and add responsiveness 2025-04-07 18:15:53 +05:30
Eknoor Singh c90f422423 Latest Bug Fixes as per QA 2025-04-07 18:02:15 +05:30
Eknoor Singh d00747dd6f Merge branch 'frontend/apiIntegration' of https://git.digimantra.com/DigiMantra/digiev_frontend 2025-04-07 10:13:07 +05:30
jaanvi fed0e9db04 Complete Landing Page and APi Integration for Dashboard 2025-04-04 18:58:57 +05:30
Eknoor Singh df66275d19 latest changes 2025-04-04 16:32:54 +05:30
jaanvi e39499d574 Add Welcome Section of Landing Page and Implements AllMangers and AllAvailableSlots APi Integration 2025-04-04 12:37:04 +05:30
Mohit kalshan f826732651 Merge pull request 'Login,Dashboard,Fonts responsiveness done' (#28) from dev-mihir into develop
Reviewed-on: DigiMantra/digiev_frontend#28
2025-04-04 06:14:55 +00:00
mihir_dml e204aae874 Login,Dashboard,Fonts responsiveness done 2025-04-03 20:09:38 +05:30
jaanvi 3a103a4b36 Minor changes in Landing Page 2025-04-03 18:26:44 +05:30
Mohit kalshan 1c8177ddbd Merge pull request 'frontend/apiIntegration' (#27) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#27
2025-04-03 12:50:23 +00:00
jaanvi 9fd914e3a4 Implement LandingPage - Hero Section 2025-04-03 17:35:33 +05:30
Eknoor Singh fac4ff3d6d Latest changes 2025-04-03 13:01:32 +05:30
jaanvi f40ac87da1 Functionality bugs fixed 2025-04-03 12:54:26 +05:30
Mohit kalshan 346c739ab6 Merge pull request 'Dynamic Ev Apis Integration implemented' (#26) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#26
2025-04-03 05:32:56 +00:00
jaanvi 4a15fd3293 Dynamic Ev Apis Integration implemented 2025-04-03 10:54:55 +05:30
Mohit kalshan aafccd9c12 Merge pull request 'fix the bugs and add NoteFoundPage' (#25) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#25
2025-04-02 05:01:51 +00:00
jaanvi 57160520fb code optimization 2025-04-01 18:39:17 +05:30
jaanvi dc327f97fc fix the bugs and add NoteFoundPage 2025-03-31 18:28:38 +05:30
Eknoor Singh 2da2eab6bf Latest changes 2025-03-31 10:31:05 +05:30
Mohit kalshan 6d2708e0f4 Merge pull request 'New Updates' (#24) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#24
2025-03-31 04:46:34 +00:00
jaanvi 1519e2ad93 Resolve minor issues 2025-03-31 10:12:42 +05:30
Eknoor Singh 09af9aae10 Changes 2025-03-31 09:40:33 +05:30
jaanvi e038428607 add new changes in station and logo 2025-03-28 14:58:24 +05:30
Eknoor Singh 23d4dbaabd after pull changes 2025-03-28 12:19:54 +05:30
jaanvi a6928b7db9 Latest changes 2025-03-28 11:48:44 +05:30
Eknoor Singh 87b971d97d Latest changes 2025-03-28 11:48:26 +05:30
jaanvi 0f33303a42 made changes in Charging Station and slots booking modals 2025-03-27 18:39:38 +05:30
jaanvi e96759ef3b Booking Slots and EditModal for Availble slots Changes 2025-03-26 18:40:09 +05:30
jaanvi 4df93ec1d9 Charging station new updates in api integration and mangerModal bookingModal changes 2025-03-25 18:21:36 +05:30
jaanvi fdff9c1dd9 Ui fixes 2025-03-24 18:33:32 +05:30
Mohit kalshan a0db1c0dd8 Merge pull request 'Implement the Slot Management and User Booking API' (#23) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#23
2025-03-21 13:08:27 +00:00
jaanvi bbb980c042 UserBooking and slots api implementation 2025-03-21 18:07:55 +05:30
jaanvi 61963d6fe2 update the slot managenemt and Implement User Booking Api 2025-03-20 18:27:52 +05:30
jaanvi 80f603703c APi integration for slot maangement and add DigiEvLogo 2025-03-19 18:30:53 +05:30
jaanvi 25f4563484 Implement the Slot Management UI 2025-03-18 18:18:00 +05:30
Mohit kalshan a5b7e77af4 Merge pull request 'frontend/apiIntegration' (#22) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#22
2025-03-18 04:51:25 +00:00
jaanvi ef2e6a3b51 API integeration for chargingStation Managers and changes in Admin 2025-03-17 18:28:52 +05:30
jaanvi 690af22199 Create Charging Station Ui and Updation in Managers 2025-03-13 16:25:46 +05:30
jaanvi 1e922f1ac5 some bug fixes and add viewModal for user 2025-03-12 18:03:15 +05:30
Mohit kalshan 7793c4b031 Merge pull request 'Vehicle & Managers API integeration' (#21) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#21
2025-03-12 05:37:10 +00:00
jaanvi 90f44b5183 Manager List API Integeration 2025-03-11 18:09:26 +05:30
jaanvi f48b5341a9 changes in Vehicle View Modal 2025-03-11 10:43:20 +05:30
Mohit kalshan 08af4a9b11 Merge pull request 'ui-station-manager' (#18) from feature/ticketsWork into develop
Reviewed-on: DigiMantra/digiev_frontend#18
2025-03-11 04:36:33 +00:00
harsh gogia dcc963eb93 station-manger 2025-03-10 22:15:36 +05:30
jaanvi 86e0502256 Upadate ui for admin panel 2025-03-10 18:34:12 +05:30
jaanvi 1d67f85f22 Vehicle API integeration and Add viewVehicleModal 2025-03-07 18:17:24 +05:30
Mohit kalshan d558697888 Merge pull request 'uiBugs' (#20) from dgev-bugs into develop
Reviewed-on: DigiMantra/digiev_frontend#20
2025-03-07 07:43:51 +00:00
harsh gogia 300a97a3c8 minor fixes 2025-03-07 13:13:01 +05:30
harsh gogia 96eba7be84 Resolved merge conflicts and kept incoming changes from develop 2025-03-07 11:43:19 +05:30
harsh gogia 93c538fb2e uninstalled-styledlibrary 2025-03-07 11:11:57 +05:30
Mohit kalshan ac145d5d23 Merge pull request 'frontend/apiIntegration' (#17) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#17
2025-03-07 05:32:50 +00:00
jaanvi e0cb35e783 Profile Role page changes 2025-03-06 18:41:53 +05:30
harsh gogia a0e7c6ec1c uiBugs 2025-03-06 17:55:25 +05:30
jaanvi f74ee5b25a minor changes 2025-03-05 18:28:46 +05:30
jaanvi 165f1fd4ea update ui for dashboard 2025-03-05 18:27:32 +05:30
harsh gogia 5cfee36f0b ui-station-manager 2025-03-05 18:06:51 +05:30
jaanvi 02b7e73ceb Merge branch 'develop' of https://git.digimantra.com/DigiMantra/digiev_frontend into frontend/apiIntegration 2025-03-05 18:06:14 +05:30
jaanvi 43709e51a7 Recreate the CustomTable UI and Appthem changes also made changes in header section 2025-03-05 18:05:29 +05:30
Mohit kalshan 5eafb62f95 Merge pull request 'frontend/apiIntegration' (#16) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#16
2025-03-05 12:21:46 +00:00
jaanvi 88daf1b1cf Merge branch 'develop' of https://git.digimantra.com/DigiMantra/digiev_frontend into frontend/apiIntegration 2025-03-04 18:19:45 +05:30
jaanvi 36d7b9e71e Profile page option feature and Its Design Implemented 2025-03-04 18:12:15 +05:30
jaanvi d1612f9131 vehicle list created and some bugs solved 2025-03-04 16:42:58 +05:30
Mohit kalshan 13ac338091 Merge branch 'develop' of https://git.digimantra.com/DigiMantra/digiev_frontend into develop 2025-03-03 17:33:26 +05:30
Mohit kalshan 01dcb50d01 hotfix 2025-03-03 17:33:08 +05:30
Mohit kalshan 1d9c5bccf9 Merge pull request 'frontend/apiIntegration' (#14) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#14
2025-03-03 11:51:12 +00:00
jaanvi d21f4f5d27 add functionality to search and password visibility and responsivess added in somepage 2025-03-03 13:36:37 +05:30
jaanvi 42300867a7 create active disactive feature 2025-02-28 16:24:40 +05:30
jaanvi 1c233360c4 Api integeration for Role 2025-02-28 14:53:24 +05:30
jaanvi 4cf59e746f mirror changes 2025-02-28 10:13:17 +05:30
Mohit kalshan 997f78138b Merge pull request 'feature/newFeature' (#13) from feature/newFeature into develop
Reviewed-on: DigiMantra/digiev_frontend#13
2025-02-28 04:39:30 +00:00
jaanvi 25b0ecf111 Add responsiveness and restrict admins 2025-02-28 09:35:31 +05:30
harsh gogia 8e170813fe roles-list 2025-02-27 22:58:16 +05:30
harsh gogia b6729564aa roles-list 2025-02-27 21:16:53 +05:30
Mohit kalshan 013cc0e0b3 Merge pull request 'frontend/apiIntegration' (#12) from frontend/apiIntegration into develop
Reviewed-on: DigiMantra/digiev_frontend#12
2025-02-27 05:11:32 +00:00
jaanvi 292ea123a0 Frontend Api integration 2025-02-27 10:06:07 +05:30
jaanvi 74038b9295 Update changes in dashboard and header 2025-02-26 15:10:06 +05:30
jaanvi 47d4b1254b implementation of dashboard layout 2025-02-25 13:15:04 +05:30
Mohit kalshan 4c63007072 Merge pull request 'Worked on the Charge stations section according to the figma design' (#11) from dev-bansh into develop
Reviewed-on: DigiMantra/digiev_frontend#11
2025-02-25 07:03:33 +00:00
bansh_dml 5ba6f847dd Created User List routes and designed that page 2025-02-25 12:26:32 +05:30
bansh_dml c9a889c20a Changed Charge station to Admins 2025-02-25 10:50:15 +05:30
bansh_dml 7366503711 Worked on the Charge stations section according to the figma design 2025-02-24 18:00:07 +05:30
jaanvi f488dd1646 Merge branch 'develop' of https://git.digimantra.com/DigiMantra/digiev_frontend into feature/loginPage 2025-02-21 13:03:14 +05:30
jaanvi e61b6460a1 Create loginPage 2025-02-21 12:53:19 +05:30
jaanvi 709d9e17fc Login Page UI and minor change in notification feature 2025-02-20 18:33:22 +05:30
Mohit kalshan 8c67cc5b85 Merge pull request 'code refactor' (#9) from fixes/code-refactor into develop
Reviewed-on: DigiMantra/digiev_frontend#9
2025-02-20 11:41:08 +00:00
Mohit kalshan 37fadb391c code refactor 2025-02-20 17:10:43 +05:30
Mohit kalshan 3d48ee0509 Merge pull request 'package updated and remove unused packages' (#8) from fixes/code-refactor into develop
Reviewed-on: DigiMantra/digiev_frontend#8
2025-02-20 08:00:45 +00:00
Mohit kalshan 508ed3de18 package updated and remove unused packages 2025-02-20 13:29:55 +05:30
Mohit kalshan 6033948759 Merge pull request 'Implementation of Admin Panel' (#5) from feature/editAdmin into develop
Reviewed-on: DigiMantra/digiev_frontend#5
2025-02-20 05:12:11 +00:00
jaanvi cadad61747 Implemented Notification feature and made changes in ui of view modal 2025-02-20 10:24:49 +05:30
jaanvi 35d5e9d980 commit new changes 2025-02-19 11:59:53 +05:30
Eknoor Singh 6b36c6c25d Create admin with CRUD's 2025-02-19 11:44:09 +05:30
Mohit kalshan 3cbb0e81b7 Merge pull request 'Logout and Signup functionality' (#6) from feature/adminList into develop
Reviewed-on: DigiMantra/digiev_frontend#6
2025-02-17 10:45:51 +00:00
jaanvi a105ad3ab4 implemented feedback changes 2025-02-17 16:07:24 +05:30
Eknoor Singh a751cb1f4f Implemented changes as per feedback 2025-02-17 16:03:16 +05:30
jaanvi be5de3ac9e Changes after Pull and resolved conflicts 2025-02-17 09:43:48 +05:30
Eknoor Singh c869245bbf Implemented feedback changes 2025-02-14 10:43:44 +05:30
jaanvi 98cde9fb8d Resoved Conflits 2025-02-13 16:50:43 +05:30
Eknoor Singh 45ad56bdf9 Merge branch 'develop' of https://git.digimantra.com/DigiMantra/digiev_frontend into feature/adminList 2025-02-13 16:11:22 +05:30
Mohit kalshan b010d7b9a7 Merge pull request 'login issue fixes' (#7) from fixes/home-page into develop
Reviewed-on: DigiMantra/digiev_frontend#7
2025-02-13 10:29:02 +00:00
Mohit kalshan ff308d124e login issue fixes 2025-02-13 15:57:28 +05:30
Eknoor Singh 8d49e4eb15 Logout and Signup functionality 2025-02-13 15:31:25 +05:30
Mohit kalshan 53e4f76f22 Merge pull request 'Get and Delete API's implemented using redux' (#4) from feature/adminList into develop
Reviewed-on: DigiMantra/digiev_frontend#4
2025-02-13 09:29:03 +00:00
Eknoor Singh 6740831762 Minor changes 2025-02-13 11:14:14 +05:30
jaanvi ba2945a3e5 Implementation-of-Profile-Api-And-SuperAdmin-Specification 2025-02-13 10:11:14 +05:30
Eknoor Singh f921de656d Profile API and User specific window 2025-02-12 18:29:09 +05:30
Eknoor Singh 85dbeb7537 API's working in real time 2025-02-12 13:17:54 +05:30
jaanvi 7de0799b02 Implementation of Edit API 2025-02-12 10:49:04 +05:30
Eknoor Singh 47a13ad356 Fixed dependency typo 2025-02-11 16:59:08 +05:30
Eknoor Singh 5d310be430 Conflict Commits 2025-02-11 16:23:41 +05:30
Eknoor Singh 79c1e02537 Resolved Conflicts-2 2025-02-11 15:40:46 +05:30
Eknoor Singh 2e417c46af Resolved Conflicts 2025-02-11 15:39:31 +05:30
Eknoor Singh 9220143bbb Get and Delete API's implemented using redux 2025-02-11 14:54:21 +05:30
jaanvi 6d4972ce11 changes 2025-02-11 10:37:02 +05:30
Eknoor Singh 575e122b02 Admin List API Implementation 2025-02-10 17:53:22 +05:30
Mohit kalshan 0890207425 Merge pull request 'registration form added' (#3) from feature/authentication into develop
Reviewed-on: DigiMantra/digiev_frontend#3
2025-01-21 11:02:08 +00:00
Mohit kalshan 46d9134e56 registration form added 2025-01-21 16:15:08 +05:30
Mohit kalshan 6bc060bb52 Merge pull request 'minor fixes' (#2) from feature/authentication into develop
Reviewed-on: DigiMantra/digiev_frontend#2
2025-01-21 10:03:52 +00:00
Mohit kalshan 0d38a260cf minor fixes 2025-01-21 15:30:07 +05:30
Mohit kalshan f67c9c17bc Merge pull request 'login setup' (#1) from feature/authentication into develop
Reviewed-on: DigiMantra/digiev_frontend#1
2025-01-21 07:38:43 +00:00
Mohit kalshan 305bbebffb login setup 2025-01-21 13:06:24 +05:30
Mohit kalshan 863cf3f6c7 initial commit 2025-01-09 13:12:05 +05:30