csvalpha · guidojw · Jun 13, 2023 · Nov 1, 2022 · Nov 1, 2022 · Nov 1, 2022
diff --git a/app/abilities/article-comment.js b/app/abilities/article-comment.js
@@ -1,6 +1,10 @@
 import { Ability } from 'ember-can';
 
 export default class ArticleComment extends Ability {
+  get canShow() {
+    return this.session.hasPermission('article-comment.read');
+  }
+
   get canCreate() {
     return this.session.hasPermission('article-comment.create');
   }

diff --git a/app/abilities/debit/transaction.js b/app/abilities/debit/transaction.js
@@ -1,6 +1,10 @@
 import { Ability } from 'ember-can';
 
 export default class Transaction extends Ability {
+  get canShow() {
+    return this.session.hasPermission('debit/transaction.read');
+  }
+
   get canEdit() {
     return this.session.hasPermission('debit/transaction.update');
   }

diff --git a/app/abilities/photo.js b/app/abilities/photo.js
@@ -8,7 +8,7 @@ export default class Photo extends Ability {
   get canShowPhotoComments() {
     return (
       this.session.hasPermission('photo-comment.read') ||
-      this.model.photoAlbum.publiclyVisible
+      this.model.photoAlbum.get('publiclyVisible')
     );
   }
 }
diff --git a/app/adapters/application.js b/app/adapters/application.js
@@ -1,7 +1,7 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import { underscore } from '@ember/string';
 import { inject as service } from '@ember/service';
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 
 import { pluralize } from 'ember-inflector';
 

diff --git a/app/authenticators/oauth2.js b/app/authenticators/oauth2.js
@@ -1,5 +1,5 @@
 import OAuth2PasswordGrant from 'ember-simple-auth/authenticators/oauth2-password-grant';
-import ENV from '../config/environment';
+import ENV from 'amber-ui/config/environment';
 
 export default class OAuth2Authenticator extends OAuth2PasswordGrant {
   serverTokenEndpoint = `${ENV.api.hostname}/oauth/token`;

diff --git a/app/components/bread-crumbs.hbs b/app/components/bread-crumbs.hbs
diff --git a/app/components/bread-crumbs.js b/app/components/bread-crumbs.js
diff --git a/app/components/breadcrumbs.hbs b/app/components/breadcrumbs.hbs
@@ -0,0 +1,15 @@
+<ol class='breadcrumb'>
+  <li class='breadcrumb-item'><LinkTo @route='index'>C.S.V. Alpha</LinkTo></li>
+
+  {{#each @routeInfos as |routeInfo|}}
+    <li class='breadcrumb-item'>
+      {{#if (has-next routeInfo @routeInfos)}}
+        <LinkTo @route={{routeInfo.name}}>
+          {{routeInfo.metadata.breadcrumb.title}}
+        </LinkTo>
+      {{else}}
+        {{routeInfo.metadata.breadcrumb.title}}
+      {{/if}}
+    </li>
+  {{/each}}
+</ol>
diff --git a/app/components/cards/activity-card.hbs b/app/components/cards/activity-card.hbs
@@ -41,15 +41,15 @@
             <span class='subtitle-author' data-test-activity-author>
               {{#if activity.group}}
                 <LinkTo
-                  @route='groups.show'
+                  @route='groups.group'
                   @model={{activity.group.id}}
                   class='link-to card-subtitle-link'
                 >
                   {{activity.group.name}}
                 </LinkTo>
               {{else}}
                 <LinkTo
-                  @route='users.show'
+                  @route='users.user'
                   @model={{activity.author.id}}
                   class='link-to card-subtitle-link'
                 >

diff --git a/app/components/cards/article-card.hbs b/app/components/cards/article-card.hbs
@@ -23,7 +23,7 @@
         </div>
 
         <div class='card-titles'>
-          <LinkTo @route='articles.show' @model={{article.id}}>
+          <LinkTo @route='articles.article' @model={{article.id}}>
             <h2 class='card-title' itemprop='name headline'>
               {{#if article.pinned}}<FaIcon @icon='thumbtack' />{{/if}}
               {{article.title}}
@@ -32,7 +32,7 @@
           <h3 class='card-subtitle'>
             {{#if article.group}}
               <LinkTo
-                @route='groups.show'
+                @route='groups.group'
                 @model={{article.group.id}}
                 class='link-to card-subtitle-link'
               >
@@ -46,7 +46,7 @@
               </LinkTo>
             {{else}}
               <LinkTo
-                @route='users.show'
+                @route='users.user'
                 @model={{article.author.id}}
                 class='link-to card-subtitle-link'
               >
@@ -101,7 +101,7 @@
         }}
       </span>
       {{#if useMaxHeight}}
-        <LinkTo @route='articles.show' @model={{article.id}} itemprop='url'>
+        <LinkTo @route='articles.article' @model={{article.id}} itemprop='url'>
           <span class='float-md-end'> {{t 'tag.button.readMore'}} </span>
         </LinkTo>
       {{/if}}

diff --git a/app/components/cards/frontpage-article-card.hbs b/app/components/cards/frontpage-article-card.hbs
@@ -1,4 +1,4 @@
-<LinkTo @route='articles.show' @model={{article.id}}>
+<LinkTo @route='articles.article' @model={{article.id}}>
   <article
     class={{if useMaxHeight 'd-flex'}}
     itemscope
@@ -24,7 +24,7 @@
             </h5>
             {{#if article.group}}
               <LinkTo
-                @route='groups.show'
+                @route='groups.group'
                 @model={{article.group.id}}
                 class='link-to card-subtitle-link'
               >
@@ -39,7 +39,7 @@
               </LinkTo>
             {{else}}
               <LinkTo
-                @route='users.show'
+                @route='users.user'
                 @model={{article.author.id}}
                 class='link-to card-subtitle-link'
               >

diff --git a/app/components/cards/privacy-preference.hbs b/app/components/cards/privacy-preference.hbs
@@ -3,7 +3,7 @@
 
   {{#if (can 'edit user' model)}}
     <LinkTo
-      @route='users.edit-privacy'
+      @route='users.user.edit.privacy'
       @model={{model.id}}
       class='btn btn-outline-info'
     >

diff --git a/app/components/form/response/response-card.hbs b/app/components/form/response/response-card.hbs
@@ -15,7 +15,7 @@
       @inputLayout='vertical'
     >
       {{#if form.questions}}
-        <LinkTo @route='activities.index' class='btn btn-default'>
+        <LinkTo @route='activities' class='btn btn-default'>
           Annuleren
         </LinkTo>
         Vragen met een * zijn verplicht

diff --git a/app/components/form/response/response-completed-alert.hbs b/app/components/form/response/response-completed-alert.hbs
@@ -11,7 +11,7 @@
     </span>
     {{#if form.canRespond}}
       <LinkTo
-        @route='form.responses.destroy'
+        @route='form.responses.response.destroy'
         @model={{form.currentUserResponseId}}
         class='btn btn-secondary'
       >

diff --git a/app/components/form/responses-table-row.hbs b/app/components/form/responses-table-row.hbs
@@ -8,7 +8,7 @@
   {{#if (can 'destroy form/response')}}
     {{#if response.form.canRespond}}
       <LinkTo
-        @route='form.responses.destroy'
+        @route='form.responses.response.destroy'
         @model={{response.id}}
         class='no-print'
       >
@@ -17,7 +17,7 @@
     {{/if}}
   {{/if}}
 
-  <LinkTo @route='users.show' @model={{response.user.id}}>
+  <LinkTo @route='users.user' @model={{response.user.id}}>
     {{response.user.fullNameWithNickname}}
   </LinkTo>
 </td>

diff --git a/app/components/forms/photo-album-form.hbs b/app/components/forms/photo-album-form.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>{{if @model.isNew 'Foto-album aanmaken' 'Foto-album wijzigen'}}</h5>
+    <h5>{{if @model.isNew 'Fotoalbum aanmaken' 'Fotoalbum wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>
@@ -25,7 +25,7 @@
         <div class="row">
           <div class="col-sm-10 offset-sm-2">
             <div class='alert alert-warning' role='alert'>
-              Een publiek foto-album verschijnt op de voorpagina, en is ook voor
+              Een publiek fotoalbum verschijnt op de voorpagina, en is ook voor
               externen zichtbaar. Wees dus voorzichtig met wat je plaatst en zorg
               dat je toestemming hebt. Zie het mediabeleid voor meer informatie.
             </div>
@@ -86,7 +86,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{action @onCancel}} type='button' class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>

diff --git a/app/components/forms/post-form.hbs b/app/components/forms/post-form.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>Forumpost bewerken</h5>
+    <h5>{{if @model.isNew 'Forumbericht aanmaken' 'Forumbericht wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>

diff --git a/app/components/forms/transaction-form.hbs b/app/components/forms/transaction-form.hbs
@@ -1,6 +1,6 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>Transactie aanmaken</h5>
+    <h5>{{if @model.isNew 'Transactie aanmaken' 'Transactie wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>

diff --git a/app/components/forum/forum-post.hbs b/app/components/forum/forum-post.hbs
@@ -2,14 +2,14 @@
   <div class='card-body'>
     <div class='row'>
       <div class='col-md-3 forum-post-author-info'>
-        <LinkTo @route='users.show' @model={{post.author.id}}>
+        <LinkTo @route='users.user' @model={{post.author.id}}>
           <img
             src='{{post.author.avatarThumbUrlOrDefault}}'
             alt='avatar'
             class='profile-picture profile-picture-large'
           />
         </LinkTo>
-        <LinkTo @route='users.show' @model={{post.author.id}}>
+        <LinkTo @route='users.user' @model={{post.author.id}}>
           <p class="mt-1"> <strong> {{post.author.fullNameWithNickname}} </strong> </p>
         </LinkTo>
       </div>
@@ -52,7 +52,7 @@
       <span class='text-muted pe-1 w-auto'>
         {{#if (can 'destroy forum/posts')}}
           <LinkTo
-            @route='forum.categories.category.threads.thread.posts.destroy'
+            @route='forum.categories.category.threads.thread.posts.post.destroy'
             @model={{post.id}}
             class='link-highlight px-2'
           >
@@ -62,7 +62,7 @@
 
         {{#if (can 'edit forum/post' post)}}
           <LinkTo
-            @route='forum.categories.category.threads.thread.posts.edit'
+            @route='forum.categories.category.threads.thread.posts.post.edit'
             @model={{post.id}}
             class='link-highlight px-2'
           >

diff --git a/app/components/header-nav.hbs b/app/components/header-nav.hbs
@@ -1,6 +1,9 @@
 <nav class='navbar pb-0 pt-0' aria-label='breadcrumb'>
   <div class="container-fluid d-flex justify-content-between">
-    <span class='left-sidebar-toggle d-block d-md-none link' {{action 'toggleLeftSidebar'}}>
+    <span
+      class='left-sidebar-toggle d-block d-md-none link'
+      {{action 'toggleLeftSidebar'}}
+    >
       ☰
     </span>
 
@@ -12,14 +15,16 @@
       <div class='navbar-overflow-wrapper'>
         <div class='navbar-nav col d-flex flex-row'>
           {{#if (or session.isAuthenticated media.isMobile)}}
-            <BreadCrumbs @crumbClass='breadcrumb-item' />
+            <Breadcrumbs @routeInfos={{@routeInfos}} />
           {{else}}
-            <BsDropdown as |dd| {{did-insert (action 'setAvailableStaticPages')}}>
-              <dd.button @type="primary">{{t "component.headerNav.aboutUs"}}</dd.button>
+            <BsDropdown {{did-insert (action 'setAvailableStaticPages')}} as |dd|>
+              <dd.button @type="primary">
+                {{t "component.headerNav.aboutUs"}}
+              </dd.button>
               <dd.menu @renderInPlace={{false}} as |ddm|>
                 {{#each-in staticPagesForDropdown as |id title|}}
                   <ddm.item>
-                    <ddm.linkTo @route='static-pages.show' @model={{id}}>
+                    <ddm.linkTo @route='static-pages.static-page' @model={{id}}>
                       {{title}}
                     </ddm.linkTo>
                   </ddm.item>
@@ -42,8 +47,11 @@
     </div>
 
     {{#unless session.isAuthenticated}}
-      <button class='btn btn-locale btn-inverse-locale-{{intl.locale}}' title='{{t "component.headerNav.changeLocale"}}'
-        {{action 'toggleLocale'}} type='button'>
+      <button
+        class='btn btn-locale btn-inverse-locale-{{intl.locale}}'
+        title='{{t "component.headerNav.changeLocale"}}'
+        {{action 'toggleLocale'}}
+        type='button'>
       </button>
     {{/unless}}
   </div>

diff --git a/app/components/header-nav.js b/app/components/header-nav.js
@@ -95,7 +95,7 @@ export default Component.extend({
   addStaticPageOption: function (list, id, localeName) {
     if (this.availableStaticPages && this.availableStaticPages[id]) {
       list.push({
-        link: 'static-pages.show',
+        link: 'static-pages.static-page',
         linkArgument: id,
         title: this.intl.t('component.headerNav.' + localeName),
         icon: '',

diff --git a/app/components/index/public/about-alpha.hbs b/app/components/index/public/about-alpha.hbs
@@ -6,7 +6,7 @@
     </p>
 
     <LinkTo
-      @route='static-pages.show'
+      @route='static-pages.static-page'
       @model='c-s-v-alpha'
       class='btn btn-lg btn-light me-3 mb-3'
     >

diff --git a/app/components/index/public/action-buttons.hbs b/app/components/index/public/action-buttons.hbs
@@ -11,7 +11,7 @@
       {{t 'component.index.public.actionButtons.memberButton'}}
     </a>
     <LinkTo
-      @route='static-pages.show'
+      @route='static-pages.static-page'
       @model='word-lid'
       class='btn btn-lg btn-primary frontpage-button mt-3'
     >

diff --git a/app/components/index/special-promo.hbs b/app/components/index/special-promo.hbs
@@ -6,7 +6,7 @@
         <em>{{date}}</em>
         <p>{{text}}</p>
         <LinkTo
-          @route='articles.show'
+          @route='articles.article'
           @model={{123}}
           class='btn frontpage-button btn-lg float-xs-end'
         >

diff --git a/app/components/index/sponsorkliks-alert.hbs b/app/components/index/sponsorkliks-alert.hbs
@@ -15,7 +15,9 @@
     bij verschillende webshops verdient Alpha er ook nog wat aan. De uitgebreide
     uitleg vind je
     <b>
-      <LinkTo @route='static-pages.show' @model='alpha-deals'>hier</LinkTo>
+      <LinkTo @route='static-pages.static-page' @model='alpha-deals'>
+        hier
+      </LinkTo>
     </b>.
 
     <br />

diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs
@@ -44,7 +44,7 @@
 
     <div class='profile-menu {{if layoutManager.profileMenuOpen "open"}}'>
       <MenuSidebarItem
-        @link='users.show'
+        @link='users.user'
         @hasPermission={{can 'show activities'}}
         @icon='user'
         @title={{t 'mixin.menuItems.profile'}}
@@ -55,7 +55,7 @@
         @link='mail-aliases'
         @hasPermission={{can 'show mail-aliases'}}
         @icon='envelope'
-        @title={{t 'mixin.menuItems.mailaliases'}}
+        @title={{t 'mixin.menuItems.mailAliases'}}
         @minor={{true}}
       />
       <MenuSidebarItem

diff --git a/app/components/model-form/file-input.js b/app/components/model-form/file-input.js
@@ -1,6 +1,6 @@
 import { computed } from '@ember/object';
 import EmberArray from '@ember/array';
-import ENV from '../../config/environment';
+import ENV from 'amber-ui/config/environment';
 import ModelFormTextInputComponent from './text-input';
 
 export default ModelFormTextInputComponent.extend({