Skip to content

Commit

Permalink
Merge staging into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Oct 12, 2024
2 parents 43f3f7e + aa79872 commit 30a79be
Show file tree
Hide file tree
Showing 29 changed files with 82 additions and 28 deletions.
5 changes: 1 addition & 4 deletions app/components/photo-tags/photo-tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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() {
Expand Down
13 changes: 11 additions & 2 deletions app/routes/sog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
}
}
1 change: 1 addition & 0 deletions app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
8 changes: 8 additions & 0 deletions app/styles/components/list-group.scss
Original file line number Diff line number Diff line change
@@ -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;
}
59 changes: 59 additions & 0 deletions app/templates/sog/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,63 @@
</LinkTo>
</div>
</div>
{{/if}}

{{#if (can 'create photo-tag')}}
<div class='card'>
<div class='card-body'>
<h2 class='card-title'>Foto's taggen</h2>
<p class='card-text'>
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.
</p>
</div>
<ul class='list-group list-group-flush mt-2'>
{{#each this.model.photoAlbumsWithoutTags as |album|}}
<LinkTo @route='photo-albums.photo-album' @model={{album.id}}>
<li class='list-group-item'>{{album.title}}</li>
</LinkTo>
{{else}}
<li class='list-group-item'>
<i>Alle albums bevatten al foto's met tags. Bekijk zelf of er nog foto's zijn in albums die nog tags missen!</i>
</li>
{{/each}}
</ul>
<div class='card-footer text-end'>
<LinkTo @route='photo-albums.index' class='btn btn-primary'>
Begin met taggen!
</LinkTo>
</div>
</div>
{{/if}}

{{#if (can 'show books')}}
<div class='card'>
<div class='card-body'>
<h2 class='card-title'>Leen een boek</h2>
<p class='card-text'>
Geen zin in je studie maar wil je toch wat nuttigs doen? Leen een boek uit de bibliotheek in de bestuurskamer!
</p>
</div>
<div class='card-footer text-end'>
<LinkTo @route='books.index' class='btn btn-primary'>
Bekijk alle boeken!
</LinkTo>
</div>
</div>
{{/if}}

{{#if (can 'show forum/categories')}}
<div class='card'>
<div class='card-body'>
<h2 class='card-title'>Lees of schrijf op het forum</h2>
<p class='card-text'>
Neem deel aan het juffen op het forum, bekijk wat uw medeleden gezegd hebben op het grote quote topic, of start uw eigen topic!
</p>
</div>
<div class='card-footer text-end'>
<LinkTo @route='forum.categories' class='btn btn-primary'>
Bekijk het forum!
</LinkTo>
</div>
</div>
{{/if}}
Binary file modified public/advertisements/Baktotaal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/ComfortProducts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/Huurzone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/LedlampenKopen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/Rike_2022.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/RotimShop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/ShopsUnited.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/Sleiderink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/SlipOnline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/StellingStunt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/TrafficToday.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/VerzekeringNL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/advertisements/Visser&Visser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions public/images/alphalogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 1 addition & 20 deletions public/images/alphalogonotextyellow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/dies_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/fallback/public_coverphoto_default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/flag-locale-en.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/icons/facebook.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/icons/instagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/public/banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/public/verantwoordelijkheid.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/public/vorming.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/public/vriendschap.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 30a79be

Please sign in to comment.