Merge branch 'release/1.10.5'

.angular-cli.json

@@ -25,7 +25,8 @@
       "environmentSource": "environments/environment.ts",
       "environments": {
         "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
+        "prod": "environments/environment.prod.ts",
+        "mockapi": "environments/environment.mockapi.ts"
       }
     }
   ],

CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="1.10.5"></a>
+## [1.10.5](https://github.com/site15/rucken/compare/1.10.3...v1.10.5) (2017-08-07)
+
+
+### Bug Fixes
+
+* **base-resource.model:** Change detect used timezone fore  date fields ([2264941](https://github.com/site15/rucken/commit/2264941))
+* **env:** Change demo host url in environment ([ca4dcce](https://github.com/site15/rucken/commit/ca4dcce))
+* **refactor:** Change modal-footer-buttons to footer-buttons ([6df03cc](https://github.com/site15/rucken/commit/6df03cc))
+* **refactor:** Change name of ResouceEnumStatus to EndpointStatusEnum ([5218af3](https://github.com/site15/rucken/commit/5218af3))
+* **services:** Refactor helpers and account service ([5f489de](https://github.com/site15/rucken/commit/5f489de))
+
+
+
 <a name="1.10.4"></a>
 ## [1.10.4](https://github.com/site15/rucken/compare/1.10.3...v1.10.4) (2017-07-02)
 

README.md

@@ -33,7 +33,7 @@ Core with Admin UI for web application maked on Angular4
 
 MIT
 
-[travis-image]: https://travis-ci.org/site15/rucken.svg?branch=develop
+[travis-image]: https://travis-ci.org/site15/rucken.svg?branch=master
 [travis-url]: https://travis-ci.org/site15/rucken
 [gitter-image]: https://img.shields.io/gitter/room/nwjs/nw.js.svg
 [gitter-url]: https://gitter.im/site15-ru/rucken

demo/src/app/app.module.ts

@@ -17,13 +17,11 @@ import {
 } from './../../../src';
 import { DemoAppComponent } from './app.component';
 import { DemoEndpointHelper } from './demo/shared/helpers/endpoint.helper';
-import { DemoHttpHelper } from './demo/shared/helpers/http.helper';
-import { DemoAccountService } from './demo/shared/account.service';
-import { DemoRepositoryHelper } from './demo/shared/helpers/repository.helper';
 import { RouterModule } from '@angular/router';
 import { DemoRoutes } from './app.routes';
 import { DemoNavbarModule } from './demo/controls/navbar/navbar.module';
 import { LaddaModule } from 'angular2-ladda';
+import { DemoHttpHelper } from './demo/shared/helpers/http.helper';
 
 @NgModule({
   declarations: [
@@ -58,10 +56,9 @@ import { LaddaModule } from 'angular2-ladda';
     SelectInputConfig,
     TableColumnConfig,
     { provide: AuthHttp, useFactory: AuthHttpFactory.create, deps: [Http, RequestOptions] },
-    { provide: RepositoryHelper, useClass: DemoRepositoryHelper },
     { provide: EndpointHelper, useClass: DemoEndpointHelper },
-    { provide: HttpHelper, useClass: DemoHttpHelper },
-    { provide: AccountService, useClass: DemoAccountService }
+    { provide: RepositoryHelper, useClass: RepositoryHelper },
+    { provide: HttpHelper, useClass: DemoHttpHelper }
   ],
   bootstrap: [DemoAppComponent]
 })

demo/src/app/demo/pages/home-page/home-page.component.html

@@ -1,4 +1,4 @@
 <div class="container-fluid">
   <page-header [title]="title"></page-header>
-  <div [innerHtml]="formatedReadme"></div>
+  <div [innerHtml]="readme"></div>
 </div>

demo/src/app/demo/pages/home-page/home-page.component.ts

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { AppService, AccountService, BasePageComponent } from './../../../../../../src';
 import { ActivatedRoute, Router } from '@angular/router';
+import { DomSanitizer } from '@angular/platform-browser';
 
 @Component({
   selector: 'home-page',
@@ -11,18 +12,16 @@ import { ActivatedRoute, Router } from '@angular/router';
 
 export class HomePageComponent extends BasePageComponent {
 
-  readme: string = require('html-loader!markdown-loader!./../../../../../../README.md');
-
   constructor(
+    public sanitizer: DomSanitizer,
     public accountService: AccountService,
     public app: AppService,
     public translateService: TranslateService,
     public activatedRoute: ActivatedRoute,
     public router: Router
   ) {
     super(accountService, app, translateService, activatedRoute, router);
-  }
-  get formatedReadme() {
-    return this.readme.replace('<h1 id="rucken">rucken</h1>', '');
+    const readme = require('html-loader!markdown-loader!./../../../../../../README.md');
+    this.readme = this.safeHtml(readme.replace('<h1 id="rucken">rucken</h1>', ''))
   }
 }

demo/src/app/demo/shared/helpers/endpoint.helper.ts

@@ -1,9 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Http, Headers, RequestOptions, Response, URLSearchParams } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
-import { AuthHttp, AuthConfig } from 'angular2-jwt';
-import { MetaModel, EndpointHelper, HttpHelper } from './../../../../../../src';
-import * as _ from 'lodash';
+import { EndpointHelper, HttpHelper } from './../../../../../../src';
 import { environment } from './../../../../environments/environment';
 
 @Injectable()
@@ -14,17 +10,15 @@ export class DemoEndpointHelper extends EndpointHelper {
   get apiUrl() {
     return environment.apiUrl;
   }
-  actionRequest(endpointService: any, action?: any, data?: any): Observable<Response> {
-    if (endpointService.name === 'account') {
-      const url = this.actionUrl(endpointService, action).replace('account/', 'account-');
-      if (action === 'info') {
-        return this.httpHelper.http.get(url);
-      }
-      if (action === 'login') {
-        return this.httpHelper.http.get(url, data);
-      }
-      return this.httpHelper.http.post(url, data);
+  actionUrl(endpointService: any, action?: any) {
+    let endpointServiceApiUrl = endpointService.apiUrl;
+    if (environment.type === 'mockapi' && endpointService.name === 'account') {
+      endpointServiceApiUrl += '/1';
+    }
+    if (action === undefined) {
+      return endpointServiceApiUrl;
+    } else {
+      return `${endpointServiceApiUrl}/${action}`;
     }
-    return super.actionRequest(endpointService, action, data);
   };
 }

demo/src/app/demo/shared/helpers/http.helper.ts

@@ -3,16 +3,14 @@ import { Http, Headers, RequestOptions, Response } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 import { AuthHttp } from 'angular2-jwt';
 import { HttpHelper } from './../../../../../../src';
-import { environment } from './../../../../environments/environment';
+import { environment } from '../../../../environments/environment';
 
 @Injectable()
 export class DemoHttpHelper extends HttpHelper {
-  withCredentials = false;
 
-  constructor(
-    public authHttp: AuthHttp,
-    public http: Http
-  ) {
+  direct = environment.type === 'mockapi';
+
+  constructor(public authHttp: AuthHttp, public http: Http) {
     super(authHttp, http);
   }
 }

demo/src/environments/environment.mockapi.ts

@@ -0,0 +1,5 @@
+export const environment = {
+  type: 'mockapi',
+  production: false,
+  apiUrl: 'https://598726293223df0011bbead7.mockapi.io/api'
+};

demo/src/environments/environment.prod.ts

@@ -1,4 +1,5 @@
 export const environment = {
+  type: 'mockapi',
   production: true,
-  apiUrl: 'https://58b570c93b33631200bf2d3d.mockapi.io/api'
+  apiUrl: 'https://598726293223df0011bbead7.mockapi.io/api'
 };

demo/src/environments/environment.ts

@@ -1,4 +1,5 @@
 export const environment = {
+  type: 'django',
   production: false,
-  apiUrl: 'http://58b570c93b33631200bf2d3d.mockapi.io/api'
+  apiUrl: 'http://localhost:5000/api'
 };