Commit Graph

4951 Commits

Author SHA1 Message Date
SennayT
ef54be5125 add deployment documentation and checkpoint file 2026-05-28 15:29:31 +03:00
SennayT
21bb1db104 run all apps in separate steps 2026-05-28 15:17:29 +03:00
SennayT
e5ffa91918 modify port mapping to read from env 2026-05-28 14:26:46 +03:00
SennayT
4b8f1b3ab1 use PORT for freight api 2026-05-28 14:19:08 +03:00
SennayT
7608cfb9e9 use PORT for freight api 2026-05-28 14:17:10 +03:00
Sennay
8492b29b7e Merge pull request #47 from Tria-plc/feat/improve-buid-pipeline
Feat/improve buid pipeline
2026-05-28 14:13:58 +03:00
SennayT
37c13ee7e1 move deployment to dev branch 2026-05-28 14:12:32 +03:00
SennayT
af5f4cd038 change node version and modify docker compose 2026-05-28 14:03:49 +03:00
Sennay
e7bb4db4ce Merge branch 'dev' into feat/improve-buid-pipeline 2026-05-28 13:50:51 +03:00
SennayT
90eec499f9 modify deploy user for passenger 2026-05-28 13:45:32 +03:00
SennayT
e18811c76d modify deploy user 2026-05-28 13:34:31 +03:00
SennayT
2a93de138f move pipelines to one file 2026-05-28 13:33:09 +03:00
SennayT
d462ddaf29 modify environment location 2026-05-28 13:29:37 +03:00
SennayT
39954f6e67 modify branch name 2026-05-28 13:28:23 +03:00
SennayT
f79ff77925 add COMPOSE_PROJECT_NAME for each workflow 2026-05-28 13:01:52 +03:00
SennayT
342ccb63de modify pipeline to speed up deployment 2026-05-28 12:52:56 +03:00
yaschalew10
32e552e13b Merge pull request #46 from Tria-plc/freight_feature/booking/minio
add service-types and cargo-types CRUD modules with pagination, filtering
2026-05-28 12:06:16 +03:00
marshal
3b53042cf8 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:58:04 +03:00
marshal
ae7b9c2750 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:53:08 +03:00
marshal
e1d05d5475 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:52:29 +03:00
yaschalew10
39764c4418 Merge pull request #45 from Tria-plc/freight/feature/backoffice_permission_roles
Freight/feature/backoffice permission roles
2026-05-28 11:48:02 +03:00
Michael Abebe
c0fc66729b feat(freight:backoffice): Added employees page 2026-05-28 11:44:58 +03:00
marshal
429459ef29 add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:37:12 +03:00
marshal
d08bc6d3fe add service-types and cargo-types CRUD modules with pagination, filtering 2026-05-28 11:34:24 +03:00
Sennay
695ef3c27b Merge pull request #44 from Tria-plc/alpha
Alpha
2026-05-28 11:28:28 +03:00
Michael Abebe
6841c3f4d8 feat(freight:backoffice): group roles by apps 2026-05-28 10:57:20 +03:00
Michael Abebe
2ccbfe324f feat(freight:backoffice): Added permissions and roles pages under user-management dashboard 2026-05-28 10:44:41 +03:00
yaschalew10
2e9a93d9e2 Merge pull request #43 from Tria-plc/freight_feature/booking/minio
allow customers booking
2026-05-28 10:37:24 +03:00
marshal
6d49c38f48 allow customers booking 2026-05-28 10:31:31 +03:00
Stephanos A.
c838e77349 fix: add missing properties to IStation interface
- Add 'country' property to match shared types package
- Add 'createdAt' property to match shared types package
- Add 'updatedAt' property to match shared types package

This fixes the TypeScript type mismatch error in StationsPage.tsx where
the local IStation type was missing properties required by the shared
@edr/types/passenger package during the Docker build.

Fixes: https://github.com/Tria-plc/edr-platform/actions/runs/26325256104/job/77502650459
2026-05-28 10:13:11 +03:00
yaschalew10
49a746b272 Merge pull request #42 from Tria-plc/freight/feature/user_registration
Freight/feature/user registration
2026-05-28 08:45:48 +03:00
yaschalew
217069fb74 fix conflict 2026-05-28 08:44:26 +03:00
yaschalew
4bacbaa96c add route 2026-05-28 08:41:12 +03:00
robiman
939b2718d3 Merge pull request #41 from Tria-plc/dev
Fare engine and hold seat implementation
2026-05-27 19:37:04 +03:00
Abubeker Yasin
d4bf9b457c Merge branch 'feat/veriFayda-integration' into alpha 2026-05-27 19:34:22 +03:00
Roba Boru
b9ca90bb9c Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-27 19:32:45 +03:00
Roba Boru
2ceb993c60 Segment based seat assignement added 2026-05-27 15:11:23 +03:00
Abubeker Yasin
78cf8e7cbb feat: ( fayda ) add the fayda variables 2026-05-27 11:31:44 +03:00
Abubeker Yasin
4e500700ec feat(fayda): add fayda verification endpoints and login-with-fayda 2026-05-26 17:28:50 +03:00
Roba Boru
3c6bd724f2 Get fare class on search 2026-05-26 16:54:52 +03:00
Roba Boru
db0af7cc00 Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-05-26 16:25:45 +03:00
Roba Boru
769294d12f Fare engine added 2026-05-26 16:25:24 +03:00
SennayT
671d24b81d fix: fix typerror on stations object 2026-05-26 15:02:38 +03:00
SennayT
a69031ccc1 add grouped argument to docker build 2026-05-26 15:02:37 +03:00
yaschalew10
ee80d597c1 Merge pull request #40 from Tria-plc/freight/feature/bootstrap_backoffice
Freight/feature/bootstrap backoffice
2026-05-26 14:49:49 +03:00
Michael Abebe
cad3dd8e2d fix(freight:api): fixed removed seeder in merge 2026-05-26 13:47:58 +03:00
Michael Abebe
39c3f3cf43 Merge branch 'freight/develop' into freight/feature/bootstrap_backoffice 2026-05-26 13:37:34 +03:00
Michael Abebe
54b122bb3a feat(freight:backoffice): added position type 2026-05-26 13:35:49 +03:00
Michael Abebe
b487d47055 feat(freight:backoffice): migrated smart-office user-management 2026-05-26 12:50:40 +03:00
Abubeker Yasin
ac55c0cebc feat(passenger-api): expose fayda verification endpoints and wire into app 2026-05-26 12:02:46 +03:00