diff --git a/proxy-conf-example.js b/proxy-conf-example.js deleted file mode 100644 index a6620a359e..0000000000 --- a/proxy-conf-example.js +++ /dev/null @@ -1,56 +0,0 @@ -const CLOUDSTACK_ENDPOINT = 'https://example.com'; -/* - * Plugins endpoint - * https://github.com/bwsw/cloudstack-ui#plugins-supported - * */ -const PULSE_PLUGIN_ENDPOINT = 'http://example.com:8081'; -const WEBSHELL_PLUGIN_ENDPOINT = 'http://example.com:8082'; - -function onProxyRes(proxyRes, req, res) { - var cookies = proxyRes.headers['set-cookie']; - var cookieRegex = /Secure/i; - - if (cookies) { - var newCookie = cookies.map(function(cookie) { - if (cookieRegex.test(cookie)) { - return cookie.replace(cookieRegex, ''); - } - return cookie; - }); - delete proxyRes.headers['set-cookie']; - proxyRes.headers['set-cookie'] = newCookie; - } -} - -const apiProxyConfig = { - context: ['/client/api', '/client/console'], - target: CLOUDSTACK_ENDPOINT, - secure: false, -}; - -// If server works over https need to change Secure Cookie -if (CLOUDSTACK_ENDPOINT.indexOf('https') === 0) { - apiProxyConfig.onProxyRes = onProxyRes; -} - -const pulseProxyConfig = { - context: ['/cs-extensions/pulse/**'], - target: PULSE_PLUGIN_ENDPOINT, - secure: false, - pathRewrite: { '^/cs-extensions/pulse': '' }, -}; - -const webShellProxyConfig = { - context: ['/cs-extensions/webshell/**'], - target: WEBSHELL_PLUGIN_ENDPOINT, - secure: false, - pathRewrite: { '^/cs-extensions/webshell': '' }, -}; - -const PROXY_CONFIG = [ - apiProxyConfig, - // pulseProxyConfig, - // webShellProxyConfig -]; - -module.exports = PROXY_CONFIG; diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index 5c40a56376..126bbf4960 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -5,18 +5,13 @@ import { RouterModule } from '@angular/router'; import { ConfigValidationService } from './config'; import { SharedModule } from '../shared/shared.module'; import { MaterialModule } from '../material/material.module'; -import { - AppNavComponent, - LicenseComponent, - MenuHeaderComponent, - SectionNavComponent, -} from './nav-menu/components/'; +import { AppNavComponent, LicenseComponent, MenuHeaderComponent } from './nav-menu/components/'; import { SidebarWidthService, SnackBarService } from './services'; @NgModule({ imports: [CommonModule, SharedModule, MaterialModule, RouterModule], - exports: [AppNavComponent, SectionNavComponent], - declarations: [AppNavComponent, SectionNavComponent, LicenseComponent, MenuHeaderComponent], + exports: [AppNavComponent], + declarations: [AppNavComponent, LicenseComponent, MenuHeaderComponent], providers: [ConfigValidationService, SnackBarService, SidebarWidthService], }) export class CoreModule { diff --git a/src/app/core/nav-menu/components/app-nav/app-nav.component.html b/src/app/core/nav-menu/components/app-nav/app-nav.component.html index 29e97c6acf..bdde2e713f 100644 --- a/src/app/core/nav-menu/components/app-nav/app-nav.component.html +++ b/src/app/core/nav-menu/components/app-nav/app-nav.component.html @@ -1,17 +1,23 @@
- +
- - - {{ route.text | translate }} - + + + + + {{ route.text | translate }} + + + + + + {{ subroute.text | translate }} + + + + diff --git a/src/app/core/nav-menu/components/app-nav/app-nav.component.scss b/src/app/core/nav-menu/components/app-nav/app-nav.component.scss index 57a5a0f839..bfe69b7a0c 100644 --- a/src/app/core/nav-menu/components/app-nav/app-nav.component.scss +++ b/src/app/core/nav-menu/components/app-nav/app-nav.component.scss @@ -5,7 +5,7 @@ flex-direction: column; justify-content: space-between; min-width: $nav-menu-min-width; - height: 100%; + overflow: auto; } .nav-routes { @@ -14,15 +14,54 @@ display: flex; flex-direction: column; + .mat-expansion-panel { + border-radius: 0; + background: none; + color: rgba(255, 255, 255, 0.87); + box-shadow: none; + + ::ng-deep .mat-expansion-panel-header-description, + .mat-expansion-panel-header-title { + align-items: center; + } + + .mat-expansion-panel-header-title { + color: white; + font-size: 14px; + } + + ::ng-deep .mat-expansion-panel-header-description, + ::ng-deep .mat-expansion-indicator::after { + color: rgba(255, 255, 255, 0.74); + } + + ::ng-deep .mat-expansion-panel-content { + font-size: 13px; + + ::ng-deep .mat-expansion-panel-body { + padding: 0; + } + } + } + + mat-icon { + margin-right: 10px; + } + .nav-link { - padding: 12px 25px; + padding: 12px 24px; display: flex; align-items: center; color: inherit; text-decoration: none; + font-size: 14px; + } - mat-icon { - margin-right: 10px; - } + .nav-sub-link { + padding: 12px 40px; + display: flex; + align-items: center; + color: inherit; + text-decoration: none; } } diff --git a/src/app/core/nav-menu/components/app-nav/app-nav.component.ts b/src/app/core/nav-menu/components/app-nav/app-nav.component.ts index f38f84cd14..15619d0d78 100644 --- a/src/app/core/nav-menu/components/app-nav/app-nav.component.ts +++ b/src/app/core/nav-menu/components/app-nav/app-nav.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { Route } from '../../models'; @@ -13,10 +13,6 @@ export class AppNavComponent { public routes: Route[]; @Input() public currentRoute: Route; - @Output() - public menuButtonClicked = new EventEmitter(); - - public onMenuButtonClicked(): void { - this.menuButtonClicked.emit(); - } + @Input() + public username: string; } diff --git a/src/app/core/nav-menu/components/index.ts b/src/app/core/nav-menu/components/index.ts index 0c26a309bd..b153682b4f 100644 --- a/src/app/core/nav-menu/components/index.ts +++ b/src/app/core/nav-menu/components/index.ts @@ -1,4 +1,3 @@ export * from './app-nav/app-nav.component'; export * from './license/license.component'; export * from './menu-header/menu-header.component'; -export * from './section-nav/section-nav.component'; diff --git a/src/app/core/nav-menu/components/menu-header/menu-header.component.html b/src/app/core/nav-menu/components/menu-header/menu-header.component.html index 1e336f5b81..cfe308ce5f 100644 --- a/src/app/core/nav-menu/components/menu-header/menu-header.component.html +++ b/src/app/core/nav-menu/components/menu-header/menu-header.component.html @@ -1,8 +1,4 @@
- -