From 758034f61a702067ff3746b712abe9716134ade7 Mon Sep 17 00:00:00 2001 From: Miska Kaipiainen Date: Sat, 11 Apr 2020 14:38:53 +0300 Subject: [PATCH] Clean up legacy references to Kontena (#216) Signed-off-by: Miska Kaipiainen --- .github/ISSUE_TEMPLATE/enhancement.md | 2 +- dashboard/client/api/endpoints/index.ts | 2 +- dashboard/client/browser-check.tsx | 2 +- dashboard/client/components/+nodes/nodes.scss | 4 ++-- .../components/+workloads-pods/pod-details-list.scss | 4 ++-- dashboard/client/components/ace-editor/ace-editor.scss | 2 +- dashboard/client/components/app-init/app-init.tsx | 2 +- dashboard/client/components/checkbox/checkbox.scss | 4 ++-- .../client/components/drawer/drawer-param-toggler.scss | 2 +- dashboard/client/components/drawer/drawer.scss | 2 +- .../client/components/error-boundary/error-boundary.tsx | 4 ++-- dashboard/client/components/layout/login-layout.scss | 2 +- dashboard/client/components/layout/sidebar.scss | 2 +- dashboard/client/components/slider/slider.scss | 8 ++++---- dashboard/client/themes/kontena-dark.json | 4 ++-- dashboard/client/themes/kontena-light.json | 4 ++-- dashboard/client/themes/theme-vars.scss | 4 ++-- dashboard/index.html | 2 +- dashboard/locales/en/messages.po | 4 ++-- dashboard/locales/ru/messages.po | 4 ++-- dashboard/package.json | 2 +- dashboard/server/config.ts | 2 +- dashboard/webpack.config.ts | 2 +- package.json | 2 +- src/main/menu.ts | 2 +- src/renderer/assets/css/custom.scss | 8 ++++---- src/renderer/components/BottomBar/BottomBar.vue | 2 +- .../ClusterSettings/Features/Components/Metrics.vue | 2 +- .../components/ClusterSettings/Preferences/index.vue | 2 +- src/renderer/components/LandingPage.vue | 2 +- src/renderer/components/PreferencesPage.vue | 2 +- src/renderer/components/WorkspacesPage.vue | 2 +- 32 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md index a38e3b934f..1b3bd32b59 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.md +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -5,7 +5,7 @@ labels: enhancement --- diff --git a/dashboard/client/api/endpoints/index.ts b/dashboard/client/api/endpoints/index.ts index 94059774f9..e3a893bb47 100644 --- a/dashboard/client/api/endpoints/index.ts +++ b/dashboard/client/api/endpoints/index.ts @@ -1,4 +1,4 @@ -// Local express.js & kontena endpoints +// Local express.js endpoints export * from "./config.api" export * from "./cluster.api" export * from "./kubeconfig.api" diff --git a/dashboard/client/browser-check.tsx b/dashboard/client/browser-check.tsx index 51b85f2046..6b6e006c51 100644 --- a/dashboard/client/browser-check.tsx +++ b/dashboard/client/browser-check.tsx @@ -11,7 +11,7 @@ export function browserCheck() { Notifications.info(

- Your browser does not support all Kontena Lens features. {" "} + Your browser does not support all Lens features. {" "} Please consider using another browser.

diff --git a/dashboard/client/components/+nodes/nodes.scss b/dashboard/client/components/+nodes/nodes.scss index a7295d9c6b..0e0b0f82db 100644 --- a/dashboard/client/components/+nodes/nodes.scss +++ b/dashboard/client/components/+nodes/nodes.scss @@ -12,7 +12,7 @@ align-self: center; .LineProgress { - color: $kontenaBlue; + color: $lensBlue; } } @@ -21,7 +21,7 @@ align-self: center; .LineProgress { - color: $kontenaMagenta; + color: $lensMagenta; } } diff --git a/dashboard/client/components/+workloads-pods/pod-details-list.scss b/dashboard/client/components/+workloads-pods/pod-details-list.scss index f248cf376d..6b62607776 100644 --- a/dashboard/client/components/+workloads-pods/pod-details-list.scss +++ b/dashboard/client/components/+workloads-pods/pod-details-list.scss @@ -30,7 +30,7 @@ align-self: center; .LineProgress { - color: $kontenaBlue; + color: $lensBlue; } } @@ -38,7 +38,7 @@ align-self: center; .LineProgress { - color: $kontenaMagenta; + color: $lensMagenta; } } diff --git a/dashboard/client/components/ace-editor/ace-editor.scss b/dashboard/client/components/ace-editor/ace-editor.scss index 3186c2611b..8640130842 100644 --- a/dashboard/client/components/ace-editor/ace-editor.scss +++ b/dashboard/client/components/ace-editor/ace-editor.scss @@ -40,7 +40,7 @@ } .ace_constant { - color: $kontenaBlue !important; + color: $lensBlue !important; } .ace_keyword { diff --git a/dashboard/client/components/app-init/app-init.tsx b/dashboard/client/components/app-init/app-init.tsx index c3a332585b..fe46a8a6d5 100644 --- a/dashboard/client/components/app-init/app-init.tsx +++ b/dashboard/client/components/app-init/app-init.tsx @@ -38,7 +38,7 @@ export class AppInit extends React.Component { return (
-
Kontena Lens - {_i18n._(t`Loading`)}..
+
Lens - {_i18n._(t`Loading`)}..
{serviceWaitingList.length > 0 && (

{_i18n._(t`Waiting services to be running`)}: {serviceNames} diff --git a/dashboard/client/components/checkbox/checkbox.scss b/dashboard/client/components/checkbox/checkbox.scss index d0a69a0452..de2cdefe36 100644 --- a/dashboard/client/components/checkbox/checkbox.scss +++ b/dashboard/client/components/checkbox/checkbox.scss @@ -2,7 +2,7 @@ .Checkbox { --checkbox-color: #{$textColorPrimary}; // tick color [√] --checkbox-color-active: #{$contentColor}; - --checkbox-bgc-active: #{$kontenaBlue}; + --checkbox-bgc-active: #{$lensBlue}; flex-shrink: 0; @@ -11,7 +11,7 @@ // default } &-light { - --checkbox-color-active: #{$kontenaBlue}; + --checkbox-color-active: #{$lensBlue}; --checkbox-bgc-active: none; } } diff --git a/dashboard/client/components/drawer/drawer-param-toggler.scss b/dashboard/client/components/drawer/drawer-param-toggler.scss index 6c62810218..214c677707 100644 --- a/dashboard/client/components/drawer/drawer-param-toggler.scss +++ b/dashboard/client/components/drawer/drawer-param-toggler.scss @@ -7,7 +7,7 @@ cursor: pointer; .param-link-text { - color: $kontenaBlue; + color: $lensBlue; text-decoration: underline; } } diff --git a/dashboard/client/components/drawer/drawer.scss b/dashboard/client/components/drawer/drawer.scss index 69aa61f184..f0449f5519 100644 --- a/dashboard/client/components/drawer/drawer.scss +++ b/dashboard/client/components/drawer/drawer.scss @@ -51,7 +51,7 @@ } .drawer-title { - background: $kontenaBlue; + background: $lensBlue; color: $drawerTitleText; padding: $padding $padding * 2.5; word-break: break-all; diff --git a/dashboard/client/components/error-boundary/error-boundary.tsx b/dashboard/client/components/error-boundary/error-boundary.tsx index a88dcab3b3..378f381e36 100644 --- a/dashboard/client/components/error-boundary/error-boundary.tsx +++ b/dashboard/client/components/error-boundary/error-boundary.tsx @@ -38,8 +38,8 @@ export class ErrorBoundary extends React.Component { render() { const { error, errorInfo } = this.state; if (error) { - const slackLink = Kontena Slack - const githubLink = Kontena Github + const slackLink = Slack + const githubLink = Github const pageUrl = location.href; return (

diff --git a/dashboard/client/components/layout/login-layout.scss b/dashboard/client/components/layout/login-layout.scss index 0c21b5b640..228d192dad 100755 --- a/dashboard/client/components/layout/login-layout.scss +++ b/dashboard/client/components/layout/login-layout.scss @@ -10,7 +10,7 @@ margin: auto; svg * { - fill: $kontenaBlue; + fill: $lensBlue; } } diff --git a/dashboard/client/components/layout/sidebar.scss b/dashboard/client/components/layout/sidebar.scss index fabd7562d5..9e9ec63622 100644 --- a/dashboard/client/components/layout/sidebar.scss +++ b/dashboard/client/components/layout/sidebar.scss @@ -1,6 +1,6 @@ .Sidebar { $iconSize: 24px; - $activeBgc: $kontenaBlue; + $activeBgc: $lensBlue; $activeTextColor: $sidebarActiveColor; $itemSpacing: floor($unit / 2.6) floor($unit / 1.6); diff --git a/dashboard/client/components/slider/slider.scss b/dashboard/client/components/slider/slider.scss index fd1397ec65..4d7125eeaa 100644 --- a/dashboard/client/components/slider/slider.scss +++ b/dashboard/client/components/slider/slider.scss @@ -1,17 +1,17 @@ .Slider { .track { - background: $kontenaBlue; + background: $lensBlue; } .thumb { - background: $kontenaBlue; + background: $lensBlue; &.activated, &.jumped, &.focused { - box-shadow: 0 0 0 $unit * 2 rgba($kontenaBlue, 0.16)!important; + box-shadow: 0 0 0 $unit * 2 rgba($lensBlue, 0.16)!important; } &:hover{ - box-shadow: 0 0 0 $unit rgba($kontenaBlue, 0.16); + box-shadow: 0 0 0 $unit rgba($lensBlue, 0.16); } } } \ No newline at end of file diff --git a/dashboard/client/themes/kontena-dark.json b/dashboard/client/themes/kontena-dark.json index 86014b0683..7066b1670a 100644 --- a/dashboard/client/themes/kontena-dark.json +++ b/dashboard/client/themes/kontena-dark.json @@ -1,7 +1,7 @@ { - "name": "Kontena Dark", + "name": "Lens Dark Theme", "type": "dark", - "author": "Kontena, Inc.", + "author": "Lakend Labs", "colors": { "blue": "#3d90ce", "magenta": "#c93dce", diff --git a/dashboard/client/themes/kontena-light.json b/dashboard/client/themes/kontena-light.json index 932aec4cdf..b485676924 100644 --- a/dashboard/client/themes/kontena-light.json +++ b/dashboard/client/themes/kontena-light.json @@ -1,7 +1,7 @@ { - "name": "Kontena Light", + "name": "Lens Light Theme", "type": "light", - "author": "Kontena, Inc.", + "author": "Lakend Labs", "colors": { "blue": "#3d90ce", "magenta": "#c93dce", diff --git a/dashboard/client/themes/theme-vars.scss b/dashboard/client/themes/theme-vars.scss index ece8a72d94..5d9e0755fa 100644 --- a/dashboard/client/themes/theme-vars.scss +++ b/dashboard/client/themes/theme-vars.scss @@ -1,6 +1,6 @@ // Base colors -$kontenaBlue: var(--blue); -$kontenaMagenta: var(--magenta); +$lensBlue: var(--blue); +$lensMagenta: var(--magenta); $golden: var(--golden); $halfGray: var(--halfGray); $primary: var(--primary); diff --git a/dashboard/index.html b/dashboard/index.html index 43da68b60e..b841f2f177 100755 --- a/dashboard/index.html +++ b/dashboard/index.html @@ -2,7 +2,7 @@ - Kubernetes Dashboard / Kontena Lens + Lens - The Kubernetes IDE diff --git a/dashboard/locales/en/messages.po b/dashboard/locales/en/messages.po index f734d402c5..988a7d6493 100644 --- a/dashboard/locales/en/messages.po +++ b/dashboard/locales/en/messages.po @@ -26,8 +26,8 @@ msgid "<0>Filtered: {itemsCount} / {allItemsCount}" msgstr "<0>Filtered: {itemsCount} / {allItemsCount}" #: client/browser-check.tsx:11 -msgid "<0>Your browser does not support all Kontena Lens features. Please consider using another browser." -msgstr "<0>Your browser does not support all Kontena Lens features. Please consider using another browser." +msgid "<0>Your browser does not support all Lens features. Please consider using another browser." +msgstr "<0>Your browser does not support all Lens features. Please consider using another browser." #: client/components/dock/create-resource.tsx:56 msgid "<0>{0} successfully created" diff --git a/dashboard/locales/ru/messages.po b/dashboard/locales/ru/messages.po index aa1e50c43b..4a0590d0b0 100644 --- a/dashboard/locales/ru/messages.po +++ b/dashboard/locales/ru/messages.po @@ -27,8 +27,8 @@ msgid "<0>Filtered: {itemsCount} / {allItemsCount}" msgstr "<0>Отфильтровано: {itemsCount} / {allItemsCount}" #: client/browser-check.tsx:11 -msgid "<0>Your browser does not support all Kontena Lens features. Please consider using another browser." -msgstr "<0>Ваш браузер не поддерживает все возможности Kontena Lens. Пожалуйста рассмотрите использование другого современного браузера." +msgid "<0>Your browser does not support all Lens features. Please consider using another browser." +msgstr "<0>Ваш браузер не поддерживает все возможности Lens. Пожалуйста рассмотрите использование другого современного браузера." #: client/components/dock/create-resource.tsx:56 msgid "<0>{0} successfully created" diff --git a/dashboard/package.json b/dashboard/package.json index 032a62c9e8..1c41a2fa62 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1,5 +1,5 @@ { - "name": "kontena-lens", + "name": "lens-app-dashboard", "version": "0.0.0", "scripts": { "dev": "webpack-cli --watch --cache --progress --output-path ../static/build/client/", diff --git a/dashboard/server/config.ts b/dashboard/server/config.ts index b84b9265e1..9a3bf3d387 100644 --- a/dashboard/server/config.ts +++ b/dashboard/server/config.ts @@ -43,7 +43,7 @@ export const config = { USER_MANAGEMENT_ENABLED: JSON.parse(process.env.USER_MANAGEMENT_ENABLED || "false"), CHARTS_ENABLED: JSON.parse(process.env.CHARTS_ENABLED || "false"), - // kontena namespaces + // namespaces LENS_NAMESPACE: process.env.LENS_NAMESPACE || "kontena-lens", STATS_NAMESPACE: process.env.STATS_NAMESPACE || "kontena-stats", diff --git a/dashboard/webpack.config.ts b/dashboard/webpack.config.ts index fdab5c8f46..faf9d598a8 100755 --- a/dashboard/webpack.config.ts +++ b/dashboard/webpack.config.ts @@ -45,7 +45,7 @@ export default () => { extractComments: { condition: "some", banner: [ - `Lens. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.` + `Lens - The Kubernetes IDE. Copyright ${new Date().getFullYear()} by Lakend Labs, Inc. All rights reserved.` ].join("\n") } }) diff --git a/package.json b/package.json index 4b3dc9b5dd..436af15513 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ }, "copyright": "© 2020, Lakend Labs, Inc.", "license": "MIT", - "description": "The Kubernetes IDE", + "description": "Lens - The Kubernetes IDE", "version": "3.2.0", "main": "main.ts", "config": { diff --git a/src/main/menu.ts b/src/main/menu.ts index 82fa8d5a32..749ab63c49 100644 --- a/src/main/menu.ts +++ b/src/main/menu.ts @@ -184,7 +184,7 @@ export default function initMenu(opts: MenuOptions, promiseIpc: any) { { label: 'Report an Issue', click: async () => { - shell.openExternal('https://github.com/kontena/lens/issues'); + shell.openExternal('https://github.com/lensapp/lens/issues'); }, }, { diff --git a/src/renderer/assets/css/custom.scss b/src/renderer/assets/css/custom.scss index 9068b03c35..ae424d106e 100644 --- a/src/renderer/assets/css/custom.scss +++ b/src/renderer/assets/css/custom.scss @@ -1,4 +1,4 @@ -// from Kontena Lens UI +// from Lens Dashboard $lens-main-bg: #1e2124 !default; // dark bg $lens-pane-bg: #262b2f !default; // all panels main bg $lens-dock-bg: #2E3136 !default; // terminal and top menu bar @@ -6,7 +6,7 @@ $lens-menu-bg: #36393E !default; // sidemenu on left $lens-menu-hl: #414448 !default; // sidemenu on left, top left corner $lens-text-color: #87909c !default; $lens-text-color-light: #a0a0a0 !default; -$kontena-blue: #3d90ce !default; +$lens-primary: #3d90ce !default; // export as css variables * { @@ -17,7 +17,7 @@ $kontena-blue: #3d90ce !default; --lens-menu-hl: #{$lens-menu-hl}; // sidemenu on left, top left corner --lens-text-color: #{$lens-text-color}; --lens-text-color-light: #{$lens-text-color-light}; - --kontena-blue: #{$kontena-blue}; + --lens-primary: #{$lens-primary}; } // Base grayscale colors definitions @@ -46,7 +46,7 @@ $teal: #20c997 !default; $cyan: #6ca5b7 !default; // Theme color default definitions -$primary: $kontena-blue !default; +$primary: $lens-primary !default; $secondary: $gray-600 !default; $success: $green !default; $info: $cyan !default; diff --git a/src/renderer/components/BottomBar/BottomBar.vue b/src/renderer/components/BottomBar/BottomBar.vue index 8877742dc6..5faffdb74d 100644 --- a/src/renderer/components/BottomBar/BottomBar.vue +++ b/src/renderer/components/BottomBar/BottomBar.vue @@ -64,7 +64,7 @@ export default { left: 0; width: 100%; height: 20px; - background-color: var(--kontena-blue); + background-color: var(--lens-primary); z-index: 2000; } #workspace-area { diff --git a/src/renderer/components/ClusterSettings/Features/Components/Metrics.vue b/src/renderer/components/ClusterSettings/Features/Components/Metrics.vue index 1ff983243b..252dde7697 100644 --- a/src/renderer/components/ClusterSettings/Features/Components/Metrics.vue +++ b/src/renderer/components/ClusterSettings/Features/Components/Metrics.vue @@ -2,7 +2,7 @@
Metrics

- Enable timeseries data visualization (Prometheus stack) for your cluster. Install this only if you don't have existing Prometheus stack installed. You can see preview of manifests here. + Enable timeseries data visualization (Prometheus stack) for your cluster. Install this only if you don't have existing Prometheus stack installed. You can see preview of manifests here.

diff --git a/src/renderer/components/ClusterSettings/Preferences/index.vue b/src/renderer/components/ClusterSettings/Preferences/index.vue index b82be56b1b..9753fafb6c 100644 --- a/src/renderer/components/ClusterSettings/Preferences/index.vue +++ b/src/renderer/components/ClusterSettings/Preferences/index.vue @@ -19,7 +19,7 @@
Prometheus -

Use pre-installed Prometheus service for metrics. Please refer to the guide for possible configuration changes.

+

Use pre-installed Prometheus service for metrics. Please refer to the guide for possible configuration changes.

- Get started by associating one or more clusters to Kontena Lens. + Get started by associating one or more clusters to Lens.

diff --git a/src/renderer/components/PreferencesPage.vue b/src/renderer/components/PreferencesPage.vue index 9ecd4b00f2..676f8b10ce 100644 --- a/src/renderer/components/PreferencesPage.vue +++ b/src/renderer/components/PreferencesPage.vue @@ -116,7 +116,7 @@

Telemetry & Usage Tracking