Skip to content
This repository has been archived by the owner on Jul 8, 2024. It is now read-only.

Commit

Permalink
fix: angular 9 template
Browse files Browse the repository at this point in the history
  • Loading branch information
JamilOmar committed May 7, 2020
1 parent 0f32b08 commit d390344
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 46 deletions.
4 changes: 2 additions & 2 deletions templates/ui-package/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {RouterModule, Routes} from '@angular/router';
import {LayoutComponent, LeftNavComponent, HeaderComponent, TenantNavComponent} from '@labshare/ngx-core-components';
import {LayoutComponent, LeftNavComponent, HeaderComponent, TenantNavComponent} from '@labshare/ngx-base-components';
import {LabShareComponent} from './labshare/labshare.component';
import {ConfigResolverService} from '@labshare/ngx-core-components';
import {ConfigResolverService} from '@labshare/ngx-base-components';
import {FormsComponent} from './forms/forms.component';
import {LoggingComponent} from './logging/logging.component';
import {AuthComponent} from './auth/auth.component';
Expand Down
4 changes: 2 additions & 2 deletions templates/ui-package/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {AuthService, EventService} from '@labshare/ngx-core-services';
import {ActivatedRoute, Router} from '@angular/router';
import {EventKeys} from '@labshare/ngx-core-components';
import {EventKeys} from '@labshare/ngx-base-components';
import {filter} from 'rxjs/operators';
@Component({
selector: 'app-root',
Expand All @@ -14,7 +14,7 @@ export class AppComponent implements OnInit {
ngOnInit(): void {
this.eventService
.get(EventKeys.LeftMenu)
.pipe(filter(x => x !== null))
.pipe(filter(x => x))
.subscribe(val => {
switch (val.id) {
case 'left.home':
Expand Down
4 changes: 2 additions & 2 deletions templates/ui-package/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {BrowserModule} from '@angular/platform-browser';
import {NgModule, APP_INITIALIZER} from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {UsersRouting} from './app-routing.module';
import {NgxCoreComponentsModule} from '@labshare/ngx-core-components';
import {LayoutModule} from '@labshare/ngx-base-components';
import {CenterHeaderComponent} from './center-header/center-header.component';
import {AppComponent} from './app.component';
import {LabShareComponent} from './labshare/labshare.component';
Expand Down Expand Up @@ -52,7 +52,7 @@ function initialize(http: HttpClient, config: ConfigService, auth: AuthService):
imports: [
BrowserModule,
NgxCoreServicesModule.forRoot({appConf: APP_CONF, appType: APP_TYPE, appBuildVersion: APP_BUILD_VERSION}),
NgxCoreComponentsModule.forRoot(customThemes),
LayoutModule.forRoot(customThemes),
CommonModule,
UsersRouting,
ReactiveFormsModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "node_modules/@labshare/ngx-core-components/scss/variables.scss";
@import "node_modules/@labshare/ngx-base-components/scss/variables.scss";
$main-container-color: "#321771";

$main-text-color: "#c2c2c2";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "node_modules/@labshare/ngx-core-components/scss/variables.scss";
@import "node_modules/@labshare/ngx-base-components/scss/variables.scss";

$main-container-color: "#321771";
$main-text-color: "#c2c2c2";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {EventService} from '@labshare/ngx-core-services';
import {Title} from '@angular/platform-browser';
import {EventKeys} from '@labshare/ngx-core-components';
import {EventKeys} from '@labshare/ngx-base-components';

@Component({
selector: 'app-labshare',
Expand Down
2 changes: 1 addition & 1 deletion templates/ui-package/src/app/theme/theme.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Theme} from '@labshare/ngx-core-components';
import {Theme} from '@labshare/ngx-base-components';

export const labshare: Theme = {
name: 'labshare',
Expand Down
2 changes: 1 addition & 1 deletion templates/ui-package/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.

import '@angular/localize/init';
/***************************************************************************************************
* APPLICATION IMPORTS
*/
71 changes: 36 additions & 35 deletions templates/ui-package/tmp-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,66 +31,67 @@
"license": "MIT",
"private": true,
"dependencies": {
"@angular/animations": "~8.2.11",
"@angular/common": "~8.2.11",
"@angular/compiler": "~8.2.11",
"@angular/core": "~8.2.11",
"@angular/forms": "^8.2.14",
"@angular/platform-browser": "~8.2.11",
"@angular/platform-browser-dynamic": "~8.2.11",
"@angular/router": "~8.2.11",
"@angular/animations": "~9.1.4",
"@angular/common": "~9.1.4",
"@angular/compiler": "~9.1.4",
"@angular/core": "~9.1.4",
"@angular/forms": "~9.1.4",
"@angular/localize": "^9.1.4",
"@angular/platform-browser": "~9.1.4",
"@angular/platform-browser-dynamic": "~9.1.4",
"@angular/router": "~9.1.4",
"@labshare/ls-font": "^1.0.0",
"@labshare/ngx-core-components": "^1.0.7",
"@labshare/ngx-core-services": "^2.0.0",
"@labshare/shell-ui": "^2.0.0",
"@labshare/ngx-base-components": "^1.2.4",
"@labshare/ngx-core-services": "^2.1.4",
"@ng-bootstrap/ng-bootstrap": "^5.2.2",
"@ngx-formly/bootstrap": "^5.5.11",
"@ngx-formly/core": "^5.5.11",
"bootstrap": "^4.4.1",
"font-awesome": "^4.7.0",
"immutable": "^4.0.0-rc.12",
"ngx-json-viewer": "^2.4.0",
"prismjs": "^1.19.0",
"rxjs": "~6.4.0",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
"zone.js": "~0.9.1"
"zone.js": "~0.10.2"
},
"packageDependencies": [
"@labshare/shell-ui"
],
"devDependencies": {
"@angular-devkit/build-angular": "~0.803.14",
"@angular/cli": "~8.3.14",
"@angular/compiler-cli": "~8.2.11",
"@angular/language-service": "~8.2.11",
"@angular-devkit/build-angular": "~0.901.4",
"@angular/cli": "~9.1.4",
"@angular/compiler-cli": "~9.1.4",
"@angular/language-service": "~9.1.4",
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@labshare/semantic-release-config": "^1.1.2",
"@pnp/common": "^1.3.6",
"@pnp/logging": "^1.3.6",
"@pnp/nodejs": "^1.3.6",
"@pnp/odata": "^1.3.6",
"@pnp/sp": "^1.3.6",
"@types/jasmine": "~3.3.8",
"@pnp/common": "^1.3.11",
"@pnp/logging": "^1.3.11",
"@pnp/nodejs": "^1.3.11",
"@pnp/odata": "^1.3.11",
"@pnp/sp": "^1.3.11",
"@labshare/shell-ui": "^2.2.0",
"@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "^5.0.0",
"codelyzer": "^5.1.2",
"cordova": "~9.0.0",
"electron": "~5.0.0",
"husky": "^4.2.3",
"jasmine-core": "~3.4.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.1.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^1.4.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~3.0.1",
"karma-jasmine-html-reporter": "^1.4.2",
"lint-staged": "^10.0.8",
"powershell": "^2.3.1",
"prettier": "1.19.1",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
"tslint": "~5.15.0",
"typescript": "~3.5.3"
"protractor": "~5.4.3",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~3.8.3"
},
"husky": {
"hooks": {
Expand Down

0 comments on commit d390344

Please sign in to comment.