Skip to content

Commit

Permalink
update profile page
Browse files Browse the repository at this point in the history
  • Loading branch information
AKwoKWH committed Jan 21, 2018
1 parent 0de8ce1 commit 3fada6b
Show file tree
Hide file tree
Showing 9 changed files with 624 additions and 207 deletions.
6 changes: 0 additions & 6 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
"firebase.json",
"**/.*",
"**/node_modules/**"
],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
1 change: 1 addition & 0 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export class MyApp {
openPage(page) {
// Reset the content nav to have just this page
// we wouldn't want the back button to show in this scenario
console.log(page)
this.nav.setRoot(page.component);
}
}
Binary file added src/assets/imgs/Add_Photo.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/noProfile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 17 additions & 19 deletions src/pages/list/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
<ion-item>
<ion-label>Expertise level</ion-label>
<ion-select [(ngModel)]="searchUserForm.level" multiple="false">
<ion-option selected>Primary School</ion-option>
<ion-option>Junior Secondary School</ion-option>
<ion-option>Senior Secondary School</ion-option>
<ion-option>University</ion-option>
<ion-option value='Primary'>Primary School</ion-option>
<ion-option value='SecondaryJunior'>Junior Secondary School</ion-option>
<ion-option value='SecondarySenior'>Senior Secondary School</ion-option>
<ion-option value='University'>University</ion-option>
</ion-select>
</ion-item>

Expand Down Expand Up @@ -104,33 +104,30 @@
</span>

<button ion-button (click)="GetUserList()">Get Filtered User Profile in Database</button>
<button ion-button (click)="SubmitRequest()">SUBMIT</button>

<div>
<br>FILTER===================<br>
<!--<ion-list class="nopadding" *ngFor="let result of userListFilter| async">
{{result|json}}
</ion-list>-->

<ion-list class="nopadding" *ngFor="let result of userListFilter| async">

<ion-list class="nopadding" *ngFor="let result of userListFilterArray">
<ion-card>
{{result|json}}
</ion-card>
</ion-list>

<!--<ion-list class="nopadding" *ngFor="let result of userListFilter | async ">
<ion-list class="nopadding" *ngFor="let result of userListFilter | async ">
<ion-item-sliding>

<ion-item class="nopadding">
<ion-thumbnail item-start>
<img src="assets/img/avatar-ts-woody.png" (click)="openModal()"/>
<img src="assets/img/avatar-ts-woody.png">
</ion-thumbnail>
<span>{{result.userName|json}}
<ion-badge right>{{result.education|json}}</ion-badge>
<ion-badge right>{{result.education.Summary|json}}</ion-badge>
<ion-icon name="checkmark-circle" ></ion-icon>
</span>
<p>Master of Math</p>
<p>AL: 2As 1Bs</p>
<p>80 hrs</p>
<br>
<span>
<ion-icon name="star"></ion-icon>
<ion-icon name="star"></ion-icon>
Expand All @@ -141,22 +138,23 @@
<div *ngIf="result.Preference == true" >SELECTED</div>
</ion-item>

<ion-item-options side="left">
<!--<ion-item-options side="left">
<button ion-button color="balanced" (click)="SelectTutor(result.$key)">
<ion-icon name="text"></ion-icon>
SELECT
</button>
</ion-item-options>
</ion-item-options>-->

<ion-item-options side="right">
<button ion-button color="primary" (click)="LikeTutor()">
<ion-icon name="mail"></ion-icon>
<button ion-button color="primary">
<ion-icon name="like"></ion-icon>
LIKE
</button>
</ion-item-options>

</ion-item-sliding>
</ion-list>-->

</ion-list>


</div>
Expand Down
Loading

0 comments on commit 3fada6b

Please sign in to comment.