Skip to content

Commit 30a79be

Browse files
Merge staging into master
2 parents 43f3f7e + aa79872 commit 30a79be

29 files changed

+82
-28
lines changed

app/components/photo-tags/photo-tags.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ export default class PhotoTags extends Component {
4848
e.stopPropagation();
4949
this.newTagX = null;
5050
this.newTagY = null;
51-
console.log('Closed tag', element);
5251
};
5352

5453
document.addEventListener('click', this.closeAddTagListener);
@@ -99,9 +98,7 @@ export default class PhotoTags extends Component {
9998

10099
@action
101100
openUserSelect(userSelect) {
102-
if (this.selectApi == null) {
103-
this.selectApi = userSelect;
104-
}
101+
this.selectApi = userSelect;
105102
}
106103

107104
get newTagStyle() {

app/routes/sog/index.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,16 @@ export default class SogIndexRoute extends ApplicationRoute {
77
return this.abilities.can('show sog');
88
}
99

10-
model() {
11-
return [];
10+
async model() {
11+
/* eslint-disable camelcase */
12+
let photoAlbumsWithoutTags = await this.store.query('photo-album', {
13+
sort: '-date',
14+
filter: { without_photo_tags: true },
15+
page: { number: '1', size: 4 },
16+
});
17+
/* eslint-enable camelcase */
18+
return {
19+
photoAlbumsWithoutTags,
20+
};
1221
}
1322
}

app/styles/app.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
@import 'components/flash-notice';
1818
@import 'components/forum/forum-post';
1919
@import 'components/footer';
20+
@import 'components/list-group';
2021
@import 'components/md-editor';
2122
@import 'components/menu-sidebar';
2223
@import 'components/navbar';
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.list-group-item:not(:first-child), a:not(:first-child) > .list-group-item {
2+
border-top: 0;
3+
}
4+
5+
.list-group-flush .list-group-item {
6+
border-right: 0;
7+
border-left: 0;
8+
}

app/templates/sog/index.hbs

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,63 @@
1717
</LinkTo>
1818
</div>
1919
</div>
20+
{{/if}}
21+
22+
{{#if (can 'create photo-tag')}}
23+
<div class='card'>
24+
<div class='card-body'>
25+
<h2 class='card-title'>Foto's taggen</h2>
26+
<p class='card-text'>
27+
Help jij mee om &aacute;lle foto's te taggen? Zoek een album of foto op zonder tags en tag wie er op de foto staan! Je kan ook een van de onderstaande albums bekijken, deze albums hebben momenteel geen enkele foto met tags.
28+
</p>
29+
</div>
30+
<ul class='list-group list-group-flush mt-2'>
31+
{{#each this.model.photoAlbumsWithoutTags as |album|}}
32+
<LinkTo @route='photo-albums.photo-album' @model={{album.id}}>
33+
<li class='list-group-item'>{{album.title}}</li>
34+
</LinkTo>
35+
{{else}}
36+
<li class='list-group-item'>
37+
<i>Alle albums bevatten al foto's met tags. Bekijk zelf of er nog foto's zijn in albums die nog tags missen!</i>
38+
</li>
39+
{{/each}}
40+
</ul>
41+
<div class='card-footer text-end'>
42+
<LinkTo @route='photo-albums.index' class='btn btn-primary'>
43+
Begin met taggen!
44+
</LinkTo>
45+
</div>
46+
</div>
47+
{{/if}}
48+
49+
{{#if (can 'show books')}}
50+
<div class='card'>
51+
<div class='card-body'>
52+
<h2 class='card-title'>Leen een boek</h2>
53+
<p class='card-text'>
54+
Geen zin in je studie maar wil je toch wat nuttigs doen? Leen een boek uit de bibliotheek in de bestuurskamer!
55+
</p>
56+
</div>
57+
<div class='card-footer text-end'>
58+
<LinkTo @route='books.index' class='btn btn-primary'>
59+
Bekijk alle boeken!
60+
</LinkTo>
61+
</div>
62+
</div>
63+
{{/if}}
64+
65+
{{#if (can 'show forum/categories')}}
66+
<div class='card'>
67+
<div class='card-body'>
68+
<h2 class='card-title'>Lees of schrijf op het forum</h2>
69+
<p class='card-text'>
70+
Neem deel aan het juffen op het forum, bekijk wat uw medeleden gezegd hebben op het grote quote topic, of start uw eigen topic!
71+
</p>
72+
</div>
73+
<div class='card-footer text-end'>
74+
<LinkTo @route='forum.categories' class='btn btn-primary'>
75+
Bekijk het forum!
76+
</LinkTo>
77+
</div>
78+
</div>
2079
{{/if}}
-13.7 KB
Loading
-3.91 KB
Loading

public/advertisements/Huurzone.png

-1.97 KB
Loading
-875 Bytes
Loading
-1.39 KB
Loading

0 commit comments

Comments
 (0)