From 0a86d39ba9cf48fc0b4fb6d91b0d5eff404b2a66 Mon Sep 17 00:00:00 2001 From: shpuld Date: Thu, 14 Mar 2019 20:40:56 +0200 Subject: remove notifications from sidebar, make notifications appear on login only --- src/components/side_drawer/side_drawer.vue | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/components/side_drawer/side_drawer.vue') diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 95ee21b4..27db12d7 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -20,11 +20,6 @@ {{ $t("login.login") }} -
  • - - {{ $t("notifications.notifications") }} {{ unseenNotificationsCount > 0 ? `(${unseenNotificationsCount})` : '' }} - -
  • {{ $t("nav.dms") }} -- cgit v1.2.3-70-g09d2 From 0eff4bd0acf709901b29877f7fc65f7a6241e058 Mon Sep 17 00:00:00 2001 From: shpuld Date: Wed, 27 Mar 2019 22:44:25 +0200 Subject: make side drawer use gesture service and fix its animations --- src/components/side_drawer/side_drawer.js | 5 +---- src/components/side_drawer/side_drawer.vue | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) (limited to 'src/components/side_drawer/side_drawer.vue') diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index 76c64fe0..567d2e5e 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -9,9 +9,7 @@ const SideDrawer = { closeGesture: undefined }), created () { - const cb = () => this.toggleDrawer() - this.closeGesture = GestureService.swipeGesture(GestureService.DIRECTION_LEFT, cb) - console.log(this.closeGesture) + this.closeGesture = GestureService.swipeGesture(GestureService.DIRECTION_LEFT, this.toggleDrawer) }, components: { UserCard }, computed: { @@ -47,7 +45,6 @@ const SideDrawer = { this.toggleDrawer() }, touchStart (e) { - console.log(this) GestureService.beginSwipe(e, this.closeGesture) }, touchMove (e) { diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue index 95ee21b4..e5046496 100644 --- a/src/components/side_drawer/side_drawer.vue +++ b/src/components/side_drawer/side_drawer.vue @@ -2,6 +2,7 @@
    +
    Date: Wed, 15 May 2019 20:44:35 +0300 Subject: Cleanup, little documentation, localization --- src/boot/routes.js | 2 +- src/components/interactions/interactions.vue | 6 +++--- src/components/nav_panel/nav_panel.vue | 2 +- src/components/notifications/notifications.js | 12 +++++++++--- src/components/notifications/notifications.scss | 6 ++++-- src/components/notifications/notifications.vue | 6 ++++-- src/components/side_drawer/side_drawer.vue | 5 +++++ src/i18n/en.json | 6 ++++++ src/i18n/ru.json | 6 ++++++ 9 files changed, 39 insertions(+), 12 deletions(-) (limited to 'src/components/side_drawer/side_drawer.vue') diff --git a/src/boot/routes.js b/src/boot/routes.js index 508c76df..1a179099 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -34,7 +34,7 @@ export default (store) => { { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline }, { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, { name: 'external-user-profile', path: '/users/:id', component: UserProfile }, - { name: 'mentions', path: '/users/:username/interactions', component: Interactions }, + { name: 'interactions', path: '/users/:username/interactions', component: Interactions }, { name: 'dms', path: '/users/:username/dms', component: DMs }, { name: 'settings', path: '/settings', component: Settings }, { name: 'registration', path: '/registration', component: Registration }, diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue index 751e5d40..5a204ca7 100644 --- a/src/components/interactions/interactions.vue +++ b/src/components/interactions/interactions.vue @@ -9,9 +9,9 @@ ref="tabSwitcher" :onSwitch="onModeSwitch" > - - - + + +
  • - + {{ $t("nav.interactions") }}
    • diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index acc31986..3a6e3b94 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -7,9 +7,15 @@ import { } from '../../services/notification_utils/notification_utils.js' const Notifications = { - props: [ - 'noHeading', 'minimalMode', 'filterMode' - ], + props: { + // Disables display of panel header + noHeading: Boolean, + // Disables panel styles, unread mark, potentially other notification-related actions + // meant for "Interactions" timeline + minimalMode: Boolean, + // Custom filter mode, an array of strings, possible values 'mention', 'repeat', 'like', 'follow', used to override global filter for use in "Interactions" timeline + filterMode: Array + }, data () { return { bottomedOut: false diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index c0b458cc..622d12f4 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -1,8 +1,10 @@ @import '../../_variables.scss'; .notifications { - // a bit of a hack to allow scrolling below notifications - padding-bottom: 15em; + &:not(.minimal) { + // a bit of a hack to allow scrolling below notifications + padding-bottom: 15em; + } .loadmore-error { color: $fallback--text; diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 3c3ae191..c71499b2 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -1,5 +1,5 @@