Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

Commit 42492e4

Browse files
andreromaoandreromao
authored
Merge pull request #448 from sinfo/staging
Update 2.4.1
2 parents ff3380b + ccc6e34 commit 42492e4

File tree

2 files changed

+95
-101
lines changed

2 files changed

+95
-101
lines changed

‎src/app/user/user.component.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,5 @@
174174
}
175175

176176
.navlist {
177-
height: -webkit-fill-available !important;
177+
min-height: 100%;
178178
}

‎src/app/user/user.component.html‎

Lines changed: 94 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,32 @@ <h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Staff
7070
<span class="list-item">Validate Card</span>
7171
</div>
7272
</a>
73-
<mat-accordion *ngIf="user && user.role === 'team'">
74-
<mat-expansion-panel style="background-color: transparent; box-shadow: none;">
75-
<mat-expansion-panel-header class="specific-class">
76-
<a mat-list-item>
77-
<div class="navigation-link">
78-
<mat-icon>cake</mat-icon>
79-
<span class="list-item">Pick Winner</span>
80-
</div>
81-
</a>
82-
</mat-expansion-panel-header>
83-
<mat-nav-list>
84-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/prizes"
85-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
86-
<div class="navigation-link">
87-
<mat-icon>cake</mat-icon>
88-
<span class="list-item">Prizes</span>
89-
</div>
90-
</a>
91-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/pick-winner"
92-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
93-
<div class="navigation-link">
94-
<mat-icon>cake</mat-icon>
95-
<span class="list-item">Pick Winner</span>
96-
</div>
97-
</a>
98-
</mat-nav-list>
99-
</mat-expansion-panel>
100-
</mat-accordion>
73+
<mat-expansion-panel *ngIf="user && user.role === 'team'" style="background-color: transparent; box-shadow: none;">
74+
<mat-expansion-panel-header class="specific-class">
75+
<a mat-list-item>
76+
<div class="navigation-link">
77+
<mat-icon>cake</mat-icon>
78+
<span class="list-item">Pick Winner</span>
79+
</div>
80+
</a>
81+
</mat-expansion-panel-header>
82+
<mat-nav-list>
83+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/prizes"
84+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
85+
<div class="navigation-link">
86+
<mat-icon>cake</mat-icon>
87+
<span class="list-item">Prizes</span>
88+
</div>
89+
</a>
90+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/pick-winner"
91+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
92+
<div class="navigation-link">
93+
<mat-icon>cake</mat-icon>
94+
<span class="list-item">Pick Winner</span>
95+
</div>
96+
</a>
97+
</mat-nav-list>
98+
</mat-expansion-panel>
10199

102100
<h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Company Options</h2>
103101
<a
@@ -133,42 +131,40 @@ <h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Compa
133131
<span class="list-item">Download CVs</span>
134132
</div>
135133
</a>
136-
137-
<mat-accordion *ngIf="user && user.role === 'team'">
138-
<mat-expansion-panel style="background-color: transparent; box-shadow: none;">
139-
<mat-expansion-panel-header class="specific-class">
140-
<a mat-list-item class="navigation-link">
141-
<div class="navigation-link">
142-
<mat-icon>get_app</mat-icon>
143-
<span class="list-item">CV Downloads </span>
144-
</div>
145-
</a>
146-
</mat-expansion-panel-header>
147-
<mat-nav-list>
148-
<a *ngIf="user && user.role !== 'user'" mat-list-item routerLink="/user/downloads/download"
149-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
150-
<div class="navigation-link">
151-
<mat-icon>get_app</mat-icon>
152-
<span class="list-item">Download CVs</span>
153-
</div>
154-
</a>
155-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/manage"
156-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
157-
<div class="navigation-link">
158-
<mat-icon>get_app</mat-icon>
159-
<span class="list-item">Create Endpoints</span>
160-
</div>
161-
</a>
162-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/status"
163-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
164-
<div class="navigation-link">
165-
<mat-icon>get_app</mat-icon>
166-
<span class="list-item">Endpoints Status</span>
167-
</div>
168-
</a>
169-
</mat-nav-list>
170-
</mat-expansion-panel>
171-
</mat-accordion>
134+
135+
<mat-expansion-panel *ngIf="user && user.role === 'team'" style="background-color: transparent; box-shadow: none;">
136+
<mat-expansion-panel-header class="specific-class">
137+
<a mat-list-item class="navigation-link">
138+
<div class="navigation-link">
139+
<mat-icon>get_app</mat-icon>
140+
<span class="list-item">CV Downloads </span>
141+
</div>
142+
</a>
143+
</mat-expansion-panel-header>
144+
<mat-nav-list>
145+
<a *ngIf="user && user.role !== 'user'" mat-list-item routerLink="/user/downloads/download"
146+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
147+
<div class="navigation-link">
148+
<mat-icon>get_app</mat-icon>
149+
<span class="list-item">Download CVs</span>
150+
</div>
151+
</a>
152+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/manage"
153+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
154+
<div class="navigation-link">
155+
<mat-icon>get_app</mat-icon>
156+
<span class="list-item">Create Endpoints</span>
157+
</div>
158+
</a>
159+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/status"
160+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
161+
<div class="navigation-link">
162+
<mat-icon>get_app</mat-icon>
163+
<span class="list-item">Endpoints Status</span>
164+
</div>
165+
</a>
166+
</mat-nav-list>
167+
</mat-expansion-panel>
172168

173169
<h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Atendee Options</h2>
174170

@@ -206,42 +202,40 @@ <h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Atend
206202
</div>
207203
</a>
208204

209-
<mat-accordion *ngIf="user && user.role === 'team'">
210-
<mat-expansion-panel style="background-color: transparent; box-shadow: none;">
211-
<mat-expansion-panel-header class="specific-class">
212-
<a mat-list-item class="navigation-link">
213-
<div class="navigation-link">
214-
<mat-icon> business</mat-icon>
215-
<span class="list-item">Workshops</span>
216-
</div>
217-
</a>
218-
</mat-expansion-panel-header>
219-
<mat-nav-list>
220-
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/workshops"
221-
routerLinkActive="navigation-link active" [routerLinkActiveOptions]="{ exact: true }"
222-
(click)="sidenav.toggle()" class="navigation-link">
223-
<div class="navigation-link">
224-
<mat-icon> business</mat-icon>
225-
<span class="list-item">Workshops</span>
226-
</div>
227-
</a>
228-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/workshops/workshops-status"
229-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
230-
<div class="navigation-link">
231-
<mat-icon>info</mat-icon>
232-
<span class="list-item">Workshop Status</span>
233-
</div>
234-
</a>
235-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/validate-workshop"
236-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
237-
<div class="navigation-link">
238-
<mat-icon>event</mat-icon>
239-
<span class="list-item">Validate Workshop</span>
240-
</div>
241-
</a>
242-
</mat-nav-list>
243-
</mat-expansion-panel>
244-
</mat-accordion>
205+
<mat-expansion-panel *ngIf="user && user.role === 'team'" style="background-color: transparent; box-shadow: none;">
206+
<mat-expansion-panel-header class="specific-class">
207+
<a mat-list-item class="navigation-link">
208+
<div class="navigation-link">
209+
<mat-icon> business</mat-icon>
210+
<span class="list-item">Workshops</span>
211+
</div>
212+
</a>
213+
</mat-expansion-panel-header>
214+
<mat-nav-list>
215+
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/workshops"
216+
routerLinkActive="navigation-link active" [routerLinkActiveOptions]="{ exact: true }"
217+
(click)="sidenav.toggle()" class="navigation-link">
218+
<div class="navigation-link">
219+
<mat-icon> business</mat-icon>
220+
<span class="list-item">Workshops</span>
221+
</div>
222+
</a>
223+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/workshops/workshops-status"
224+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
225+
<div class="navigation-link">
226+
<mat-icon>info</mat-icon>
227+
<span class="list-item">Workshop Status</span>
228+
</div>
229+
</a>
230+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/validate-workshop"
231+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
232+
<div class="navigation-link">
233+
<mat-icon>event</mat-icon>
234+
<span class="list-item">Validate Workshop</span>
235+
</div>
236+
</a>
237+
</mat-nav-list>
238+
</mat-expansion-panel>
245239

246240

247241

0 commit comments

Comments
 (0)