Commit Graph

2873 Commits

Author SHA1 Message Date
ghost2023
509e1f0611 style: rebuild the new booking portal based on the US 2026-05-21 17:07:15 +03:00
Stephanos A
9151110fd8 Refactor seat class handling 2026-05-21 14:31:07 +03:00
Stephanos A
4234c2fdd5 Refactor seat class handling 2026-05-21 14:31:07 +03:00
Stephanos A
2e42662729 Merge remote changes: Add SeatClass model and seat-classes module while preserving local IAM integration and enhancements 2026-05-21 14:06:05 +03:00
Stephanos A
7869994045 Merge remote changes: Add SeatClass model and seat-classes module while preserving local IAM integration and enhancements 2026-05-21 14:06:05 +03:00
Stephanos A
3f60836e5d Implemened verifayda and currency modules 2026-05-21 10:22:08 +03:00
Stephanos A
860170f229 Implemened verifayda and currency modules 2026-05-21 10:22:08 +03:00
ghost2023
74559bb7e6 fix 2026-05-21 10:08:02 +03:00
ghost2023
8ccd4f96a1 fix 2026-05-21 10:02:28 +03:00
Stephanos A
51bc906792 Refactored the whole app based on the requirements shared 2026-05-21 08:48:28 +03:00
Stephanos A
69b27ecb4b Refactored the whole app based on the requirements shared 2026-05-21 08:48:28 +03:00
yaschalew
c7347b88d7 customer registration api integration 2026-05-21 02:21:32 +03:00
yaschalew
fea308a6af improve endpoints 2026-05-21 01:11:51 +03:00
ghost2023
2a1cb9ebd9 refactor(api client): reuse the existing services instead 2026-05-20 16:40:19 +03:00
ghost2023
028cf2aea8 feat: implement better api service 2026-05-20 16:35:03 +03:00
ghost2023
5d3164074b fix: styling conflict issues 2026-05-20 14:32:03 +03:00
ghost2023
0440206c06 chore: add dropdown and also updated tables to use dropdown instead 2026-05-20 13:49:17 +03:00
ghost2023
76dcc48a38 chore: update the react version for the frieght portal to 19 2026-05-20 13:48:09 +03:00
ghost2023
059e555dc9 style: update the pages to use global theme 2026-05-20 12:04:07 +03:00
Nathnael Wondisha
841d8c803f Merge branch 'develop' into ui-comps 2026-05-20 11:40:54 +03:00
ghost2023
1cf67c45ca feat(portal): Integrate @edr/ui-common components and centralize styling 2026-05-20 11:35:44 +03:00
yaschalew
51d6df42bb file upload settings 2026-05-20 08:15:29 +03:00
ghost2023
024871c127 chore: centralized the themeing and fix styles 2026-05-19 16:51:44 +03:00
Roba Boru
3449004331 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-19 16:49:43 +03:00
Roba Boru
7775b304ed Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-19 16:49:43 +03:00
Roba Boru
a73277ae38 Updated seat class and coach mangement 2026-05-19 16:49:22 +03:00
SennayT
3e7b24113b remove localhost on swagger 2026-05-19 09:40:08 +03:00
SennayT
2097b275cc remove localhost on swagger 2026-05-19 09:40:08 +03:00
yaschalew
6aa8265bf5 update main color 2026-05-18 23:23:51 +03:00
Stephanos A.
2dc3da9e74 Merge pull request #7 from Tria-plc/feat/telebirr-integration
Feat/telebirr integration
2026-05-18 18:49:36 +03:00
Stephanos A.
0c4f22c85c Merge pull request #7 from Tria-plc/feat/telebirr-integration
Feat/telebirr integration
2026-05-18 18:49:36 +03:00
yaschalew
ab9d42e371 Merge branch 'develop' of github.com:Tria-plc/edr-platform into feat/customer_registration 2026-05-18 17:04:28 +03:00
Michael Abebe
576841cc96 fix(portal:auth): auth portal redirect fixed 2026-05-18 17:00:45 +03:00
yaschalew
7fe5be2438 Merge branch 'develop' of github.com:Tria-plc/edr-platform into feat/customer_registration 2026-05-18 12:10:12 +03:00
Michael Abebe
2478b0278b feat(freight:auth): show real user profile in top bar and fix logout
- DashboardLayout now accepts userName, userEmail, userInitials, onLogout
  props; computes initials from name; replaces hardcoded "John Doe" values
- Portal App.tsx pulls display name and email from useAuth user object and
  passes them to DashboardLayout
- handleLogout performs unconditional local cleanup (cookies + localStorage
  + hard redirect to /auth) so a failed API call never leaves the user stuck
- main.tsx purges cookies whose value is the literal string "undefined",
  clearing stale tokens written before the envelope interceptor fix

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-18 11:52:03 +03:00
yaschalew
978bbd16cb Merge branch 'develop' of github.com:Tria-plc/edr-platform into feat/customer_registration 2026-05-18 11:25:59 +03:00
yaschalew
db1f0cc5d7 add customer portal 2026-05-18 11:25:33 +03:00
Michael Abebe
881064eb98 Merge branch 'develop' into feat/add_auth_integration 2026-05-18 11:14:55 +03:00
Michael Abebe
2940d20e06 fix:(freight:auth): finished integrating the freight api with the freight portal 2026-05-18 11:07:09 +03:00
Michael Abebe
b46a7765e8 fix:(api:auth): added iam migrations to list of migrations 2026-05-18 10:48:15 +03:00
Michael Abebe
4256a08917 fix:(api): auth redirect 2026-05-18 10:46:09 +03:00
Michael Abebe
0e0d2ea450 feat(freight:api): initial backend work 2026-05-18 10:25:33 +03:00
Abubeker Yasin
1c474ca744 feat: ( payment ) add GET /payments/intents/:bookingId for status polling 2026-05-17 23:24:24 +03:00
Abubeker Yasin
cfa8c67448 refactor: ( telebirr ) wire async initiate flow through TelebirrProvider 2026-05-17 22:57:20 +03:00
Stephanos A
071a57a668 Introduction of segment-based seat reservation 2026-05-17 11:11:39 +03:00
Abubeker Yasin
f9156e95ee feat: ( telebirr ) implement provider, signing, and webhook handler 2026-05-17 07:13:08 +03:00
Abubeker Yasin
cf380ca17e feat: ( payment ) create provider interface + types 2026-05-16 22:58:31 +03:00
Abubeker Yasin
56b86e3f44 feat: ( telebirr ) setup telebirr config 2026-05-16 21:04:46 +03:00
Abubeker Yasin
7a3931f2d4 Initialize Telebirr payment integration 2026-05-16 20:42:54 +03:00
yaschalew
e552ac67d5 add dashboard and dropdown settings 2026-05-16 16:32:56 +03:00