From 84617b1bcdd8f2f63b73bf05ee4eba9c000dd6b6 Mon Sep 17 00:00:00 2001 From: baudelotphilippe Date: Tue, 17 Sep 2024 10:44:11 +0200 Subject: [PATCH 01/18] change default color for card link --- daikoku/app/domain/tenantEntities.scala | 10 +++++----- daikoku/javascript/src/style/components/apicard.scss | 3 +++ daikoku/javascript/src/style/variables.scss | 4 ++-- daikoku/public/themes/dark.css | 6 +++--- daikoku/public/themes/light.css | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/daikoku/app/domain/tenantEntities.scala b/daikoku/app/domain/tenantEntities.scala index 33dad90d9..8eb588e9c 100644 --- a/daikoku/app/domain/tenantEntities.scala +++ b/daikoku/app/domain/tenantEntities.scala @@ -82,9 +82,9 @@ case class DaikokuStyle( --card_header-bg-color: #404040; --card_header-text-color: #fff; --card_bg-color: #282828; - --card_text-color: #fff; - --card_link-color: #b3b3b3; - --card_link-hover-color: orange; + --card_text-color: #fff; + --card_link-color: #97b0c7; + --card_link-hover-color : #a9cbea; --btn-bg-color: #fff; --btn-text-color: #495057; @@ -143,8 +143,8 @@ case class DaikokuStyle( --card_header-text-color: #fff; --card_bg-color: #282828; --card_text-color: #fff; - --card_link-color: #b3b3b3; - --card_link-hover-color: orange; + --card_link-color: #97b0c7; + --card_link-hover-color : #a9cbea; --btn-bg-color: #fff; diff --git a/daikoku/javascript/src/style/components/apicard.scss b/daikoku/javascript/src/style/components/apicard.scss index fb0f19f6d..7a90c7514 100644 --- a/daikoku/javascript/src/style/components/apicard.scss +++ b/daikoku/javascript/src/style/components/apicard.scss @@ -24,6 +24,9 @@ } #dropdownMenuButton { color: $card-link-color; + &:hover{ + color: $card-link-hover-color; + } } } diff --git a/daikoku/javascript/src/style/variables.scss b/daikoku/javascript/src/style/variables.scss index c218f85c5..fccf2ffd0 100644 --- a/daikoku/javascript/src/style/variables.scss +++ b/daikoku/javascript/src/style/variables.scss @@ -57,8 +57,8 @@ $card-header-bg-color : #{"var(--card_header-bg-color, #404040)"}; $card-header-text-color : #{"var(--card-header-text-color, #fff)"}; $card-bg-color: #{"var(--card_bg-color, #282828)"}; $card-text-color: #{"var(--card_text-color, #FFF)"}; -$card-link-color: #{"var(--card_link-color, #b3b3b3)"}; -$card-link-hover-color: #{"var(--card_link-hover-color, orange)"}; +$card-link-color: #{"var(--card_link-color, #97b0c7)"}; +$card-link-hover-color: #{"var(--card_link-hover-color, #a9cbea)"}; :export { successColor: $success-color; diff --git a/daikoku/public/themes/dark.css b/daikoku/public/themes/dark.css index 571d91b27..f65126777 100644 --- a/daikoku/public/themes/dark.css +++ b/daikoku/public/themes/dark.css @@ -28,9 +28,9 @@ --card_header-bg-color : #404040; --card_header-text-color: #fff; --card_bg-color: #282828; - --card_text-color: #fff; - --card_link-color: #ffe1a7; - --card_link-hover-color : #ffc107; + --card_text-color: #fff; + --card_link-color: #97b0c7; + --card_link-hover-color : #a9cbea; --btn-bg-color: #fff; --btn-text-color: #495057; diff --git a/daikoku/public/themes/light.css b/daikoku/public/themes/light.css index e70b6723b..5f4dcd531 100644 --- a/daikoku/public/themes/light.css +++ b/daikoku/public/themes/light.css @@ -29,8 +29,8 @@ --card_header-text-color: #fff; --card_bg-color: #282828; --card_text-color: #fff; - --card_link-color: #ffe1a7; - --card_link-hover-color : #ffc107; + --card_link-color: #97b0c7; + --card_link-hover-color : #a9cbea; --btn-bg-color: #fff; --btn-text-color: #495057; From 7ffe3b06c5954f65a009d4140be6fc2898fab306 Mon Sep 17 00:00:00 2001 From: baudelotphilippe Date: Tue, 17 Sep 2024 14:53:26 +0200 Subject: [PATCH 02/18] improve translation --- daikoku/javascript/src/locales/en/translation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daikoku/javascript/src/locales/en/translation.json b/daikoku/javascript/src/locales/en/translation.json index d55f947f9..186eebc61 100644 --- a/daikoku/javascript/src/locales/en/translation.json +++ b/daikoku/javascript/src/locales/en/translation.json @@ -1454,7 +1454,7 @@ "subscription.enable.button.label": "Enable subscription", "subscription.disable.button.label": "Disable subscription", "subscription.delete.button.label": "Delete", - "subscription.extract.button.label": "Extract from agg.", + "subscription.extract.button.label": "Extract from aggregate", "subscription.enable.label": "Enabled", "subscription.disable.label": "Disabled", "subscriptions.hide.link": "Hide link", From 4177014c9d6f858aaf0ddc718ed4a6a4284823e0 Mon Sep 17 00:00:00 2001 From: baudelotphilippe Date: Tue, 17 Sep 2024 14:54:20 +0200 Subject: [PATCH 03/18] improve api-subscription content display --- .../backoffice/apikeys/TeamApiKeysForApi.tsx | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/daikoku/javascript/src/components/backoffice/apikeys/TeamApiKeysForApi.tsx b/daikoku/javascript/src/components/backoffice/apikeys/TeamApiKeysForApi.tsx index e7c69fa2a..2e687a234 100644 --- a/daikoku/javascript/src/components/backoffice/apikeys/TeamApiKeysForApi.tsx +++ b/daikoku/javascript/src/components/backoffice/apikeys/TeamApiKeysForApi.tsx @@ -593,18 +593,13 @@ const ApiKeyCard = ({ return (
-
-
- {subscription.children.length === 0 && } - {subscription.children.length > 0 && - - } -
+
+
+ {subscription.children.length === 0 && !subscription.parent && } + {subscription.children.length === 0 && subscription.parent &&
} + {subscription.children.length > 0 && + } +
{subscription.enabled ? translate("subscription.enable.label") : translate("subscription.disable.label")}
{_customName}
{`${subscription.apiKey.clientId}:${subscription.apiKey.clientSecret}`}
-
+