diff --git a/app/components/photo-tags/photo-tags.js b/app/components/photo-tags/photo-tags.js index de3e5fe2c..1894325df 100644 --- a/app/components/photo-tags/photo-tags.js +++ b/app/components/photo-tags/photo-tags.js @@ -48,7 +48,6 @@ export default class PhotoTags extends Component { e.stopPropagation(); this.newTagX = null; this.newTagY = null; - console.log('Closed tag', element); }; document.addEventListener('click', this.closeAddTagListener); @@ -99,9 +98,7 @@ export default class PhotoTags extends Component { @action openUserSelect(userSelect) { - if (this.selectApi == null) { - this.selectApi = userSelect; - } + this.selectApi = userSelect; } get newTagStyle() { diff --git a/app/routes/sog/index.js b/app/routes/sog/index.js index 6e9f15827..e404adb55 100644 --- a/app/routes/sog/index.js +++ b/app/routes/sog/index.js @@ -7,7 +7,16 @@ export default class SogIndexRoute extends ApplicationRoute { return this.abilities.can('show sog'); } - model() { - return []; + async model() { + /* eslint-disable camelcase */ + let photoAlbumsWithoutTags = await this.store.query('photo-album', { + sort: '-date', + filter: { without_photo_tags: true }, + page: { number: '1', size: 4 }, + }); + /* eslint-enable camelcase */ + return { + photoAlbumsWithoutTags, + }; } } diff --git a/app/styles/app.scss b/app/styles/app.scss index d9b27a4ad..d1288923e 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -17,6 +17,7 @@ @import 'components/flash-notice'; @import 'components/forum/forum-post'; @import 'components/footer'; +@import 'components/list-group'; @import 'components/md-editor'; @import 'components/menu-sidebar'; @import 'components/navbar'; diff --git a/app/styles/components/list-group.scss b/app/styles/components/list-group.scss new file mode 100644 index 000000000..4dbed5928 --- /dev/null +++ b/app/styles/components/list-group.scss @@ -0,0 +1,8 @@ +.list-group-item:not(:first-child), a:not(:first-child) > .list-group-item { + border-top: 0; +} + +.list-group-flush .list-group-item { + border-right: 0; + border-left: 0; +} \ No newline at end of file diff --git a/app/templates/sog/index.hbs b/app/templates/sog/index.hbs index 7cbfb55d7..c18b9664d 100644 --- a/app/templates/sog/index.hbs +++ b/app/templates/sog/index.hbs @@ -17,4 +17,63 @@ +{{/if}} + +{{#if (can 'create photo-tag')}} +
+
+

Foto's taggen

+

+ Help jij mee om á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. +

+
+ + +
+{{/if}} + +{{#if (can 'show books')}} +
+
+

Leen een boek

+

+ Geen zin in je studie maar wil je toch wat nuttigs doen? Leen een boek uit de bibliotheek in de bestuurskamer! +

+
+ +
+{{/if}} + +{{#if (can 'show forum/categories')}} +
+
+

Lees of schrijf op het forum

+

+ Neem deel aan het juffen op het forum, bekijk wat uw medeleden gezegd hebben op het grote quote topic, of start uw eigen topic! +

+
+ +
{{/if}} \ No newline at end of file diff --git a/public/advertisements/Baktotaal.png b/public/advertisements/Baktotaal.png index b648e7539..463a79c48 100644 Binary files a/public/advertisements/Baktotaal.png and b/public/advertisements/Baktotaal.png differ diff --git a/public/advertisements/ComfortProducts.png b/public/advertisements/ComfortProducts.png index e9fc97c4d..3a431bfa7 100644 Binary files a/public/advertisements/ComfortProducts.png and b/public/advertisements/ComfortProducts.png differ diff --git a/public/advertisements/Huurzone.png b/public/advertisements/Huurzone.png index 2723461c9..111ee05d8 100644 Binary files a/public/advertisements/Huurzone.png and b/public/advertisements/Huurzone.png differ diff --git a/public/advertisements/LedlampenKopen.png b/public/advertisements/LedlampenKopen.png index e015240b7..6350e205e 100644 Binary files a/public/advertisements/LedlampenKopen.png and b/public/advertisements/LedlampenKopen.png differ diff --git a/public/advertisements/Rike_2022.png b/public/advertisements/Rike_2022.png index a8a4187f0..c51e304dd 100644 Binary files a/public/advertisements/Rike_2022.png and b/public/advertisements/Rike_2022.png differ diff --git a/public/advertisements/RotimShop.png b/public/advertisements/RotimShop.png index 3cffb807a..90684c110 100644 Binary files a/public/advertisements/RotimShop.png and b/public/advertisements/RotimShop.png differ diff --git a/public/advertisements/ShopsUnited.png b/public/advertisements/ShopsUnited.png index d090fbb2a..4e2881e74 100644 Binary files a/public/advertisements/ShopsUnited.png and b/public/advertisements/ShopsUnited.png differ diff --git a/public/advertisements/Sleiderink.png b/public/advertisements/Sleiderink.png index e8197b514..7917ade36 100644 Binary files a/public/advertisements/Sleiderink.png and b/public/advertisements/Sleiderink.png differ diff --git a/public/advertisements/SlipOnline.png b/public/advertisements/SlipOnline.png index c20b793c2..550701b9a 100644 Binary files a/public/advertisements/SlipOnline.png and b/public/advertisements/SlipOnline.png differ diff --git a/public/advertisements/StellingStunt.png b/public/advertisements/StellingStunt.png index 088f49a8d..83c4e18ef 100644 Binary files a/public/advertisements/StellingStunt.png and b/public/advertisements/StellingStunt.png differ diff --git a/public/advertisements/TrafficToday.jpg b/public/advertisements/TrafficToday.jpg index 8efccb6c7..e28822c20 100644 Binary files a/public/advertisements/TrafficToday.jpg and b/public/advertisements/TrafficToday.jpg differ diff --git a/public/advertisements/VerzekeringNL.png b/public/advertisements/VerzekeringNL.png index 21960bb95..4268b1a13 100644 Binary files a/public/advertisements/VerzekeringNL.png and b/public/advertisements/VerzekeringNL.png differ diff --git a/public/advertisements/Visser&Visser.png b/public/advertisements/Visser&Visser.png index 2053201f8..7386577a5 100644 Binary files a/public/advertisements/Visser&Visser.png and b/public/advertisements/Visser&Visser.png differ diff --git a/public/images/alphalogo.svg b/public/images/alphalogo.svg index eeec565f5..ad3a03046 100644 --- a/public/images/alphalogo.svg +++ b/public/images/alphalogo.svg @@ -1,2 +1 @@ - - + \ No newline at end of file diff --git a/public/images/alphalogonotextyellow.svg b/public/images/alphalogonotextyellow.svg index b0b7b0389..5b487c93b 100644 --- a/public/images/alphalogonotextyellow.svg +++ b/public/images/alphalogonotextyellow.svg @@ -1,20 +1 @@ - - + \ No newline at end of file diff --git a/public/images/dies_logo.png b/public/images/dies_logo.png index 32c72813d..5285aeaa3 100644 Binary files a/public/images/dies_logo.png and b/public/images/dies_logo.png differ diff --git a/public/images/fallback/public_coverphoto_default.png b/public/images/fallback/public_coverphoto_default.png index ad3a99175..bb456f7d0 100644 Binary files a/public/images/fallback/public_coverphoto_default.png and b/public/images/fallback/public_coverphoto_default.png differ diff --git a/public/images/flag-locale-en.png b/public/images/flag-locale-en.png index 920d65f1c..41e2ae18c 100644 Binary files a/public/images/flag-locale-en.png and b/public/images/flag-locale-en.png differ diff --git a/public/images/icons/facebook.png b/public/images/icons/facebook.png index 7a187d128..ce7c555d2 100644 Binary files a/public/images/icons/facebook.png and b/public/images/icons/facebook.png differ diff --git a/public/images/icons/instagram.png b/public/images/icons/instagram.png index 5479e62a1..5420a2b02 100644 Binary files a/public/images/icons/instagram.png and b/public/images/icons/instagram.png differ diff --git a/public/images/public/banner.jpg b/public/images/public/banner.jpg index a0cf26ed8..3645886d4 100644 Binary files a/public/images/public/banner.jpg and b/public/images/public/banner.jpg differ diff --git a/public/images/public/verantwoordelijkheid.jpg b/public/images/public/verantwoordelijkheid.jpg index abe1591ab..75fd2c0ae 100644 Binary files a/public/images/public/verantwoordelijkheid.jpg and b/public/images/public/verantwoordelijkheid.jpg differ diff --git a/public/images/public/vorming.jpg b/public/images/public/vorming.jpg index 3e5e6402e..eb7116ffe 100644 Binary files a/public/images/public/vorming.jpg and b/public/images/public/vorming.jpg differ diff --git a/public/images/public/vriendschap.jpg b/public/images/public/vriendschap.jpg index fc65fb500..449e6db3e 100644 Binary files a/public/images/public/vriendschap.jpg and b/public/images/public/vriendschap.jpg differ