From ccebed5020ae8b40961b2dd8beb92588d3c41d90 Mon Sep 17 00:00:00 2001 From: Olu Amey Date: Sun, 13 Sep 2020 16:49:26 -0400 Subject: [PATCH] fix --- src/app/app-routing.module.ts | 66 +++++++++++++----------- src/app/app.module.ts | 4 +- src/app/login/login.page.html | 3 ++ src/app/services/core-service.service.ts | 47 ++++++++++++++++- src/app/start/start.page.html | 47 ++++------------- src/app/start/start.page.ts | 28 +++++++++- 6 files changed, 122 insertions(+), 73 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 3bbffd4..89456ef 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,32 +1,36 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule) - }, - { - path: 'start', - loadChildren: () => import('./start/start.module').then( m => m.StartPageModule) - }, - { - path: 'signup', - loadChildren: () => import('./signup/signup.module').then( m => m.SignupPageModule) - }, - { - path: 'login', - loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule) - }, - { - path: 'settings', - loadChildren: () => import('./users/settings/settings.module').then( m => m.SettingsPageModule) +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule) + }, + { + path: 'start', + loadChildren: () => import('./start/start.module').then( m => m.StartPageModule) + }, + { + path: 'signup', + loadChildren: () => import('./signup/signup.module').then( m => m.SignupPageModule) + }, + { + path: 'login', + loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule) + }, + { + path: 'settings', + loadChildren: () => import('./users/settings/settings.module').then( m => m.SettingsPageModule) + }, { + path: 'blogdetail', + loadChildren: () => import('./blogdetail/blogdetail.module').then( m => m.BlogdetailPageModule) } -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f111814..15defa5 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,8 @@ import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { RouteReuseStrategy } from '@angular/router'; +import { HttpClient, HttpClientModule } from '@angular/common/http'; + import { IonicModule, IonicRouteStrategy } from '@ionic/angular'; import { SplashScreen } from '@ionic-native/splash-screen/ngx'; @@ -12,7 +14,7 @@ import { AppComponent } from './app.component'; @NgModule({ declarations: [AppComponent], entryComponents: [], - imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule], + imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule,HttpClientModule], providers: [ StatusBar, SplashScreen, diff --git a/src/app/login/login.page.html b/src/app/login/login.page.html index 3ff88cc..22982f1 100644 --- a/src/app/login/login.page.html +++ b/src/app/login/login.page.html @@ -1,5 +1,8 @@ + + + CoreGrade diff --git a/src/app/services/core-service.service.ts b/src/app/services/core-service.service.ts index c511e83..2316db5 100644 --- a/src/app/services/core-service.service.ts +++ b/src/app/services/core-service.service.ts @@ -1,9 +1,54 @@ + import { Injectable } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Observable, from } from 'rxjs'; +import { map } from 'rxjs/operators'; +//import { resolve } from 'dns'; @Injectable({ providedIn: 'root' }) export class CoreServiceService { - constructor() { } + url = 'https://www.chiefsoft.net/INTGR/API/coregrade/'; + apiKey = ''; // <-- Enter your own key here! + + constructor( + private http: HttpClient + ) { + + + } + + + getResult: any; + blogData(title: string) { + // blogData(title: string): Observable { + var end_url = this.url + "?s=" + encodeURI(title) + "&apikey=" + this.apiKey; + // return this.http.get(`${this.url}?s=${encodeURI(title)}&apikey=${this.apiKey}`).pipe( + + /* return this.http.get(this.url+"?s="+encodeURI(title)+"&apikey="+this.apiKey).pipe( + map(results => results['internal_return']) + */ + return from( + new Promise((resolve) => { + + this.http.get(end_url).subscribe( + (data) => { + this.getResult = data; + // console.log(this.getResult); + resolve(data); + } + ) + + }) + ) + + //console.log(results); + // ); + } + } + + + diff --git a/src/app/start/start.page.html b/src/app/start/start.page.html index 1b821ed..8e39f86 100644 --- a/src/app/start/start.page.html +++ b/src/app/start/start.page.html @@ -1,6 +1,6 @@ - + CoreGrade @@ -20,55 +20,26 @@ + + + + + - + -

CoreGrade is your interest connection platform. Enter the page of the group to get started. You can also find - an open group by using the search. +

{{type.short_desciption}}

- - - - - - -

CoreGrade is your interest connection platform. Enter the page of the group to get started. You can also find - an open group by using the search. -

- - - + - - -

CoreGrade is your interest connection platform. Enter the page of the group to get started. You can also find - an open group by using the search. -

- - - - - - - -

CoreGrade is your interest connection platform. Enter the page of the group to get started. You can also find - an open group by using the search. -

- - - - - - - diff --git a/src/app/start/start.page.ts b/src/app/start/start.page.ts index a5a42ab..4d65239 100644 --- a/src/app/start/start.page.ts +++ b/src/app/start/start.page.ts @@ -1,6 +1,7 @@ +import { CoreServiceService } from './../services/core-service.service'; import { Router } from '@angular/router'; import { Component, OnInit } from '@angular/core'; - +import { core } from '@angular/compiler'; @Component({ selector: 'app-start', @@ -8,11 +9,34 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./start.page.scss'], }) export class StartPage implements OnInit { + blogData: any; + constructor( private router: Router, private coreServiceService:CoreServiceService) { this.getBlog(); } - constructor( private router: Router) { } + + image_url = "https://blog.chiefsoft.com/wp-content/uploads/"; ngOnInit() { + this.getBlog(); } + + blog_list: any; + getBlog() { + this.coreServiceService.blogData("blackblog").subscribe((retBlogData) => { + this.blogData = retBlogData; + //console.log(this.blogData); + //console.log(this.blogData["internal_return"]["result_list"]); + this.image_url = this.blogData["internal_return"]["image_url"]; + this.blog_list = this.blogData["internal_return"]["result_list"]; + console.log(this.blog_list); + }) + + } + + openBlogItem(selBlogdata: any) { + // alert(selBlogdata.id); + this.router.navigateByUrl("blogdetail",selBlogdata); + } + onLogin(){ this.router.navigateByUrl('login'); }