diff options
Diffstat (limited to 'frontend/src/components')
| -rw-r--r-- | frontend/src/components/Err.js | 2 | ||||
| -rw-r--r-- | frontend/src/components/PasteInfo.js | 34 |
2 files changed, 20 insertions, 16 deletions
diff --git a/frontend/src/components/Err.js b/frontend/src/components/Err.js index c87f6a8..fae0e0d 100644 --- a/frontend/src/components/Err.js +++ b/frontend/src/components/Err.js @@ -1,7 +1,7 @@ import React from 'react'; import styled, { css } from 'styled-components' -const ErrMsg = styled.p` +export const ErrMsg = styled.p` display: inline; font-weight: 700; color: #ff3333; diff --git a/frontend/src/components/PasteInfo.js b/frontend/src/components/PasteInfo.js index 2f912fb..1ef69cc 100644 --- a/frontend/src/components/PasteInfo.js +++ b/frontend/src/components/PasteInfo.js @@ -3,6 +3,7 @@ import styled from 'styled-components' import { Theme } from './Inputs' import {Button} from "./Common/Button"; import {useRouter} from "next/router"; +import {ErrMsg} from "./Err"; const Bold = styled.span` font-weight: 700 @@ -27,21 +28,21 @@ const Flex = styled.div` flex-direction: row; ` -const PasteInfo = (props) => { +const PasteInfo = ({hash, lang, theme, expiry, toggleRenderCallback, isRenderMode, onChange, err}) => { const router = useRouter() const redirRaw = () => { - const redirUrl = `/raw/${props.hash}` + const redirUrl = `/raw/${hash}` router.push(redirUrl); } const renderable = () => { - const buttonTxt = props.isRenderMode ? 'text' : 'render' - if (props.lang === 'latex' || props.lang === 'markdown') { + const buttonTxt = isRenderMode ? 'text' : 'render' + if (lang === 'latex' || lang === 'markdown') { return ( <ShiftedButton secondary type="button" - onClick={props.toggleRenderCallback}> + onClick={toggleRenderCallback}> {buttonTxt} </ShiftedButton> ); @@ -59,20 +60,23 @@ const PasteInfo = (props) => { </ShiftedButton> {renderable()} <Theme - value={props.theme} - onChange={props.onChange} + value={theme} + onChange={onChange} id="themeInput" /> </Flex> <StyledDiv> - <SpacedText> - <Bold>language: </Bold>{props.lang} - </SpacedText> - <SpacedText> - <Bold>expires: </Bold>{props.expiry} - </SpacedText> + {err ? + <ErrMsg active> {err} </ErrMsg> : + <> + <SpacedText> + <Bold>language: </Bold>{lang} + </SpacedText> + <SpacedText> + <Bold>expires: </Bold>{expiry} + </SpacedText> + </> + } </StyledDiv> - <br /> - {props.err} </div> ); } |