Skip to content
This repository has been archived by the owner on Nov 22, 2019. It is now read-only.

Commit

Permalink
TEIIDTOOLS-324 Convert Non-Patternfly 2+ Components to Patternfly NG …
Browse files Browse the repository at this point in the history
…Components If Available

- converted vertical and horizontal navbar to patternfly-ng
- upgraded patternfly and patternfly-ng versions
- changes to some stylesheets
- deleted NavHeaderComponent (no longer needed)
  • Loading branch information
elvisisking committed Jan 22, 2018
1 parent e007944 commit da47f69
Show file tree
Hide file tree
Showing 24 changed files with 157 additions and 436 deletions.
52 changes: 26 additions & 26 deletions ngapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ngapp/package.json
Expand Up @@ -25,8 +25,8 @@
"core-js": "^2.4.1",
"ng2-codemirror": "^1.1.3",
"ngx-bootstrap": "^1.9.3",
"patternfly": "^3.31.0",
"patternfly-ng": "^2.0.0",
"patternfly": "^3.37.1",
"patternfly-ng": "^2.1.1",
"rxjs": "^5.5.5",
"zone.js": "^0.8.14"
},
Expand Down
2 changes: 0 additions & 2 deletions ngapp/src/app/app.component.html
@@ -1,8 +1,6 @@
<div>
<app-nav-header></app-nav-header>
<app-vertical-nav></app-vertical-nav>
<div id="{{ routerOutletWrapperId }}" class="{{ routerOutletWrapperClass }}">
<router-outlet></router-outlet>
</div>
</div>

@@ -1,4 +1,4 @@
<div style="margin-left: 150px">
<div class="app-feature-content">
<div id="connections-breadcrumb-bar">
<app-breadcrumbs>
<li i18n="@@connectionsCards.connections" app-breadcrumb label="Connections" icon="plug" [route]="[ connectionsLink ]"></li>
Expand Down
2 changes: 1 addition & 1 deletion ngapp/src/app/connections/connections.component.html
@@ -1,4 +1,4 @@
<div style="margin-left: 150px">
<div class="app-feature-content">

<div id="connections-breadcrumb-bar">
<app-breadcrumbs>
Expand Down
9 changes: 9 additions & 0 deletions ngapp/src/app/connections/shared/connections-constants.ts
Expand Up @@ -10,11 +10,20 @@
* limitations under the License.
*/

import { NavigationItemConfig } from "patternfly-ng";

export class ConnectionsConstants {

public static readonly connectionsRootRoute = "connections";
public static readonly connectionsRootPath = "/" + ConnectionsConstants.connectionsRootRoute;

public static readonly addConnectionRoute = ConnectionsConstants.connectionsRootRoute + "/add-connection";
public static readonly addConnectionPath = ConnectionsConstants.connectionsRootPath + "/add-connection";

public static readonly connectionsNavItem: NavigationItemConfig = {
title: "Connections",
iconStyleClass: "fa fa-fw fa-plug",
url: ConnectionsConstants.connectionsRootPath
};

}
5 changes: 2 additions & 3 deletions ngapp/src/app/core/core.module.ts
Expand Up @@ -25,29 +25,28 @@ import { AppSettingsService } from "@core/app-settings.service";
import { BreadcrumbComponent } from "@core/breadcrumbs/breadcrumb/breadcrumb.component";
import { BreadcrumbsComponent } from "@core/breadcrumbs/breadcrumbs.component";
import { LoggerService } from "@core/logger.service";
import { NavHeaderComponent } from "@core/nav-header/nav-header.component";
import { VerticalNavComponent } from "@core/vertical-nav/vertical-nav.component";
import { ModalModule } from "ngx-bootstrap/modal";
import { BsModalService } from "ngx-bootstrap/modal";
import { PatternFlyNgModule } from "patternfly-ng";

@NgModule({
imports: [
CommonModule,
HttpModule,
ModalModule,
PatternFlyNgModule,
RouterModule
],
declarations: [
AboutDialogComponent,
BreadcrumbComponent,
BreadcrumbsComponent,
NavHeaderComponent,
VerticalNavComponent
],
exports: [
BreadcrumbComponent,
BreadcrumbsComponent,
NavHeaderComponent,
VerticalNavComponent
],
providers: [
Expand Down
44 changes: 0 additions & 44 deletions ngapp/src/app/core/nav-header/nav-header.component.html

This file was deleted.

50 changes: 0 additions & 50 deletions ngapp/src/app/core/nav-header/nav-header.component.less

This file was deleted.

47 changes: 0 additions & 47 deletions ngapp/src/app/core/nav-header/nav-header.component.spec.ts

This file was deleted.

0 comments on commit da47f69

Please sign in to comment.