Skip to content

Commit 5e3b6d3

Browse files
ToMaartonToMaarton
authored
New/bestuur (#1025)
* start with board page * board page is done * lint fix * lint fix * lint fix * lint fix
1 parent 6e4cdca commit 5e3b6d3

File tree

28 files changed

+222
-64
lines changed

28 files changed

+222
-64
lines changed

‎app/components/header-nav.hbs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@
2929
{{t "component.headerNav.aboutUs"}}
3030
</dd.button>
3131
<dd.menu class="public-about-us-dropdown" @renderInPlace={{true}} as |ddm|>
32-
<!-- put links to other pages here -->
32+
{{! put links to other pages here }}
33+
<LinkTo @route='public.board' class="dropdown-item btn btn-primary">
34+
{{t 'mixin.menuItems.board'}}
35+
</LinkTo>
3336
<LinkTo @route='public.flux' class="dropdown-item btn btn-primary">
34-
Sociëteit Flux
37+
{{t 'mixin.menuItems.flux'}}
3538
</LinkTo>
3639
<LinkTo @route='public.room-forum' class="dropdown-item btn btn-primary">
3740
{{t 'mixin.menuItems.roomForum'}}

‎app/components/public/index/about-alpha.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<h1 class="public-title">{{t 'component.public.index.aboutAlpha.intro-title'}}</h1>
33
<hr class="public-title-border border border-secondary bg-secondary border-3 opacity-100" />
44

5-
<p class="mt-3 text-center about-text">{{t 'component.public.index.aboutAlpha.intro'}}</p>
5+
<p class="mt-3 text-center public-text">{{t 'component.public.index.aboutAlpha.intro'}}</p>
66

77
<div class="mt-3 row">
88
<div class="about-v col-12 col-md-4 mt-5">

‎app/router.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ Router.map(function () {
269269
this.route('public', function () {
270270
this.route('room-forum');
271271
this.route('flux');
272+
this.route('board');
272273
});
273274

274275
return true;

‎app/routes/public/board.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import Route from '@ember/routing/route';
2+
3+
export default class PublicBoardRoute extends Route {}

‎app/styles/app.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
@import 'routes/polls';
7474
@import 'routes/public';
7575
@import 'routes/sog/name-trainer';
76+
@import 'routes/public/board';
7677

7778
// Import package style
7879
@import 'ember-power-select/themes/bootstrap';

‎app/styles/components/public/card.scss‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
.circle-card {
2+
/* Responsive: horizontal becomes vertical on small screens */
3+
@media (width <= 768px) {
4+
&.horizontal {
5+
flex-direction: column;
6+
align-items: center;
7+
8+
.card-image {
9+
margin-right: 0;
10+
margin-bottom: 1.5rem;
11+
}
12+
13+
.content {
14+
align-items: center;
15+
text-align: center;
16+
}
17+
}
18+
}
19+
220
display: flex;
321

422

@@ -56,26 +74,7 @@
5674
.card-text {
5775
margin-top: 1rem;
5876
text-align: justify;
59-
line-height: 1.6rem;
60-
font-size: 1.3rem;
61-
}
62-
}
63-
64-
/* Responsive: horizontal becomes vertical on small screens */
65-
@media (width <= 768px) {
66-
&.horizontal {
67-
flex-direction: column;
68-
align-items: center;
69-
70-
.card-image {
71-
margin-right: 0;
72-
margin-bottom: 1.5rem;
73-
}
74-
75-
.content {
76-
align-items: center;
77-
text-align: center;
78-
}
77+
font-size: 1.5rem;
7978
}
8079
}
8180
}

‎app/styles/components/public/header.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
border-bottom: 4px solid $brand-secondary;
2626
height: 100%;
2727
object-fit: cover;
28-
object-position: bottom;
28+
object-position: center;
2929
}
3030

3131
.header-overlay {
@@ -60,4 +60,4 @@
6060
text-transform: uppercase;
6161
}
6262
}
63-
}
63+
}

‎app/styles/routes/public.scss‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44
text-align: center;
55
font-family: "Libre Franklin", sans-serif;
66
font-size: 3rem;
7-
7+
88
&.public-title-smaller {
99
margin-bottom: 0.8rem;
1010
font-size: 2.5rem;
1111
}
1212
}
1313

1414
.public-text {
15+
width: 80vw;
1516
font-size: 1.5rem;
1617
hyphens: none;
1718
}
18-
19+
1920
.public-title-border {
2021
width: 30vw;
2122
}
@@ -24,4 +25,23 @@
2425
text-align: center;
2526
font-size: 1.2rem;
2627
}
27-
}
28+
29+
.red-container{
30+
position: relative;
31+
left: 50%;
32+
margin-left: -50vw;
33+
background: linear-gradient(90deg, rgba(0 0 0 / 40%) 0%, $brand-secondary 100%), $brand-secondary;
34+
padding: 1rem;
35+
width: 100vw;
36+
max-width: 100vw;
37+
38+
39+
.public-title,.public-title-smaller{
40+
color: $brand-cream;
41+
}
42+
43+
.public-title-border{
44+
border-color: $brand-primary-dark;
45+
}
46+
}
47+
}

‎app/styles/routes/public/board.scss‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.board{
2+
.members{
3+
.member{
4+
margin: 2rem 0;
5+
padding: 0 5%;
6+
}
7+
}
8+
}
9+

‎app/templates/public/board.hbs‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<div class="public">
2+
<Public::Header
3+
@imageUrl="/images/public/board/banner.jpeg"
4+
@title="{{t 'template.public.board.header'}}"
5+
/>
6+
<div class="board row my-4 d-flex flex-column align-items-center">
7+
<h1 class="public-title">{{t 'template.public.board.senaat'}}</h1>
8+
<hr class="public-title-border border border-secondary bg-secondary border-3 opacity-100" />
9+
<p class="mt-3 text-center public-text">{{t 'template.public.board.intro'}}</p>
10+
<p class="text-center public-text"><i>{{t 'template.public.board.slogan'}}</i></p>
11+
<div class="members row">
12+
<div class="member col-12 col-md-6" >
13+
<Public::Card
14+
@imgurl="/images/public/board/Stefan.jpg"
15+
@title="{{t 'template.public.board.chair'}}"
16+
@subtitle="{{t 'template.public.board.chair-name'}}"
17+
@text="{{t 'template.public.board.chair-story'}}"
18+
/>
19+
</div>
20+
<div class="member col-12 col-md-6">
21+
<Public::Card
22+
@imgurl="/images/public/board/Jesse.jpg"
23+
@title="{{t 'template.public.board.secretary'}}"
24+
@subtitle="{{t 'template.public.board.secretary-name'}}"
25+
@text="{{t 'template.public.board.secretary-story'}}"
26+
/>
27+
</div>
28+
<div class="member col-12 col-md-6">
29+
<Public::Card
30+
@imgurl="/images/public/board/Niels.jpg"
31+
@title="{{t 'template.public.board.treasurer'}}"
32+
@subtitle="{{t 'template.public.board.treasurer-name'}}"
33+
@text="{{t 'template.public.board.treasurer-story'}}"
34+
/>
35+
</div>
36+
<div class="member col-12 col-md-6">
37+
<Public::Card
38+
@imgurl="/images/public/board/Alina.jpg"
39+
@title="{{t 'template.public.board.assessor1'}}"
40+
@subtitle="{{t 'template.public.board.assessor1-name'}}"
41+
@text="{{t 'template.public.board.assessor1-story'}}"
42+
/>
43+
</div>
44+
</div>
45+
<a class="text-center" href="{{t 'template.public.board.photographer-url'}}">{{t 'template.public.board.photographer'}}</a>
46+
</div>
47+
<div class="red-container row d-flex flex-column align-items-center">
48+
<h1 class="public-title">{{t 'template.public.board.previous-boards'}}</h1>
49+
<hr class="public-title-border border border-primary bg-primary border-3 opacity-100" />
50+
<div class="previous-boards row px-10">
51+
<div class="previous-board col-12 col-sm-6 col-md-4 p-3">
52+
<h3 class="public-title-smaller text-center">{{t 'template.public.board.old-boards.board1'}}</h3>
53+
<img src="/images/public/board/XLIV.jpeg">
54+
</div>
55+
<div class="previous-board col-12 col-sm-6 col-md-4 p-3">
56+
<h3 class="public-title-smaller text-center">{{t 'template.public.board.old-boards.board2'}}</h3>
57+
<img src="/images/public/board/XLIII.jpeg">
58+
</div>
59+
<div class="previous-board col-12 col-sm-6 col-md-4 p-3">
60+
<h3 class="public-title-smaller text-center">{{t 'template.public.board.old-boards.board3'}}</h3>
61+
<img src="/images/public/board/XLII.jpeg">
62+
</div>
63+
<div class="previous-board col-12 col-sm-6 col-md-4 p-3">
64+
<h3 class="public-title-smaller text-center">{{t 'template.public.board.old-boards.board4'}}</h3>
65+
<img src="/images/public/board/XLI.jpeg">
66+
</div>
67+
<div class="previous-board col-12 col-sm-6 col-md-4 p-3">
68+
<h3 class="public-title-smaller text-center">{{t 'template.public.board.old-boards.board5'}}</h3>
69+
<img src="/images/public/board/XL.jpeg">
70+
</div>
71+
<div class="previous-board col-12 col-sm-6 col-md-4 p-3">
72+
<h3 class="public-title-smaller text-center">{{t 'template.public.board.old-boards.board6'}}</h3>
73+
<img src="/images/public/board/XXXIX.jpeg">
74+
</div>
75+
</div>
76+
</div>
77+
</div>

0 commit comments

Comments
 (0)