kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Remove global button
rodzic
fefea50b65
commit
640bf97663
|
@ -13,7 +13,6 @@ import plusIcon from '@tabler/icons/outline/plus.svg';
|
||||||
import settingsIcon from '@tabler/icons/outline/settings.svg';
|
import settingsIcon from '@tabler/icons/outline/settings.svg';
|
||||||
import userPlusIcon from '@tabler/icons/outline/user-plus.svg';
|
import userPlusIcon from '@tabler/icons/outline/user-plus.svg';
|
||||||
import userIcon from '@tabler/icons/outline/user.svg';
|
import userIcon from '@tabler/icons/outline/user.svg';
|
||||||
import worldIcon from '@tabler/icons/outline/world.svg';
|
|
||||||
import xIcon from '@tabler/icons/outline/x.svg';
|
import xIcon from '@tabler/icons/outline/x.svg';
|
||||||
import clsx from 'clsx';
|
import clsx from 'clsx';
|
||||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||||
|
@ -268,15 +267,6 @@ const SidebarMenu: React.FC = (): JSX.Element | null => {
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{features.publicTimeline && features.federating && (
|
|
||||||
<SidebarLink
|
|
||||||
to='/timeline/global'
|
|
||||||
icon={worldIcon}
|
|
||||||
text={<FormattedMessage id='tabs_bar.global' defaultMessage='Global' />}
|
|
||||||
onClick={onClose}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<Divider />
|
<Divider />
|
||||||
|
|
||||||
{features.blocks && (
|
{features.blocks && (
|
||||||
|
|
|
@ -18,7 +18,6 @@ import messagesIcon from '@tabler/icons/outline/messages.svg';
|
||||||
import settingsIcon from '@tabler/icons/outline/settings.svg';
|
import settingsIcon from '@tabler/icons/outline/settings.svg';
|
||||||
import userPlusIcon from '@tabler/icons/outline/user-plus.svg';
|
import userPlusIcon from '@tabler/icons/outline/user-plus.svg';
|
||||||
import userIcon from '@tabler/icons/outline/user.svg';
|
import userIcon from '@tabler/icons/outline/user.svg';
|
||||||
import worldIcon from '@tabler/icons/outline/world.svg';
|
|
||||||
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
|
import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
|
|
||||||
|
@ -31,7 +30,6 @@ import ComposeButton from 'soapbox/features/ui/components/compose-button.tsx';
|
||||||
import ProfileDropdown from 'soapbox/features/ui/components/profile-dropdown.tsx';
|
import ProfileDropdown from 'soapbox/features/ui/components/profile-dropdown.tsx';
|
||||||
import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts';
|
import { useAppSelector } from 'soapbox/hooks/useAppSelector.ts';
|
||||||
import { useFeatures } from 'soapbox/hooks/useFeatures.ts';
|
import { useFeatures } from 'soapbox/hooks/useFeatures.ts';
|
||||||
import { useInstance } from 'soapbox/hooks/useInstance.ts';
|
|
||||||
import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts';
|
import { useOwnAccount } from 'soapbox/hooks/useOwnAccount.ts';
|
||||||
import { useSettings } from 'soapbox/hooks/useSettings.ts';
|
import { useSettings } from 'soapbox/hooks/useSettings.ts';
|
||||||
import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts';
|
import { useSettingsNotifications } from 'soapbox/hooks/useSettingsNotifications.ts';
|
||||||
|
@ -52,7 +50,6 @@ const SidebarNavigation = () => {
|
||||||
const intl = useIntl();
|
const intl = useIntl();
|
||||||
const { unreadChatsCount } = useStatContext();
|
const { unreadChatsCount } = useStatContext();
|
||||||
|
|
||||||
const { instance } = useInstance();
|
|
||||||
const features = useFeatures();
|
const features = useFeatures();
|
||||||
const { isDeveloper } = useSettings();
|
const { isDeveloper } = useSettings();
|
||||||
const { account } = useOwnAccount();
|
const { account } = useOwnAccount();
|
||||||
|
@ -62,8 +59,6 @@ const SidebarNavigation = () => {
|
||||||
const dashboardCount = useAppSelector((state) => state.admin.openReports.count() + state.admin.awaitingApproval.count());
|
const dashboardCount = useAppSelector((state) => state.admin.openReports.count() + state.admin.awaitingApproval.count());
|
||||||
const settingsNotifications = useSettingsNotifications();
|
const settingsNotifications = useSettingsNotifications();
|
||||||
|
|
||||||
const restrictUnauth = instance.pleroma.metadata.restrict_unauthenticated;
|
|
||||||
|
|
||||||
const makeMenu = (): Menu => {
|
const makeMenu = (): Menu => {
|
||||||
const menu: Menu = [];
|
const menu: Menu = [];
|
||||||
|
|
||||||
|
@ -220,16 +215,6 @@ const SidebarNavigation = () => {
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{(features.publicTimeline) && (
|
|
||||||
features.federating && (account || !restrictUnauth.timelines.federated)) && (
|
|
||||||
<SidebarNavigationLink
|
|
||||||
to='/timeline/global'
|
|
||||||
icon={worldIcon}
|
|
||||||
text={<FormattedMessage id='tabs_bar.global' defaultMessage='Global' />}
|
|
||||||
/>
|
|
||||||
|
|
||||||
)}
|
|
||||||
|
|
||||||
{menu.length > 0 && (
|
{menu.length > 0 && (
|
||||||
<DropdownMenu items={menu} placement='top'>
|
<DropdownMenu items={menu} placement='top'>
|
||||||
<SidebarNavigationLink
|
<SidebarNavigationLink
|
||||||
|
|
|
@ -1642,7 +1642,6 @@
|
||||||
"sw.url": "Script URL",
|
"sw.url": "Script URL",
|
||||||
"tabs_bar.dashboard": "Dashboard",
|
"tabs_bar.dashboard": "Dashboard",
|
||||||
"tabs_bar.follows": "Follows",
|
"tabs_bar.follows": "Follows",
|
||||||
"tabs_bar.global": "Global",
|
|
||||||
"tabs_bar.groups": "Groups",
|
"tabs_bar.groups": "Groups",
|
||||||
"tabs_bar.home": "Home",
|
"tabs_bar.home": "Home",
|
||||||
"tabs_bar.more": "More",
|
"tabs_bar.more": "More",
|
||||||
|
|
Ładowanie…
Reference in New Issue