From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 10 Dec 2017 18:55:03 +0200 Subject: Final commit to master merge from Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman --- .../app/ng2/shared/navbar/navbar-routes.config.ts | 27 ----------- .../app/ng2/shared/navbar/navbar.component.html | 23 ---------- .../app/ng2/shared/navbar/navbar.component.less | 11 ----- .../src/app/ng2/shared/navbar/navbar.component.ts | 52 ---------------------- .../src/app/ng2/shared/navbar/navbar.metadata.ts | 31 ------------- .../src/app/ng2/shared/navbar/navbar.module.ts | 36 --------------- 6 files changed, 180 deletions(-) delete mode 100644 catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts delete mode 100644 catalog-ui/src/app/ng2/shared/navbar/navbar.component.html delete mode 100644 catalog-ui/src/app/ng2/shared/navbar/navbar.component.less delete mode 100644 catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts delete mode 100644 catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts delete mode 100644 catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts (limited to 'catalog-ui/src/app/ng2/shared/navbar') diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts deleted file mode 100644 index ac58cbd063..0000000000 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar-routes.config.ts +++ /dev/null @@ -1,27 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -import { MenuType, RouteInfo } from './navbar.metadata'; - -export const ROUTES: RouteInfo[] = [ - { path: 'page1', title: 'Logo', menuType: MenuType.BRAND }, - { path: 'page1', title: 'Page 1', menuType: MenuType.LEFT }, - { path: 'page2', title: 'Page 2', menuType: MenuType.LEFT } -]; diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.html b/catalog-ui/src/app/ng2/shared/navbar/navbar.component.html deleted file mode 100644 index d783be4c27..0000000000 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.html +++ /dev/null @@ -1,23 +0,0 @@ - diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.less b/catalog-ui/src/app/ng2/shared/navbar/navbar.component.less deleted file mode 100644 index 3e5165b798..0000000000 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.less +++ /dev/null @@ -1,11 +0,0 @@ -.active { - color: #ffffff; -} -.navbar-toggler { - border: solid 1px #cccccc; - color: #ff0000; -} -.navbar { - background-color: #0000ff; - border-radius: 0; -} \ No newline at end of file diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts deleted file mode 100644 index 68a26c4780..0000000000 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.component.ts +++ /dev/null @@ -1,52 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -import {Component, OnInit, ViewEncapsulation} from '@angular/core'; -import { ROUTES } from './navbar-routes.config'; -import { MenuType, RouteInfo } from './navbar.metadata'; - -@Component({ - selector: 'app-navbar', - templateUrl: './navbar.component.html', - styleUrls: [ './navbar.component.less' ], - encapsulation: ViewEncapsulation.None -}) -export class NavbarComponent implements OnInit { - public menuItems: Array; - public brandMenu: RouteInfo; - isCollapsed = true; - - constructor() {} - - ngOnInit() { - this.menuItems = ROUTES.filter(menuItem => menuItem.menuType !== MenuType.BRAND); - this.brandMenu = ROUTES.filter(menuItem => menuItem.menuType === MenuType.BRAND)[0]; - } - - public get menuIcon(): string { - return this.isCollapsed ? '☰' : '✖'; - } - - public getMenuItemClasses(menuItem: any) { - return { - 'pull-xs-right': this.isCollapsed && menuItem.menuType === MenuType.RIGHT - }; - } -} diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts deleted file mode 100644 index 71cc3cb59f..0000000000 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.metadata.ts +++ /dev/null @@ -1,31 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -export enum MenuType { - BRAND, - LEFT, - RIGHT -} - -export interface RouteInfo { - path: string; - title: string; - menuType: MenuType; -} diff --git a/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts b/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts deleted file mode 100644 index 4a754dfe99..0000000000 --- a/catalog-ui/src/app/ng2/shared/navbar/navbar.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; -import { NavbarComponent } from "./navbar.component"; - -@NgModule({ - imports: [ - RouterModule, - CommonModule - ], - declarations: [ NavbarComponent ], - exports: [ - NavbarComponent - ] -}) -export class NavbarModule {} -- cgit 1.2.3-korg