From 2474e3ef251203c757635569304cc2b7f691ec63 Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Mon, 19 Aug 2019 17:35:57 +0530 Subject: [PATCH] Fixed a few errors which showed up when ng build --prod was used Removed the loading bar component as it was giving build troubles and can be added back later Added the HttpClientModule import to app.module without which it will not run --- .gitignore | 1 + bookie/angular.json | 2 +- bookie/package.json | 4 +--- bookie/src/app/app.component.html | 1 - bookie/src/app/app.module.ts | 2 ++ bookie/src/app/core/core.module.ts | 8 -------- .../printers/printer-detail/printer-detail.component.html | 4 ++-- .../sale-category-detail.component.html | 4 ++-- .../app/section-printers/section-printer.component.html | 2 +- .../sections/section-detail/section-detail.component.html | 4 ++-- 10 files changed, 12 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index bb73101..bc53436 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ env .idea/ *.egg-info/ DB/*.sql +barker/static/ diff --git a/bookie/angular.json b/bookie/angular.json index ad151bc..8d8ca78 100644 --- a/bookie/angular.json +++ b/bookie/angular.json @@ -13,7 +13,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "../brewman/static", + "outputPath": "../barker/static", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", diff --git a/bookie/package.json b/bookie/package.json index 101a44b..5f96c06 100644 --- a/bookie/package.json +++ b/bookie/package.json @@ -23,8 +23,6 @@ "@angular/platform-browser": "^8.0.0", "@angular/platform-browser-dynamic": "^8.0.0", "@angular/router": "^8.0.0", - "@ngx-loading-bar/http-client": "^3.0.0", - "@ngx-loading-bar/router": "^3.0.0", "angular2-hotkeys": "^2.1.4", "core-js": "^3.1.1", "hammerjs": "^2.0.8", @@ -36,7 +34,7 @@ }, "devDependencies": { "@angular-devkit/build-angular": "~0.800.0", - "@angular/cli": "^8.0.2", + "@angular/cli": "^8.2.2", "@angular/compiler-cli": "^8.0.0", "@angular/language-service": "^8.0.0", "@types/jasmine": "^3.3.0", diff --git a/bookie/src/app/app.component.html b/bookie/src/app/app.component.html index 4da6fa8..8c7d128 100644 --- a/bookie/src/app/app.component.html +++ b/bookie/src/app/app.component.html @@ -1,4 +1,3 @@ -
diff --git a/bookie/src/app/app.module.ts b/bookie/src/app/app.module.ts index 6ed7ca0..da4a8ba 100644 --- a/bookie/src/app/app.module.ts +++ b/bookie/src/app/app.module.ts @@ -1,6 +1,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { LOCALE_ID, NgModule } from '@angular/core'; import { registerLocaleData } from '@angular/common'; +import { HttpClientModule } from "@angular/common/http"; import enIN from '@angular/common/locales/en-IN'; import { AppRoutingModule } from './app-routing.module'; @@ -39,6 +40,7 @@ registerLocaleData(enIN); AppRoutingModule, BrowserAnimationsModule, FlexLayoutModule, + HttpClientModule, MatGridListModule, MatCardModule, MatMenuModule, diff --git a/bookie/src/app/core/core.module.ts b/bookie/src/app/core/core.module.ts index 570836a..8256fd2 100644 --- a/bookie/src/app/core/core.module.ts +++ b/bookie/src/app/core/core.module.ts @@ -7,14 +7,10 @@ import { MatToolbarModule } from '@angular/material/toolbar'; import {RouterModule} from '@angular/router'; import {HTTP_INTERCEPTORS} from '@angular/common/http'; import {HttpAuthInterceptor} from './http-auth-interceptor'; -import {LoadingBarHttpClientModule} from '@ngx-loading-bar/http-client'; -import {LoadingBarRouterModule} from '@ngx-loading-bar/router'; @NgModule({ imports: [ CommonModule, - LoadingBarHttpClientModule, - LoadingBarRouterModule, MatButtonModule, MatIconModule, MatMenuModule, @@ -23,10 +19,6 @@ import {LoadingBarRouterModule} from '@ngx-loading-bar/router'; ], declarations: [ ], - exports: [ - LoadingBarHttpClientModule, - LoadingBarRouterModule - ], providers: [[{ provide: HTTP_INTERCEPTORS, useClass: HttpAuthInterceptor, diff --git a/bookie/src/app/printers/printer-detail/printer-detail.component.html b/bookie/src/app/printers/printer-detail/printer-detail.component.html index 72bb26b..9801759 100644 --- a/bookie/src/app/printers/printer-detail/printer-detail.component.html +++ b/bookie/src/app/printers/printer-detail/printer-detail.component.html @@ -26,8 +26,8 @@ - - + + diff --git a/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html b/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html index 9ac015d..3cb32fc 100644 --- a/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html +++ b/bookie/src/app/sale-category/sale-category-detail/sale-category-detail.component.html @@ -26,8 +26,8 @@ - - + + diff --git a/bookie/src/app/section-printers/section-printer.component.html b/bookie/src/app/section-printers/section-printer.component.html index a6d616e..5c5bcdc 100644 --- a/bookie/src/app/section-printers/section-printer.component.html +++ b/bookie/src/app/section-printers/section-printer.component.html @@ -59,7 +59,7 @@ - + diff --git a/bookie/src/app/sections/section-detail/section-detail.component.html b/bookie/src/app/sections/section-detail/section-detail.component.html index 3a3619d..40d9983 100644 --- a/bookie/src/app/sections/section-detail/section-detail.component.html +++ b/bookie/src/app/sections/section-detail/section-detail.component.html @@ -15,8 +15,8 @@ - - + +