login page added, search updated ..will push

src/app/app.component.ts

@@ -9,6 +9,7 @@ import { ListPage } from '../pages/list/list';
 import { NewProfilePage } from '../pages/registerUser/registerUser';
 import { TeacherRegistrationPage } from '../pages/registerTeacher/registerTeacher';
 import { SearchPage } from '../pages/search/search';
+import { LoginPage } from '../pages/login/login';
 
 
 
@@ -27,7 +28,8 @@ export class MyApp {
 
     // used for an example of ngFor and navigation
     this.pages = [
-      { title: 'Home', component: HomePage },
+      { title: 'Login', component: LoginPage },
+      { title: 'Profile', component: HomePage },
       { title: 'List', component: ListPage },
       { title: 'Register User', component: NewProfilePage },
       { title: 'Register Teacher', component: TeacherRegistrationPage }, 

src/app/app.module.ts

@@ -10,6 +10,7 @@ import { NewProfilePage } from '../pages/registerUser/registerUser';
 import { TeacherRegistrationPage } from '../pages/registerTeacher/registerTeacher';
 import { SearchPage } from '../pages/search/search';
 import { SchoolPage } from '../pages/schools/schools';
+import { LoginPage } from '../pages/login/login';
 
 
 import { StatusBar } from '@ionic-native/status-bar';
@@ -26,6 +27,7 @@ import { DistrictProvider } from '../providers/connection/district';
     TeacherRegistrationPage,
     SearchPage,
     SchoolPage,
+    LoginPage,
   ],
   imports: [
     BrowserModule,
@@ -40,7 +42,8 @@ import { DistrictProvider } from '../providers/connection/district';
     NewProfilePage,
     TeacherRegistrationPage,
     SearchPage,
-    SchoolPage, 
+    SchoolPage,
+    LoginPage, 
   ],
   providers: [
     StatusBar,

src/app/component/school.ts

@@ -1,7 +1,7 @@
 export class School {
 
 
-    constructor(public name: string) {
+    constructor(public name?: string) {
 
     }
 }

src/app/component/user.ts

@@ -5,4 +5,5 @@ export class User {
     displayName: string; 
     email: string;
     password: string; 
+    verifyPassword: string;
 }

src/index.html

@@ -45,5 +45,7 @@
   <!-- The main bundle js is generated during the build process -->
   <script src="build/main.js"></script>
 
-</body>
+  <script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBjUqkq3Y327lB9evByUsXROPj03Y2JDbg"></script>
+  
+  </body>
 </html>

src/pages/login/login.html

@@ -0,0 +1,49 @@
+<ion-header>
+  <ion-navbar>
+    <button ion-button menuToggle>
+      <ion-icon name="menu"></ion-icon>
+    </button>
+    <ion-title>
+      Login
+    </ion-title>
+  </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">
+    <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-item>
+      <ion-item id="login-input2">
+        <ion-label>
+          Password
+        </ion-label>
+        <ion-input type="password" placeholder=""></ion-input>
+      </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()">
+      Log in
+    </button>
+  </form>
+  <button id="login-button11" ion-button color="positive" small icon-left>
+    <ion-icon name="linkedin"></ion-icon>
+    LinkedIn Login
+  </button>
+  <button id="login-button14" ion-button clear color="light" small style="color:#FFFFFF;">
+               
+  </button>
+  <button id="login-button12" ion-button color="energized" small>
+    <ion-icon name="googleplus"></ion-icon>
+    Google + Login
+  </button>
+  <button id="login-button2" ion-button color="assertive" full small on-click="goToNewProfile()">
+    Create A New Profile!
+  </button>
+  <button id="login-button5" ion-button color="balanced" full small on-click="goToTeacherRegistration()">
+    Register As An Educator!
+  </button>
+</ion-content>

src/pages/login/login.scss

@@ -0,0 +1,3 @@
+page-login {
+
+}

src/pages/login/login.ts

@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+import { NavController } from 'ionic-angular';
+
+
+@Component({
+  selector: 'page-login',
+  templateUrl: 'login.html'
+})
+export class LoginPage {
+
+  constructor(public navCtrl: NavController) {
+  }
+//   goToNewProfile(params){
+//     if (!params) params = {};
+//     this.navCtrl.push(NewProfilePage);
+//   }
+  
+}

src/pages/registerTeacher/registerTeacher.html

@@ -56,13 +56,13 @@
       <ion-label>
         Password
       </ion-label>
-      <ion-input type="text" placeholder="" [(ngModel)]="user.password" name="password"></ion-input>
+      <ion-input type="password" placeholder="" [(ngModel)]="user.password" name="password"></ion-input>
     </ion-item>
     <ion-item id="teacherRegistration-input14">
       <ion-label>
         Verify Password
       </ion-label>
-      <ion-input type="text" placeholder=""></ion-input>
+      <ion-input type="password" placeholder="" [(ngModel)]="user.verifyPassword" name="verify password"></ion-input>
     </ion-item>
     <button id="teacherRegistration-button17" ion-button color="stable" block on-click="register()">
       Sign up

src/pages/registerUser/registerUser.html

@@ -45,14 +45,14 @@
         </ion-item>
         <ion-item id="newProfile-input6">
           <ion-label>
-            Display Name (optional)
+            Display Name
           </ion-label>
-          <ion-input type="text" placeholder="" [(ngModel)]="user.displayName" name="displayName"></ion-input>
+          <ion-input type="text" placeholder="optional" [(ngModel)]="user.displayName" name="displayName" required minlength="5" maxlength="8"></ion-input>
         </ion-item>
         <div class="spacer" style="width:299.531px;height:12.9688px;" id="newProfile-spacer5"></div>
         <div id="newProfile-markdown17" class="show-list-numbers-and-dots">
           <p style="color:#FF0303;font-size:-1px;">
-            If under the age of 13, tell yo momma, or your daddy ...if he&#39;s still there ...mines wasn&#39;t T^T
+            If under the age of 13, tell yo momma, or yo daddy ...if he&#39;s still there ...mines wasn&#39;t T^T
           </p>
         </div>
       </form>
@@ -67,7 +67,7 @@
       <ion-label>
         Verify Password
       </ion-label>
-      <ion-input type="password" placeholder="" [(ngModel)]="user.password" name="password">></ion-input>
+      <ion-input type="password" placeholder="" [(ngModel)]="user.verifyPassword" name="verify password"></ion-input>
     </ion-item>
     <div class="spacer" style="width:299.514px;height:55.9757px;" id="newProfile-spacer4"></div>
     <button id="newProfile-button9" ion-button color="balanced" full on-click="register()">

src/pages/schools/schools.html

@@ -13,11 +13,12 @@
   {{school.name}}
   </h1>
       <ion-item color="none" id="teacherSelectPage-list-item52">
-      <ion-thumbnail item-left>
-  
-      </ion-thumbnail>
       <h2>
         School Aggregate Score
       </h2>
     </ion-item>
+    <div #mapsId id="mapsId">
+ASASAS
+    </div>
+
 </ion-content>

src/pages/schools/schools.scss

@@ -0,0 +1,2 @@
+page-schools {
+}

src/pages/schools/schools.ts

@@ -1,18 +1,38 @@
 import { Component } from '@angular/core';
 import { NavController, NavParams } from 'ionic-angular';
-//import { SearchPage } from '../../pages/search/search'
 
+// declare var google;
 
 @Component({
-  selector: 'page-school-page',
+  selector: 'page-schools',
   templateUrl: 'schools.html'
 })
 export class SchoolPage {
     public school; 
+    public gMap;
 
-  constructor(public navCtrl: NavController, public navParams: NavParams) {
+    // @ViewChild('mapsId') mapElement: ElementRef;
+    // map: any;
 
+  constructor(public navCtrl: NavController, public navParams: NavParams) {
       this.school = this.navParams.get("school");
   }
 
+  // ionViewDidLoad () {
+  //   this.loadMap();
+  // }
+
+  // loadMap () {
+  //     const latLng = new google.maps.LatLng(40.758895,-73.985) 
+  //     const mapOptions = {
+  //       zoom: 13,
+	// 	    center: latLng,
+	// 	    mapTypeId: google.maps.MapTypeId.ROADMAP
+  //     }
+
+  //     this.gMap = new google.maps.Map(this.mapElement.nativeElement, mapOptions);
+  // }
+
+
+
 }

src/pages/search/search.html

@@ -1,8 +1,8 @@
 <ion-header>
   <ion-navbar>
-    <!-- <button ion-button menuToggle>
+    <button ion-button menuToggle>
       <ion-icon name="menu"></ion-icon>
-    </button> -->
+    </button>
     <ion-title>
       Search Page
     </ion-title>

src/pages/search/search.ts

@@ -14,6 +14,7 @@ import { School } from './../../app/component/school'
 export class SearchPage {
     listOfSchools: any; 
     filterSchools: any;
+    school: School = new School(); 
 
   constructor(public navCtrl: NavController, public conn: ConnectionProvider, public dist: DistrictProvider) {
   }
@@ -40,7 +41,17 @@ export class SearchPage {
 
     }
     
+    postSchool(event: any) {
+        this.dist.post("schools/post", this.school).subscribe(
+            data => console.log(data)
+          );
+    }
+    
     goToSchoolPage(school: School){
+    
+        this.dist.post("schools/post", school).subscribe(
+            data => console.log(data)
+          )
     this.navCtrl.push(SchoolPage, {
         school: school
     });

src/providers/connection/connection.ts

@@ -26,4 +26,6 @@ get(partialPath: string, data: any) {
 
 
 
+
+
 }

src/providers/connection/district.ts

@@ -6,6 +6,7 @@ import { School } from './../../app/component/school'
 export class DistrictProvider {
 
     public districtAPI = 'https://data.delaware.gov/api/views/wky5-77bt/rows.json?accessType=DOWNLOAD'
+    public apiUrl = 'http://localhost:8080/'; 
 
     constructor(public http: HttpClient) {
             console.log('Hello DistrictProvider Provider');
@@ -13,14 +14,7 @@ export class DistrictProvider {
     }
 
     getAllSchools() {
-
-        return this.http.get(this.districtAPI) //.map((response: any) => {
-            // if (response.data.length > 0) {
-            //     return response.data[0].images.original.url;
-            // } else {
-            //     return console.log('error');
-        //     }
-        // });
+        return this.http.get(this.districtAPI)
     }
 
     parseData(data: any) {
@@ -30,6 +24,9 @@ export class DistrictProvider {
     onlyUnique(value, index, self) { 
         return self.indexOf(value) === index;
     }
-
+    
+    post(partialPath: string, data: any) {
+        return this.http.post(this.apiUrl + partialPath, data);
+      }
 
 }