Update template by the generated project (#59)

* Update template by the generated project

* Add license

Author: dxvladislavvolkov

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Developer Express Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

angular.json

@@ -1,12 +1,18 @@
 {
-  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
     "devextreme-angular-template": {
       "root": "",
+      "sourceRoot": "src",
       "projectType": "application",
       "prefix": "app",
+      "schematics": {
+        "@schematics/angular:component": {
+          "styleext": "scss"
+        }
+      },
       "architect": {
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
@@ -17,22 +23,14 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
             "assets": [
-              {
-                "glob": "favicon.ico",
-                "input": "src",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/assets",
-                "output": "/assets"
-              }
+              "src/favicon.ico",
+              "src/assets"
             ],
             "styles": [
-              { "input": "src/styles.scss" },
-              "./node_modules/devextreme/dist/css/dx.common.css",
+              "node_modules/devextreme/dist/css/dx.common.css",
               "./src/themes/generated/theme.additional.css",
-              "./src/themes/generated/theme.base.css"
+              "./src/themes/generated/theme.base.css",
+              "src/styles.scss"
             ],
             "scripts": []
           },
@@ -81,22 +79,12 @@
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "styles": [
-              {
-                "input": "styles.scss"
-              }
+              "src/styles.scss"
             ],
             "scripts": [],
             "assets": [
-              {
-                "glob": "favicon.ico",
-                "input": "src/",
-                "output": "/"
-              },
-              {
-                "glob": "**/*",
-                "input": "src/assets",
-                "output": "/assets"
-              }
+              "src/favicon.ico",
+              "src/assets"
             ]
           }
         },
@@ -123,6 +111,11 @@
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
             "devServerTarget": "devextreme-angular-template:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "devextreme-angular-template:serve:production"
+            }
           }
         },
         "lint": {
@@ -136,5 +129,6 @@
         }
       }
     }
-  }
+  },
+  "defaultProject": "devextreme-angular-template"
 }

package.json

@@ -1,10 +1,9 @@
 {
   "name": "devextreme-angular-template",
   "version": "0.0.0",
-  "license": "MIT",
   "scripts": {
     "ng": "ng",
-    "start": "npm run build-themes && ng serve",
+    "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
@@ -13,45 +12,43 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.0.0",
-    "@angular/cdk": "6.0.0",
-    "@angular/common": "^6.0.0",
-    "@angular/compiler": "^6.0.0",
-    "@angular/core": "^6.0.0",
-    "@angular/flex-layout": "6.0.0-beta.15",
-    "@angular/forms": "^6.0.0",
-    "@angular/http": "^6.0.0",
-    "@angular/platform-browser": "^6.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.0",
-    "@angular/router": "^6.0.0",
-    "@types/jszip": "^3.1.3",
+    "@angular/animations": "^6.1.0",
+    "@angular/cdk": "^6.0.0",
+    "@angular/common": "^6.1.0",
+    "@angular/compiler": "^6.1.0",
+    "@angular/core": "^6.1.0",
+    "@angular/forms": "^6.1.0",
+    "@angular/http": "^6.1.0",
+    "@angular/platform-browser": "^6.1.0",
+    "@angular/platform-browser-dynamic": "^6.1.0",
+    "@angular/router": "^6.1.0",
+    "copyfiles": "^2.1.0",
     "core-js": "^2.5.4",
     "devextreme": "18.2-unstable",
     "devextreme-angular": "18.2-unstable",
-    "jszip": "^3.1.5",
-    "rxjs": "^6.1.0",
-    "zone.js": "^0.8.24"
+    "rxjs": "~6.2.0",
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.5.0",
-    "@angular/cli": "~6.0.0",
-    "@angular/compiler-cli": "^6.0.0",
-    "@angular/language-service": "^6.0.0",
-    "@types/jasmine": "~2.8.6",
+    "@angular-devkit/build-angular": "~0.8.0",
+    "@angular/cli": "~6.2.4",
+    "@angular/compiler-cli": "^6.1.0",
+    "@angular/language-service": "^6.1.0",
+    "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "codelyzer": "~4.2.1",
+    "codelyzer": "~4.3.0",
     "devextreme-cli": "latest",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~1.7.1",
+    "karma": "~3.0.0",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~1.4.2",
-    "karma-jasmine": "~1.1.1",
+    "karma-coverage-istanbul-reporter": "~2.0.1",
+    "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.3.0",
-    "ts-node": "~5.0.1",
-    "tslint": "~5.9.1",
-    "typescript": "~2.7.2"
+    "protractor": "~5.4.0",
+    "ts-node": "~7.0.0",
+    "tslint": "~5.11.0",
+    "typescript": "~2.9.2"
   }
 }

src/app/app-navigation.ts

@@ -3,8 +3,7 @@ export const navigation = [
         text: 'Home',
         path: '/home',
         icon: 'home'
-    },
-    {
+    }, {
         text: 'Examples',
         icon: 'folder',
         items: [{
@@ -14,5 +13,4 @@ export const navigation = [
             text: 'Display Data',
             path: '/display-data'
         }]
-    }
-];
+    }];

src/app/app-routing.module.ts

@@ -1,21 +1,17 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
-
+import { HomeComponent } from './pages/home/home.component';
 import { ProfileComponent } from './pages/profile/profile.component';
 import { DisplayDataComponent } from './pages/display-data/display-data.component';
-import { HomeComponent } from './pages/home/home.component';
-
-import {
-    DxDataGridModule,
-    DxFormModule
-} from 'devextreme-angular';
+import { DxDataGridModule, DxFormModule } from 'devextreme-angular';
 
-export const routes: Routes = [
+const routes: Routes = [
     {
         path: '',
         redirectTo: 'home',
         pathMatch: 'full'
-    }, {
+    }
+, {
         path: 'home',
         component: HomeComponent
     }, {
@@ -24,16 +20,11 @@ export const routes: Routes = [
     }, {
         path: 'display-data',
         component: DisplayDataComponent
-    }
-];
+    }];
 
 @NgModule({
-    imports: [
-        RouterModule.forRoot(routes),
-        DxDataGridModule,
-        DxFormModule
-    ],
-    exports: [ RouterModule ],
-    declarations: [HomeComponent, DisplayDataComponent, ProfileComponent]
+  imports: [RouterModule.forRoot(routes), DxDataGridModule, DxFormModule],
+  exports: [RouterModule],
+  declarations: [HomeComponent, ProfileComponent, DisplayDataComponent]
 })
-export class PagesRoutingModule {}
+export class AppRoutingModule { }

src/app/app.component.html

@@ -1,4 +1,4 @@
-<app-side-nav-outer-toolbar title="DevExtreme Angular Template">
+<app-side-nav-outer-toolbar title="Devextreme Angular Template">
     <router-outlet></router-outlet>
 
     <app-footer>

src/app/app.component.spec.ts

@@ -1,27 +1,31 @@
 import { TestBed, async } from '@angular/core/testing';
 import { AppComponent } from './app.component';
+
 describe('AppComponent', () => {
-    beforeEach(async(() => {
-        TestBed.configureTestingModule({
-            declarations: [
-              AppComponent
-            ],
-        }).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'`, async(() => {
-        const fixture = TestBed.createComponent(AppComponent);
-        const app = fixture.debugElement.componentInstance;
-        expect(app.title).toEqual('app');
-    }));
-    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('Welcome to app!');
-    }));
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  it(`should have as title 'devextreme-angular-template'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.debugElement.componentInstance;
+    expect(app.title).toEqual('devextreme-angular-template');
+  });
+
+  it('should render title in a h1 tag', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to devextreme-angular-template!');
+  });
 });

src/app/app.component.ts

@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
 @Component({
-    selector: 'app-root',
-    templateUrl: './app.component.html',
-    styleUrls: ['./app.component.scss']
+  selector: 'app-root',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss']
 })
-export class AppComponent  {
-
+export class AppComponent {
+  title = 'devextreme-angular-template';
 }

src/app/app.module.ts

@@ -2,27 +2,22 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 
 import { AppComponent } from './app.component';
-
-import { PagesRoutingModule } from './app-routing.module';
-import {
-    SideNavOuterToolbarModule,
-    SideNavInnerToolbarModule
-} from './layouts';
-
+import { SideNavOuterToolbarModule, SideNavInnerToolbarModule } from './layouts';
 import { FooterModule } from './shared/components/footer/footer.component';
+import { AppRoutingModule } from './app-routing.module';
 
 @NgModule({
-    declarations: [
-        AppComponent
-    ],
-    imports: [
-        FooterModule,
-        SideNavOuterToolbarModule,
-        SideNavInnerToolbarModule,
-        BrowserModule,
-        PagesRoutingModule
-    ],
-    providers: [],
-    bootstrap: [AppComponent]
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    SideNavOuterToolbarModule,
+    SideNavInnerToolbarModule,
+    FooterModule,
+    AppRoutingModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
 })
 export class AppModule { }