Skip to content

Commit

Permalink
about complete
Browse files Browse the repository at this point in the history
  • Loading branch information
harshbaldwa committed Oct 6, 2019
1 parent 8f7dde4 commit 5a420b2
Showing 8 changed files with 289 additions and 101 deletions.
49 changes: 47 additions & 2 deletions src/app/about/about.component.css
Original file line number Diff line number Diff line change
@@ -17,9 +17,54 @@ img {
}

.container {
margin-bottom: 50px;
margin-bottom: 15%;
}

.no-margin {
margin-left: -10px;
margin-left: -15px;
}

.mat-card-content {
font-size:100%;
}

.rejected,
.rejected:hover {
background-color: #E26D5A !important;
}

.accepted,
.accepted:hover {
background-color: #A1CCA5 !important;
}

.won,
.won:hover {
background-color: #A1CCA5 !important;
}

.lost,
.lost:hover {
background-color: #E26D5A !important;
}

.draw,
.draw:hover {
background-color: rgb(220, 184, 253) !important;
}

.awaiting,
.awaiting:hover {
background-color: #FFDA84 !important;
}

.reported,
.reported:hover {
background-color: #586F7C !important;
}

a:visited, a:hover, a {
cursor: pointer;
color: #3f51b5;

}
277 changes: 200 additions & 77 deletions src/app/about/about.component.html

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions src/app/challenge-list/challenge-list.component.css
Original file line number Diff line number Diff line change
@@ -12,10 +12,12 @@ button {
margin: 1rem auto;
}

.rejected {
background-color: #E26D5A;
.rejected,
.rejected:hover {
background-color: #E26D5A !important;
}

.accepted {
background-color: #A1CCA5;
.accepted,
.accepted:hover {
background-color: #A1CCA5 !important;
}
3 changes: 2 additions & 1 deletion src/app/challenge-list/challenge-list.component.html
Original file line number Diff line number Diff line change
@@ -20,7 +20,8 @@ <h1 class='mat-heading'>Challenges Received</h1>
<h1 class='mat-heading'>Challenges Sent</h1>
<mat-accordion multi="true" *ngIf="challengesS">
<mat-expansion-panel *ngFor="let challenege of challengesS" [ngClass]="{ 'rejected': (challenege.rejected == true), 'accepted': (challenege.accepted == true)}" >
<mat-expansion-panel-header>
<mat-expansion-panel-header
[ngClass]="{ 'rejected': (challenege.rejected == true), 'accepted': (challenege.accepted == true)}">
{{ challenege.p1_name }}
</mat-expansion-panel-header>
<p *ngIf="!challenege.rejected && !challenege.accepted"> Sport - {{ challenege.sport }} </p>
3 changes: 2 additions & 1 deletion src/app/header/header.component.html
Original file line number Diff line number Diff line change
@@ -92,7 +92,8 @@
</li>
</ul>

<button mat-icon-button [matMenuTriggerFor]="harsh" aria-label="Menu" *ngIf="isMobile && !userAuthenticated">
<button mat-icon-button [matMenuTriggerFor]="harsh" aria-label="Menu"
*ngIf="isMobile && !userAuthenticated">
<mat-icon>more_vert</mat-icon>
</button>
<mat-menu #harsh="matMenu" >
26 changes: 16 additions & 10 deletions src/app/previous-match/previous-match.component.css
Original file line number Diff line number Diff line change
@@ -9,22 +9,28 @@ button {
margin: 10px;
}

.won {
background-color: #A1CCA5;
.won,
.won:hover {
background-color: #A1CCA5 !important;
}

.lost {
background-color: #E26D5A;
.lost,
.lost:hover {
background-color: #E26D5A !important;
}

.draw {
background-color: rgb(220, 184, 253);
.draw,
.draw:hover {
background-color: rgb(220, 184, 253) !important;
}

.awaiting {
background-color: #FFDA84;
.awaiting,
.awaiting:hover {
background-color: #FFDA84 !important;
}

.reported {
background-color: #586F7C;
.reported,
.reported:hover {
background-color: #586F7C !important;
}

22 changes: 16 additions & 6 deletions src/app/previous-match/previous-match.component.html
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [ngClass]="{'won': (row.won=='Won'), 'lost': (row.won=='Lost') }"></tr>
</table> -->
<div class="container">
<h1 class='mat-heading'>Previous Matches</h1>
<h1 class='mat-heading'>Recent Matches</h1>
<mat-accordion *ngIf="previousMatches">
<mat-expansion-panel *ngFor="let data of previousMatches"
[ngClass]="{
@@ -27,18 +27,28 @@ <h1 class='mat-heading'>Previous Matches</h1>
'lost' : ((data.p1_yes && data.winner_2) || (!data.p1_yes && data.winner_1)),
'draw' : (data.winner_1 && data.winner_2),
'reported' : (data.report_secy !== 'no') }">
<mat-expansion-panel-header *ngIf="data.p1_yes">
<mat-expansion-panel-header [ngClass]="{
'awaiting' : ((data.confirm_1 || data.confirm_2) && !(data.confirm_1 && data.confirm_2)),
'won' : ((data.p1_yes && data.winner_1) || (!data.p1_yes && data.winner_2)),
'lost' : ((data.p1_yes && data.winner_2) || (!data.p1_yes && data.winner_1)),
'draw' : (data.winner_1 && data.winner_2),
'reported' : (data.report_secy !== 'no') }" *ngIf="data.p1_yes">
{{ data.date }} - {{ data.p2_name }}
</mat-expansion-panel-header>
<mat-expansion-panel-header *ngIf="!data.p1_yes">
<mat-expansion-panel-header [ngClass]="{
'awaiting' : ((data.confirm_1 || data.confirm_2) && !(data.confirm_1 && data.confirm_2)),
'won' : ((data.p1_yes && data.winner_1) || (!data.p1_yes && data.winner_2)),
'lost' : ((data.p1_yes && data.winner_2) || (!data.p1_yes && data.winner_1)),
'draw' : (data.winner_1 && data.winner_2),
'reported' : (data.report_secy !== 'no') }" *ngIf="!data.p1_yes">
{{ data.date }} - {{ data.p1_name }}
</mat-expansion-panel-header>
<p> Sport:
{{data.sport}} </p>
<p *ngIf="data.confirm_1 || data.confirm_2"> Set Score :
{{data.set_score}} </p>
<p *ngIf="data.confirm_1 || data.confirm_2"> Match Score :
{{data.match_score}} </p>
<p *ngIf="data.confirm_1 || data.confirm_2"> Set Score :
{{data.set_score}} </p>
<p *ngIf="data.p1_yes">Contact - {{ data.contact2 }}</p>
<p *ngIf="!data.p1_yes">Contact - {{ data.contact1 }}</p>
<p *ngIf="data.report_secy == 'p1' && data.p1_yes">This has been reported to the secy by You</p>
@@ -47,7 +57,7 @@ <h1 class='mat-heading'>Previous Matches</h1>
<p *ngIf="data.report_secy == 'p2' && !data.p1_yes">This has been reported to the secy by You</p>
<mat-action-row *ngIf="!data.confirm_1 && !data.confirm_2">
<!-- <button mat-raised-button [routerLink]="">Report Issue?</button> -->
<button mat-raised-button [routerLink]="['/confirmation/update/', data._id, data.p1_yes]">Update Result</button>
<button mat-raised-button color="primary" [routerLink]="['/confirmation/update/', data._id, data.p1_yes]">Update Result</button>
</mat-action-row>
</mat-expansion-panel>
</mat-accordion>
Binary file added src/assets/github.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5a420b2

Please sign in to comment.