Skip to content

Commit

Permalink
Merge branch 'rohanbsher' into samuelmenkus
Browse files Browse the repository at this point in the history
  • Loading branch information
samuelmenkus committed Mar 2, 2020
2 parents dd2ff82 + b127c00 commit fc27032
Show file tree
Hide file tree
Showing 5 changed files with 62 additions and 65 deletions.
91 changes: 35 additions & 56 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@angular/platform-browser": "~8.1.2",
"@angular/platform-browser-dynamic": "~8.1.2",
"@angular/router": "~8.1.2",
"@ionic-native/call-number": "^5.22.0",
"@ionic-native/core": "^5.0.0",
"@ionic-native/facebook": "^5.20.0",
"@ionic-native/qr-scanner": "^5.17.1",
Expand Down Expand Up @@ -104,4 +105,4 @@
"browser"
]
}
}
}
20 changes: 15 additions & 5 deletions src/app/home/home.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ion-content (swipe)="swipe($event)">
<!-- main profile -->
<ion-item id = "main" button (click)="goToProfile()">
<ion-item lines="none" id = "main" button (click)="goToProfile()">
<ion-avatar>
<ion-img src = "{{profile.photo}}"></ion-img>
</ion-avatar>
Expand All @@ -38,10 +38,20 @@
<div id="contacts">
<ion-card *ngFor="let contact of profile.contacts" (click)="goToUserContact(contact)">
<ion-card-content>
<ion-avatar>
<ion-img src = "{{contact.photo}}"></ion-img>
</ion-avatar>
<ion-title>{{contact.name}}</ion-title>
<ion-grid>
<ion-row>
<ion-col id ="avtar-width">
<ion-avatar>
<ion-img src = "{{contact.photo}}"></ion-img>
</ion-avatar>
</ion-col>
<ion-col id ="user-info">
<ion-item lines="none">
<ion-title>{{contact.name}}</ion-title>
</ion-item>
</ion-col>
</ion-row>
</ion-grid>
</ion-card-content>
</ion-card>
</div>
Expand Down
Loading

0 comments on commit fc27032

Please sign in to comment.