ratings and login cooperating

src/app/app.component.ts

@@ -19,7 +19,7 @@ import { LoginPage } from '../pages/login/login';
 export class MyApp {
   @ViewChild(Nav) nav: Nav;
 
-  rootPage: any = HomePage;
+  rootPage: any = LoginPage;
 
   pages: Array<{title: string, component: any}>;
 

src/app/app.module.ts

@@ -2,6 +2,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { ErrorHandler, NgModule } from '@angular/core';
 import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
 import { HttpClientModule } from '@angular/common/http';
+import { HttpModule } from '@angular/http';
 import { Ionic2RatingModule } from 'ionic2-rating';
 
 
@@ -19,42 +20,47 @@ import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import { ConnectionProvider } from '../providers/connection/connection';
 import { DistrictProvider } from '../providers/connection/district';
+import { UserLoginProvider } from '../providers/connection/userLogin';
+
 
 @NgModule({
   declarations: [
     MyApp,
+    LoginPage,
     HomePage,
     ListPage,
     NewProfilePage,
     TeacherRegistrationPage,
     SearchPage,
     SchoolPage,
-    LoginPage,
+    
   ],
   imports: [
     BrowserModule,
     IonicModule.forRoot(MyApp),
     HttpClientModule, 
-    Ionic2RatingModule
+    Ionic2RatingModule,
+    HttpModule
 
 
   ],
   bootstrap: [IonicApp],
   entryComponents: [
     MyApp,
+    LoginPage, 
     HomePage,
     ListPage, 
     NewProfilePage,
     TeacherRegistrationPage,
     SearchPage,
     SchoolPage,
-    LoginPage, 
   ],
   providers: [
     StatusBar,
     SplashScreen,
     ConnectionProvider,
     DistrictProvider, 
+    UserLoginProvider,
     {provide: ErrorHandler, useClass: IonicErrorHandler}
     
   ]

src/pages/login/login.html

@@ -9,26 +9,32 @@
   </ion-navbar>
 </ion-header>
 <ion-content padding style="background:url(assets/imgs/final_spitball.jpg) no-repeat center;background-size:cover;" id="page7">
-  <form id="login-form1">
+  
+  <form [formGroup]="formgroup" (ngSubmit)="goToUserProfile(formgroup.value)">
+    
     <ion-list id="login-list1">
       <ion-item id="login-input1">
-        <ion-label>
-          Email or Display Name
-        </ion-label>
-        <ion-input type="email" placeholder=""></ion-input>
+        <ion-input type="email" placeholder="Email or Display Name" formControlName="username"></ion-input>
       </ion-item>
-      <ion-item id="login-input2">
-        <ion-label>
-          Password
-        </ion-label>
-        <ion-input type="password" placeholder=""></ion-input>
+      <ion-item text-center *ngIf="username.hasError('required') && username.touched">
+        <p> *Please enter your e-mail or display name</p>
+      </ion-item>
+
+      <ion-item text-center>
+        <ion-input type="password" placeholder="Password" formControlName="password"></ion-input>
+      </ion-item>
+      <ion-item text-center *ngIf="password.hasError('required') && password.touched">
+        <p> *Please enter your password</p>
       </ion-item>
     </ion-list>
+
+
     <div class="spacer" style="height:20px;" id="login-spacer1"></div>
-    <button id="login-button1" ion-button color="calm" block on-click="goToUserProfile()">
+    <button id="login-button1" ion-button color="calm" block on-click="goToUserProfile(formgroup.value)">
       Log in
     </button>
   </form>
+
   <button id="login-button11" ion-button color="positive" small icon-left>
     <ion-icon name="linkedin"></ion-icon>
     LinkedIn Login
@@ -40,7 +46,7 @@
     <ion-icon name="googleplus"></ion-icon>
     Google + Login
   </button>
-  <button id="login-button2" ion-button color="assertive" full small on-click="goToNewProfile()">
+  <button id="login-button2" ion-button color="assertive" full small on-click="goToUserRegistration()">
     Create A New Profile!
   </button>
   <button id="login-button5" ion-button color="balanced" full small on-click="goToTeacherRegistration()">

src/pages/login/login.ts

@@ -1,6 +1,14 @@
 import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
 
+import { FormGroup, FormBuilder, Validators, AbstractControl } from '@angular/forms';
+import { UserLoginProvider } from './../../providers/connection/userLogin';
+
+import { HomePage } from './../../pages/home/home';
+import { NewProfilePage } from './../../pages/registerUser/registerUser';
+import { TeacherRegistrationPage } from './../../pages/registerTeacher/registerTeacher';
+
+
 
 @Component({
   selector: 'page-login',
@@ -8,11 +16,46 @@ import { NavController } from 'ionic-angular';
 })
 export class LoginPage {
 
-  constructor(public navCtrl: NavController) {
+  formgroup: FormGroup;
+
+  username: AbstractControl;
+  password: AbstractControl;
+
+  constructor(public navCtrl: NavController,  private formbuilder: FormBuilder, private userLogin: UserLoginProvider) {
+  
+    this.formgroup=this.formbuilder.group(
+      
+      {
+      username : ['', Validators.required],
+      password : ['', Validators.required]
+      });
+
+    this.username=this.formgroup.controls['username'];
+    this.password=this.formgroup.controls['password'];
+  
+  }
+
+  goToUserProfile(loginForm){
+        this.userLogin.login(loginForm.username, loginForm.password, result =>{
+        if(result.status == 200){
+        console.log("Success!");
+        this.userLogin.setToken(result.headers.get("authorization"));
+        console.log(this.userLogin.getToken());
+        this.navCtrl.setRoot(HomePage);
+
+
+      } else {
+        console.log("invalid login attempt");
+      }
+    });
+  }
+
+  goToTeacherRegistration(){
+    this.navCtrl.push(TeacherRegistrationPage); 
+  }
+
+  goToUserRegistration(){
+    this.navCtrl.push(NewProfilePage); 
   }
-//   goToNewProfile(params){
-//     if (!params) params = {};
-//     this.navCtrl.push(NewProfilePage);
-//   }
   
 }

src/pages/schools/schools.html

@@ -20,6 +20,7 @@
         School Aggregate Score
       </h2>
   </ion-item>
+  
      <rating id="stars"
         readOnly="false"
         max="5"

src/pages/schools/schools.ts

@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { NavController, NavParams } from 'ionic-angular';
 import { ConnectionProvider } from './../../providers/connection/connection';
 
-import { Rating } from './../../app/component/rating';
+//import { Rating } from './../../app/component/rating';
 import { Review } from './../../app/component/review';
 
 
@@ -19,7 +19,6 @@ export class SchoolPage {
     public gMap;
 
     review: Review = new Review();
-    // review: string;
     // rate: Rating = new Rating();
 
     // @ViewChild('mapsId') mapElement: ElementRef;
@@ -28,6 +27,12 @@ export class SchoolPage {
   constructor(public navCtrl: NavController, public navParams: NavParams, public conn: ConnectionProvider) {
       this.school = this.navParams.get("school");
   }
+  postReview(){
+    console.log(this.review);
+    this.conn.post('reviews/post', this.review).subscribe(
+      data => console.log(data)
+    );
+  }
 
   // postRating(rate: number){
   //   this.conn.post('ratings/rate', this.rate).subscribe(
@@ -35,14 +40,6 @@ export class SchoolPage {
   //   );
   // }
 
-   postReview(){
-     console.log("post reviw");
-     console.log(this.review);
-    this.conn.post('reviews/post', this.review).subscribe(
-      data => console.log(data)
-    );
-  }
-
   // ionViewDidLoad () {
   //   this.loadMap();
   // }

src/providers/connection/connection.ts

@@ -16,12 +16,20 @@ public apiUrl = 'http://localhost:8080/';
     console.log('Hello ConnectionProvider Provider');
   }
 
+  setAPI(apiUrl: string){
+    this.apiUrl = apiUrl;
+  }
+
+  getAPI(){
+    return this.apiUrl;
+  }
+
 post(partialPath: string, data: any) {
-  return this.http.post(this.apiUrl + partialPath, data);
+  return this.http.post(this.getAPI() + partialPath, data);
 }
 
 get(partialPath: string, data: any) {
-  return this.http.get(this.apiUrl + partialPath, data);
+  return this.http.get(this.getAPI() + partialPath, data);
 }
 
 

src/providers/connection/userLogin.ts

@@ -0,0 +1,47 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Http, Headers, RequestOptions } from '@angular/http';
+import { ConnectionProvider } from '../connection/connection';
+
+/*
+  Generated class for the UserProvider provider.
+
+  See https://angular.io/guide/dependency-injection for more info on providers
+  and Angular DI.
+*/
+@Injectable()
+export class UserLoginProvider {
+
+  constructor( public http: Http, public conn: ConnectionProvider) {
+    console.log('Hello UserProvider Provider');
+  }
+
+
+  private token: string;
+
+  getToken(){return this.token}
+
+  setToken(token: string){this.token = token}
+  
+  login(username, password, callback){
+   
+    var url: string = this.conn.getAPI() + "/login";
+ 
+    var header = new Headers({
+      'content-type': 'application/json',
+    })
+ 
+    let options = new RequestOptions({headers: header})
+ 
+    var body = {
+      "username": username,
+      "password": password
+    };
+ 
+    this.http.post(url, body, options).subscribe( result => {
+      callback(result);
+      //console.log(result.headers.get("authorization"));
+    })
+  }
+
+}