From e3f871044c39ae05d5c84b5157a1f12579811303 Mon Sep 17 00:00:00 2001 From: jackyzha0 Date: Thu, 14 May 2020 23:23:12 -0700 Subject: working code render --- frontend/src/components/ViewPaste.js | 54 +++++++++++++++++------------------- 1 file changed, 25 insertions(+), 29 deletions(-) (limited to 'frontend/src/components/ViewPaste.js') diff --git a/frontend/src/components/ViewPaste.js b/frontend/src/components/ViewPaste.js index 835deaf..491c440 100644 --- a/frontend/src/components/ViewPaste.js +++ b/frontend/src/components/ViewPaste.js @@ -1,16 +1,11 @@ import React from 'react'; import Error from './Err'; -import { TitleInput, PasteInput } from './Inputs'; +import { TitleInput } from './Inputs'; +import CodeRenderer from './renderers/Code' import PasteInfo from './PasteInfo'; import PasswordModal from './modals/PasswordModal' import { FetchPaste, FetchPasswordPaste } from '../helpers/httpHelper' - -const RENDER_MODES = Object.freeze({ - RAW: 'raw text', - MD: 'markdown', - LATEX: 'latex', - CODE: 'code', -}) +import { LANGS } from './renderers/Code' class ViewPaste extends React.Component { @@ -25,31 +20,29 @@ class ViewPaste extends React.Component { expiry: 'no expiry', error: '', passError: '', - mode: RENDER_MODES.RAW, + theme: 'atom', + language: LANGS.raw, }; this.handleChange = this.handleChange.bind(this); + this.typedPass = this.typedPass.bind(this); this.validatePass = this.validatePass.bind(this); this.ErrorLabel = React.createRef(); this.PasswordModal = React.createRef(); } handleChange(event) { - this.setState({ enteredPass: event.target.value }); - } + const target = event.target; + const name = target.name; + console.log(target, name) - drawRightMode() { - switch (this.state.mode) { - // TODO: add other renderers + this.setState({ + [name]: target.value + }); + } - // default render raw - case RENDER_MODES.RAW: - default: - return (); - } + typedPass(event) { + this.setState({ enteredPass: event.target.value }); } validatePass(pass) { @@ -87,18 +80,22 @@ class ViewPaste extends React.Component { hasPass={this.state.hasPass} validPass={this.state.validPass} value={this.state.enteredPass} - onChange={this.handleChange} + onChange={this.typedPass} validateCallback={this.validatePass} /> - - {this.drawRightMode()} - + + lang={this.state.language} + theme={this.state.theme} + onChange={this.handleChange} + expiry={this.state.expiry} /> ); @@ -111,7 +108,6 @@ class ViewPaste extends React.Component { } setStateFromData(data) { - console.log(data) this.setState({ title: data.title, content: data.content, -- cgit v1.2.3