Skip to content

Commit

Permalink
user progile doing
Browse files Browse the repository at this point in the history
  • Loading branch information
jainam7 committed Jan 8, 2018
2 parents 3bfe334 + 1369b57 commit 1961b0a
Show file tree
Hide file tree
Showing 25 changed files with 489 additions and 16 deletions.
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@
"@angular/platform-browser": "5.0.3",
"@angular/platform-browser-dynamic": "5.0.3",
"@ionic-native/core": "4.4.0",
"@ionic-native/facebook": "^4.5.2",
"@ionic-native/splash-screen": "4.4.0",
"@ionic-native/status-bar": "4.4.0",
"@ionic/storage": "^2.1.3",
"cordova-plugin-facebook4": "^1.9.1",
"ionic-angular": "3.9.2",
"ionicons": "3.0.0",
"rxjs": "5.5.2",
Expand Down
22 changes: 21 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { BrowserModule } from '@angular/platform-browser';
import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
import { MyApp } from './app.component';
import { HttpModule } from '@angular/http';
import { HttpClientModule } from "@angular/common/http";
import { IonicStorageModule } from '@ionic/storage';

import { AboutPage } from '../pages/about/about';
Expand All @@ -19,15 +20,21 @@ import { Viewprescription2Page } from "../pages/viewprescription2/viewprescripti
import { Viewprescription3Page } from "../pages/viewprescription3/viewprescription3";
import { Searchdocpage1Page } from '../pages/searchdocpage1/searchdocpage1'
import { Searchmedpage1Page } from "../pages/searchmedpage1/searchmedpage1";
import { ChatwithbotPage } from "../pages/chatwithbot/chatwithbot";


import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';
import { PrescriptionProvider } from '../providers/prescription/prescription';
import { SearchproProvider } from '../providers/searchpro/searchpro';
import { UserlogProvider } from "../providers/userlog/userlog";
<<<<<<< HEAD
import { ChangepassPage } from '../pages/changepass/changepass';
import { ForgetpassPage } from "../pages/forgetpass/forgetpass";
=======
import { BlogdbProvider } from '../providers/blogdb/blogdb';
import { BlogdescriptionPage } from "../pages/blogdescription/blogdescription";
>>>>>>> 1369b572788bb4069e9d01917e8795a66243a907
//import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1';


Expand All @@ -47,12 +54,18 @@ import { ForgetpassPage } from "../pages/forgetpass/forgetpass";
Viewprescription3Page,
Searchmedpage1Page,
Searchdocpage1Page,
<<<<<<< HEAD
ChangepassPage,
ForgetpassPage
=======
ChatwithbotPage,
BlogdescriptionPage
>>>>>>> 1369b572788bb4069e9d01917e8795a66243a907
],
imports: [
BrowserModule,
HttpModule,
HttpClientModule,
IonicModule.forRoot(MyApp),
IonicStorageModule.forRoot()
],
Expand All @@ -75,16 +88,23 @@ import { ForgetpassPage } from "../pages/forgetpass/forgetpass";

Searchmedpage1Page,
Searchdocpage1Page,
<<<<<<< HEAD
ChangepassPage,
ForgetpassPage
=======

ChatwithbotPage,
BlogdescriptionPage
>>>>>>> 1369b572788bb4069e9d01917e8795a66243a907
],
providers: [
StatusBar,
SplashScreen,
{provide: ErrorHandler, useClass: IonicErrorHandler},
PrescriptionProvider,
SearchproProvider,
UserlogProvider
UserlogProvider,
BlogdbProvider
]
})
export class AppModule {}
Binary file added src/assets/imgs/SP49579.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgs/a.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgs/blog1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/imgs/parth.ico
Binary file not shown.
53 changes: 52 additions & 1 deletion src/pages/about/about.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,62 @@
<ion-header>
<ion-navbar color="myapp1">
<ion-title>
About
Blogs
</ion-title>
</ion-navbar>
</ion-header>

<ion-content padding>
<ion-refresher (ionRefresh)="doRefresh($event);">
<ion-refresher-content>


</ion-refresher-content>
</ion-refresher>
<ion-card *ngFor="let i of bg">

<ion-item>


<h2>{{i.fk_doc_email_id}}</h2>
<p>{{i.fk_spec_id}}</p>
</ion-item>



<ion-card-content>
<p>{{i.blog_title}}</p>
<p>Your Answers:</p>
<p>{{i.blog_desc}}</p>
</ion-card-content>

<ion-row>
<ion-col>
<button ion-button icon-left clear small (tap)="tapev($event)" style="cursor:pointer;" >
<ion-icon name="thumbs-up" ></ion-icon>
<div>{{like}} Likes</div>
</button>
</ion-col>
<ion-col>
<button ion-button icon-left clear small (tap)="tapv($event)" style="cursor:pointer;" >
<ion-icon name="text"></ion-icon>
<div>{{comment}} Share</div>
</button>

<button ion-button icon-left clear small (tap)="onRead(i.blog_id)" style="cursor:pointer;" >
<ion-icon name="text"></ion-icon>
<div>Read More</div>
</button>

</ion-col>
<ion-col center text-center>
<ion-note>
{{i.blog_date}}
</ion-note>
</ion-col>
</ion-row>

</ion-card>


</ion-content>
53 changes: 49 additions & 4 deletions src/pages/about/about.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,59 @@
import { Component } from '@angular/core';
import { NavController } from 'ionic-angular';

import { NavController,ToastController } from 'ionic-angular';
import { BlogdbProvider } from "../../providers/blogdb/blogdb";
import { blog } from "./blog";
import { BlogdescriptionPage} from "../blogdescription/blogdescription";
@Component({
selector: 'page-about',
templateUrl: 'about.html'
})
export class AboutPage {
bg:blog[];
like:number=0;
comment:number=0;
constructor(public navCtrl: NavController,public bgdata:BlogdbProvider,public toast:ToastController) {

constructor(public navCtrl: NavController) {

}
doRefresh(refresher){



this.bgdata.getAllBlogs().subscribe(
(data:blog[])=>{
this.bg=data;
}
);

refresher.complete();

}
ionViewDidLoad(){
let t1=this.toast.create({
message:"Pull Down to Refresh Content",
duration:5000,
position:"bottom"
});
this.bgdata.getAllBlogs().subscribe(
(data:blog[])=>{
this.bg=data;
}
);
t1.present();
}
tapev(e)
{
this.like++;
}
tapv(k)
{
this.comment++;
}
onRead(i:any)
{

this.navCtrl.push(BlogdescriptionPage,{
param1:i
});
}

}
7 changes: 7 additions & 0 deletions src/pages/about/blog.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export class blog
{
constructor(public blog_id:number,public blog_title:string,public blog_desc:string,public fk_doc_email_id:string,public blog_date:string,public fk_spec_id:string)
{

}
}
34 changes: 34 additions & 0 deletions src/pages/blogdescription/blogdescription.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!--
Generated template for the BlogdescriptionPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>

<ion-navbar color="myapp1">
<ion-title>Blog Description</ion-title>
</ion-navbar>

</ion-header>


<ion-content padding>
{{blogid}}
<ion-card *ngFor="let item of blogdata">

<ion-card-header>
{{item.blog_title}}
{{date | date: 'ddMMyyyy'}}{{item.blog_date}}
<div align="right">
<div>{{item.fk_doc_email_id}}</div>
<div>{{item.fk_spec_id}}</div>
</div>
</ion-card-header>

<ion-card-content>
{{item.blog_desc}}
</ion-card-content>

</ion-card>
</ion-content>
13 changes: 13 additions & 0 deletions src/pages/blogdescription/blogdescription.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { BlogdescriptionPage } from './blogdescription';

@NgModule({
declarations: [
BlogdescriptionPage,
],
imports: [
IonicPageModule.forChild(BlogdescriptionPage),
],
})
export class BlogdescriptionPageModule {}
3 changes: 3 additions & 0 deletions src/pages/blogdescription/blogdescription.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
page-blogdescription {

}
48 changes: 48 additions & 0 deletions src/pages/blogdescription/blogdescription.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { Component} from '@angular/core';
import { IonicPage, NavController, NavParams,LoadingController } from 'ionic-angular';
import { BlogdbProvider } from "../../providers/blogdb/blogdb";
import { blog } from "../about/blog";
/**
* Generated class for the BlogdescriptionPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/

@IonicPage()
@Component({
selector: 'page-blogdescription',
templateUrl: 'blogdescription.html',
})
export class BlogdescriptionPage {
blogid:Number;
blogdata:blog[];
constructor(public navCtrl: NavController, public navParams: NavParams,public db:BlogdbProvider,public loadingcontroller:LoadingController) {
}

ionViewDidLoad() {
this.blogid=this.navParams.get('param1');

console.log('ionViewDidLoad BlogdescriptionPage');
this.db.blogid=this.blogid;
let loadingdata=this.loadingcontroller.create({
content:"Fetching your prescriptions"
});
loadingdata.present();
this.db.getBlogById().subscribe(
(data:blog[])=>{
this.blogdata=data;
console.log(data);
}
,
function(error){
console.log("error"+error)
},
function(){
console.log("success");
loadingdata.dismiss();
}
);
}

}
18 changes: 18 additions & 0 deletions src/pages/chatwithbot/chatwithbot.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!--
Generated template for the ChatwithbotPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>

<ion-navbar color="myapp1">
<ion-title>Chat with Bot</ion-title>
</ion-navbar>

</ion-header>


<ion-content padding>

</ion-content>
13 changes: 13 additions & 0 deletions src/pages/chatwithbot/chatwithbot.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { ChatwithbotPage } from './chatwithbot';

@NgModule({
declarations: [
ChatwithbotPage,
],
imports: [
IonicPageModule.forChild(ChatwithbotPage),
],
})
export class ChatwithbotPageModule {}
3 changes: 3 additions & 0 deletions src/pages/chatwithbot/chatwithbot.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
page-chatwithbot {

}
Loading

0 comments on commit 1961b0a

Please sign in to comment.