From 02e16d259956a669cde25f1963c26b656c5f1e0a Mon Sep 17 00:00:00 2001 From: Loup Theron Date: Thu, 5 Dec 2024 10:57:27 +0100 Subject: [PATCH 1/2] Use flexbox --- frontend/src/auth/components/Login.tsx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/src/auth/components/Login.tsx b/frontend/src/auth/components/Login.tsx index 235dfeaae2..09f4cf1a9b 100644 --- a/frontend/src/auth/components/Login.tsx +++ b/frontend/src/auth/components/Login.tsx @@ -50,7 +50,7 @@ export function Login() { {!!auth?.isLoading || isLoading ? ( ) : ( -
+ <> MonitorFish
+ )} {auth?.error &&
Oops... {auth.error?.message}
} @@ -79,12 +79,11 @@ export function Login() { const Warning = styled.p` max-width: 600px; font-style: italic; - bottom: 120px; - position: absolute; - left: 50%; - transform: translateX(-50%); + height: 130px; background-color: #8aa4bd; padding: 32px; + margin-top: auto; + margin-bottom: 6vh; ` const WarningHeader = styled.span` @@ -93,6 +92,7 @@ const WarningHeader = styled.span` ` const Head = styled.div` + margin-top: 40vh; margin-bottom: 16px; font-size: 32px; font-weight: 800; @@ -100,21 +100,21 @@ const Head = styled.div` ` const Footer = styled.div` - bottom: 16px; - position: absolute; - left: 50%; - transform: translateX(-50%); background-color: #8aa4bd; padding: 8px; + height: 34px; + margin-bottom: 0; ` export const LoginBackground = styled.div` font-size: 13px; text-align: center; width: 100vw; - padding-top: 40vh; height: 100vh; overflow: hidden; + display: flex; + flex-direction: column; + align-items: center; background: url('landing_background.png') no-repeat center center fixed; -webkit-background-size: cover; From 9808b4ac950a632f6c610bcac2a4361370cb7c87 Mon Sep 17 00:00:00 2001 From: Loup Theron Date: Thu, 5 Dec 2024 10:58:48 +0100 Subject: [PATCH 2/2] Remove unwanted commit --- .../repositories/interfaces/DBLogbookReportRepository.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt index 6b11eefd82..ed7a3562ef 100644 --- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt +++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBLogbookReportRepository.kt @@ -343,8 +343,6 @@ interface DBLogbookReportRepository : SELECT * FROM logbook_reports WHERE referenced_report_id IN (select report_id FROM dat_cor) - AND operation_datetime_utc + INTERVAL '1 day' >= :startDate - AND operation_datetime_utc - INTERVAL '1 day' <= :endDate AND operation_type = 'RET' AND NOT is_test_message )