Skip to content

Commit

Permalink
login n signup success
Browse files Browse the repository at this point in the history
  • Loading branch information
jainam7 committed Dec 28, 2017
1 parent 2433a5c commit abf46c4
Show file tree
Hide file tree
Showing 12 changed files with 275 additions and 14 deletions.
4 changes: 3 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';


Expand Down Expand Up @@ -66,7 +67,8 @@ import { SearchproProvider } from '../providers/searchpro/searchpro';
SplashScreen,
{provide: ErrorHandler, useClass: IonicErrorHandler},
PrescriptionProvider,
SearchproProvider
SearchproProvider,
UserlogProvider
]
})
export class AppModule {}
Binary file added src/assets/imgs/med.png
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/med2.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/med3.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/medi.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 40 additions & 5 deletions src/pages/signinpage/signinpage.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,49 @@
<ion-header>

<ion-navbar>
<ion-title>Jainam</ion-title>
<ion-title align="left"color="black">Login</ion-title>
</ion-navbar>

</ion-header>


<ion-content padding>
<button (click)="onSignInNext()">Aa Home Ni Link 6. Ano code .ts file ma joi le and pachi sign in thay etle avi rite automatic redirect karavi le.</button>
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.
<ion-content scroll="false">
<div class="splash-bg"></div>
<div class="splash-info"></div>

<!-- <div class="img">
<img src="../../assets/imgs/med3.jpg" alt="">
</div>-->
<br/><br/>
<br/><br/>
<ion-list>

<ion-item>
<ion-label floating>Email Id</ion-label>
<ion-input type="email" [(ngModel)]="email_id" name="email"></ion-input>
</ion-item>

<ion-item>
<ion-label floating>Password</ion-label>
<ion-input type="password" [(ngModel)]="password" name="password"></ion-input>
</ion-item>
<br/>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
&nbsp;
<!--<button ion-button round color="secondary">Forget Password</button>-->
<span class="pull-right"><a href="">Forgot Password???</a></span>
<div padding>

<button ion-button round (click)="onSignInNext()"color="secondary" block>Login</button>
</div>
&nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;
<button ion-button round (click)="onClick()"color="secondary">New On Medsky???</button>



</ion-list>

</ion-content>
22 changes: 22 additions & 0 deletions src/pages/signinpage/signinpage.scss
Original file line number Diff line number Diff line change
@@ -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;
}


}
72 changes: 67 additions & 5 deletions src/pages/signinpage/signinpage.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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);
}


}
35 changes: 34 additions & 1 deletion src/pages/signuppage/signuppage.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,45 @@
<ion-header>

<ion-navbar>
<ion-title>signuppage</ion-title>
<ion-title>Signup</ion-title>
</ion-navbar>

</ion-header>


<ion-content padding>
<div class="img">
<img src="../../assets/imgs/med.png" alt="">
</div>
<ion-list>

<ion-item>
<ion-label floating>Email Id</ion-label>
<ion-input type="email" [(ngModel)]="email_id" name="email" required></ion-input>
</ion-item>

<ion-item>
<ion-label floating>Password</ion-label>
<ion-input type="password" [(ngModel)]="password" name="password"></ion-input>
</ion-item>


<ion-item>
<ion-label floating>Mobile No</ion-label>
<ion-input type="number" [(ngModel)]="mno" name="mno"></ion-input>
</ion-item>



<div padding>
<button ion-button round (click)="onSignupClick()" color="secondary" block>Sign Up</button>

</div>




</ion-list>


</ion-content>
65 changes: 63 additions & 2 deletions src/pages/signuppage/signuppage.ts
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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(){

}
);
}


}
7 changes: 7 additions & 0 deletions src/providers/userlog/user_class.ts
Original file line number Diff line number Diff line change
@@ -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)
{

}
}
39 changes: 39 additions & 0 deletions src/providers/userlog/userlog.ts
Original file line number Diff line number Diff line change
@@ -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());
}

}

0 comments on commit abf46c4

Please sign in to comment.