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

Update icons #4404

Merged
merged 4 commits into from
Jun 29, 2020
+51 −44
Merged

Update icons #4404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35a3b8c
Update icons
nwmac Jun 26, 2020
283d622
Update docker icon and optimize other pngs
nwmac Jun 26, 2020
96bcec7
Improve resolution of container icon
nwmac Jun 26, 2020
b34e809
Update e2e test for new icons
nwmac Jun 27, 2020
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
6 changes: 3 additions & 3 deletions ...eatures/applications/application/application-tabs-base/application-tabs-base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
);

this.tabLinks = [
{ link: 'summary', label: 'Summary', icon: 'description' },
{ link: 'instances', label: 'Instances', icon: 'library_books' },
{ link: 'routes', label: 'Routes', iconFont: 'stratos-icons', icon: 'network_route' },
{ link: 'summary', label: 'Summary', iconFont: 'stratos-icons', icon: 'application' },
{ link: 'instances', label: 'Instances', iconFont: 'stratos-icons', icon: 'application_instance' },
{ link: 'routes', label: 'Routes', iconFont: 'stratos-icons', icon: 'route' },
{ link: 'log-stream', label: 'Log Stream', icon: 'featured_play_list' },
{ link: 'services', label: 'Services', iconFont: 'stratos-icons', icon: 'service' },
{ link: 'variables', label: 'Variables', icon: 'list', hidden$: appDoesNotHaveEnvVars$ },
Expand Down
8 changes: 4 additions & 4 deletions ...es/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<app-metadata-item icon="access_time" label="Modified">
{{ appSvc.app.entity.package_updated_at ? (appSvc.app.entity.package_updated_at | date:'medium') : '-' }}
</app-metadata-item>
<app-metadata-item icon="developer_mode" label="SSH Enabled">{{ sshStatus$ | async }}
<app-metadata-item icon="virtual_guest" iconFont="stratos-icons" label="SSH Enabled">{{ sshStatus$ | async }}
</app-metadata-item>
</div>
<div class="app-metadata__two-cols">
Expand All @@ -95,7 +95,7 @@
<app-metadata-item icon="service" iconFont="stratos-icons" label="Services">
{{(applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}
</app-metadata-item>
<app-metadata-item icon="network_route" iconFont="stratos-icons" label="Routes">
<app-metadata-item icon="route" iconFont="stratos-icons" label="Routes">
{{(applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}
</app-metadata-item>
</div>
Expand All @@ -118,7 +118,7 @@
<a
[routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
</app-metadata-item>
<app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" icon="language" label="Space">
<app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" iconFont="stratos-icons" icon="virtual_space" label="Space">
<a
[routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
</app-metadata-item>
Expand Down Expand Up @@ -174,7 +174,7 @@
<app-metadata-item *ngSwitchCase="'archive'" icon="insert_drive_file" label="File">
Deployed from local file
</app-metadata-item>
<app-metadata-item *ngSwitchCase="'docker'" iconFont="stratos-icons" icon="docker" label="Docker Image">
<app-metadata-item *ngSwitchCase="'docker'" iconFont="stratos-icons" icon="container" label="Docker Image">
<a *ngIf="deploySource.dockerUrl; else noDockerUrl" href="{{ deploySource.dockerUrl }}"
rel="noopener noreferrer" target="_blank">
{{deploySource.dockerImage}}
Expand Down
2 changes: 1 addition & 1 deletion ...ns/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ng-template #noEntries>
<app-no-content-message iconFont="stratos-icons" icon="network_route" [firstLine]="'This application has no routes'" [secondLine]="{
<app-no-content-message iconFont="stratos-icons" icon="route" [firstLine]="'This application has no routes'" [secondLine]="{
text: ''
}"></app-no-content-message>
</ng-template>
Expand Down
4 changes: 2 additions & 2 deletions ...y/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ export class CloudFoundryTabsBaseComponent implements OnInit {

// Default tabs + add any tabs from extensions
this.tabLinks = [
{ link: 'summary', label: 'Summary', icon: 'description' },
{ link: 'summary', label: 'Summary', icon: 'cloud_foundry', iconFont: 'stratos-icons' },
{ link: 'organizations', label: 'Organizations', icon: 'organization', iconFont: 'stratos-icons' },
{
link: CloudFoundryTabsBaseComponent.cells,
label: 'Cells',
icon: 'select_all',
hidden$: cellsHidden$
},
{ link: 'routes', label: 'Routes', icon: 'network_route', iconFont: 'stratos-icons', },
{ link: 'routes', label: 'Routes', icon: 'route', iconFont: 'stratos-icons', },
{
link: CloudFoundryTabsBaseComponent.users,
label: 'Users',
Expand Down
6 changes: 3 additions & 3 deletions ...cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h4 class="quota-definition-base__section-header">Memory</h4>
<h4 class="quota-definition-base__section-header">Application</h4>
<app-tile-group>
<app-tile>
<app-card-number-metric labelAtTop="true" icon="apps" label="Maximum Application Instances"
<app-card-number-metric labelAtTop="true" icon="application_instance" iconFont="stratos-icons" label="Maximum Application Instances"
value="{{ quotaDefinition.entity?.app_instance_limit }}">
</app-card-number-metric>
</app-tile>
Expand Down Expand Up @@ -74,12 +74,12 @@ <h4 class="quota-definition-base__section-header">Service</h4>
<h4 class="quota-definition-base__section-header">Routes & Domains</h4>
<app-tile-group>
<app-tile>
<app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons" label="Maximum Routes"
<app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons" label="Maximum Routes"
value="{{ quotaDefinition.entity?.total_routes }}">
</app-card-number-metric>
</app-tile>
<app-tile>
<app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons"
<app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons"
label="Maximum Reserved Route Ports" value="{{ quotaDefinition.entity?.total_reserved_route_ports }}">
</app-card-number-metric>
</app-tile>
Expand Down
6 changes: 3 additions & 3 deletions ...y/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h4 class="quota-definition-base__section-header">Memory</h4>
<h4 class="quota-definition-base__section-header">Application</h4>
<app-tile-group>
<app-tile>
<app-card-number-metric labelAtTop="true" icon="apps" label="Maximum Application Instances"
<app-card-number-metric labelAtTop="true" icon="application_instance" iconFont="stratos-icons" label="Maximum Application Instances"
value="{{ quotaDefinition.entity?.app_instance_limit }}">
</app-card-number-metric>
</app-tile>
Expand Down Expand Up @@ -73,12 +73,12 @@ <h4 class="quota-definition-base__section-header">Service</h4>
<h4 class="quota-definition-base__section-header">Routes</h4>
<app-tile-group>
<app-tile>
<app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons" label="Maximum Routes"
<app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons" label="Maximum Routes"
value="{{ quotaDefinition.entity?.total_routes }}">
</app-card-number-metric>
</app-tile>
<app-tile>
<app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons"
<app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons"
label="Maximum Reserved Route Ports" value="{{ quotaDefinition.entity?.total_reserved_route_ports }}">
</app-card-number-metric>
</app-tile>
Expand Down
12 changes: 8 additions & 4 deletions ...rganizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,14 @@ export class CloudFoundryOrganizationBaseComponent {
{
link: 'summary',
label: 'Summary',
icon: 'description'
icon: 'organization',
iconFont: 'stratos-icons'
},
{
link: 'spaces',
label: 'Spaces',
icon: 'language'
icon: 'virtual_space',
iconFont: 'stratos-icons'
},
{
link: 'users',
Expand All @@ -61,12 +63,14 @@ export class CloudFoundryOrganizationBaseComponent {
{
link: 'quota',
label: 'Quota',
icon: 'data_usage'
icon: 'quota',
iconFont: 'stratos-icons'
},
{
link: 'space-quota-definitions',
label: 'Space Quotas',
icon: 'data_usage'
icon: 'quota',
iconFont: 'stratos-icons'
},
{
link: 'events',
Expand Down
5 changes: 3 additions & 2 deletions ...oundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
{
link: 'summary',
label: 'Summary',
icon: 'description'
icon: 'virtual_space',
iconFont: 'stratos-icons',
},
{
link: 'apps',
Expand All @@ -73,7 +74,7 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
link: 'routes',
label: 'Routes',
iconFont: 'stratos-icons',
icon: 'network_route'
icon: 'route'
},
{
link: 'users',
Expand Down
4 changes: 2 additions & 2 deletions ...zation-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
</app-card-number-metric>
</app-tile>
<app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
<app-card-number-metric icon="content_copy" label="App Instances"
<app-card-number-metric icon="application_instance" iconFont="stratos-icons" label="App Instances"
value="{{ (cfSpaceService.appInstances$ | async) }}"
limit="{{ (cfSpaceService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
</app-tile>
<app-tile>
<app-card-number-metric
link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/routes"
iconFont="stratos-icons" icon="network_route" label="Routes"
iconFont="stratos-icons" icon="route" label="Routes"
value="{{ (cfSpaceService.routes$ | async)?.length }}"
limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
</app-tile>
Expand Down
10 changes: 5 additions & 5 deletions ...ions/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<app-tile-group>
<app-tile>
<app-card-number-metric
link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" icon="language"
link="/cloud-foundry/{{cfOrgService.cfGuid}}/organizations/{{cfOrgService.orgGuid}}/spaces" iconFont="stratos-icons" icon="virtual_space"
label="Spaces" labelSingular="Space" value="{{ (cfOrgService.spaces$ | async)?.length }}">
</app-card-number-metric>
</app-tile>
Expand All @@ -36,12 +36,12 @@
value="{{ cfOrgService.appCount$ | async }}"></app-card-number-metric>
</app-tile>
<app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
<app-card-number-metric icon="content_copy" label="App Instances"
<app-card-number-metric icon="application_instance" iconFont="stratos-icons" label="App Instances"
value="{{ (cfOrgService.appInstances$ | async) }}"
limit="{{ (cfOrgService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
</app-tile>
<app-tile>
<app-card-number-metric iconFont="stratos-icons" icon="network_route" label="Routes"
<app-card-number-metric iconFont="stratos-icons" icon="route" label="Routes"
value="{{ (cfOrgService.routesCount$ | async) }}"
limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
</app-tile>
Expand All @@ -58,12 +58,12 @@
limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_private_domains}}"></app-card-number-metric>
</app-tile>
<app-tile>
<app-card-number-metric iconFont="stratos-icons" icon="service" label="Service Instances"
<app-card-number-metric iconFont="stratos-icons" icon="service_instance" label="Service Instances"
value="{{ (cfOrgService.serviceInstancesCount$ | async) }}"
limit="{{ (cfOrgService.quotaDefinition$ | async)?.total_services }}"></app-card-number-metric>
</app-tile>
<app-tile *ngIf="(cfOrgService.userProvidedServiceInstancesCount$ | async) > 0">
<app-card-number-metric iconFont="stratos-icons" icon="service" label="User Service Instances"
<app-card-number-metric iconFont="stratos-icons" icon="service_instance" label="User Service Instances"
value="{{ (cfOrgService.userProvidedServiceInstancesCount$ | async) }}"></app-card-number-metric>
</app-tile>
<app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
Expand Down
4 changes: 2 additions & 2 deletions ...cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
</ng-template>
<app-tile-group>
<app-tile>
<app-card-number-metric [link]="serviceInstancesLink" icon="library_books" label="Instances" labelSingular="Instance" value="{{ (instances$ | async)?.length }}"></app-card-number-metric>
<app-card-number-metric [link]="serviceInstancesLink" icon="service_instance" iconFont="stratos-icons" label="Instances" labelSingular="Instance" value="{{ (instances$ | async)?.length }}"></app-card-number-metric>
</app-tile>
<app-tile>
<app-card-number-metric [link]="servicePlansLink" icon="products" iconFont="stratos-icons" label="Service Plans" labelSingular="Service Plan" value="{{ ( servicePlans$ | async)?.length }}"></app-card-number-metric>
<app-card-number-metric [link]="servicePlansLink" icon="service_plan" iconFont="stratos-icons" label="Service Plans" labelSingular="Service Plan" value="{{ ( servicePlans$ | async)?.length }}"></app-card-number-metric>
</app-tile>
</app-tile-group>
<app-tile-group>
Expand Down
2 changes: 1 addition & 1 deletion ...ckages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{ (cfEndpointService.endpoint$ | async )?.entity.user.name }}
<span *ngIf="(cfEndpointService.endpoint$ | async )?.entity.user.admin"> (Administrator)</span>
</app-metadata-item>
<app-metadata-item icon="developer_mode" label="SSH Access">
<app-metadata-item icon="virtual_guest" iconFont="stratos-icons" label="SSH Access">
{{ (cfEndpointService.hasSSHAccess$ | async) ? 'Available' : 'Not available'}}</app-metadata-item>
<app-metadata-item icon="email" label="User Invitation Support">
<div class="user-invites">
Expand Down
5 changes: 3 additions & 2 deletions ...ents/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class TableCellEventActeeComponent extends TableCellCustom<APIResource> {
icon: 'apps',
},
route: {
icon: 'network_route',
icon: 'route',
iconFont: 'stratos-icons'
},
service: {
Expand Down Expand Up @@ -55,7 +55,8 @@ export class TableCellEventActeeComponent extends TableCellCustom<APIResource> {
icon: 'remove_red_eye',
},
space: {
icon: 'language',
icon: 'virtual_space',
iconFont: 'stratos-icons'
},
organization: {
icon: 'organization',
Expand Down
2 changes: 1 addition & 1 deletion ...oud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
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'
Expand Down
Binary file modified src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/packages/core/assets/endpoint-icons/docker.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/packages/core/assets/endpoint-icons/github-logo-light.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/frontend/packages/core/assets/endpoint-icons/github-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions src/frontend/packages/core/src/app.routing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand Down Expand Up @@ -76,7 +76,8 @@ const appRoutes: Routes = [
data: {
stratosNavigation: {
label: 'Endpoints',
matIcon: 'settings_ethernet',
matIcon: 'endpoints',
matIconFont: 'stratos-icons',
position: 100,
requiresPersistence: true
}
Expand All @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions .../list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<ng-container *ngIf="connectable; else notConnectable">
<ng-container *ngIf="row.connectionStatus === 'connected'">
<span *ngIf="config?.showLabel">Connected </span>
<mat-icon>cloud_done</mat-icon>
<mat-icon fontSet="stratos-icons">endpoints_connected</mat-icon>
</ng-container>
<ng-container *ngIf="row.connectionStatus === 'disconnected'">
<span *ngIf="config?.showLabel">Disconnected </span>
<mat-icon>cloud_off</mat-icon>
<mat-icon fontSet="stratos-icons">endpoints_disconnected</mat-icon>
</ng-container>
<ng-container *ngIf="row.connectionStatus === 'checking'">
<span *ngIf="config?.showLabel">Updating </span>
Expand Down
4 changes: 2 additions & 2 deletions src/test-e2e/endpoints/endpoints.po.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down