Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(*): style, test and text #103

Merged
merged 1 commit into from
Oct 10, 2023
Merged

fix(*): style, test and text #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/KonnectCTA.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const link = 'https://konghq.com/products/kong-konnect/register?utm_medium=produ
.konnect-container {
display: flex;
justify-content: space-between;
overflow: auto;

.konnect-content {
flex-shrink: 0;
Expand Down Expand Up @@ -175,8 +176,6 @@ const link = 'https://konghq.com/products/kong-konnect/register?utm_medium=produ
}

.konnect-preview {
overflow: hidden;

.konnect-preview-screenshot {
width: 570px;
}
Expand Down
16 changes: 12 additions & 4 deletions src/pages/overview/Overview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@ const config = computed(() => ({
}))
const version = computed(() => gatewayConfig.GATEWAY_VERSION ? `${formatVersion(gatewayConfig.GATEWAY_VERSION)}.x` : 'latest')
const info = computed(() => {
const guiListeners = config.value.admin_gui_listeners
const nonSslGuiListener = guiListeners?.find?.(listener => !listener.ssl)
const sslGuiListener = guiListeners?.find?.(listener => listener.ssl)
const proxyListeners = config.value.proxy_listeners
const nonSslProxyListener = proxyListeners?.find?.(listener => !listener.ssl)
const sslProxyListener = proxyListeners?.find?.(listener => listener.ssl)

return [
{
title: t('overview.info.gateway.title'),
Expand Down Expand Up @@ -112,19 +119,19 @@ const info = computed(() => {
items: [
{
label: t('overview.info.port.port'),
value: config.value.admin_gui_listeners?.[0]?.port ?? '--',
value: nonSslGuiListener?.port ?? '--',
},
{
label: t('overview.info.port.ssl'),
value: config.value.admin_gui_listeners?.[1]?.port ?? '--',
value: sslGuiListener?.port ?? '--',
},
{
label: t('overview.info.port.proxy'),
value: config.value.proxy_listeners?.[0]?.port ?? '--',
value: nonSslProxyListener?.port ?? '--',
},
{
label: t('overview.info.port.proxy.ssl'),
value: config.value.proxy_listeners?.[1]?.port ?? '--',
value: sslProxyListener?.port ?? '--',
},
],
},
Expand Down Expand Up @@ -251,6 +258,7 @@ $card-spacing: 32px;
padding: 16px $kui-space-80;
text-decoration: none;
color: inherit;
height: 100%;

&:hover {
background-color: $kui-color-background-primary-weakest;
Expand Down
4 changes: 2 additions & 2 deletions src/stores/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export interface Info {
}
role?: 'traditional' | 'control_plane' | 'data_plane'
admin_listen?: string[]
admin_gui_listeners?: Array<{ port: number }>
proxy_listeners?: Array<{ port: number }>
admin_gui_listeners?: Array<{ port: number, ssl?: boolean }>
proxy_listeners?: Array<{ port: number, ssl?: boolean }>
pg_user?: string
pg_host?: string
pg_port?: number
Expand Down