Mirrors
/
vizality
mirror of https://github.com/vizality/vizality
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dashboard routing changes to now work with addon subroutes

Browse Source
pull/67/head
dperolio 3 years ago
parent 67b5baf749
commit ab67ba7cde
No known key found for this signature in database
GPG Key ID: 3E9BBAA710D3DDCE
2 changed files with 21 additions and 39 deletions
Show Stats Download Patch File Download Diff File

6
src/core/api/Routes.js
Unescape View File

@ -120,7 +120,7 @@ export default class Routes extends API {
try {
assertObject(route);
route.caller = route.path === '' ? 'vizality' : getCaller();
route.id = route.id || `${toSnakeCase(route.caller).toUpperCase()}_ROUTE_${this.getRoutesByCaller(route.caller)?.length + 1 || '1'}`;
route.id = route.id || `${toSnakeCase(route.caller?.id).toUpperCase()}_ROUTE_${this.getRoutesByCaller(route.caller?.id)?.length + 1 || '1'}`;
assertString(route.id);
assertString(route.path);
if (route.path !== '') {
@ -159,7 +159,7 @@ export default class Routes extends API {
getRoutesByCaller (addonId) {
try {
assertString(addonId);
return this._routes.filter(route => route.caller === addonId);
return this._routes.filter(route => route.caller?.id === addonId);
} catch (err) {
return this.error(this._labels.concat('getRoutesByCaller'), err);
}
@ -265,7 +265,7 @@ export default class Routes extends API {
/**
* Try to set the scroller position to the hash element.
*/
return scroller.scroll({ top: topOfElement - 30 });
return scroller.scroll({ top: topOfElement - 80, behavior: 'smooth' });
}, 250);
}
/**

54
src/core/builtins/dashboard/routes/Routes.jsx
Unescape View File

@ -1,17 +1,16 @@
import { FormNotice, Anchor, Markdown as _Markdown } from '@vizality/components';
import { Content, Layout } from '@vizality/components/dashboard';
import { AddonsList } from '@vizality/components/addon';
import { AddonsList, AddonListing } from '@vizality/components/addon';
import { Route, Switch, Redirect } from 'react-router';
import React, { memo } from 'react';
import ImageCarouselModal from '../pages/screenshots/ImageCarouselModal';
import Screenshots from '../pages/screenshots/Screenshots';
import Markdown from '../pages/docs/components/Markdown';
import Changelog from '../pages/changelog/Changelog';
import Icons from '../pages/docs/components/Icons';
import Changelog from '../pages/Changelog';
import ErrorTest from '../pages/ErrorTest';
import Home from '../pages/home/Home';
import Test2 from '../pages/Test2';
import Home from '../pages/Home';
import Test from '../pages/Test';
export default memo(() => {
@ -19,6 +18,10 @@ export default memo(() => {
<>
<Switch>
<Redirect from='/vizality' to='/vizality/dashboard' exact />
<Redirect from='/vizality/plugins' to='/vizality/plugins/installed' exact />
<Redirect from='/vizality/themes' to='/vizality/themes/installed' exact />
<Redirect from='/vizality/plugin/:id' to='/vizality/plugin/:id/overview' exact />
<Redirect from='/vizality/theme/:id' to='/vizality/theme/:id/overview' exact />
<Redirect from='/vizality/docs' to='/vizality/docs/getting-started' exact />
</Switch>
<Switch>
@ -29,7 +32,7 @@ export default memo(() => {
</Content>
</Layout>
</Route>
<Route path='/vizality/plugins' exact>
<Route path='/vizality/plugins/:section' exact>
<Layout>
<Content
header='Plugins'
@ -37,44 +40,30 @@ export default memo(() => {
icon='Plugin'
className='vz-addons-list-page-content'
>
<AddonsList type='plugin' tab='installed' source={[ ...vizality.manager.plugins.values ]} />
<AddonsList />
</Content>
</Layout>
</Route>
<Route path='/vizality/plugins/browse' exact>
<Route path='/vizality/themes/:section' exact>
<Layout>
<Content
header='Plugins'
header='Themes'
description='Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin ornare tellus nec dapibus finibus. Nulla massa velit, mattis non eros a, interdum tristique massa. Curabitur mauris sem, porttitor quis ligula vitae, suscipit hendrerit quam. Nunc sit amet enim id elit vehicula tempus sed sed tellus. Aliquam felis turpis, malesuada ut tortor id, iaculis facilisis felis.'
icon='Plugin'
className='vz-addons-list-page-content'
icon='Theme'
className='vz-addons-listing-content'
>
<AddonsList type='plugin' tab='browse' source={[ ...vizality.manager.community.plugins.values() ]} />
<AddonsList />
</Content>
</Layout>
</Route>
<Route path='/vizality/themes' exact>
<Route path='/vizality/plugin/:id/:section' exact>
<Layout>
<Content
header='Themes'
description='Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin ornare tellus nec dapibus finibus. Nulla massa velit, mattis non eros a, interdum tristique massa. Curabitur mauris sem, porttitor quis ligula vitae, suscipit hendrerit quam. Nunc sit amet enim id elit vehicula tempus sed sed tellus. Aliquam felis turpis, malesuada ut tortor id, iaculis facilisis felis.'
icon='Theme'
className='vz-addons-list-page-content'
>
<AddonsList type='theme' tab='installed' source={[ ...vizality.manager.themes.values ]} />
</Content>
<AddonListing />
</Layout>
</Route>
<Route path='/vizality/themes/browse' exact>
<Route path='/vizality/theme/:id/:section' exact>
<Layout>
<Content
header='Themes'
description='Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin ornare tellus nec dapibus finibus. Nulla massa velit, mattis non eros a, interdum tristique massa. Curabitur mauris sem, porttitor quis ligula vitae, suscipit hendrerit quam. Nunc sit amet enim id elit vehicula tempus sed sed tellus. Aliquam felis turpis, malesuada ut tortor id, iaculis facilisis felis.'
icon='Theme'
className='vz-addons-list-page-content'
>
<AddonsList type='theme' tab='browse' source={[ ...vizality.manager.community.themes.values() ]} />
</Content>
<AddonListing />
</Layout>
</Route>
<Route path='/vizality/development' exact>
@ -115,13 +104,6 @@ export default memo(() => {
</Content>
</Layout>
</Route>
<Route path='/vizality/docs/components/test2' exact>
<Layout>
<Content>
<Test2 />
</Content>
</Layout>
</Route>
<Route path='/vizality/changelog' exact>
<Layout>
<Content

Write Preview
Loading…
Cancel
Save