From 2c5eda15e639672e4b0f50911739b1ced26b3b94 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sat, 7 Oct 2023 10:04:39 +0200 Subject: [PATCH 1/2] fix(styles): Move custom styles to globals Signed-off-by: Helio Chissini de Castro --- src/components/AddAdditionalRoles.tsx | 10 +- src/components/AddKeyValue.tsx | 6 +- .../ReleaseRepository/ReleaseRepository.tsx | 115 +++++++++--------- src/css/AddKeyValue.module.css | 31 ----- src/css/AddProjects.module.css | 65 ---------- src/styles/globals.css | 14 +++ 6 files changed, 80 insertions(+), 161 deletions(-) delete mode 100644 src/css/AddKeyValue.module.css delete mode 100644 src/css/AddProjects.module.css diff --git a/src/components/AddAdditionalRoles.tsx b/src/components/AddAdditionalRoles.tsx index 8e5a7bb61..0cc4d1d33 100644 --- a/src/components/AddAdditionalRoles.tsx +++ b/src/components/AddAdditionalRoles.tsx @@ -7,13 +7,13 @@ // SPDX-License-Identifier: EPL-2.0 // License-Filename: LICENSE -import styles from '@/css/AddKeyValue.module.css' import { FaTrashAlt } from 'react-icons/fa' -import DocumentTypes from '@/object-types/enums/DocumentTypes' -import { RolesType } from '@/object-types/RolesType' import { useTranslations } from 'next-intl' + import { COMMON_NAMESPACE } from '@/object-types/Constants' -import InputKeyValue from '@/object-types/InputKeyValue' +import { InputKeyValue } from '@/object-types' +import { RolesType } from '@/object-types/RolesType' +import DocumentTypes from '@/object-types/enums/DocumentTypes' interface Props { documentType?: string @@ -52,7 +52,7 @@ export default function AddAdditionalRolesComponent({ documentType, setDataRoles return ( <> -
+

{t('Additional Roles')}

diff --git a/src/components/AddKeyValue.tsx b/src/components/AddKeyValue.tsx index b50762fb1..8cf8ca048 100644 --- a/src/components/AddKeyValue.tsx +++ b/src/components/AddKeyValue.tsx @@ -8,10 +8,10 @@ // License-Filename: LICENSE import React from 'react' -import styles from '@/css/AddKeyValue.module.css' import { FaTrashAlt } from 'react-icons/fa' + import { AddtionalDataType } from '@/object-types/AddtionalDataType' -import InputKeyValue from '@/object-types/InputKeyValue' +import { InputKeyValue } from '@/object-types' interface Props { header: string @@ -51,7 +51,7 @@ export default function AddKeyValueComponent(props: Props) { return ( <> -
+

{props.header}

diff --git a/src/components/ReleaseRepository/ReleaseRepository.tsx b/src/components/ReleaseRepository/ReleaseRepository.tsx index 2290880bb..eff3868e2 100644 --- a/src/components/ReleaseRepository/ReleaseRepository.tsx +++ b/src/components/ReleaseRepository/ReleaseRepository.tsx @@ -9,9 +9,10 @@ // License-Filename: LICENSE 'use client' -import styles from '@/css/AddKeyValue.module.css' + import React from 'react' import { useTranslations } from 'next-intl' + import { COMMON_NAMESPACE } from '@/object-types/Constants' import ReleasePayload from '@/object-types/ReleasePayload' import ShowInfoOnHover from '../ShowInfoOnHover/ShowInfoOnHover' @@ -37,67 +38,67 @@ const ReleaseRepository = ({ releasePayload, setReleasePayload }: Props) => { return ( <>
-
+

{t('Release Repository')}

-
- - -
- - {t('Learn more about repository types')}. -
-
-
- - handleInputChange(e)} - /> +
+ + +
+ + {t('Learn more about repository types')}.
+
+ + handleInputChange(e)} + /> +
+
) diff --git a/src/css/AddKeyValue.module.css b/src/css/AddKeyValue.module.css deleted file mode 100644 index 5a01e3b30..000000000 --- a/src/css/AddKeyValue.module.css +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copyright (C) Siemens AG, 2023. Part of the SW360 Frontend Project. - - This program and the accompanying materials are made - available under the terms of the Eclipse Public License 2.0 - which is available at https://www.eclipse.org/legal/epl-2.0/ - - SPDX-License-Identifier: EPL-2.0 - License-Filename: LICENSE -*/ - -.button-plain, -.button-plain:focus, -.button-plain:active { - border-color: #dbdce4 !important; - color: #6b6c7e !important; - background-color: white !important; -} -.button-plain:hover { - border-color: #dbdce4 !important; - color: black !important; - background-color: #f8f9fa !important; -} - -.header { - background-color: #5D8EA9; - color: white; - margin-top: 10px; - margin-bottom: 20px; - margin-left: 12px; -} diff --git a/src/css/AddProjects.module.css b/src/css/AddProjects.module.css deleted file mode 100644 index 208938922..000000000 --- a/src/css/AddProjects.module.css +++ /dev/null @@ -1,65 +0,0 @@ -/* - Copyright (C) Siemens AG, 2023. Part of the SW360 Frontend Project. - - This program and the accompanying materials are made - available under the terms of the Eclipse Public License 2.0 - which is available at https://www.eclipse.org/legal/epl-2.0/ - - SPDX-License-Identifier: EPL-2.0 - License-Filename: LICENSE -*/ - -.link-sidebar { - background-color: white !important; - color: #6b6c7e !important; -} - -.button, -.button:focus, -.button:active { - background-color: #f28809 !important; - border-color: #dbdce4 !important; - color: black !important; -} -.button:hover { - background-color: #f28809 !important; - border-color: #dbdce4 !important; - color: white !important; -} - -.button-plain, -.button-plain:focus, -.button-plain:active { - border-color: #dbdce4 !important; - color: #6b6c7e !important; - background-color: white !important; -} -.button-plain:hover { - border-color: #dbdce4 !important; - color: black !important; - background-color: #f8f9fa !important; -} - -.header { - background-color: #5D8EA9; - color: white; - margin-top: 10px; - margin-left: 12px; -} - -.list-group-item-action { - background-color: white !important; - color: #6b6c7e !important; -} - -.list-group-item-action:hover { - border-color: #dbdce4 !important; - color: #6b6c7e !important; - background-color: #edcaa0 !important; -} - -.sidebar-active { - border-color: #dbdce4 !important; - color: #000000 !important; - background-color: #e89734 !important; -} diff --git a/src/styles/globals.css b/src/styles/globals.css index 5d11288c1..9e5271fe9 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -52,6 +52,8 @@ code { } .header { + background-color: #5d8ea9; + color: white; padding-left: 3%; padding-right: 3%; padding-top: 1rem; @@ -364,6 +366,7 @@ th { } .list-group-item-action { + background-color: white !important; color: #6b6c7e !important; } @@ -445,6 +448,17 @@ th { background-color: #f8f9fa !important; } +.sidebar-active { + border-color: #dbdce4 !important; + color: #000000 !important; + background-color: #e89734 !important; +} + +.link-sidebar { + background-color: white !important; + color: #6b6c7e !important; +} + .label { font-weight: bold; } From b39f29d9e6b72e4b290a86dd922ee4912a7abf06 Mon Sep 17 00:00:00 2001 From: Helio Chissini de Castro Date: Sat, 7 Oct 2023 10:05:20 +0200 Subject: [PATCH 2/2] feat(docker): Update to Node 20 in Docker Signed-off-by: Helio Chissini de Castro --- .devcontainer/Dockerfile | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c82da4c76..ff7c84ed8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,7 +7,7 @@ # SPDX-License-Identifier: EPL-2.0 # License-Filename: LICENSE -ARG VARIANT=19-bullseye-slim +ARG VARIANT=20-bullseye-slim FROM node:${VARIANT} ARG USERNAME=devel diff --git a/Dockerfile b/Dockerfile index 54f25167f..07da8fb0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ # SPDX-License-Identifier: EPL-2.0 # License-Filename: LICENSE -ARG VARIANT=19-alpine +ARG VARIANT=20-alpine FROM node:${VARIANT} as build WORKDIR /frontend