Skip to content

Commit

Permalink
Issue#SH-24 merge: Merge pull request #1090 from Diptesh6501/branch-3…
Browse files Browse the repository at this point in the history
….1.0

Issue#SH-24 feat : implemented color pallete in group list
  • Loading branch information
AmiableAnil authored Jul 14, 2020
2 parents f2b1c8b + e3d6d10 commit e617bd7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/app/my-groups/my-groups.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<div *ngFor="let group of groupList" class="mg-list-card-container">
<sb-group-card [isMobile]="true" [isAdmin]="group.memberRole === 'admin'" [group]="group"
(cardClick)="navigateToGroupdetailsPage($event)"></sb-group-card>
[cardTitleColor]="group.cardTitleColor" [cardBgColor]="group.cardBgColor" (cardClick)="navigateToGroupdetailsPage($event)"></sb-group-card>
</div>
<div *ngIf="!isGuestUser && !groupList.length && groupListLoader">
<div *ngFor="let item of [0,1,2,3,4,5,6,7,8,9,10]">
Expand Down
8 changes: 6 additions & 2 deletions src/app/my-groups/my-groups.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ interface GroupData extends Group {
export class MyGroupsPage implements OnInit {
isGuestUser: boolean;
groupList: GroupData[] = [];
themeColors: string[] = ['#FFDFC7', '#C2ECE6', '#FFE59B', '#DAD4FF', '#80CBC4', '#E6EE9C', '#FFE082'];
fontColor: string[] = ['#AD632D', '#149D88', '#8D6A00', '#635CDC', '#00695C', '#9E9D24', '#FF8F00'];
groupListLoader = false;
headerObservable: any;
userId: string;
Expand Down Expand Up @@ -153,10 +155,12 @@ export class MyGroupsPage implements OnInit {
}
};
this.groupList = (await this.groupService.search(groupSearchCriteria).toPromise())
.map<GroupData>((group) => {
.map<GroupData>((group , index) => {
return {
...group,
initial: this.commonUtilService.extractInitial(group.name)
initial: this.commonUtilService.extractInitial(group.name),
cardBgColor: this.themeColors[index % this.themeColors.length],
cardTitleColor: this.fontColor[index % this.fontColor.length]
};
});
this.groupListLoader = false;
Expand Down

0 comments on commit e617bd7

Please sign in to comment.