From cdf8e036ff56281e9052fff7a688c6f32121428f Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Fri, 22 May 2020 23:39:35 -0700
Subject: add preview panel

---
 frontend/src/components/App.js                | 13 -----
 frontend/src/components/Inputs.js             |  1 +
 frontend/src/components/NewPaste.js           | 75 ++++++++++++++++++++++++---
 frontend/src/components/PasteInfo.js          |  6 +--
 frontend/src/components/renderers/Code.js     |  4 +-
 frontend/src/components/renderers/Dispatch.js | 56 --------------------
 frontend/src/components/renderers/Latex.js    | 15 ++++++
 7 files changed, 89 insertions(+), 81 deletions(-)
 delete mode 100644 frontend/src/components/renderers/Dispatch.js

(limited to 'frontend/src/components')

diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
index eb63ed9..ae95dcb 100644
--- a/frontend/src/components/App.js
+++ b/frontend/src/components/App.js
@@ -11,7 +11,6 @@ import {
   useParams
 } from "react-router-dom";
 import Raw from './renderers/Raw'
-import Dispatch from './renderers/Raw'
 
 const SpacedTitle = styled.div`
     margin-top: 10vh
@@ -39,15 +38,6 @@ const GetRawWithParam = () => {
   );
 }
 
-const RenderWithParam = () => {
-  let { hash } = useParams();
-  console.log(hash)
-
-  return (
-    <Dispatch hash={hash} />
-  );
-}
-
 function App() {
   return (
     <Router>
@@ -68,9 +58,6 @@ function App() {
 
           <main id="appElement">
             <Switch>
-              <Route path="/render/:hash"
-                children={<RenderWithParam />}
-              />
               <Route path="/:hash"
                 children={<GetPasteWithParam />}
               />
diff --git a/frontend/src/components/Inputs.js b/frontend/src/components/Inputs.js
index b96ceb0..872afd7 100644
--- a/frontend/src/components/Inputs.js
+++ b/frontend/src/components/Inputs.js
@@ -7,6 +7,7 @@ import { LANGS, THEMES } from './renderers/Code';
 
 const RelPositioning = styled.div`
     position: relative; 
+    height: calc(100% - 4em);
 `
 
 const FlexChild = styled.div`
diff --git a/frontend/src/components/NewPaste.js b/frontend/src/components/NewPaste.js
index e13e7df..e1075c4 100644
--- a/frontend/src/components/NewPaste.js
+++ b/frontend/src/components/NewPaste.js
@@ -5,6 +5,29 @@ import Error from './Err'
 import { PostNewPaste } from '../helpers/httpHelper'
 import PasteModal from './modals/PasteModal'
 import { LANGS } from './renderers/Code'
+import styled from 'styled-components'
+import CodeRenderer from './renderers/Code'
+
+const Button = styled.button`
+    margin-right: 0 !important;
+    margin-left: 2em !important;
+    height: calc(16px + 1.6em + 2px);
+`
+
+const Flex = styled.div`
+    display: flex;
+    flex-direction: row;
+`
+
+const FlexLeft = styled.div`
+    flex: 0 0 50%;
+`
+
+const FlexRight = styled.div`
+    flex: 0 0 50%;
+    max-width: calc(50% - 1em + 2px);
+    margin-left: 2em;
+`
 
 class NewPaste extends React.Component {
     constructor(props) {
@@ -17,10 +40,13 @@ class NewPaste extends React.Component {
             expiry: '',
             hash: '',
             error: '',
+            preview: false,
         };
 
         this.handleChange = this.handleChange.bind(this);
         this.handleSubmit = this.handleSubmit.bind(this);
+        this.togglePreview = this.togglePreview.bind(this);
+        this.renderPreview = this.renderPreview.bind(this);
         this.ErrorLabel = React.createRef();
     }
 
@@ -41,6 +67,11 @@ class NewPaste extends React.Component {
         });
     }
 
+    togglePreview() {
+        const state = this.state.preview
+        this.setState({ preview: !state })
+    }
+
     handleSubmit(event) {
         event.preventDefault();
 
@@ -65,26 +96,58 @@ class NewPaste extends React.Component {
         }
     }
 
+    renderPreview() {
+        const pasteInput = <PasteInput
+            onChange={this.handleChange}
+            content={this.state.content}
+            maxLength="100000"
+            id="pasteInput" />
+
+        const preview = <CodeRenderer
+            lang={this.state.language}
+            theme='atom'
+            content={this.state.content} />
+
+        if (this.state.preview) {
+            return (
+                <Flex>
+                    <FlexLeft>
+                        {pasteInput}
+                    </FlexLeft>
+                    <FlexRight className='preview' >
+                        {preview}
+                    </FlexRight>
+                </Flex>
+            );
+        } else {
+            return (
+                pasteInput
+            );
+        }
+    }
+
     render() {
         return (
             <form onSubmit={this.handleSubmit}>
                 <PasteModal hash={this.state.hash} />
-                <TitleInput 
+                <TitleInput
                     onChange={this.handleChange}
                     value={this.state.title}
                     maxLength="100"
                     id="titleInput" />
-                <PasteInput
-                    onChange={this.handleChange}
-                    content={this.state.content}
-                    maxLength="100000"
-                    id="pasteInput" />
+                {this.renderPreview()}
                 <OptionsContainer
                     pass={this.state.pass}
                     expiry={this.state.expiry}
                     lang={this.state.language}
                     onChange={this.handleChange} />
                 <input className="lt-button lt-shadow lt-hover" type="submit" value="new paste" />
+                <Button
+                    className="lt-shadow lt-hover"
+                    type="button"
+                    onClick={this.togglePreview} >
+                    preview
+                </Button>
                 <Error ref={this.ErrorLabel} />
             </form>
         );
diff --git a/frontend/src/components/PasteInfo.js b/frontend/src/components/PasteInfo.js
index 28141ac..9cf4da3 100644
--- a/frontend/src/components/PasteInfo.js
+++ b/frontend/src/components/PasteInfo.js
@@ -37,9 +37,7 @@ const PasteInfo = (props) => {
         history.push(redirUrl);
     }
 
-    const redirRender = () => {
-        const redirUrl = `/render/${props.hash}`
-        history.push(redirUrl);
+    const render = () => {
     }
 
     const renderable = () => {
@@ -48,7 +46,7 @@ const PasteInfo = (props) => {
                 <Button
                     className="lt-shadow lt-hover"
                     type="button"
-                    onClick={redirRender}
+                    onClick={render}
                 >
                     render
                 </Button>
diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index 0c601b3..7c32c39 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -36,14 +36,14 @@ export const LANGS = Object.freeze({
 })
 
 const StyledPre = styled.pre`
-  padding: 0 !important;
+  padding: calc(0.8em - 1px) !important;
   margin: 0;
 `
 
 const CodeBlock = styled.div`
   width: 100%;
   font-size: 0.8em;
-  padding: calc(0.8em - 1px) !important;
+  min-height: 1.2em;
   border-radius: 3px;
   border: 1px solid #565656;
   outline: none;
diff --git a/frontend/src/components/renderers/Dispatch.js b/frontend/src/components/renderers/Dispatch.js
deleted file mode 100644
index fc80a47..0000000
--- a/frontend/src/components/renderers/Dispatch.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import { FetchPaste } from '../../helpers/httpHelper'
-
-class Raw extends React.Component {
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            content: '',
-        };
-    }
-
-    render() {
-        const styles = {
-            wordWrap: "break-word",
-            whiteSpace: "pre-wrap",
-            lineHeight: "initial",
-            fontSize: "0.8em",
-            padding: "0 1em"
-        }
-
-        return (
-            <pre style={styles}>
-                {this.state.content}
-            </pre>
-        );
-    }
-
-    componentDidMount() {
-        FetchPaste(this.props.hash)
-            .then((response) => {
-                const data = response.data
-                this.setState({ content: data.content })
-            }).catch((error) => {
-                const resp = error.response
-
-                // catch 401 unauth (password protected)
-                if (resp.status === 401) {
-                    this.setState({ content: 'err: password protected' })
-                    return
-                }
-
-                // some weird err
-                if (resp !== undefined) {
-                    const errTxt = `${resp.statusText}: ${resp.data}`
-                    this.setState({ content: errTxt })
-                    return
-                }
-
-                // some weird err (e.g. network)
-                this.setState({ content: error })
-            })
-    }
-}
-
-export default Raw
\ No newline at end of file
diff --git a/frontend/src/components/renderers/Latex.js b/frontend/src/components/renderers/Latex.js
index e69de29..299432e 100644
--- a/frontend/src/components/renderers/Latex.js
+++ b/frontend/src/components/renderers/Latex.js
@@ -0,0 +1,15 @@
+import React from 'react';
+import { BlockMath } from 'react-katex';
+import 'katex/dist/katex.min.css';
+
+class Latex extends React.Component {
+    render() {
+        return (
+            <BlockMath>
+                {this.props.content}
+            </BlockMath>
+        );
+    }
+}
+
+export default Latex
\ No newline at end of file
-- 
cgit v1.2.3