Commit Graph

62 Commits

Author SHA1 Message Date
yaschalew10
ab1dfe0c16 Merge pull request #38 from Tria-plc/freight_feature/booking/minio
implement file module and add files relation to booking entity and po…
2026-05-25 10:58:56 +03:00
marshal
9432814e3b implement file module and add files relation to booking entity and populate on fetch 2026-05-25 10:19:08 +03:00
ghost2023
dc41da3731 feat: wire up the create booking form 2026-05-23 11:54:13 +03:00
ghost2023
8a5652d7d9 feat(booking): Introduce comprehensive booking DTO, refine form validation, and enhance API docs 2026-05-23 11:21:17 +03:00
yaschalew10
a252b88dfb Merge pull request #36 from Tria-plc/freight/features/dynamic-terminal-component
Freight/features/dynamic terminal component
2026-05-23 11:13:24 +03:00
marshal
ae317540c1 feat(bookings): support multiple containers per booking via JSONB array 2026-05-23 11:08:35 +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
2064e6efda change the schema from public to freight 2026-05-23 10:00:40 +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
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
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
ghost2023
4691f5ad3f feat: enhance the new booking form with RHC 2026-05-22 15:43:20 +03:00
ghost2023
e9362abecd feat(bookings): Rework New Booking flow to support cargo type selection 2026-05-22 11:38:22 +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
74333e5e42 fix: incorrect NewBookingPage 2026-05-22 10:36:44 +03:00
ghost2023
509e1f0611 style: rebuild the new booking portal based on the US 2026-05-21 17:07:15 +03:00
ghost2023
74559bb7e6 fix 2026-05-21 10:08:02 +03:00
ghost2023
8ccd4f96a1 fix 2026-05-21 10:02: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
yaschalew
6aa8265bf5 update main color 2026-05-18 23:23:51 +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
yaschalew
e552ac67d5 add dashboard and dropdown settings 2026-05-16 16:32:56 +03:00