From ba2867b8015654b74937b3e6a06dd9d7521f3893 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 8 Feb 2017 15:50:52 +0200 Subject: [PATCH] first commit --- package.json | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------- src/app/app.component.css | 14 ++++++++++++++ src/app/app.component.html | 8 +++++--- src/app/app.component.spec.ts | 34 ---------------------------------- src/app/app.component.ts | 11 +++++++---- src/app/app.module.ts | 5 ++++- src/styles.css | 2 +- src/tsconfig.json | 37 ++++++++++++++++++++----------------- 8 files changed, 101 insertions(+), 105 deletions(-) delete mode 100644 src/app/app.component.spec.ts diff --git a/package.json b/package.json index 8dbf91d..4480cdf 100644 --- a/package.json +++ b/package.json @@ -1,46 +1,51 @@ { - "name": "main-maps", - "version": "0.0.0", - "license": "MIT", - "angular-cli": {}, - "scripts": { - "ng": "ng", - "start": "ng serve", - "test": "ng test", - "pree2e": "webdriver-manager update --standalone false --gecko false", - "e2e": "protractor" - }, - "private": true, - "dependencies": { - "@angular/common": "^2.3.1", - "@angular/compiler": "^2.3.1", - "@angular/core": "^2.3.1", - "@angular/forms": "^2.3.1", - "@angular/http": "^2.3.1", - "@angular/platform-browser": "^2.3.1", - "@angular/platform-browser-dynamic": "^2.3.1", - "@angular/router": "^3.3.1", - "core-js": "^2.4.1", - "rxjs": "^5.0.1", - "ts-helpers": "^1.1.1", - "zone.js": "^0.7.2" - }, - "devDependencies": { - "@angular/compiler-cli": "^2.3.1", - "@types/jasmine": "2.5.38", - "@types/node": "^6.0.42", - "angular-cli": "1.0.0-beta.28.3", - "codelyzer": "~2.0.0-beta.1", - "jasmine-core": "2.5.2", - "jasmine-spec-reporter": "2.5.0", - "karma": "1.2.0", - "karma-chrome-launcher": "^2.0.0", - "karma-cli": "^1.0.1", - "karma-jasmine": "^1.0.2", - "karma-remap-istanbul": "^0.2.1", - "protractor": "~4.0.13", - "ts-node": "1.2.1", - "tslint": "^4.3.0", - "typescript": "~2.0.3" - } -} + "name": "main-maps", + "version": "0.0.0", + "license": "MIT", + "angular-cli": {}, + "scripts": { + "ng": "ng", + "start": "ng serve", + "test": "ng test", + "pree2e": "webdriver-manager update --standalone false --gecko false", + "e2e": "protractor" + }, + "private": true, + "dependencies": { + "@angular/common": "^2.3.1", + "@angular/compiler": "^2.3.1", + "@angular/core": "^2.3.1", + "@angular/forms": "^2.3.1", + "@angular/http": "^2.3.1", + "@angular/material": "^2.0.0-beta.1", + "@angular/platform-browser": "^2.3.1", + "@angular/platform-browser-dynamic": "^2.3.1", + "@angular/router": "^3.3.1", + "ag-grid": "7.2.x", + "ag-grid-ng2": "7.2.x", + "core-js": "^2.4.1", + "hammerjs": "^2.0.8", + "rxjs": "^5.0.1", + "ts-helpers": "^1.1.1", + "zone.js": "^0.7.2" + }, + "devDependencies": { + "@angular/compiler-cli": "^2.3.1", + "@types/hammerjs": "^2.0.34", + "@types/jasmine": "2.5.38", + "@types/node": "^6.0.42", + "angular-cli": "1.0.0-beta.28.3", + "codelyzer": "~2.0.0-beta.1", + "jasmine-core": "2.5.2", + "jasmine-spec-reporter": "2.5.0", + "karma": "1.2.0", + "karma-chrome-launcher": "^2.0.0", + "karma-cli": "^1.0.1", + "karma-jasmine": "^1.0.2", + "karma-remap-istanbul": "^0.2.1", + "protractor": "~4.0.13", + "ts-node": "1.2.1", + "tslint": "^4.3.0", + "typescript": "~2.0.3" + } +} \ No newline at end of file diff --git a/src/app/app.component.css b/src/app/app.component.css index e69de29..3d2a75f 100644 --- a/src/app/app.component.css +++ b/src/app/app.component.css @@ -0,0 +1,14 @@ +.example-h2 { + margin: 10px; +} + +.example-section { + display: flex; + align-content: center; + align-items: center; + height: 60px; +} + +.example-margin { + margin: 0 10px; +} \ No newline at end of file diff --git a/src/app/app.component.html b/src/app/app.component.html index b6931b5..2e4ffcc 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,3 +1,5 @@ -

- {{title}} -

+ + + {{tile.text}} + + \ No newline at end of file diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts deleted file mode 100644 index 5be2cb3..0000000 --- a/src/app/app.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* tslint:disable:no-unused-variable */ - -import { TestBed, async } from '@angular/core/testing'; -import { AppComponent } from './app.component'; - -describe('AppComponent', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - declarations: [ - AppComponent - ], - }); - TestBed.compileComponents(); - }); - - it('should create the app', async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app).toBeTruthy(); - })); - - it(`should have as title 'app works!'`, async(() => { - const fixture = TestBed.createComponent(AppComponent); - const app = fixture.debugElement.componentInstance; - expect(app.title).toEqual('app works!'); - })); - - it('should render title in a h1 tag', async(() => { - const fixture = TestBed.createComponent(AppComponent); - fixture.detectChanges(); - const compiled = fixture.debugElement.nativeElement; - expect(compiled.querySelector('h1').textContent).toContain('app works!'); - })); -}); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index ff63e05..145314e 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,10 +1,13 @@ -import { Component } from '@angular/core'; +import {Component} from '@angular/core'; + @Component({ selector: 'app-root', templateUrl: './app.component.html', - styleUrls: ['./app.component.css'] }) export class AppComponent { - title = 'app works!'; -} + checked = false; + indeterminate = false; + align = 'start'; + disabled = false; +} \ No newline at end of file diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 67ae491..9e64152 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,6 +2,8 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { HttpModule } from '@angular/http'; +import { MaterialModule } from '@angular/material'; +import 'hammerjs'; import { AppComponent } from './app.component'; @@ -12,7 +14,8 @@ import { AppComponent } from './app.component'; imports: [ BrowserModule, FormsModule, - HttpModule + HttpModule, + MaterialModule.forRoot() ], providers: [], bootstrap: [AppComponent] diff --git a/src/styles.css b/src/styles.css index 90d4ee0..348598d 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1 +1 @@ -/* You can add global styles to this file, and also import other style files */ +@import '~@angular/material/core/theming/prebuilt/deeppurple-amber.css'; \ No newline at end of file diff --git a/src/tsconfig.json b/src/tsconfig.json index 1cf713a..e0f4a63 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -1,18 +1,21 @@ { - "compilerOptions": { - "baseUrl": "", - "declaration": false, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "lib": ["es6", "dom"], - "mapRoot": "./", - "module": "es6", - "moduleResolution": "node", - "outDir": "../dist/out-tsc", - "sourceMap": true, - "target": "es5", - "typeRoots": [ - "../node_modules/@types" - ] - } -} + "compilerOptions": { + "types": [ + "hammerjs" + ], + "baseUrl": "", + "declaration": false, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "lib": ["es6", "dom"], + "mapRoot": "./", + "module": "es6", + "moduleResolution": "node", + "outDir": "../dist/out-tsc", + "sourceMap": true, + "target": "es5", + "typeRoots": [ + "../node_modules/@types" + ] + } +} \ No newline at end of file -- libgit2 0.21.4