diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index 182c92f..0120385 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -7,6 +7,7 @@ import { OnesignalService } from 'src/app/services/onesignal.service';// import { UserWalletService } from 'src/app/store/user-wallet.service'; import { LocTrcService } from "../../services/loc-trc.service"; import {MarketDataService} from "../../store/market-data.service"; +import {BannersDataService} from "../../store/banners-data.service"; //import * as stream from "stream"; @@ -37,6 +38,7 @@ export class HomePage implements OnInit { public userWalletService: UserWalletService, private locTrcService:LocTrcService, public marketDataService:MarketDataService, + public bannersDataService:BannersDataService ) { this.accountType = sessionDataProviderService.account_type; this.firstname = this.sessionDataProviderService.firstname; @@ -119,27 +121,40 @@ export class HomePage implements OnInit { // 'uid' => string '3119b744-42ad-4834-bb83-b737588754ca' (length=36) // 'action' => int 11200 // + + async refreshBannersData(){ + this.bannerData = this.bannersDataService.bannerData; + this.homebannerCount = this.bannersDataService.homebannerCount; + } + usrData: { action:number, member_id: number, uid: string, sessionid: string, 'limit': 30, 'offset': 0 }; - getBannersData(){ - this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, - sessionid: this.sessionDataProviderService.session,'limit': 30, - 'offset': 0 } - this.wrenchService.getHomeBanners(this.usrData).subscribe( - bannerResult => { - this.bannerResult = bannerResult; - console.log("BANNERS RETURN->", this.bannerResult); - this.bannerData = this.bannerResult.result_list; - this.homebannerCount = this.bannerData.length; - // debugger; - console.log("BANNERS RETURN DATA->", this.bannerData); - // this.blogDataService.setBlogData(this.blogResult.blog_data); - } - ); + async getBannersData(){ + this.refreshBannersData(); + + var interval = setInterval( ()=> { + this.refreshBannersData(); + }, 5000); + + + // this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, + // sessionid: this.sessionDataProviderService.session,'limit': 30, + // 'offset': 0 } + // this.wrenchService.getHomeBanners(this.usrData).subscribe( + // bannerResult => { + // this.bannerResult = bannerResult; + // console.log("BANNERS RETURN->", this.bannerResult); + // this.bannerData = this.bannerResult.result_list; + // this.homebannerCount = this.bannerData.length; + // // debugger; + // console.log("BANNERS RETURN DATA->", this.bannerData); + // // this.blogDataService.setBlogData(this.blogResult.blog_data); + // } + // ); } familySuggestResult:any; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 01d5704..46655f6 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -22,6 +22,7 @@ import {UserWalletService} from "../../store/user-wallet.service"; import {IntervalRefreshService} from "../../store/interval-refresh.service"; import {MarketDataService} from "../../store/market-data.service"; import {TasksDataService} from "../../store/tasks-data.service"; +import {BannersDataService} from "../../store/banners-data.service"; @Component({ selector: 'app-login', @@ -62,7 +63,8 @@ export class LoginPage implements OnInit { public platform: Platform, private loadingCtrl: LoadingController, public marketDataService:MarketDataService, - public tasksDataService:TasksDataService + public tasksDataService:TasksDataService, + public bannersDataService:BannersDataService ) { this.sessionDataProviderService.DestroySessionOnLogout(); // https://ionicframework.com/docs/angular/platform @@ -177,6 +179,7 @@ getBlogData(){ this.getBlogData(); this.tasksDataService.getJobsData(); this.userWalletService.getWalletData(); + this.bannersDataService.getBannersData(); } onForgot() { this.router.navigate(['forgot']); diff --git a/src/app/store/banners-data.service.spec.ts b/src/app/store/banners-data.service.spec.ts new file mode 100644 index 0000000..1694d03 --- /dev/null +++ b/src/app/store/banners-data.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { BannersDataService } from './banners-data.service'; + +describe('BannersDataService', () => { + let service: BannersDataService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(BannersDataService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/banners-data.service.ts b/src/app/store/banners-data.service.ts new file mode 100644 index 0000000..08aafc6 --- /dev/null +++ b/src/app/store/banners-data.service.ts @@ -0,0 +1,37 @@ +import { Injectable } from '@angular/core'; +import {SessionDataProviderService} from "./session-data-provider.service"; +import {WrenchService} from "../services/wrench.service"; + +@Injectable({ + providedIn: 'root' +}) +export class BannersDataService { + homebannerCount:number=0; + constructor( public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService) { } + bannerResult:any; + bannerData: []; + usrData: { + action:number, member_id: number, uid: string, + sessionid: string, + 'limit': 30, + 'offset': 0 + }; + async getBannersData(){ + this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session,'limit': 30, + 'offset': 0 } + this.wrenchService.getHomeBanners(this.usrData).subscribe( + bannerResult => { + this.bannerResult = bannerResult; + console.log("BANNERS RETURN->", this.bannerResult); + this.bannerData = this.bannerResult.result_list; + this.homebannerCount = this.bannerData.length; + // debugger; + console.log("BANNERS RETURN DATA->", this.bannerData); + // this.blogDataService.setBlogData(this.blogResult.blog_data); + } + ); + } + +} diff --git a/src/app/store/interval-refresh.service.ts b/src/app/store/interval-refresh.service.ts index d422d77..0045260 100644 --- a/src/app/store/interval-refresh.service.ts +++ b/src/app/store/interval-refresh.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import {SessionDataProviderService} from "./session-data-provider.service"; import {MarketDataService} from "./market-data.service"; import {TasksDataService} from "./tasks-data.service"; +import {BannersDataService} from "./banners-data.service"; @Injectable({ providedIn: 'root' @@ -10,7 +11,8 @@ export class IntervalRefreshService { constructor( public sessionDataProviderService:SessionDataProviderService, public marketDataService:MarketDataService, - public tasksDataService:TasksDataService) { + public tasksDataService:TasksDataService, + public bannersDataService:BannersDataService) { this.marketDataService.getJobsData(); } @@ -25,6 +27,8 @@ export class IntervalRefreshService { console.log("Interval Function ",this.sessionDataProviderService.session ); this.marketDataService.getJobsData(); this.tasksDataService.getJobsData(); + this.bannersDataService.getBannersData(); + }, this.sessionDataProviderService.refresh*2); }