Skip to content

Commit c84bdbb

Browse files
authored
Merge pull request #34 from oslabs-beta/victor/codepreview
add configuration for ace editor
2 parents 07d61c8 + 392c903 commit c84bdbb

File tree

2 files changed

+31
-28
lines changed

2 files changed

+31
-28
lines changed

app/src/components/bottom/CodePreview.tsx

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
import React, { useContext, useState, useRef, useEffect } from 'react';
2-
import AceEditor from 'react-ace';
1+
import 'ace-builds/src-noconflict/ace';
32
import 'ace-builds/src-min-noconflict/ext-searchbox';
43
import 'ace-builds/src-noconflict/mode-javascript';
5-
import 'ace-builds/src-noconflict/theme-monokai';
6-
import 'ace-builds/src-noconflict/theme-github';
7-
import 'ace-builds/src-noconflict/theme-solarized_dark';
8-
import 'ace-builds/src-noconflict/theme-solarized_light';
9-
import 'ace-builds/src-noconflict/theme-monokai';
4+
import 'ace-builds/src-noconflict/theme-dracula';
105
import 'ace-builds/src-noconflict/theme-terminal';
11-
import { Component } from '../../interfaces/Interfaces';
12-
import useResizeObserver from '../../tree/useResizeObserver';
13-
import { unpkgPathPlugin } from '../../plugins/unpkg-path-plugin';
14-
import { fetchPlugin } from '../../plugins/fetch-plugin';
6+
157
import * as esbuild from 'esbuild-wasm';
16-
import {codePreviewSave, codePreviewInput} from "../../redux/reducers/slice/codePreviewSlice";
8+
9+
import React, { useContext, useEffect, useRef, useState } from 'react';
10+
import {
11+
codePreviewInput,
12+
codePreviewSave
13+
} from '../../redux/reducers/slice/codePreviewSlice';
1714
import { useDispatch, useSelector } from 'react-redux';
15+
16+
import AceEditor from 'react-ace';
17+
import { Component } from '../../interfaces/Interfaces';
1818
import { RootState } from '../../redux/store';
19+
import { fetchPlugin } from '../../plugins/fetch-plugin';
20+
import { unpkgPathPlugin } from '../../plugins/unpkg-path-plugin';
21+
import useResizeObserver from '../../tree/useResizeObserver';
1922

2023
const CodePreview: React.FC<{
2124
theme: string | null;
@@ -37,7 +40,7 @@ const CodePreview: React.FC<{
3740
const wrapper = useRef();
3841
const dimensions = useResizeObserver(wrapper);
3942
const { height } = dimensions || 0;
40-
const state = useSelector((store:RootState) => store.appState)
43+
const state = useSelector((store: RootState) => store.appState);
4144
const [, setDivHeight] = useState(0);
4245
let currentComponent = state.components.find(
4346
(elem: Component) => elem.id === state.canvasFocus.componentId
@@ -80,7 +83,7 @@ const CodePreview: React.FC<{
8083
global: 'window'
8184
}
8285
});
83-
dispatch(codePreviewSave(result.outputFiles[0].text))
86+
dispatch(codePreviewSave(result.outputFiles[0].text));
8487
};
8588

8689
return (
@@ -95,15 +98,16 @@ const CodePreview: React.FC<{
9598
>
9699
<AceEditor
97100
mode="javascript"
98-
theme="monokai"
101+
theme="dracula"
99102
width="100%"
100103
height="100%"
101104
onChange={handleChange}
102105
value={input}
103106
name="Code_div"
104107
readOnly={false}
105-
fontSize={18}
108+
fontSize={14}
106109
tabSize={2}
110+
wrapEnabled={true}
107111
setOptions={{
108112
useWorker: false
109113
}}

app/src/components/bottom/StylesEditor.tsx

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
import React, { useState, useRef } from 'react';
2-
import AceEditor from 'react-ace';
1+
import 'ace-builds/src-noconflict/ace';
32
import 'ace-builds/src-noconflict/mode-css';
4-
import 'ace-builds/src-noconflict/theme-monokai';
5-
import 'ace-builds/src-noconflict/theme-github';
6-
import 'ace-builds/src-noconflict/theme-solarized_dark';
7-
import 'ace-builds/src-noconflict/theme-solarized_light';
8-
import 'ace-builds/src-noconflict/theme-terminal';
9-
import 'ace-builds/src-noconflict/theme-monokai';
3+
import 'ace-builds/src-noconflict/theme-dracula';
104
import 'ace-builds/src-min-noconflict/ext-searchbox';
5+
import 'ace-builds/src-noconflict/ext-language_tools';
6+
7+
import React, { useRef, useState } from 'react';
8+
import { useDispatch, useSelector } from 'react-redux';
9+
10+
import AceEditor from 'react-ace';
1111
import Fab from '@mui/material/Fab';
12+
import { RootState } from '../../redux/store';
1213
import SaveIcon from '@mui/icons-material/Save';
1314
import { updateStylesheet } from '../../redux/reducers/slice/appStateSlice';
14-
import { useDispatch, useSelector } from 'react-redux';
15-
import { RootState } from '../../redux/store';
1615

1716
const StylesEditor: React.FC<{
1817
theme: string | null;
@@ -50,13 +49,13 @@ const StylesEditor: React.FC<{
5049
>
5150
<AceEditor
5251
mode="css"
53-
theme={'monokai'}
52+
theme="dracula"
5453
width="100%"
5554
height="100%"
5655
onChange={handleChange}
5756
value={css}
5857
name="Css_div"
59-
fontSize={16}
58+
fontSize={14}
6059
tabSize={2}
6160
setOptions={{
6261
useWorker: false,

0 commit comments

Comments
 (0)