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

Commit 97edc15

Browse files
PMax5PMax5
authored
Merge pull request #436 from sinfo/side-bar-change
visually changes the side bar
2 parents eeb2643 + 3dbb5b7 commit 97edc15

File tree

5 files changed

+130
-91
lines changed

5 files changed

+130
-91
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ <h3 class="title">Achievements</h3>
1212
<div class="row">
1313
<div class="col-sm-12">
1414
<h6 class="lead">
15-
Earn entries by completing achievements.
16-
<br> Each entry increases your chance of being awarded a prize at the end of the day!
15+
Get achievements to increase your chances of winning the daily prizes.
16+
<br> If you found a secret QR code, <a routerLink="/user/redeem">scan it</a> to unlock a hidden achievement!
1717
</h6>
1818
</div>
1919
</div>

‎src/app/user/link/my-links/my-links.component.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,3 +205,8 @@ img.portrait {
205205
.black-text {
206206
color: black;
207207
}
208+
209+
h6.lead{
210+
margin-bottom: 40px;
211+
text-align: center;
212+
}

‎src/app/user/link/my-links/my-links.component.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ <h3 *ngIf="!company">My Links</h3>
3030
</div>
3131
</div>
3232

33-
<div *ngIf="!processedLinks?.length" class="row">
33+
<div class="row">
3434
<div class="col-sm-12">
35-
<h6 class="lead">
35+
<h6 *ngIf="!processedLinks?.length" class="lead">
3636
Looks like you have not made any links yet.
37-
<br> You can link with {{me.role === "company" ? "attendees" : "companies"}}
37+
</h6>
38+
<h6 class="lead">
39+
You can link with {{me.role === "company" ? "attendees" : "companies"}}
3840
<a routerLink="/user/links/link">here</a>.
3941
</h6>
4042
</div>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
display: flex;
133133
flex-direction: column;
134134
justify-content: end;
135+
padding-bottom: 3dvh;
135136
}
136137

137138
.fab {
@@ -170,4 +171,8 @@
170171
justify-content: space-between;
171172
width: 100%;
172173
height: 100%;
174+
}
175+
176+
.navlist {
177+
height: -webkit-fill-available !important;
173178
}

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

Lines changed: 113 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@
4848
<span class="list-item">QR Code</span>
4949
</div>
5050
</a>
51-
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/cv"
51+
<h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Staff Options</h2>
52+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/promote"
5253
routerLinkActive="navigation-link active" (click)="sidenav.toggle()" class="mat-list-item-custom">
5354
<div class="navigation-link">
54-
<mat-icon *ngIf="!isCvUpdated" matBadge="!" matBadgeColor="warn" matBadgeSize="small">account_box</mat-icon>
55-
<mat-icon *ngIf="isCvUpdated">account_box</mat-icon>
56-
<span class="list-item">Upload CV</span>
55+
<mat-icon>verified_user</mat-icon>
56+
<span class="list-item">Promote</span>
5757
</div>
5858
</a>
5959
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/checkin"
@@ -70,15 +70,39 @@
7070
<span class="list-item">Validate Card</span>
7171
</div>
7272
</a>
73-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/promote"
74-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()" class="mat-list-item-custom">
75-
<div class="navigation-link">
76-
<mat-icon>verified_user</mat-icon>
77-
<span class="list-item">Promote</span>
78-
</div>
79-
</a>
73+
<mat-accordion *ngIf="user && user.role === 'team'">
74+
<mat-expansion-panel style="background-color: transparent !important">
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+
<mat-icon>keyboard_arrow_right</mat-icon>
81+
</div>
82+
</a>
83+
</mat-expansion-panel-header>
84+
<mat-nav-list>
85+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/prizes"
86+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
87+
<div class="navigation-link">
88+
<mat-icon>cake</mat-icon>
89+
<span class="list-item">Prizes</span>
90+
</div>
91+
</a>
92+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/pick-winner"
93+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
94+
<div class="navigation-link">
95+
<mat-icon>cake</mat-icon>
96+
<span class="list-item">Pick Winner</span>
97+
</div>
98+
</a>
99+
</mat-nav-list>
100+
</mat-expansion-panel>
101+
</mat-accordion>
102+
103+
<h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Company Options</h2>
80104
<a
81-
*ngIf="user"
105+
*ngIf="user && user.role === 'company'"
82106
mat-list-item
83107
routerLink="/user/links/link"
84108
routerLinkActive="navigation-link active"
@@ -87,11 +111,11 @@
87111
>
88112
<div class="navigation-link">
89113
<mat-icon>done_outline</mat-icon>
90-
<span class="list-item">{{(user.role === 'company' ? "Sign and ": "" )}}Link Card </span>
114+
<span class="list-item">Sign and Link Card </span>
91115
</div>
92116
</a>
93117
<a
94-
*ngIf="user"
118+
*ngIf="user && user.role !== 'user'"
95119
mat-list-item
96120
routerLink="/user/links/my-links"
97121
routerLinkActive="navigation-link active"
@@ -103,124 +127,126 @@
103127
<span class="list-item">My links</span>
104128
</div>
105129
</a>
106-
107-
<a *ngIf="user && user.role === 'user'" mat-list-item routerLink="/user/workshops"
108-
routerLinkActive="navigation-link active" [routerLinkActiveOptions]="{ exact: true }"
109-
(click)="sidenav.toggle()">
130+
<a *ngIf="user && user.role === 'company'" mat-list-item routerLink="/user/downloads/download"
131+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
110132
<div class="navigation-link">
111-
<mat-icon> business</mat-icon>
112-
<span class="list-item">Workshops</span>
133+
<mat-icon>get_app</mat-icon>
134+
<span class="list-item">Download CVs</span>
113135
</div>
114136
</a>
115-
137+
116138
<mat-accordion *ngIf="user && user.role === 'team'">
117139
<mat-expansion-panel style="background-color: transparent !important">
118140
<mat-expansion-panel-header class="specific-class">
119141
<a mat-list-item class="navigation-link">
120142
<div class="navigation-link">
121-
<mat-icon> business</mat-icon>
122-
<span class="list-item">Workshops</span>
143+
<mat-icon>get_app</mat-icon>
144+
<span class="list-item">CV Downloads </span>
123145
<mat-icon>keyboard_arrow_right</mat-icon>
124146
</div>
125147
</a>
126148
</mat-expansion-panel-header>
127149
<mat-nav-list>
128-
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/workshops"
129-
routerLinkActive="navigation-link active" [routerLinkActiveOptions]="{ exact: true }"
130-
(click)="sidenav.toggle()" class="navigation-link">
131-
<div class="navigation-link">
132-
<mat-icon> business</mat-icon>
133-
<span class="list-item">Workshops</span>
134-
</div>
135-
</a>
136-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/workshops/workshops-status"
137-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
138-
<div class="navigation-link">
139-
<mat-icon>info</mat-icon>
140-
<span class="list-item">Workshop Status</span>
141-
</div>
142-
</a>
143-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/validate-workshop"
150+
<a *ngIf="user && user.role !== 'user'" mat-list-item routerLink="/user/downloads/download"
144151
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
145152
<div class="navigation-link">
146-
<mat-icon>event</mat-icon>
147-
<span class="list-item">Validate Workshop</span>
148-
</div>
149-
</a>
150-
</mat-nav-list>
151-
</mat-expansion-panel>
152-
153-
<mat-expansion-panel style="background-color: transparent !important">
154-
<mat-expansion-panel-header class="specific-class">
155-
<a mat-list-item>
156-
<div class="navigation-link">
157-
<mat-icon>cake</mat-icon>
158-
<span class="list-item">Pick Winner</span>
159-
<mat-icon>keyboard_arrow_right</mat-icon>
153+
<mat-icon>get_app</mat-icon>
154+
<span class="list-item">Download CVs</span>
160155
</div>
161156
</a>
162-
</mat-expansion-panel-header>
163-
<mat-nav-list>
164-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/prizes"
157+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/manage"
165158
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
166159
<div class="navigation-link">
167-
<mat-icon>cake</mat-icon>
168-
<span class="list-item">Prizes</span>
160+
<mat-icon>get_app</mat-icon>
161+
<span class="list-item">Create Endpoints</span>
169162
</div>
170163
</a>
171-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/pick-winner"
164+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/status"
172165
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
173166
<div class="navigation-link">
174-
<mat-icon>cake</mat-icon>
175-
<span class="list-item">Pick Winner</span>
167+
<mat-icon>get_app</mat-icon>
168+
<span class="list-item">Endpoints Status</span>
176169
</div>
177170
</a>
178171
</mat-nav-list>
179172
</mat-expansion-panel>
173+
</mat-accordion>
174+
175+
<h2 *ngIf="user && user.role === 'team'" matSubheader style="color: grey;">Atendee Options</h2>
176+
177+
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/cv"
178+
routerLinkActive="navigation-link active" (click)="sidenav.toggle()" class="mat-list-item-custom">
179+
<div class="navigation-link">
180+
<mat-icon *ngIf="!isCvUpdated" matBadge="!" matBadgeColor="warn" matBadgeSize="small">account_box</mat-icon>
181+
<mat-icon *ngIf="isCvUpdated">account_box</mat-icon>
182+
<span class="list-item">Upload CV</span>
183+
</div>
184+
</a>
185+
186+
<!-- Ugly fix one day before the event. Just to have the 'Upload CV' on the top for users
187+
and on the 'Attendee options' section for members -->
188+
<a
189+
*ngIf="user && user.role === 'user'"
190+
mat-list-item
191+
routerLink="/user/links/my-links"
192+
routerLinkActive="navigation-link active"
193+
(click)="sidenav.toggle()"
194+
class="navigation-link"
195+
>
196+
<div class="navigation-link">
197+
<mat-icon> forum</mat-icon>
198+
<span class="list-item">My links</span>
199+
</div>
200+
</a>
180201

202+
<a *ngIf="user && user.role === 'user'" mat-list-item routerLink="/user/workshops"
203+
routerLinkActive="navigation-link active" [routerLinkActiveOptions]="{ exact: true }"
204+
(click)="sidenav.toggle()">
205+
<div class="navigation-link">
206+
<mat-icon> business</mat-icon>
207+
<span class="list-item">Workshops</span>
208+
</div>
209+
</a>
210+
211+
<mat-accordion *ngIf="user && user.role === 'team'">
181212
<mat-expansion-panel style="background-color: transparent !important">
182213
<mat-expansion-panel-header class="specific-class">
183214
<a mat-list-item class="navigation-link">
184215
<div class="navigation-link">
185-
<mat-icon>get_app</mat-icon>
186-
<span class="list-item">CV Downloads </span>
216+
<mat-icon> business</mat-icon>
217+
<span class="list-item">Workshops</span>
187218
<mat-icon>keyboard_arrow_right</mat-icon>
188219
</div>
189220
</a>
190221
</mat-expansion-panel-header>
191222
<mat-nav-list>
192-
<a *ngIf="user && user.role !== 'user'" mat-list-item routerLink="/user/downloads/download"
193-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
223+
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/workshops"
224+
routerLinkActive="navigation-link active" [routerLinkActiveOptions]="{ exact: true }"
225+
(click)="sidenav.toggle()" class="navigation-link">
194226
<div class="navigation-link">
195-
<mat-icon>get_app</mat-icon>
196-
<span class="list-item">Download CVs</span>
227+
<mat-icon> business</mat-icon>
228+
<span class="list-item">Workshops</span>
197229
</div>
198230
</a>
199-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/manage"
231+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/workshops/workshops-status"
200232
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
201233
<div class="navigation-link">
202-
<mat-icon>get_app</mat-icon>
203-
<span class="list-item">Create Endpoints</span>
234+
<mat-icon>info</mat-icon>
235+
<span class="list-item">Workshop Status</span>
204236
</div>
205237
</a>
206-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/downloads/status"
238+
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/validate-workshop"
207239
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
208240
<div class="navigation-link">
209-
<mat-icon>get_app</mat-icon>
210-
<span class="list-item">Endpoints Status</span>
241+
<mat-icon>event</mat-icon>
242+
<span class="list-item">Validate Workshop</span>
211243
</div>
212244
</a>
213245
</mat-nav-list>
214-
</mat-expansion-panel>
246+
</mat-expansion-panel>
215247
</mat-accordion>
216248

217-
<a *ngIf="user && user.role === 'company'" mat-list-item routerLink="/user/downloads/download"
218-
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
219-
<div class="navigation-link">
220-
<mat-icon>get_app</mat-icon>
221-
<span class="list-item">Download CVs</span>
222-
</div>
223-
</a>
249+
224250

225251
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/achievements"
226252
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
@@ -241,27 +267,28 @@
241267
<mat-icon>stars</mat-icon>
242268
<span class="list-item">Secret Codes</span>
243269
</a> -->
244-
<a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/redeem"
270+
<!-- <a *ngIf="user && user.role !== 'company'" mat-list-item routerLink="/user/redeem"
245271
routerLinkActive="navigation-link active" (click)="sidenav.toggle()">
246272
<div class="navigation-link">
247273
<mat-icon>stars</mat-icon>
248274
<span class="list-item">Redeem Achievement</span>
249275
</div>
250-
</a>
276+
</a> -->
277+
<!-- create a space between -->
251278
<a *ngIf="user" mat-list-item routerLink="/user/promocodes" routerLinkActive="navigation-link active"
252-
(click)="sidenav.toggle()" class="navigation-link">
279+
(click)="sidenav.toggle()" class="mat-list-item-custom">
253280
<div class="navigation-link">
254281
<mat-icon>receipt</mat-icon>
255282
<span class="list-item">Promo Codes</span>
256283
</div>
257284
</a>
258-
<a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/add-achievement"
285+
<!-- <a *ngIf="user && user.role === 'team'" mat-list-item routerLink="/user/add-achievement"
259286
routerLinkActive="navigation-link active" (click)="sidenav.toggle()" class="mat-list-item-custom">
260287
<div class="navigation-link">
261288
<mat-icon>star_border</mat-icon>
262289
<span class="list-item">Add achievement</span>
263290
</div>
264-
</a>
291+
</a> -->
265292
<div class="gap"></div>
266293
<div class="bottom">
267294
<a *ngIf="isLoggedIn" mat-list-item (click)="sidenav.toggle()"

0 commit comments

Comments
 (0)