48 Commits

Author	SHA1	Message	Date
Michael Abebe	4ae83896d3	dep(freight): iam module upgrade	2026-06-06 10:43:17 +03:00
Michael Abebe	c31d87fc35	dep(freight): updated iam imports	2026-06-06 09:45:00 +03:00
hagiye	55e6ca4a3f	Merge branch 'freight/develop' of https://github.com/Tria-plc/edr-platform into feature/trains-management	2026-06-05 21:07:36 +03:00
hagiye	dc42838a43	Trains management CRUD issues solved	2026-06-05 21:07:04 +03:00
Nathnael Wondisha	4a0dee9b7b	Merge pull request #97 from Tria-plc/freight/feat/booking-pricing ... Booking request approval ui	2026-06-05 15:02:24 +03:00
hagiye	9676a6bb56	resolve conflict	2026-06-05 14:17:48 +03:00
hagiye	c3e92dbe70	resolve conflict	2026-06-05 14:13:35 +03:00
Eyosiyas Girma	03a997fad2	Merge branch 'freight/develop' into freight/feature/payment	2026-06-05 13:01:42 +03:00
Tria	c0dc9f5fc5	payment	2026-06-05 12:54:35 +03:00
ghost2023	6e4b70be34	chore: install date-fns	2026-06-05 11:28:43 +03:00
hagiye	b33517f47d	resolve conflict	2026-06-05 10:59:52 +03:00
hagiye	c66b57d599	Merge freight/develop into feature/trains-management	2026-06-05 10:21:39 +03:00
ghost2023	c7617b1b6e	chore: deps	2026-06-05 09:51:12 +03:00
hagiye	71ac89edc7	trains, wagons,containers and cargoes schema and API	2026-06-04 15:56:29 +03:00
marshal	324935a334	implement booking flow	2026-06-04 15:24:18 +03:00
marshal	125ee18308	implement booking flow	2026-06-04 15:16:27 +03:00
Tria	da10d067f8	multiple notification strategies	2026-06-03 16:17:36 +03:00
hagiye	d52a5715e0	Rate Matrix Rules user story	2026-06-02 10:47:36 +03:00
hagiye	3682bda85c	rule engine UI, services and API integration	2026-06-01 16:01:51 +03:00
hagiye	ccbc642075	rure engine	2026-05-30 11:19:40 +03:00
yaschalew	ac35218299	add docs settings to admin page	2026-05-29 16:50:55 +03:00
ghost2023	14f73f0c79	refactor(portal): Streamline client-side navigation with React Router Link components, refine global route handling, remove obsolete path definitions, and update project dependencies, including minor UI adjustments.	2026-05-28 16:45:10 +03:00
yaschalew	8a7a56766f	add onboarding	2026-05-26 10:15:59 +03:00
yaschalew	5a4d6baec2	user account create	2026-05-26 05:40:53 +03:00
mengstabketemaw	cf3869ef66	features: dynamic terminal components	2026-05-23 11:08:05 +03:00
mengstabketemaw	3485ef299d	fix local merge conflict	2026-05-23 10:52:31 +03:00
marshal	ecbf1f2408	mergefix	2026-05-23 09:38:19 +03:00
marshal	82c6b1284e	implement contract booking functionality and MinIO setup	2026-05-23 09:31:52 +03:00
Michael Abebe	2272255bef	Merge remote-tracking branch 'origin/freight/develop' into freight/feature/bootstrap_backoffice	2026-05-22 17:58:43 +03:00
Michael Abebe	27e2cfcf6b	feat(freight:backoffice): added login page and basic authorization	2026-05-22 17:55:20 +03:00
Michael Abebe	2c9ca6f16b	feat(freight:backoffice): added basic frontend integration with auth(login) page	2026-05-22 17:15:46 +03:00
ghost2023	c9bf3f6726	fix: react update to v19	2026-05-22 15:47:26 +03:00
ghost2023	3b2a0c6ffc	chore: packages	2026-05-22 15:44:21 +03:00
ghost2023	47bcc82c88	chore: install react-hook-form, zod and @hookform/resolvers to freight web portal	2026-05-22 10:47:12 +03:00
yaschalew	fea308a6af	improve endpoints	2026-05-21 01:11:51 +03:00
ghost2023	76dcc48a38	chore: update the react version for the frieght portal to 19	2026-05-20 13:48:09 +03:00
ghost2023	024871c127	chore: centralized the themeing and fix styles	2026-05-19 16:51:44 +03:00
Michael Abebe	881064eb98	Merge branch 'develop' into feat/add_auth_integration	2026-05-18 11:14:55 +03:00
Michael Abebe	0e0d2ea450	feat(freight:api): initial backend work	2026-05-18 10:25:33 +03:00
yaschalew	e552ac67d5	add dashboard and dropdown settings	2026-05-16 16:32:56 +03:00
yaschalew	b5fe2c2e3c	add ui for major components	2026-05-15 22:17:31 +03:00
Michael Abebe	f0b309b65c	dep(freight:api): added latest iamapi packages for api, docker compose dev for removed passenger	2026-05-15 16:25:39 +03:00
yaschalew	84f4f7edba	add customers page	2026-05-15 14:42:04 +03:00
Michael Abebe	f08f6b5209	fix(portal:auth): fixed styling from @tria-plc/iamui-common just rendering	2026-05-15 11:17:03 +03:00
Michael Abebe	7340d00827	feat: integrated login page and tailwind	2026-05-13 14:43:36 +03:00
Michael Abebe	5618df7bb4	fix: pnpm module issue fixed	2026-05-12 17:25:30 +03:00
Michael Abebe	516bbbb42b	chore: fixed pnpm install issues, regarding package versions	2026-05-12 16:09:25 +03:00
Muluhabt	3b8b6979db	Project Initialization	2026-05-12 15:17:16 +03:00