From 02ac94490a67659c7cc669ead5b107b724db6e68 Mon Sep 17 00:00:00 2001 From: Plastikmensch Date: Sun, 19 Mar 2023 17:26:02 +0100 Subject: [PATCH] Add getting-started-misc to route (#2141) * Add getting-started-misc to web_app_paths Signed-off-by: Plastikmensch * Add signed in check to navigation entries Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors. Also fixed the keys as these were literally "i++". Signed-off-by: Plastikmensch * Remove "Extended information" from getting-started-misc I couldn't find any reference to this translation string, so I removed it too. Signed-off-by: Plastikmensch --------- Signed-off-by: Plastikmensch --- .../features/getting_started_misc/index.jsx | 27 ++++++++++--------- .../flavours/glitch/locales/en.json | 1 - config/routes.rb | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx index 613b43df7f..f3779280f2 100644 --- a/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx +++ b/app/javascript/flavours/glitch/features/getting_started_misc/index.jsx @@ -16,10 +16,8 @@ const messages = defineMessages({ blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' }, mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, - info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }, show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' }, - info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' }, keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' }, featured_users: { id: 'navigation_bar.featured_users', defaultMessage: 'Featured users' }, }); @@ -28,6 +26,11 @@ export default @connect() @injectIntl class gettingStartedMisc extends ImmutablePureComponent { + static contextTypes = { + router: PropTypes.object.isRequired, + identity: PropTypes.object, + }; + static propTypes = { intl: PropTypes.object.isRequired, dispatch: PropTypes.func.isRequired, @@ -43,8 +46,7 @@ class gettingStartedMisc extends ImmutablePureComponent { render () { const { intl } = this.props; - - let i = 1; + const { signedIn } = this.context.identity; return ( @@ -52,15 +54,14 @@ class gettingStartedMisc extends ImmutablePureComponent {
- - - - - - - - - + {signedIn && ()} + {signedIn && ()} + {signedIn && ()} + {signedIn && ()} + {signedIn && ()} + {signedIn && ()} + + {signedIn && ()}
); diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json index 7c21f69c3c..d15c23e134 100644 --- a/app/javascript/flavours/glitch/locales/en.json +++ b/app/javascript/flavours/glitch/locales/en.json @@ -67,7 +67,6 @@ "moved_to_warning": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.", "navigation_bar.app_settings": "App settings", "navigation_bar.featured_users": "Featured users", - "navigation_bar.info": "Extended information", "navigation_bar.keyboard_shortcuts": "Keyboard shortcuts", "navigation_bar.misc": "Misc", "notification.markForDeletion": "Mark for deletion", diff --git a/config/routes.rb b/config/routes.rb index 8c6f126649..257babbf6b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,7 @@ Rails.application.routes.draw do # have alternative format representations requiring separate controllers web_app_paths = %w( /getting-started + /getting-started-misc /keyboard-shortcuts /home /public