Skip to content
Permalink
Browse files

replace ng-bootstrap with bootstrap

  • Loading branch information...
hantsy committed Sep 3, 2017
1 parent 49196d5 commit 53bfd85e4d33a1012425c98cc73fd2ef6ef55514
Showing with 22 additions and 14 deletions.
  1. +5 −1 .angular-cli.json
  2. +10 −5 package-lock.json
  3. +2 −1 package.json
  4. +0 −2 src/app/app.module.ts
  5. +2 −2 src/app/layout/navbar.component.ts
  6. +3 −3 src/app/shared/shared.module.ts
@@ -23,7 +23,11 @@
"styles.css",
"forms.css"
],
"scripts": [],
"scripts": [
"../node_modules/jquery/dist/jquery.js",
"../node_modules/popper.js/dist/popper.js",
"../node_modules/bootstrap/dist/js/bootstrap.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
"dev": "environments/environment.ts",

Some generated files are not rendered by default. Learn more.

@@ -22,11 +22,12 @@
"@angular/platform-browser": "^4.1.0",
"@angular/platform-browser-dynamic": "^4.1.0",
"@angular/router": "^4.1.0",
"@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.1",
"@ngx-translate/core": "^6.0.1",
"@ngx-translate/http-loader": "0.0.3",
"bootstrap": "^4.0.0-beta",
"core-js": "^2.4.1",
"jquery": "^3.2.1",
"popper.js": "^1.12.5",
"rxjs": "^5.1.0",
"zone.js": "^0.8.4"
},
@@ -19,7 +19,6 @@ import {
MissingTranslationHandlerParams
} from '@ngx-translate/core';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';

export function createTranslateLoader(http: Http) {
return new TranslateHttpLoader(http, './assets/i18n/', '.json');
@@ -43,7 +42,6 @@ export class MyMissingTranslationHandler implements MissingTranslationHandler {
deps: [Http]
}
}),
NgbModule.forRoot(),
CoreModule,
AppRoutingModule,
HomeModule,
@@ -8,8 +8,8 @@ import { AuthService } from '../core/auth.service';
styleUrls: ['./navbar.component.css']
})
export class NavbarComponent implements OnInit {

constructor(private authService: AuthService) { }
constructor(private authService: AuthService) {
}

ngOnInit() {
}
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
//import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule} from '@ngx-translate/core';
import { ShowAuthedDirective } from './show-authed.directive';

@@ -17,7 +17,7 @@ import { EmailValidatorDirective } from './email-validator.directive';
FormsModule,
ReactiveFormsModule,
//3rd party modules
NgbModule,
//NgbModule,
TranslateModule
],
declarations: [
@@ -30,7 +30,7 @@ import { EmailValidatorDirective } from './email-validator.directive';
RouterModule,
FormsModule,
ReactiveFormsModule,
NgbModule,
//NgbModule,
ShowAuthedDirective,
Nl2brPipe,
EmailValidatorDirective,

0 comments on commit 53bfd85

Please sign in to comment.
You can’t perform that action at this time.