@osovitny/anatoly 1.2.0 → 1.2.1

package/ng-package.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
+  "dest": "../../dist/anatoly",
+  "lib": {
+    "entryFile": "src/public-api.ts"
+  }
+}

package/package.json

@@ -1,18 +1,7 @@
 {
   "name": "@osovitny/anatoly",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "private": false,
   "peerDependencies": {
-    "tslib": "^1.10.0"
-  },
-  "main": "bundles/osovitny-anatoly.umd.js",
-  "module": "fesm5/osovitny-anatoly.js",
-  "es2015": "fesm2015/osovitny-anatoly.js",
-  "esm5": "esm5/osovitny-anatoly.js",
-  "esm2015": "esm2015/osovitny-anatoly.js",
-  "fesm5": "fesm5/osovitny-anatoly.js",
-  "fesm2015": "fesm2015/osovitny-anatoly.js",
-  "typings": "osovitny-anatoly.d.ts",
-  "metadata": "osovitny-anatoly.metadata.json",
-  "sideEffects": false
+  }
 }

package/src/lib/billing/billing.module.ts

@@ -0,0 +1,62 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    10 Nov 2017
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule, HttpClientXsrfModule, HttpClientJsonpModule, HttpClient } from '@angular/common/http';
+
+//@osovitny/anatoly
+import { AnatolyIdentityModule } from '../identity'
+
+//Components/subscriptions
+import { SubscribePlanButtonComponent } from './components/subscriptions/subscribe-plan-button.component';
+import { UpgradePlanButtonComponent } from './components/subscriptions/upgrade-plan-button.component';
+
+//Components/buyaccess
+import { BuyAccessButtonComponent } from './components/buyaccess/buyaccess-button.component';
+
+//Services
+import { BaseBillingApiService } from './services/base-billing-api.service';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    HttpClientModule,
+    HttpClientXsrfModule,
+    HttpClientJsonpModule,
+    AnatolyIdentityModule
+  ],
+  exports: [
+    CommonModule,
+    HttpClientModule,
+    HttpClientXsrfModule,
+    HttpClientJsonpModule,
+    SubscribePlanButtonComponent,
+    UpgradePlanButtonComponent,
+    BuyAccessButtonComponent
+  ],
+  declarations: [
+    SubscribePlanButtonComponent,
+    UpgradePlanButtonComponent,
+    BuyAccessButtonComponent
+  ],
+  providers: [
+    BaseBillingApiService
+  ]
+})
+
+export class AnatolyBillingModule {
+}

package/src/lib/billing/components/buyaccess/buyaccess-button.component.html

@@ -0,0 +1,15 @@
+<div *ngIf="contextUpdated">
+  <div *ngIf="!isUserSignedIn">
+    <anatoly-signup-button classbtn="btn btn-block btn-primary"></anatoly-signup-button>
+  </div>
+
+  <div *ngIf="isUserSignedIn">
+    <button class="btn btn-block btn-success selectPlan" *ngIf="plan == currentPlan">
+      Your Plan
+    </button>
+
+    <button class="btn btn-block  btn-warning selectPlan" *ngIf="plan != currentPlan && currentPlan == 1" (click)="onBuyPlan()">
+      Buy Now
+    </button>
+  </div>
+</div>

package/src/lib/billing/components/buyaccess/buyaccess-button.component.ts

@@ -0,0 +1,70 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    14 Aug 2018
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { Component, Input, OnInit } from '@angular/core';
+
+//Services
+import { AppContextService } from '../../../core/services/appcontext.service';
+import { BaseBillingApiService } from '../../services/base-billing-api.service';
+
+@Component({
+  selector: 'anatoly-buyaccess-button',
+  templateUrl: './buyaccess-button.component.html'
+})
+
+export class BuyAccessButtonComponent implements OnInit {
+  public contextUpdated: boolean = false;
+  public isUserSignedIn: boolean = false;
+  public currentPlan: number = 0;
+  public currentPlanTitle: string = "";
+
+  @Input() plan: number;
+  @Input() plantitle: string;
+
+  constructor(private appcontext: AppContextService, private api: BaseBillingApiService) {
+  }
+
+  ngOnInit() {
+    if (!this.appcontext.isUserSignedIn()) {
+        this.contextUpdated = true;
+        return;
+    }
+
+    this.appcontext.getCurrent((current) => {
+      this.isUserSignedIn = current.isUserSignedIn;
+
+      if (this.isUserSignedIn) {
+          this.currentPlan = current.account.billingPlan;
+          this.currentPlanTitle = current.account.billingPlanAsString;
+      }
+
+      this.contextUpdated = true;
+    });
+  }
+
+  onBuyPlan() {
+    const text = `Requested plan: ${this.plantitle} `;
+
+    var that = this;
+    osovitny.ui.areYouSure(text, 'Buying access', 'Confirm change', 'Cancel', () => {
+      that.api.buyAccess(that.plan, () => {
+        osovitny.ui.alertSuccess('Access Granted', null, () => {
+          (<any>window).location.reload();
+        });
+      });
+    });
+  }
+}

package/src/lib/billing/components/subscriptions/subscribe-plan-button.component.html

@@ -0,0 +1,21 @@
+<div *ngIf="contextUpdated">
+  <div *ngIf="!isUserSignedIn">
+    <anatoly-signup-button classbtn="btn btn-block btn-primary"></anatoly-signup-button>
+  </div>
+
+  <div *ngIf="isUserSignedIn">
+    <button class="btn btn-block btn-success selectPlan" *ngIf="plan == currentPlan">
+      Your Plan
+    </button>
+
+    <button class="btn btn-block  btn-warning selectPlan" *ngIf="requestedPlan != null && requestedPlan != 0 && plan == requestedPlan">
+      Requested
+    </button>
+
+    <anatoly-upgrade-plan-button *ngIf="plan != currentPlan && plan != requestedPlan"
+                                 [currentplantitle]="currentPlanTitle"
+                                 [requestedplan]=plan
+                                 [requestedplantitle]="plantitle">
+    </anatoly-upgrade-plan-button>
+  </div>
+</div>

package/src/lib/billing/components/subscriptions/subscribe-plan-button.component.ts

@@ -0,0 +1,60 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    1 Jun 2018
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { Component, Input, OnInit } from '@angular/core';
+
+//Services
+import { AppContextService } from '../../../core/services/appcontext.service';
+
+@Component({
+  selector: 'anatoly-subscribe-plan-button',
+  templateUrl: './subscribe-plan-button.component.html'
+})
+
+export class SubscribePlanButtonComponent implements OnInit {
+  public contextUpdated: boolean = false;
+  public isUserSignedIn: boolean = false;
+  public currentPlan: number = 0;
+  public currentPlanTitle: string = "";
+  public requestedPlan: number = 0;
+  public requestedPlanTitle: string = "";
+
+  @Input() plan: number;
+  @Input() plantitle: string;
+
+  constructor(private appcontext: AppContextService) {
+  }
+
+  ngOnInit() {
+    if (!this.appcontext.isUserSignedIn()) {
+        this.contextUpdated = true;
+        return;
+    }
+
+    this.appcontext.getCurrent((current) => {
+      this.isUserSignedIn = current.isUserSignedIn;
+
+      if (this.isUserSignedIn) {
+          this.currentPlan = current.account.billingPlan;
+          this.currentPlanTitle = current.account.billingPlanAsString;
+          this.requestedPlan = current.account.requestedBillingPlan;
+          this.requestedPlanTitle = current.account.requestedBillingPlanAsString;
+      }
+
+      this.contextUpdated = true;
+    });
+  }
+}

package/src/lib/billing/components/subscriptions/upgrade-plan-button.component.html

@@ -0,0 +1,3 @@
+<button class="btn btn-block btn-primary" (click)="onUpgradePlan()">
+  Upgrade
+</button>

package/src/lib/billing/components/subscriptions/upgrade-plan-button.component.ts

@@ -0,0 +1,47 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    12 Nov 2017
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { Component, Input } from '@angular/core';
+
+//Services
+import { BaseBillingApiService } from '../../services/base-billing-api.service';
+
+@Component({
+  selector: 'anatoly-upgrade-plan-button',
+  templateUrl: './upgrade-plan-button.component.html'
+})
+
+export class UpgradePlanButtonComponent {
+  @Input() currentplantitle: string;
+  @Input() requestedplan: number;
+  @Input() requestedplantitle: string;
+
+  constructor(private api: BaseBillingApiService) {
+  }
+
+  onUpgradePlan() {
+    const text = `Current plan: ${this.currentplantitle} New plan: ${this.requestedplantitle}`;
+
+    var that = this;
+    osovitny.ui.areYouSure(text, 'Change billing plan', 'Confirm change', 'Cancel', () => {
+      that.api.requestNewSubscription(that.requestedplan, () => {
+        osovitny.ui.alertSuccess('Your request for changing plan has been sent.', null, () => {
+          (<any>window).location.reload();
+        });
+      });
+    });
+  }
+}

package/{lib/billing/index.d.ts → src/lib/billing/index.ts}

@@ -1,5 +1,10 @@
+// Components
 export * from './components/buyaccess/buyaccess-button.component';
 export * from './components/subscriptions/subscribe-plan-button.component';
 export * from './components/subscriptions/upgrade-plan-button.component';
+
+// Services
 export * from './services/base-billing-api.service';
-export { AnatolyBillingModule } from './billing.module';
+
+//Module
+export { AnatolyBillingModule } from './billing.module';

package/src/lib/billing/services/base-billing-api.service.ts

@@ -0,0 +1,56 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    12 Nov 2017
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+//@osovitny/anatoly
+import { BaseApiService } from '../../core'
+
+@Injectable()
+export class BaseBillingApiService extends BaseApiService {
+  constructor(protected http: HttpClient) {
+    super(http);
+    this.baseUrl += 'billing/';
+  }
+
+  public requestNewSubscription(requestedPlan: Number, success?: Function, error?: Function) {
+    this.postQS('requestNewSubscription', { requestedPlan: requestedPlan })
+      .subscribe(
+        data => { },
+        e => { if (error) error() },
+        () => { if (success) success() }
+      );
+  }
+
+  public cancelRequestedSubscription(success?: Function, error?: Function) {
+    this.postQS('cancelRequestedSubscription', null)
+      .subscribe(
+        data => { },
+        e => { if (error) error() },
+        () => { if (success) success() }
+      );
+  }
+
+  public buyAccess(requestedPlan: Number, success?: Function, error?: Function) {
+    this.postQS('buyAccess', { requestedPlan: requestedPlan })
+      .subscribe(
+        data => { },
+        e => { if (error) error() },
+        () => { if (success) success() }
+      );
+  }
+}

package/src/lib/core/consts.ts

@@ -0,0 +1,7 @@
+namespace anatoly.consts {
+  export const jsonUrl: string = "/dist/json/";
+  export const appUrl = "/";
+  export const apiUrl = "/api/";
+}
+
+(<any>window).anatoly = anatoly;

package/src/lib/core/core.module.ts

@@ -0,0 +1,45 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    10 Nov 2017
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { HttpClientModule, HttpClientXsrfModule, HttpClientJsonpModule, HttpClient } from '@angular/common/http';
+
+//Services
+import { AppContextService } from './services/appcontext.service';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    HttpClientModule,
+    HttpClientXsrfModule,
+    HttpClientJsonpModule
+  ],
+  exports: [
+    CommonModule,
+    HttpClientModule,
+    HttpClientXsrfModule,
+    HttpClientJsonpModule
+  ],
+  declarations: [
+  ],
+  providers: [
+    AppContextService
+  ]
+})
+
+export class AnatolyCoreModule {
+}

package/{lib/core/index.d.ts → src/lib/core/index.ts}

@@ -1,5 +1,10 @@
+// Base
 export * from './services/base-api.service';
 export * from './services/base-gridedit.service';
 export * from './services/base-go.service';
+
+// Services
 export * from './services/appcontext.service';
-export { AnatolyCoreModule } from './core.module';
+
+//Module
+export { AnatolyCoreModule } from './core.module';

package/src/lib/core/services/appcontext.service.ts

@@ -0,0 +1,81 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    13 Nov 2017
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+//Node
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Subscription } from 'rxjs';
+
+//Custom
+import { BaseApiService } from './base-api.service';
+import '../consts';
+
+@Injectable()
+export class AppContextService extends BaseApiService {
+  private current = null;
+  private successes = [];
+  private subscription: Subscription = null;
+
+  constructor(protected http: HttpClient) {
+    super(http);
+    this.baseUrl = anatoly.consts.apiUrl + 'appcontext/';
+  }
+
+  getCurrent(success: Function) {
+    if (typeof success == "undefined") {
+        return;
+    }
+
+    if (this.current != null) {
+        success(this.current);
+        return;
+    }
+
+    this.successes.push(success);
+
+    if (this.subscription != null) {
+      return;
+    }
+
+    this.subscription = this.get('GetCurrentContext', null).subscribe(
+      data => {
+        this.dataReceived(data);
+      },
+      e => { }
+    );
+  }
+
+  dataReceived(data) {
+    this.current = data;
+
+    for (var i = 0; i < this.successes.length; i++) {
+      var success = this.successes[i];
+      success(data);
+    }
+
+    this.successes = [];
+    this.subscription.unsubscribe();
+    this.subscription = null;
+    this.current = null;
+  }
+
+  isUserSignedIn() {
+    return (<any>window).__context_isUserSignedIn;
+  }
+
+  isUserAdmin() {
+    return (<any>window).__context_isUserAdmin;
+  }
+}

package/src/lib/core/services/base-api.service.ts

@@ -0,0 +1,87 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    13 Nov 2017
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+
+//RxJs
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+                                         
+import '../consts';
+
+@Injectable()
+export class BaseApiService {
+  protected baseUrl: string;
+  protected jsonUrl: string;
+
+  constructor(protected http: HttpClient) {
+    this.baseUrl = anatoly.consts.apiUrl;
+  }
+
+  private serializeParams(data?: any): string {
+    return data ? ('?' + $.param(data)) : '';
+  }
+
+  //webApi
+  public get<T>(action: String, data?: any): Observable<T> {
+    var url = this.baseUrl + `${action}${this.serializeParams(data)}`;
+    return this.http.get(url).pipe(
+      map(res => <T>res)
+    );
+  }
+
+  public post(action: String, data?: any): Observable<any> {
+    var url = this.baseUrl + `${action}`;
+    return this.http.post(url, data, { responseType: 'text' });
+  }
+
+  public postQS(action: String, data?: any): Observable<any> {
+    var url = this.baseUrl + `${action}${this.serializeParams(data)}`;
+    return this.http.post(url, null, { responseType: 'text' });
+  }
+
+  //gets
+  public getAll<T>(data?: any): Observable<T[]> {
+    return this.get('getall', data).pipe(
+      map(res => <T[]>res)
+    );
+  }
+
+  public getJsonFile(fileName: string, jsonVersion: string): Observable<any[]> {
+    if (!jsonVersion) {
+        jsonVersion = "1.0";
+    }
+
+    var url = anatoly.consts.jsonUrl + fileName + '?' + jsonVersion;
+    return this.http.get(url).pipe(
+      map(res => <any[]>res)
+    );
+  }
+
+  public getNewGuid(): Observable<string> {
+    var url = this.baseUrl + 'getNewGuid';
+    return this.http.get(url, { responseType: 'text' });
+  }
+
+  //CRUD function
+  public getById<T>(id: any): Observable<T> {
+    return this.get<T>('getById', { id: id });
+  }
+
+  public remove(id: any): Observable<string> {
+    return this.postQS('remove', { id: id });
+  }
+}

package/src/lib/core/services/base-go.service.ts

@@ -0,0 +1,33 @@
+/*
+<file>
+  Authors:
+    Vadim Osovitny
+
+  Created:
+    17 Jun 2018
+
+  Version:
+    1.0
+
+  Copyright (c) 2016-2019 Osovitny Inc. All rights reserved.
+</file>
+*/
+
+import { Injectable } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Injectable()
+export class BaseGoService {
+  protected route: ActivatedRoute;
+  protected router: Router;
+
+  constructor(route: ActivatedRoute, router: Router) {
+    this.route = route;
+    this.router = router;
+  }
+
+  locationReload() {
+    //this.router.navigate([this.route.url]);
+    (<any>window).location.reload();
+  }
+}