diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
index b8f929355c..ebbd8333b3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
@@ -23,7 +23,7 @@ export class TableCellEventActeeComponent extends TableCellCustom
{
icon: 'apps',
},
route: {
- icon: 'network_route',
+ icon: 'route',
iconFont: 'stratos-icons'
},
service: {
@@ -55,7 +55,8 @@ export class TableCellEventActeeComponent extends TableCellCustom {
icon: 'remove_red_eye',
},
space: {
- icon: 'language',
+ icon: 'virtual_space',
+ iconFont: 'stratos-icons'
},
organization: {
icon: 'organization',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
index b1a7ae262b..63f6c134d3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
@@ -78,7 +78,7 @@ export abstract class CfRoutesListConfigBase implements IListConfig
noEntries: 'There are no routes',
filter: 'Search by Route',
maxedResults: {
- icon: 'network_route',
+ icon: 'route',
iconFont: 'stratos-icons',
canIgnoreMaxFirstLine: 'Fetching all routes might take a long time',
cannotIgnoreMaxFirstLine: 'There are too many routes to fetch'
diff --git a/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png b/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png
index 0c81f62f51..733c676310 100644
Binary files a/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png and b/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png differ
diff --git a/src/frontend/packages/core/assets/endpoint-icons/docker.png b/src/frontend/packages/core/assets/endpoint-icons/docker.png
old mode 100644
new mode 100755
index 5272401a98..fa544fb7fe
Binary files a/src/frontend/packages/core/assets/endpoint-icons/docker.png and b/src/frontend/packages/core/assets/endpoint-icons/docker.png differ
diff --git a/src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png b/src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png
index 192846a120..bb1892db53 100644
Binary files a/src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png and b/src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png differ
diff --git a/src/frontend/packages/core/assets/endpoint-icons/github-logo.png b/src/frontend/packages/core/assets/endpoint-icons/github-logo.png
index ea6ff545a2..a60aafeb05 100644
Binary files a/src/frontend/packages/core/assets/endpoint-icons/github-logo.png and b/src/frontend/packages/core/assets/endpoint-icons/github-logo.png differ
diff --git a/src/frontend/packages/core/src/app.routing.ts b/src/frontend/packages/core/src/app.routing.ts
index 7f85939c8b..4dcb335ed5 100644
--- a/src/frontend/packages/core/src/app.routing.ts
+++ b/src/frontend/packages/core/src/app.routing.ts
@@ -5,18 +5,18 @@ import { RouterModule, Routes } from '@angular/router';
import { AuthGuardService } from './core/auth-guard.service';
import { CoreModule } from './core/core.module';
import { EndpointsService } from './core/endpoints.service';
+import { NotSetupGuardService } from './core/not-setup-guard.service';
import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component';
import { CustomRoutingImportModule } from './custom-import.module';
import { DashboardBaseComponent } from './features/dashboard/dashboard-base/dashboard-base.component';
import { HomePageComponent } from './features/home/home/home-page.component';
import { NoEndpointsNonAdminComponent } from './features/no-endpoints-non-admin/no-endpoints-non-admin.component';
import { DomainMismatchComponent } from './features/setup/domain-mismatch/domain-mismatch.component';
+import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component';
+import { SetupWelcomeComponent } from './features/setup/setup-welcome/setup-welcome.component';
import { ConsoleUaaWizardComponent } from './features/setup/uaa-wizard/console-uaa-wizard.component';
import { UpgradePageComponent } from './features/setup/upgrade-page/upgrade-page.component';
import { SharedModule } from './shared/shared.module';
-import { NotSetupGuardService } from './core/not-setup-guard.service';
-import { SetupWelcomeComponent } from './features/setup/setup-welcome/setup-welcome.component';
-import { LocalAccountWizardComponent } from './features/setup/local-account-wizard/local-account-wizard.component';
const appRoutes: Routes = [
{ path: '', redirectTo: 'home', pathMatch: 'full' },
@@ -76,7 +76,8 @@ const appRoutes: Routes = [
data: {
stratosNavigation: {
label: 'Endpoints',
- matIcon: 'settings_ethernet',
+ matIcon: 'endpoints',
+ matIconFont: 'stratos-icons',
position: 100,
requiresPersistence: true
}
@@ -89,7 +90,7 @@ const appRoutes: Routes = [
path: '',
loadChildren: () => import('./features/endpoints/endpoints.module').then(m => m.EndpointsModule),
}]
- },
+ },
{
path: 'marketplace',
loadChildren: () => import('../../cloud-foundry/src/features/service-catalog/service-catalog.module')
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
index ad808f4303..e9e474a2b5 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
@@ -2,11 +2,11 @@
Connected
- cloud_done
+ endpoints_connected
Disconnected
- cloud_off
+ endpoints_disconnected
Updating
diff --git a/src/test-e2e/endpoints/endpoints.po.ts b/src/test-e2e/endpoints/endpoints.po.ts
index 506039e4c5..b9899f7110 100644
--- a/src/test-e2e/endpoints/endpoints.po.ts
+++ b/src/test-e2e/endpoints/endpoints.po.ts
@@ -39,7 +39,7 @@ export class EndpointCards extends ListCardComponent {
const url = urlField.replace('content_copy', '').trim();
return {
name: t.substring(0, t.indexOf('\n')),
- connected: m.find(item => item.key === 'Status').value === 'Connected\ncloud_done',
+ connected: m.find(item => item.key === 'Status').value === 'Connected\nendpoints_connected',
type: t.substring(t.indexOf('\n') + 1, t.length),
user,
isAdmin,
@@ -61,7 +61,7 @@ export class EndpointsTable extends ListTableComponent {
return row.all(by.tagName('app-table-cell')).map(col => col.getText()).then((data: string[]) => {
return {
name: data[0],
- connected: data[1] === 'cloud_done',
+ connected: data[1] === 'endpoints_connected',
type: data[2],
user: data[3],
isAdmin: data[4].indexOf('Yes') !== -1,