Browse Source

Add page forward/back buttons

- change styling on modal back button
master
jeffvli 3 years ago
committed by Jeff
parent
commit
0096923fa6
  1. 22
      src/components/layout/Layout.tsx
  2. 11
      src/components/modal/PageModal.tsx

22
src/components/layout/Layout.tsx

@ -1,12 +1,13 @@
import React from 'react'; import React from 'react';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { Content } from 'rsuite'; import { ButtonToolbar, Content, FlexboxGrid, Icon } from 'rsuite';
import Sidebar from './Sidebar'; import Sidebar from './Sidebar';
import Titlebar from './Titlebar'; import Titlebar from './Titlebar';
import { RootContainer, RootFooter, MainContainer } from './styled'; import { RootContainer, RootFooter, MainContainer } from './styled';
import { setContextMenu, setExpandSidebar } from '../../redux/miscSlice'; import { setContextMenu, setExpandSidebar } from '../../redux/miscSlice';
import { useAppDispatch, useAppSelector } from '../../redux/hooks'; import { useAppDispatch, useAppSelector } from '../../redux/hooks';
import { clearSelected } from '../../redux/multiSelectSlice'; import { clearSelected } from '../../redux/multiSelectSlice';
import { StyledIconButton } from '../shared/styled';
const Layout = ({ footer, children, disableSidebar, font }: any) => { const Layout = ({ footer, children, disableSidebar, font }: any) => {
const history = useHistory(); const history = useHistory();
@ -93,6 +94,25 @@ const Layout = ({ footer, children, disableSidebar, font }: any) => {
}} }}
> >
<MainContainer id="container-main" expanded={misc.expandSidebar}> <MainContainer id="container-main" expanded={misc.expandSidebar}>
<FlexboxGrid justify="space-between" style={{ padding: '10px 10px 0px 10px' }}>
<FlexboxGrid.Item>
<ButtonToolbar style={{ height: '20px' }}>
<StyledIconButton
appearance="subtle"
size="sm"
icon={<Icon icon="arrow-circle-left" />}
onClick={() => history.goBack()}
/>
<StyledIconButton
appearance="subtle"
size="sm"
icon={<Icon icon="arrow-circle-right" />}
onClick={() => history.goForward()}
/>
</ButtonToolbar>
</FlexboxGrid.Item>
</FlexboxGrid>
<Content id="container-content">{children}</Content> <Content id="container-content">{children}</Content>
</MainContainer> </MainContainer>
<RootFooter id="container-footer">{footer}</RootFooter> <RootFooter id="container-footer">{footer}</RootFooter>

11
src/components/modal/PageModal.tsx

@ -3,7 +3,7 @@ import { Icon, Modal } from 'rsuite';
import styled from 'styled-components'; import styled from 'styled-components';
import { useAppDispatch, useAppSelector } from '../../redux/hooks'; import { useAppDispatch, useAppSelector } from '../../redux/hooks';
import { decrementModalPage, hideModal, setContextMenu } from '../../redux/miscSlice'; import { decrementModalPage, hideModal, setContextMenu } from '../../redux/miscSlice';
import { StyledButton } from '../shared/styled'; import { StyledIconButton } from '../shared/styled';
import ArtistView from '../library/ArtistView'; import ArtistView from '../library/ArtistView';
import AlbumView from '../library/AlbumView'; import AlbumView from '../library/AlbumView';
import PlaylistView from '../playlist/PlaylistView'; import PlaylistView from '../playlist/PlaylistView';
@ -36,14 +36,13 @@ const PageModal = () => {
full full
> >
<Modal.Header onClick={() => dispatch(setContextMenu({ show: false }))}> <Modal.Header onClick={() => dispatch(setContextMenu({ show: false }))}>
<StyledButton <StyledIconButton
appearance="link" appearance="subtle"
icon={<Icon icon="arrow-circle-left" />}
onClick={() => { onClick={() => {
dispatch(decrementModalPage()); dispatch(decrementModalPage());
}} }}
> />
<Icon icon="arrow-circle-left" />
</StyledButton>
</Modal.Header> </Modal.Header>
<Modal.Body <Modal.Body
style={{ height: '800px' }} style={{ height: '800px' }}

Loading…
Cancel
Save