mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

/admin --> /soapbox/admin

next
Alex Gleason 2022-04-30 11:31:04 -05:00
rodzic e08a297eff
commit f19bd32e52
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
7 zmienionych plików z 19 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/soapbox/components/sidebar-navigation.tsx
Wyświetl plik

@ -73,7 +73,7 @@ const SidebarNavigation = () => {
if (account.staff) { if (account.staff) {
menu.push({ menu.push({
to: '/admin', to: '/soapbox/admin',
icon: require('@tabler/icons/icons/dashboard.svg'), icon: require('@tabler/icons/icons/dashboard.svg'),
text: <FormattedMessage id='tabs_bar.dashboard' defaultMessage='Dashboard' />, text: <FormattedMessage id='tabs_bar.dashboard' defaultMessage='Dashboard' />,
count: dashboardCount, count: dashboardCount,

2
app/soapbox/components/thumb_navigation.tsx
Wyświetl plik

@ -61,7 +61,7 @@ const ThumbNavigation: React.FC = (): JSX.Element => {
<ThumbNavigationLink <ThumbNavigationLink
src={require('@tabler/icons/icons/dashboard.svg')} src={require('@tabler/icons/icons/dashboard.svg')}
text={<FormattedMessage id='navigation.dashboard' defaultMessage='Dashboard' />} text={<FormattedMessage id='navigation.dashboard' defaultMessage='Dashboard' />}
to='/admin' to='/soapbox/admin'
count={dashboardCount} count={dashboardCount}
/> />
)} )}

12
app/soapbox/features/admin/components/admin-tabs.tsx
Wyświetl plik

@ -19,18 +19,18 @@ const AdminTabs: React.FC = () => {
const reportsCount = useAppSelector(state => state.admin.openReports.count()); const reportsCount = useAppSelector(state => state.admin.openReports.count());
const tabs = [{ const tabs = [{
name: '/admin', name: '/soapbox/admin',
text: intl.formatMessage(messages.dashboard), text: intl.formatMessage(messages.dashboard),
to: '/admin', to: '/soapbox/admin',
}, { }, {
name: '/admin/reports', name: '/soapbox/admin/reports',
text: intl.formatMessage(messages.reports), text: intl.formatMessage(messages.reports),
to: '/admin/reports', to: '/soapbox/admin/reports',
count: reportsCount, count: reportsCount,
}, { }, {
name: '/admin/approval', name: '/soapbox/admin/approval',
text: intl.formatMessage(messages.waitlist), text: intl.formatMessage(messages.waitlist),
to: '/admin/approval', to: '/soapbox/admin/approval',
count: approvalCount, count: approvalCount,
}]; }];

2
app/soapbox/features/admin/components/latest_accounts_panel.tsx
Wyświetl plik

@ -46,7 +46,7 @@ const LatestAccountsPanel: React.FC<ILatestAccountsPanel> = ({ limit = 5 }) => {
} }
const handleAction = () => { const handleAction = () => {
history.push('/admin/users'); history.push('/soapbox/admin/users');
}; };
return ( return (

6
app/soapbox/features/admin/index.tsx
Wyświetl plik

@ -26,9 +26,9 @@ const Admin: React.FC = () => {
<AdminTabs /> <AdminTabs />
<Switch> <Switch>
<Route path='/admin' exact component={Dashboard} /> <Route path='/soapbox/admin' exact component={Dashboard} />
<Route path='/admin/reports' exact component={Reports} /> <Route path='/soapbox/admin/reports' exact component={Reports} />
<Route path='/admin/approval' exact component={Waitlist} /> <Route path='/soapbox/admin/approval' exact component={Waitlist} />
</Switch> </Switch>
</Column> </Column>
); );

2
app/soapbox/features/admin/tabs/dashboard.tsx
Wyświetl plik

@ -77,7 +77,7 @@ const Dashboard: React.FC = () => {
</div> </div>
)} )}
{isNumber(userCount) && ( {isNumber(userCount) && (
<Link className='dashcounter' to='/admin/users'> <Link className='dashcounter' to='/soapbox/admin/users'>
<Text align='center' size='2xl' weight='medium'> <Text align='center' size='2xl' weight='medium'>
<FormattedNumber value={userCount} /> <FormattedNumber value={userCount} />
</Text> </Text>

12
app/soapbox/features/ui/index.tsx
Wyświetl plik

@ -227,7 +227,7 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
<Redirect from='/home' to='/' /> <Redirect from='/home' to='/' />
{/* Mastodon rendered pages */} {/* Mastodon rendered pages */}
<Redirect from='/admin/dashboard' to='/admin' exact /> <Redirect from='/admin' to='/soapbox/admin' />
<Redirect from='/terms' to='/about' /> <Redirect from='/terms' to='/about' />
<Redirect from='/settings/preferences' to='/settings' /> <Redirect from='/settings/preferences' to='/settings' />
<Redirect from='/settings/two_factor_authentication_methods' to='/settings/mfa' /> <Redirect from='/settings/two_factor_authentication_methods' to='/settings/mfa' />
@ -302,11 +302,11 @@ const SwitchingColumnsArea: React.FC = ({ children }) => {
{/* <WrappedRoute path='/backups' page={DefaultPage} component={Backups} content={children} /> */} {/* <WrappedRoute path='/backups' page={DefaultPage} component={Backups} content={children} /> */}
<WrappedRoute path='/soapbox/config' adminOnly page={DefaultPage} component={SoapboxConfig} content={children} /> <WrappedRoute path='/soapbox/config' adminOnly page={DefaultPage} component={SoapboxConfig} content={children} />
<WrappedRoute path='/admin' staffOnly page={AdminPage} component={Dashboard} content={children} exact /> <WrappedRoute path='/soapbox/admin' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
<WrappedRoute path='/admin/approval' staffOnly page={AdminPage} component={Dashboard} content={children} exact /> <WrappedRoute path='/soapbox/admin/approval' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
<WrappedRoute path='/admin/reports' staffOnly page={AdminPage} component={Dashboard} content={children} exact /> <WrappedRoute path='/soapbox/admin/reports' staffOnly page={AdminPage} component={Dashboard} content={children} exact />
<WrappedRoute path='/admin/log' staffOnly page={AdminPage} component={ModerationLog} content={children} exact /> <WrappedRoute path='/soapbox/admin/log' staffOnly page={AdminPage} component={ModerationLog} content={children} exact />
<WrappedRoute path='/admin/users' staffOnly page={AdminPage} component={UserIndex} content={children} exact /> <WrappedRoute path='/soapbox/admin/users' staffOnly page={AdminPage} component={UserIndex} content={children} exact />
<WrappedRoute path='/info' page={EmptyPage} component={ServerInfo} content={children} /> <WrappedRoute path='/info' page={EmptyPage} component={ServerInfo} content={children} />
<WrappedRoute path='/developers/apps/create' developerOnly page={DefaultPage} component={CreateApp} content={children} /> <WrappedRoute path='/developers/apps/create' developerOnly page={DefaultPage} component={CreateApp} content={children} />