diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 985425b..72c92f9 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,6 +21,7 @@ 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";
//import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1';
@@ -66,7 +67,8 @@ import { SearchproProvider } from '../providers/searchpro/searchpro';
SplashScreen,
{provide: ErrorHandler, useClass: IonicErrorHandler},
PrescriptionProvider,
- SearchproProvider
+ SearchproProvider,
+ UserlogProvider
]
})
export class AppModule {}
diff --git a/src/assets/imgs/med.png b/src/assets/imgs/med.png
new file mode 100644
index 0000000..432bcf8
Binary files /dev/null and b/src/assets/imgs/med.png differ
diff --git a/src/assets/imgs/med2.jpg b/src/assets/imgs/med2.jpg
new file mode 100644
index 0000000..4f48d65
Binary files /dev/null and b/src/assets/imgs/med2.jpg differ
diff --git a/src/assets/imgs/med3.jpg b/src/assets/imgs/med3.jpg
new file mode 100644
index 0000000..82e14a5
Binary files /dev/null and b/src/assets/imgs/med3.jpg differ
diff --git a/src/assets/imgs/medi.jpg b/src/assets/imgs/medi.jpg
new file mode 100644
index 0000000..6922c6a
Binary files /dev/null and b/src/assets/imgs/medi.jpg differ
diff --git a/src/pages/signinpage/signinpage.html b/src/pages/signinpage/signinpage.html
index fe93c10..70a14c9 100644
--- a/src/pages/signinpage/signinpage.html
+++ b/src/pages/signinpage/signinpage.html
@@ -7,14 +7,49 @@
- Jainam
+ Login
-
-
-Aa taru page.Ahiya Tari design and code avse.
-Ek link avse "New To Medsky???".ema sign up page khulse netar direct home page of our app.
+
+
+
+
+
+
+
+
+
+
+ Email Id
+
+
+
+
+ Password
+
+
+
+
+
+
+
+
+
+ Forgot Password???
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/signinpage/signinpage.scss b/src/pages/signinpage/signinpage.scss
index e60b772..9b9e9f9 100644
--- a/src/pages/signinpage/signinpage.scss
+++ b/src/pages/signinpage/signinpage.scss
@@ -1,3 +1,25 @@
page-signinpage {
+ .splash-bg {
+ position: relative;
+ background: url('../../assets/imgs/med.png') no-repeat transparent;
+ background-size: cover;
+ height: 40%;
+ z-index: 1;
+ background-repeat: repeat-x;
+ animation: animatedBackground 40s linear infinite;
+ }
+ @keyframes animatedBackground {
+ from { background-position: 0 0; }
+ to { background-position: 100% 0; }
+ }
+
+ .splash-info {
+ position: relative;
+ z-index: 2;
+ margin-top: -64px;
+ text-align: center;
+ }
+
+
}
diff --git a/src/pages/signinpage/signinpage.ts b/src/pages/signinpage/signinpage.ts
index 7072c9b..98a4c6c 100644
--- a/src/pages/signinpage/signinpage.ts
+++ b/src/pages/signinpage/signinpage.ts
@@ -1,6 +1,9 @@
import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { IonicPage, NavController,LoadingController,ToastController} from 'ionic-angular';
import { TabsPage } from '../../pages/tabs/tabs';
+import { UserlogProvider } from "../../providers/userlog/userlog";
+import { User_Class } from "../../providers/userlog/user_class";
+import { SignuppagePage } from "../signuppage/signuppage";
/**
* Generated class for the SigninpagePage page.
@@ -15,16 +18,75 @@ import { TabsPage } from '../../pages/tabs/tabs';
templateUrl: 'signinpage.html',
})
export class SigninpagePage {
+ email_id:string='';
+ password:string='';
+ userObject:User_Class;
+ constructor(public load:LoadingController,public toast:ToastController,public navCtrl: NavController,public _db:UserlogProvider){
- constructor(public navCtrl: NavController, public navParams: NavParams) {
}
-
ionViewDidLoad() {
console.log('ionViewDidLoad SigninpagePage');
}
// aa code thi home par redirect thavase
onSignInNext(){
- this.navCtrl.push(TabsPage);
- }
+ /* let l1=this.load.create({
+ content:"Loading...",
+ duration:2000
+ });
+ l1.present();*/
+ /*let t1=this.toast.create({
+ message:"Data Added",
+ duration:2000,
+ position:"top"
+ });*/
+
+
+
+ this._db.Login(new User_Class(0,this.email_id,'','',this.password,'','',0,'',''))
+ .subscribe(
+ (x:User_Class[])=>{
+ if(this.email_id=='' || this.password=='')
+ {
+ alert("Enter Data");
+ }
+ else{
+ if(x.length==1){
+ alert('login successfully');
+ let l1=this.load.create({
+ content:"Loading...",
+ duration:3000
+
+ });
+ l1.present();
+
+ //t1.present();
+ l1.dismissAll();
+
+
+ this.navCtrl.push(TabsPage);
+ }
+ else{
+ alert('Enter proper mail id and Password');
+ this.navCtrl.push(SigninpagePage);
+ }
+ }
+
+
+
+ },
+ function(error){
+ console.log(error);
+ },
+ function(){
+ //l1.dismissAll();
+ }
+ );
+}
+
+onClick()
+{
+ this.navCtrl.push(SignuppagePage);
+}
+
}
diff --git a/src/pages/signuppage/signuppage.html b/src/pages/signuppage/signuppage.html
index 6523955..90fab42 100644
--- a/src/pages/signuppage/signuppage.html
+++ b/src/pages/signuppage/signuppage.html
@@ -7,12 +7,45 @@
- signuppage
+ Signup
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/signuppage/signuppage.ts b/src/pages/signuppage/signuppage.ts
index fc9f4f5..be0220e 100644
--- a/src/pages/signuppage/signuppage.ts
+++ b/src/pages/signuppage/signuppage.ts
@@ -1,5 +1,8 @@
import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { IonicPage, NavController,LoadingController,ToastController} from 'ionic-angular';
+import { UserlogProvider } from "../../providers/userlog/userlog";
+import { User_Class } from "../../providers/userlog/user_class";
+import { TabsPage } from "../tabs/tabs";
/**
* Generated class for the SignuppagePage page.
@@ -15,11 +18,69 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
})
export class SignuppagePage {
- constructor(public navCtrl: NavController, public navParams: NavParams) {
+ email_id:string='';
+ password:string='';
+ mno:string='';
+ userObject:User_Class;
+
+ constructor(public load:LoadingController,public toast:ToastController,public navCtrl: NavController, public data:UserlogProvider) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad SignuppagePage');
}
+ onSignupClick()
+ {
+ let t1=this.toast.create({
+ message:"Signup Successfully",
+ duration:2000,
+ position:"top"
+ });
+ this.data.addUser(new User_Class(0,this.email_id,'',this.mno,this.password,'','',0,'',''))
+ .subscribe(
+
+ (data:User_Class[])=>{
+ if(this.email_id=='')
+
+ {
+ /* let t2=this.toast.create({
+ message:"Please Enter Valid Data",
+ duration:2000,
+ position:"top"
+ });*/
+ alert("Enter Valid Data");
+ this.navCtrl.push(SignuppagePage);
+ }
+ if(this.password=='')
+ {
+ alert("enter password");
+ }
+ if(this.mno=='')
+ {
+ alert("enter Mobile No");
+ }
+ else{
+ let l1=this.load.create({
+ content:"Loading...",
+ duration:3000
+
+ });
+ // l1.present();
+
+ t1.present();
+ //l1.dismissAll();
+ this.navCtrl.push(TabsPage);
+
+ }
+ },
+ function(error){
+ console.log(error);
+ },
+ function(){
+
+ }
+ );
+ }
+
}
diff --git a/src/providers/userlog/user_class.ts b/src/providers/userlog/user_class.ts
new file mode 100644
index 0000000..c713e9f
--- /dev/null
+++ b/src/providers/userlog/user_class.ts
@@ -0,0 +1,7 @@
+export class User_Class{
+
+ constructor(public usr_sr_no:number,public pk_usr_email_id:string,public usr_name:string,public usr_mno:string,public usr_pass:string,public usr_gen:string,public usr_pro_pic:string,public usr_verify:number,public usr_token:string,public usr_type:string)
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/src/providers/userlog/userlog.ts b/src/providers/userlog/userlog.ts
new file mode 100644
index 0000000..a25f447
--- /dev/null
+++ b/src/providers/userlog/userlog.ts
@@ -0,0 +1,39 @@
+//import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Http,Response,RequestOptions, Headers } from '@angular/http';
+import 'rxjs/rx';
+import { User_Class } from "./user_class";
+
+
+/*
+ Generated class for the UserlogProvider provider.
+
+ See https://angular.io/guide/dependency-injection for more info on providers
+ and Angular DI.
+*/
+@Injectable()
+export class UserlogProvider {
+
+ constructor(public http: Http) {
+ console.log('Hello UserlogProvider Provider');
+ }
+ public url_login:string="http://localhost:3000/login/";
+ public url_signup:string="http://localhost:3000/signup/";
+ Login(user:User_Class) {
+
+ let body = JSON.stringify(user);
+ //console.log(body);
+ let h = new Headers({ 'Content-Type': 'application/json' });
+ let ro = new RequestOptions({ headers: h });
+
+ return this.http.post(this.url_login,body,ro)
+ .map((res:Response) => res.json());
+ }
+ addUser(user){
+ let body = JSON.stringify(user);
+ let h = new Headers({ 'Content-Type': 'application/json' });
+ let ro = new RequestOptions({ headers: h });
+ return this.http.post(this.url_signup, body, ro).map((res) => res.json());
+ }
+
+}