Skip to content

Commit

Permalink
Merge pull request #71 from GoogolApp/refineUS
Browse files Browse the repository at this point in the history
now, we can view the profiles of users that confirmed presence in an …
  • Loading branch information
daniyelnnr committed Apr 10, 2019
2 parents 4930609 + 3c5b12d commit 3289ff7
Show file tree
Hide file tree
Showing 8 changed files with 146 additions and 5 deletions.
7 changes: 5 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import { ClaimBarPage } from '../pages/Enterprise/claim-bar/claim-bar';
import { SearchBarEventPage } from '../pages/User/matches/create-event/search-bar-event/search-bar-event';
import { ListEventsTab } from '../pages/Enterprise/bar-events/list-events-tab/list-events-tab';
import { UsersEventsPage } from '../pages/Enterprise/users-events/users-events';
import { FollowerProfilePage } from '../pages/follower-profile/follower-profile';


@NgModule({
Expand Down Expand Up @@ -108,7 +109,8 @@ import { UsersEventsPage } from '../pages/Enterprise/users-events/users-events';
FilterEventsModal,
FilterMatchesModal,
FollowersBarPage,
UsersEventsPage
UsersEventsPage,
FollowerProfilePage
],
imports: [
ComponentsModule,
Expand Down Expand Up @@ -158,7 +160,8 @@ import { UsersEventsPage } from '../pages/Enterprise/users-events/users-events';
FilterEventsModal,
FilterMatchesModal,
FollowersBarPage,
UsersEventsPage
UsersEventsPage,
FollowerProfilePage
],
providers: [
StatusBar,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Enterprise/followers-bar/followers-bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<p text-center *ngIf="followers.length == 0">Você ainda não tem nenhum seguidor.</p>

<ion-list no-lines *ngIf="followers.length > 0">
<button ion-item detail-none *ngFor="let follower of users">
<button ion-item detail-none *ngFor="let follower of users" (click)="showPageUser(follower._id)">
<ion-avatar item-start>
<profile-pic-generator word="{{follower.username}}" color="#4A90E2"></profile-pic-generator>
</ion-avatar>
Expand Down
6 changes: 6 additions & 0 deletions src/pages/Enterprise/followers-bar/followers-bar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { Component} from '@angular/core';
import { NavController, NavParams, LoadingController, Events } from 'ionic-angular';
import { User } from '../../../_models/user';
import { UsersService } from '../../../_services/users';
import { EventsPage } from '../../User/events/events';
import { FollowerProfilePage } from '../../follower-profile/follower-profile';

@Component({
selector: 'page-followers-bar',
Expand Down Expand Up @@ -52,4 +54,8 @@ export class FollowersBarPage{
});
}

showPageUser(id:string){
this.navCtrl.push(FollowerProfilePage, {id:id})
}

}
2 changes: 1 addition & 1 deletion src/pages/Enterprise/users-events/users-events.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ion-content padding padding id="usersConfirmed">
<ion-list no-lines>
<button ion-item detail-none *ngFor="let user of users">
<button ion-item detail-none *ngFor="let user of users" (click)="showPageUser(user._id)">
<ion-avatar item-start>
<profile-pic-generator word="{{user.username}}" color="#4A90E2"></profile-pic-generator>
</ion-avatar>
Expand Down
7 changes: 6 additions & 1 deletion src/pages/Enterprise/users-events/users-events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { IonicPage, NavController, NavParams, Events, ViewController } from 'ion
import { EventsService } from '../../../_services/events';
import { Event } from '../../../_models/event';
import { User } from '../../../_models/user';
import { FollowerProfilePage } from '../../follower-profile/follower-profile';

@Component({
selector: 'page-users-events',
templateUrl: 'users-events.html',
})
export class UsersEventsPage {


private users:User[] = [];

constructor(
Expand All @@ -37,6 +37,11 @@ export class UsersEventsPage {
)
}

showPageUser(id:string){
this.navCtrl.push(FollowerProfilePage, {id:id})
}


dismiss(){
this.viewController.dismiss();
}
Expand Down
62 changes: 62 additions & 0 deletions src/pages/follower-profile/follower-profile.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<ion-header>
<ion-navbar>
<ion-title>Perfil</ion-title>
</ion-navbar>
</ion-header>

<ion-content padding class="pg-profile">
<!-- img -->
<section text-center>
<profile-pic-generator word="{{userSearch.username}}" color="#4A90E2"></profile-pic-generator>
</section>

<!-- name / username -->
<p class="text-xxlarge-normal" text-center>
@{{userSearch.username}}
<br>
<span class="text-default-light" text-center>{{userSearch.email}}</span>
</p>

<!-- follow grid -->
<ion-grid>
<ion-row>
<ion-col class="text-default-light" text-center>
<span class="text-default-medium">{{userSearch.following.length}}</span>
<br> Seguindo
</ion-col>

<ion-col class="text-default-light" text-center>
<span class="text-default-medium">{{userSearch.followers.length}}</span>
<br> Seguidores
</ion-col>

<ion-col class="text-default-light" text-center>
<span class="text-default-medium">{{userSearch.reputation}}</span>
<br> Reputação
</ion-col>
</ion-row>
</ion-grid>

<!-- teams row -->
<section class="favorite-teams">
<p class="text-default-light">Times Favoritos</p>
<div *ngIf="userSearch.favTeams.length==0">
<p class="text-default-light">Usuário sem times favoritos!</p>
</div>

<div *ngIf="userSearch.favTeams.length==1">
<img width="40" height="40" src={{userSearch.favTeams[0].teamLogoUrl}}>
</div>

<div *ngIf="userSearch.favTeams.length==2" (click)="gotoTeamsPage()">
<img width="40" height="40" src={{userSearch.favTeams[0].teamLogoUrl}}>
<img width="40" height="40" src={{userSearch.favTeams[1].teamLogoUrl}}>
</div>

<div *ngIf="userSearch.favTeams.length >=3 ">
<img width="40" height="40" src={{userSearch.favTeams[0].teamLogoUrl}}>
<img width="40" height="40" src={{userSearch.favTeams[1].teamLogoUrl}}>
<img width="40" height="40" src={{userSearch.favTeams[2].teamLogoUrl}}>
</div>
</section>
</ion-content>
3 changes: 3 additions & 0 deletions src/pages/follower-profile/follower-profile.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
page-follower-profile {

}
62 changes: 62 additions & 0 deletions src/pages/follower-profile/follower-profile.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams, LoadingController, Events } from 'ionic-angular';
import { User } from '../../_models/user';
import { UsersService } from '../../_services/users';
import { EventsService } from '../../_services/events';



@Component({
selector: 'page-follower-profile',
templateUrl: 'follower-profile.html',
})
export class FollowerProfilePage {

userSearch = new User();
eventos = {};

constructor(
public navCtrl: NavController,
public navParams: NavParams,
private userService : UsersService,
private eventsService : EventsService,
private loadingController: LoadingController,
private events: Events) {

let id = this.navParams.get("id");
this.fetchUser(id);
this.fetchEvents();
}


fetchEvents(){
this.eventos = this.eventsService.getAll();
}

async fetchUser(id : string){
let loading = this.loading();
await loading;
this.userService.getOne(id).subscribe(
data=> {
this.userSearch = data;
loading.dismiss();
},
err =>{
console.log(err);
loading.dismiss();
}
)
}

loading(){
let loading = this.loadingController.create({
content: 'Por favor, aguarde...',
spinner: 'bubbles'
});

loading.present();

return loading;
}

}

0 comments on commit 3289ff7

Please sign in to comment.