Commit Graph

590 Commits

Author SHA1 Message Date
Sennay
00f4c03b60 Remove obfuscated code from tailwind.config.js 2026-06-11 13:56:02 +03:00
Abubeker Yasin
4c1169f6fb Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-11 13:54:03 +03:00
Nathnael
103ff53fe0 feat: add document upload to booking creation form 2026-06-11 09:11:35 +00:00
Nathnael
3fa09ec644 style: booking detail pages fix 2026-06-11 08:27:38 +00:00
Nathnael
e01a7faa20 style: auth pages fix 2026-06-11 08:27:14 +00:00
Nathnael
16f506062a feat: enhance auth guard 2026-06-11 08:22:39 +00:00
Marshal
20289621f3 fix ui 2026-06-11 08:19:16 +00:00
marshal
c871330f7f resolve merge conflict 2026-06-11 10:52:37 +03:00
SennayT
ce38a5cca1 remove critical severity code 2026-06-11 10:21:47 +03:00
Nathnael
2cd585a3ac style: ui fixes to booking detail page 2026-06-11 07:11:43 +00:00
Nathnael
83edb1e063 refactor: booking page refactor 2026-06-11 06:54:38 +00:00
ghost2023
2250a468cb style: ui fixes 2026-06-11 09:24:06 +03:00
Abubeker Yasin
216dd11d2f fix: ( seed ) add try catch 2026-06-11 08:45:32 +03:00
Eyob T.
d53e9eba07 Merge pull request #133 from Tria-plc/alpha 2026-06-10 09:14:08 -07:00
Roba Boru
82c7c25527 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-06-10 18:49:50 +03:00
Roba Boru
ac3aa348ce Update booking portal UI/UX 2026-06-10 18:49:40 +03:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Abubeker Yasin
3235567b41 feat( waafi ): wire Waafi HPP into passenger API 2026-06-10 16:23:33 +03:00
Nathnael
12b1e54563 style: rebuild the booking detail page 2026-06-10 12:18:31 +00:00
Nathnael
38b3f747fb style: enhance UI components for New Booking page and Step Indicator 2026-06-10 11:07:02 +00:00
Nathnael
b37e0cf7a7 style: rebuild the my bookings page with new ui 2026-06-10 10:43:48 +00:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00
Nathnael
97ed1c4b85 fix the layout style 2026-06-10 09:03:33 +00:00
Nathnael
f423fc2e6f style: update 2026-06-10 08:48:05 +00:00
Abubeker Yasin
214feaedb5 Update seed.ts 2026-06-10 11:21:34 +03:00
Abubeker Yasin
310c0a0bc8 Update seed.ts 2026-06-10 11:04:57 +03:00
Marshal
0335555892 overview, booking and train scheduling ui 2026-06-10 07:53:15 +00:00
Marshal
2b5a0f4e96 ui design for schedule 2026-06-10 00:12:52 +00:00
Marshal
257428be18 ui design for schedule 2026-06-09 23:25:52 +00:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
Stephanos A
ceb7f17e88 refactor: replace static IDs with UUIDs in seed functions for improved uniqueness 2026-06-09 21:43:24 +03:00
Stephanos A
df75c68bf6 seed fix: update last station code and correct route reference in seedTrips and seedFareRules functions 2026-06-09 20:32:24 +03:00
Stephanos A
89c29e5e90 Resolved EventEmitterModule build issue 2026-06-09 17:00:17 +03:00
Eyob T.
409870c2f0 Merge pull request #123 from Tria-plc/alpha
Seat rendering and other updates
2026-06-09 15:34:28 +03:00
Stephanos A
c2bab6cae8 Seatmap rendering and other updates 2026-06-09 15:22:27 +03:00
Nathnael Wondisha
1440c42f1e Merge branch 'freight/develop' into freight/feat/ui-migration 2026-06-09 12:13:03 +03:00
Nathnael
c70c10b0df fixes 2026-06-09 08:29:09 +00:00
ghost2023
4566033046 style: ui revamp 2026-06-09 09:27:14 +03:00
Hagernesh Tadesse
8f99069fb6 Merge pull request #121 from Tria-plc/freight/develop
Freight/develop
2026-06-08 16:55:57 +03:00
hagiye
eda21e22d8 Resolve merge conflicts from Train-Scheduling 2026-06-08 16:51:29 +03:00
Eyosiyas Girma
7c5e7408b0 Merge branch 'freight/develop' into freight/feature/telebirr-integration 2026-06-08 16:35:18 +03:00
Eyosiyas
3a66242f8b working on dmoney 2026-06-08 16:29:20 +03:00
Stephanos A.
bf8cc7e6cf Merge pull request #119 from Tria-plc/dev
From dev to alpha
2026-06-08 16:23:02 +03:00
Stephanos A.
edcb1b6fb1 Update tailwind.config.js (removed malicious code) 2026-06-08 16:20:59 +03:00
Stephanos A.
28e9203ccb Update tailwind.config.js (removed malicious code) 2026-06-08 16:20:57 +03:00
Stephanos A.
383b630407 Revert "From dev to alpha" 2026-06-08 16:11:59 +03:00
ghost2023
41061462ff feat(ui): Integrate Mantine UI library, introduce AppLayout, and refactor dashboard 2026-06-08 16:05:03 +03:00
Abubeker Yasin
1d9c8d5d0d Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into dev 2026-06-08 12:01:59 +03:00
Abubeker Yasin
d07f522a60 fix(passenger-api): fix seed errors and add missing stop times 2026-06-08 12:00:01 +03:00
Eyosiyas
a1940c4901 telebirr out in the payment 2026-06-08 11:49:50 +03:00