From 640c99cde2c520080ba5f53016c09f06550ef8b0 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Tue, 6 Oct 2020 09:07:40 +0200 Subject: [PATCH] Add test component --- package-lock.json | 18 +++++++++--------- package.json | 6 +++--- src/app/app-routing.module.ts | 7 ++++++- src/app/app.module.ts | 4 +++- src/app/test/test.component.html | 12 ++++++++++++ src/app/test/test.component.scss | 0 src/app/test/test.component.spec.ts | 25 +++++++++++++++++++++++++ src/app/test/test.component.ts | 20 ++++++++++++++++++++ 8 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 src/app/test/test.component.html create mode 100644 src/app/test/test.component.scss create mode 100644 src/app/test/test.component.spec.ts create mode 100644 src/app/test/test.component.ts diff --git a/package-lock.json b/package-lock.json index 4f21e37..72464f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1707,25 +1707,25 @@ } }, "@farmmaps/common": { - "version": "0.0.1-prerelease.430", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.430.tgz", - "integrity": "sha512-UMllsjUL+ky/jIde0CxHov9xB6bpdtb0ZF2aoRltbJWBR6Eaoa7O5i3c6BrQn7BxTNcPWcFyPgHLr3/r8BgtVg==", + "version": "0.0.1-prerelease.434", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.434.tgz", + "integrity": "sha512-4xDbu8GV7iP05ZfHx2IoA0imvbdmCM+bUnNQ8kUAGvvudgg4pzDsItFG5PkQBnYd7IfpLiwOLXHCFAa6SvijCg==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map": { - "version": "0.0.1-prerelease.430", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.430.tgz", - "integrity": "sha512-9g0GDpYHKiP04KOjj1bxMSgrK2hs3dKp4TXFWE1PNczKjuBXNSceviAFSo1dyghP5oYZBQJquHxI0nF1Ks8eRg==", + "version": "0.0.1-prerelease.434", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.434.tgz", + "integrity": "sha512-DGp6cRGSpyJ/TxnQ3XH1enXJO1vQgULixU9i2HGgs5/2Gc65Cps3oPRObYrzjwPEOATfDGGthzdveeL5+cpGMg==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "0.0.1-prerelease.430", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.430.tgz", - "integrity": "sha512-a1tBLu57+tQaInKs6DJQrrKIJ/YkV+asPNPAd0P9wHVpai4wLe0EPZeD5p1MPvKhyU5a9udq26tx0I53VwPlLQ==", + "version": "0.0.1-prerelease.434", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.434.tgz", + "integrity": "sha512-EbtdamVsJlop2EHJRYUzrXsz2356CCjyRYbrPKNCrhMtXhKLk2hRW2of5C4+LVdcutCudJbAa6zll9k6Nb905w==", "requires": { "tslib": "^2.0.0" } diff --git a/package.json b/package.json index be4723e..4c72c89 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~10.1.3", "@angular/platform-browser-dynamic": "~10.1.3", "@angular/router": "~10.1.3", - "@farmmaps/common": ">=0.0.1-prerelease.430 <0.0.1", - "@farmmaps/common-map": ">=0.0.1-prerelease.430 <0.0.1", - "@farmmaps/common-map3d": ">=0.0.1-prerelease.430 <0.0.1", + "@farmmaps/common": ">=0.0.1-prerelease.434 <0.0.1", + "@farmmaps/common-map": ">=0.0.1-prerelease.434 <0.0.1", + "@farmmaps/common-map3d": ">=0.0.1-prerelease.434 <0.0.1", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2961558..40efa4b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -9,6 +9,7 @@ import { MenuComponent } from './menu/menu.component'; import {RegisterDeviceComponent} from './registerdevice/registerdevice.component'; import {NotImplementedComponent} from '@farmmaps/common'; import { NavBarGuard } from 'projects/common/src/public-api'; +import {TestComponent} from './test/test.component'; export function urlMatcher(url: UrlSegment[]) { return {consumed:url}; @@ -59,12 +60,16 @@ const routes = [ { path: ':queryState', component: MapComponent - } + } ]}, { path:'registerdevice/:deviceToken', canActivate:[FullScreenGuard], component:RegisterDeviceComponent + }, + { + path:'test', + component: TestComponent } ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 53ad953..ac145aa 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -22,6 +22,7 @@ import {RegisterDeviceComponent} from './registerdevice/registerdevice.component import { SecureOAuthStorage} from '@farmmaps/common'; import { OAuthStorage } from 'angular-oauth2-oidc'; import {Id4AuthconfigFactory} from './id4AuthconfigFactory'; +import { TestComponent } from './test/test.component'; export const BOOTSTRAP_EFFECTS = new InjectionToken('Bootstrap Effects'); @@ -65,7 +66,8 @@ export const metaReducers: MetaReducer[] = [debug]; AppRootComponent, LogoComponent, MenuComponent, - RegisterDeviceComponent + RegisterDeviceComponent, + TestComponent ], imports: [ AppRoutingModule, diff --git a/src/app/test/test.component.html b/src/app/test/test.component.html new file mode 100644 index 0000000..c8f21b7 --- /dev/null +++ b/src/app/test/test.component.html @@ -0,0 +1,12 @@ +
+
+ +
+
+ +
+
+ + + + diff --git a/src/app/test/test.component.scss b/src/app/test/test.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/test/test.component.spec.ts b/src/app/test/test.component.spec.ts new file mode 100644 index 0000000..e0f9bcc --- /dev/null +++ b/src/app/test/test.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TestComponent } from './test.component'; + +describe('TestComponent', () => { + let component: TestComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ TestComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(TestComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/test/test.component.ts b/src/app/test/test.component.ts new file mode 100644 index 0000000..672ed97 --- /dev/null +++ b/src/app/test/test.component.ts @@ -0,0 +1,20 @@ +import { Component, OnInit } from '@angular/core'; +import { ItemService} from '@farmmaps/common'; +import { Observable} from 'rxjs'; + +@Component({ + selector: 'app-test', + templateUrl: './test.component.html', + styleUrls: ['./test.component.scss'] +}) +export class TestComponent implements OnInit { + + public gradientItems:Observable + + constructor(private itemService$:ItemService) { + this.gradientItems = this.itemService$.getItemList("vnd.farmmaps.itemtype.gradient"); + } + + ngOnInit(): void { + } +}