Commit Graph

87 Commits

Author SHA1 Message Date
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
yaschalew10
a470244f06 Merge pull request #28 from Tria-plc/freight/feature/bootstrap_backoffice
Freight/feature/bootstrap backoffice
2026-05-22 18:03:07 +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
Nathnael Wondisha
5c0d44ed7c Merge pull request #27 from Tria-plc/freight/feature/dynamic-dropdown
Implemented the dynamic dropdown
2026-05-22 17:34:36 +03:00
ghost2023
bf4d9550f1 feat: implemented dynamic select 2026-05-22 17:32:35 +03:00
ghost2023
724a99a2fc chore: add the dropdown service to the api repo 2026-05-22 17:31:26 +03:00
Nathnael Wondisha
5b926293a0 Merge pull request #26 from Tria-plc/freight/feature/rebuild_booking_form
Freight/feature/rebuild booking form
2026-05-22 17:19:36 +03:00
ghost2023
1949bed303 fix: the muliple wagon validation 2026-05-22 17:18:43 +03:00
ghost2023
80db8f11df refactor 2026-05-22 17:18:43 +03:00
Michael Abebe
2c9ca6f16b feat(freight:backoffice): added basic frontend integration with auth(login) page 2026-05-22 17:15:46 +03:00
Nathnael Wondisha
87f66a2f92 Merge pull request #25 from Tria-plc/freight/feature/rebuild_booking_form
Freight/feature/rebuild booking form
2026-05-22 15:53:39 +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
4691f5ad3f feat: enhance the new booking form with RHC 2026-05-22 15:43:20 +03:00
ghost2023
6287022a53 style: improve the switch component 2026-05-22 15:42:56 +03:00
ghost2023
e9362abecd feat(bookings): Rework New Booking flow to support cargo type selection 2026-05-22 11:38:22 +03:00
ghost2023
37916a0cae chore: add switch component from shadcn to ui-common 2026-05-22 11:37:24 +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
ghost2023
9fbe27e634 chore: add field component from shadcn to ui-common 2026-05-22 10:45:13 +03:00
ghost2023
74333e5e42 fix: incorrect NewBookingPage 2026-05-22 10:36:44 +03:00
Nathnael Wondisha
f9a9d9923c Merge pull request #23 from Tria-plc/freight/feature/rebuild_booking_form
style: rebuild the new booking portal based on the US
2026-05-21 17:12:42 +03:00
ghost2023
509e1f0611 style: rebuild the new booking portal based on the US 2026-05-21 17:07:15 +03:00
Nathnael Wondisha
c0b97cdf3c Merge pull request #19 from Tria-plc/nati-branch
Fix import
2026-05-21 10:39:42 +03:00
ghost2023
74559bb7e6 fix 2026-05-21 10:08:02 +03:00
ghost2023
8ccd4f96a1 fix 2026-05-21 10:02:28 +03:00
yaschalew10
41e15437ec Merge pull request #18 from Tria-plc/feature/file_settings
customer registration api integration
2026-05-21 02:23:51 +03:00
yaschalew
c7347b88d7 customer registration api integration 2026-05-21 02:21:32 +03:00
yaschalew10
db9a1347e8 Merge pull request #17 from Tria-plc/feature/file_settings
improve endpoints
2026-05-21 01:14:07 +03:00
yaschalew
fea308a6af improve endpoints 2026-05-21 01:11:51 +03:00
Nathnael Wondisha
3150da2671 Merge pull request #16 from Tria-plc/forms
feat: build a global smart file input field
2026-05-20 16:41:21 +03:00
ghost2023
2a1cb9ebd9 refactor(api client): reuse the existing services instead 2026-05-20 16:40:19 +03:00
Nathnael Wondisha
c34a456880 Merge pull request #15 from Tria-plc/forms
feat: build a global smart file input field
2026-05-20 16:38:01 +03:00
ghost2023
028cf2aea8 feat: implement better api service 2026-05-20 16:35:03 +03:00
ghost2023
995030a72c feat: build a global smart file input field 2026-05-20 16:08:38 +03:00
Nathnael Wondisha
678a50a0e1 Merge pull request #14 from Tria-plc/ui-comps
Most theming setted up
2026-05-20 14:36:23 +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
ghost2023
e1aa01724f style: add components 2026-05-20 12:03:15 +03:00
Nathnael Wondisha
0317d083c6 Merge pull request #13 from Tria-plc/ui-comps
UI comps
2026-05-20 11:41:25 +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
ghost2023
b9ef5a2b46 style: finish based global them 2026-05-20 11:35:00 +03:00
yaschalew10
25d1eb4f01 Merge pull request #12 from Tria-plc/feat/customer_registration
Feat/customer registration
2026-05-20 08:29:37 +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
ghost2023
f9b96c143e chore(style): setup shadcn components 2026-05-19 16:50:40 +03:00