diff --git a/app/controllers/user_notifications_controller.rb b/app/controllers/user_notifications_controller.rb index 0f1ffa0eb..127d35289 100644 --- a/app/controllers/user_notifications_controller.rb +++ b/app/controllers/user_notifications_controller.rb @@ -8,7 +8,7 @@ class UserNotificationsController < ApplicationController notifications = load_notifications case params[:tab] - when 'all' + when 'read' notifications = notifications.where.not(read_at: nil) when 'unread' notifications = notifications.where(read_at: nil) diff --git a/app/javascript/packs/vue/design_system/breadcrumbs.js b/app/javascript/packs/vue/design_system/breadcrumbs.js new file mode 100644 index 000000000..207ba469a --- /dev/null +++ b/app/javascript/packs/vue/design_system/breadcrumbs.js @@ -0,0 +1,22 @@ +import { createApp } from 'vue/dist/vue.esm-bundler.js'; +import Breadcrumbs from '../../../vue/shared/breadcrumbs.vue'; +import { mountWithTurbolinks } from '../helpers/turbolinks.js'; + +const app = createApp({ + computed: { + breadcrumbs() { + return [ + { name: 'Home', url: '/' }, + { name: 'Very very very long name ', url: '' }, + { name: 'Data', url: '' }, + { name: 'Very very very very very very very very very very long name ', url: '' }, + { name: 'Very very very very very very very long name ', url: '' }, + { name: 'Very very very very very long name ', url: '' }, + { name: 'Very very very very long name ', url: '' } + ]; + } + } +}); +app.component('Breadcrumbs', Breadcrumbs); +app.config.globalProperties.i18n = window.I18n; +mountWithTurbolinks(app, '#breadcrumbs'); diff --git a/app/javascript/vue/navigation/notifications/notification_item.vue b/app/javascript/vue/navigation/notifications/notification_item.vue index 1b33f05d8..9ab899648 100644 --- a/app/javascript/vue/navigation/notifications/notification_item.vue +++ b/app/javascript/vue/navigation/notifications/notification_item.vue @@ -16,24 +16,23 @@