Commit c80785ed authored by sunko's avatar sunko
Browse files

fix: rework

parent 95c762ed

packages/carrier-mobile-ionic/src/pages/information/about/about.ts

+4 −12
Original line number Diff line number Diff line 
import { Component, OnInit, OnDestroy } from '@angular/core';

import { UserRouter } from '@modules/client.common.angular2/routers/user-router.service';

import { Subscription } from 'rxjs/Subscription';

import { Store } from 'services/store.service';

import { environment } from 'environments/environment';

import ILanguage from '@modules/server.common/interfaces/ILanguage';

import { DeviceRouter } from '@modules/client.common.angular2/routers/device-router.service';



@Component({

	selector: 'page-about',
@@ -13,26 +10,21 @@ import { DeviceRouter } from '@modules/client.common.angular2/routers/device-rou 
})

export class AboutPage implements OnInit, OnDestroy {

	public useAboutHtml: string = '<h1>Loading...</h1>';

	public selectedLanguage: ILanguage;

	public selectedLanguage: string;

	private sub: Subscription;

	public deviceId: string;

	public userId: string;

	public appVersion: string;



	constructor(

		private userRouter: UserRouter,

		private deviceRouter: DeviceRouter

	) {

		this.selectedLanguage =

			(localStorage.getItem('_language') as ILanguage) || 'en-US';

	constructor(private userRouter: UserRouter) {

		this.selectedLanguage = localStorage.getItem('_language') || 'en-US';

		this.deviceId = localStorage.getItem('_deviceId');

		this.userId = localStorage.getItem('_userId');

		this.appVersion = environment.APP_VERSION;

	}

	ngOnInit() {

		this.deviceRouter.updateLanguage(this.deviceId, this.selectedLanguage);

		this.sub = this.userRouter

			.getAboutUs(this.userId, this.deviceId)

			.getAboutUs(this.userId, this.deviceId, this.selectedLanguage)

			.subscribe((html) => {

				this.useAboutHtml = html;

			});

packages/carrier-mobile-ionic/src/pages/information/terms-of-use/terms-of-use.ts

+4 −11
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ import { Component, OnInit, OnDestroy } from '@angular/core'; 


import { UserRouter } from '@modules/client.common.angular2/routers/user-router.service';

import { Subscription } from 'rxjs';

import ILanguage from '@modules/server.common/interfaces/ILanguage';

import { DeviceRouter } from '@modules/client.common.angular2/routers/device-router.service';



@Component({

	selector: 'page-terms-of-use',
@@ -12,25 +10,20 @@ import { DeviceRouter } from '@modules/client.common.angular2/routers/device-rou 
})

export class TermsOfUsePage implements OnInit, OnDestroy {

	public useTermsHtml: string = '<h1>Loading...</h1>';

	public selectedLanguage: ILanguage;

	public selectedLanguage: string;

	private sub: Subscription;

	public deviceId: string;

	public userId: string;



	constructor(

		private userRouter: UserRouter,

		private deviceRouter: DeviceRouter

	) {

		this.selectedLanguage =

			(localStorage.getItem('_language') as ILanguage) || 'en-US';

	constructor(private userRouter: UserRouter) {

		this.selectedLanguage = localStorage.getItem('_language') || 'en-US';

		this.deviceId = localStorage.getItem('_deviceId');

		this.userId = localStorage.getItem('_userId');

	}



	ngOnInit() {

		this.deviceRouter.updateLanguage(this.deviceId, this.selectedLanguage);

		this.sub = this.userRouter

			.getTermsOfUse(this.userId, this.deviceId)

			.getTermsOfUse(this.userId, this.deviceId, this.selectedLanguage)

			.subscribe((html) => {

				this.useTermsHtml = html;

			});

packages/common-angular/src/routers/user-router.service.ts

+32 −8
Original line number Diff line number Diff line
@@ -60,31 +60,55 @@ export class UserRouter implements IUserRouter { 
		return this._userFactory(user);

	}



	getAboutUs(userId: string, deviceId: string): Observable<string> {

	getAboutUs(

		userId: string,

		deviceId: string,

		selectedLanguage: string

	): Observable<string> {

		return this.router.runAndObserve<string>(

			'getAboutUs',

			userId,

			deviceId

			deviceId,

			selectedLanguage

		);

	}



	getTermsOfUse(userId: string, deviceId: string): Observable<string> {

	getTermsOfUse(

		userId: string,

		deviceId: string,

		selectedLanguage: string

	): Observable<string> {

		return this.router.runAndObserve<string>(

			'getTermsOfUse',

			userId,

			deviceId

			deviceId,

			selectedLanguage

		);

	}



	getHelp(userId: string, deviceId: string): Observable<string> {

		return this.router.runAndObserve<string>('getHelp', userId, deviceId);

	getHelp(

		userId: string,

		deviceId: string,

		selectedLanguage: string

	): Observable<string> {

		return this.router.runAndObserve<string>(

			'getHelp',

			userId,

			deviceId,

			selectedLanguage

		);

	}



	getPrivacy(userId: string, deviceId: string): Observable<string> {

	getPrivacy(

		userId: string,

		deviceId: string,

		selectedLanguage: string

	): Observable<string> {

		return this.router.runAndObserve<string>(

			'getPrivacy',

			userId,

			deviceId

			deviceId,

			selectedLanguage

		);

	}

packages/common/package.json

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	"name": "@ever-platform/common",

	"description": "Ever Platform Shared Core",

	"license": "AGPL-3.0",

	"version": "0.3.17",

	"version": "0.3.20",

	"homepage": "https://ever.co",

	"repository": {

		"type": "git",

packages/common/src/routers/IUserRouter.ts

+17 −4
Original line number Diff line number Diff line
@@ -21,16 +21,29 @@ interface IUserRouter { 
		geoLocation: GeoLocation

	): Promise<User>;



	getAboutUs(userId: User['id'], deviceId: Device['id']): Observable<string>;

	getAboutUs(

		userId: User['id'],

		deviceId: Device['id'],

		selectedLanguage: string

	): Observable<string>;



	getTermsOfUse(

		userId: User['id'],

		deviceId: Device['id']

		deviceId: Device['id'],

		selectedLanguage: string

	): Observable<string>;



	getHelp(userId: User['id'], deviceId: Device['id']): Observable<string>;

	getHelp(

		userId: User['id'],

		deviceId: Device['id'],

		selectedLanguage: string

	): Observable<string>;



	getPrivacy(userId: User['id'], deviceId: Device['id']): Observable<string>;

	getPrivacy(

		userId: User['id'],

		deviceId: Device['id'],

		selectedLanguage: string

	): Observable<string>;

}



export default IUserRouter;