Skip to content

Commit d3fa86c

Browse files
risenWrisenW
authored
Merge pull request #12 from opensource9ja/AceTheCreator-main
Fix merge conflict from [Ace the creator main]
2 parents 19b1bbf + f06ded2 commit d3fa86c

22 files changed

Lines changed: 869 additions & 158 deletions

‎.eslintrc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ module.exports = {
1818
Atomics: "readonly",
1919
SharedArrayBuffer: "readonly",
2020
},
21-
21+
parser: "babel-eslint",
2222
parserOptions: {
23-
ecmaVersion: 2018,
23+
ecmaVersion: 2019,
2424
sourceType: "module",
2525
},
2626
rules: {

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
"react-codemirror": "^1.0.0",
1616
"react-codemirror2": "^7.2.1",
1717
"react-dom": "^17.0.1",
18+
"react-icons": "^4.1.0",
1819
"react-router-dom": "^5.2.0",
1920
"react-scripts": "4.0.0",
21+
"react-textarea-autosize": "^8.3.2",
2022
"remarkable": "^2.0.1",
2123
"remarkable-react": "^1.4.3",
2224
"styled-components": "^5.2.1",

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
manifest.json provides metadata used when your web app is installed on a
1717
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
1818
-->
19-
<script src="https://cdn.jsdelivr.net/npm/danfojs@0.1.2/dist/index.min.js"></script>
2019
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
20+
<script src="https://cdn.jsdelivr.net/npm/danfojs@0.1.2/dist/index.min.js"></script>
2121
<!--
2222
Notice the use of %PUBLIC_URL% in the tags above.
2323
It will be replaced with the URL of the `public` folder during the build.

‎src/App.js‎

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,20 @@
11
/* eslint-disable camelcase */
22
// import './App.css';
3-
import React, { useState, useReducer } from "react";
4-
import Cell from "./Cell";
5-
import { reducer } from "./reducer";
6-
import { makeGlobal, downLoad_notebook, load_notebook } from "./utils";
3+
import React from "react";
74
import Layout from "./components/layout/layout";
85
import NavBar from "./components/NavBar/navbar";
6+
import Routes from "./routes/routes";
7+
import { makeGlobal } from "./utils";
98

10-
const defaultState = {
11-
cells: [{ id: "cell_1", input: "", output: "", type: "code" }],
12-
};
139
function App() {
14-
const [state, dispatch] = useReducer(reducer, defaultState);
15-
const [currentCell, setCurrentCell] = useState(null);
16-
1710
makeGlobal();
18-
1911
return (
20-
<Layout>
12+
<div>
2113
<NavBar />
22-
<button
23-
onClick={() => {
24-
downLoad_notebook(state);
25-
}}
26-
>
27-
Download Notebook
28-
</button>
29-
<input
30-
type="file"
31-
id="import-notebook-file"
32-
onChange={() => {
33-
load_notebook(dispatch);
34-
}}
35-
></input>
36-
<br />
37-
{state.cells.map((cell, index) => {
38-
return (
39-
<Cell
40-
key={cell.id}
41-
cell={cell}
42-
dispatch={dispatch}
43-
currentCell={currentCell}
44-
setCurrentCell={setCurrentCell}
45-
cellId={index + 1}
46-
/>
47-
);
48-
})}
49-
</Layout>
14+
<Layout>
15+
<Routes />
16+
</Layout>
17+
</div>
5018
);
5119
}
5220

0 commit comments

Comments
 (0)