diff --git a/config.yaml b/config.yaml index 5ef5f93..039c8fe 100644 --- a/config.yaml +++ b/config.yaml @@ -145,6 +145,7 @@ views: - web/layouts/vehicles_management/overview.html bookings_list: files: + - web/layouts/vehicles_management/_partials/booking_filters.html - web/layouts/vehicles_management/_partials/bookings-list.html - web/layouts/vehicles_management/bookings-list.html fleet_add: @@ -359,6 +360,7 @@ views: - web/layouts/administration/vehicles_stats.html bookings_list: files: + - web/layouts/vehicles_management/_partials/booking_filters.html - web/layouts/administration/_partials/bookings_list.html - web/layouts/administration/bookings_stats.html settings: @@ -393,6 +395,7 @@ icons: svg: coopgo:parcoursmob/monogram: hero:outline/archive-box: + hero:outline/archive-box-x-mark: hero:outline/arrow-long-right: hero:outline/arrow-path-rounded-square: hero:outline/briefcase: diff --git a/web/layouts/administration/bookings_stats.html b/web/layouts/administration/bookings_stats.html index 94036de..93677c1 100644 --- a/web/layouts/administration/bookings_stats.html +++ b/web/layouts/administration/bookings_stats.html @@ -5,33 +5,29 @@
- +
-
- - - +
+{{template "vehicle_booking_filters" .}} + {{template "bookings_list" .}} {{end}} diff --git a/web/layouts/beneficiaries/_partials/beneficiary-files.html b/web/layouts/beneficiaries/_partials/beneficiary-files.html index b8044b5..62e51b4 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-files.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-files.html @@ -65,9 +65,20 @@ x-data="{ {{.Metadata.Name}} {{.LastModified.Format "02/01/2006"}} - - - +
+ + + + +
{{end}} diff --git a/web/layouts/beneficiaries/list.html b/web/layouts/beneficiaries/list.html index c16c4d0..e6b8a9f 100644 --- a/web/layouts/beneficiaries/list.html +++ b/web/layouts/beneficiaries/list.html @@ -14,6 +14,15 @@ Exporter + {{if .ViewState.Archived}} + + + + {{else}} + {{end}} - +
+ + + + +
{{end}} diff --git a/web/layouts/solidarity_transport/_partials/driver_documents.html b/web/layouts/solidarity_transport/_partials/driver_documents.html index b3d5756..4d6d29e 100644 --- a/web/layouts/solidarity_transport/_partials/driver_documents.html +++ b/web/layouts/solidarity_transport/_partials/driver_documents.html @@ -66,9 +66,20 @@ x-data="{ {{.Metadata.Name}} {{.LastModified.Format "02/01/2006"}} - - - +
+ + + + +
{{end}} diff --git a/web/layouts/vehicles_management/_partials/booking_filters.html b/web/layouts/vehicles_management/_partials/booking_filters.html new file mode 100644 index 0000000..123395b --- /dev/null +++ b/web/layouts/vehicles_management/_partials/booking_filters.html @@ -0,0 +1,41 @@ +{{ define "vehicle_booking_filters" }} +
+
+ +
+ +
+
+ +
+ + +
+
+
+ +
+ +
+ + +
+
+ +
+ +
+ +
+ +
+
+{{ end }} diff --git a/web/layouts/vehicles_management/bookings-list.html b/web/layouts/vehicles_management/bookings-list.html index 32cfafc..5068b9d 100644 --- a/web/layouts/vehicles_management/bookings-list.html +++ b/web/layouts/vehicles_management/bookings-list.html @@ -5,11 +5,11 @@
- +
- - + +
+{{template "vehicle_booking_filters" .}} + {{template "bookings_list" .}} -{{end}} \ No newline at end of file +{{end}} diff --git a/web/public/css/main.css b/web/public/css/main.css index eac0205..5efb1f4 100644 --- a/web/public/css/main.css +++ b/web/public/css/main.css @@ -6,9 +6,11 @@ "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + --color-red-50: oklch(0.971 0.013 17.38); --color-red-100: oklch(0.936 0.032 17.717); --color-red-500: oklch(0.637 0.237 25.331); --color-red-600: oklch(0.577 0.245 27.325); + --color-red-700: oklch(0.505 0.213 27.518); --color-red-800: oklch(0.444 0.177 26.899); --color-red-900: oklch(0.396 0.141 25.723); --color-orange-50: oklch(0.98 0.016 73.684); @@ -2552,6 +2554,9 @@ .text-red-600 { color: var(--color-red-600); } + .text-red-700 { + color: var(--color-red-700); + } .text-red-800 { color: var(--color-red-800); } @@ -3207,6 +3212,20 @@ } } } + .hover\:bg-red-50 { + &:hover { + @media (hover: hover) { + background-color: var(--color-red-50); + } + } + } + .hover\:bg-red-700 { + &:hover { + @media (hover: hover) { + background-color: var(--color-red-700); + } + } + } .hover\:bg-white { &:hover { @media (hover: hover) { @@ -3362,6 +3381,11 @@ --tw-ring-color: var(--color-indigo-500); } } + .focus\:ring-red-500 { + &:focus { + --tw-ring-color: var(--color-red-500); + } + } .focus\:ring-white { &:focus { --tw-ring-color: var(--color-white);