figbertmath

commit 2ad58cd5e9fa5464f3aeea80856a1ee10810fb46
parent 25d6c1497f4c489108291e8d9ff4c62d5c89ca0a
Author: therealFIGBERT <figbertwelner@gmail.com>
Date:   Fri, 22 Nov 2019 08:24:16 -0800

Move App files into the components directory and merge with calculator.js

Diffstat:
D
src/App.js
 | 
10
----------
R
src/App.css -> src/components/App.css
 | 
0

A
src/components/App.js
 | 
26
++++++++++++++++++++++++++
D
src/components/calculator.js
 | 
26
--------------------------
M
src/index.js
 | 
2
+-

5 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/src/App.js b/src/App.js
@@ -1,9 +0,0 @@
-import React from 'react';
-import { Calculator } from "./components/calculator";
-import './App.css';
-
-export class App extends React.Component {
-  render() {
-    return <Calculator/>;
-  }
-}
-\ No newline at end of file
diff --git a/src/App.css b/src/components/App.css
diff --git a/src/components/App.js b/src/components/App.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import './App.css';
+
+export class App extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      mode: 'basic',
+      output: '000000',
+      input: '0000'
+    };
+  }
+
+  render() {
+    return (
+        <div>
+          <div id='calcOut'>
+            {this.state.output}
+            <br/>
+            <span style={{fontSize: 'large'}}>{this.state.input}</span>
+          </div>
+        </div>
+    );
+  }
+}
+\ No newline at end of file
diff --git a/src/components/calculator.js b/src/components/calculator.js
@@ -1,25 +0,0 @@
-import React from 'react';
-import '../App.css';
-
-export class Calculator extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            mode: 'basic',
-            output: '000000',
-            input: '0000'
-        };
-    }
-
-    render() {
-        return (
-            <div>
-                <div id='calcOut'>
-                    {this.state.output}
-                    <br/>
-                    <span style={{fontSize: 'large'}}>{this.state.input}</span>
-                </div>
-            </div>
-        );
-    }
-}
-\ No newline at end of file
diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import './index.css';
-import { App } from './App';
+import { App } from './components/App';
 
 ReactDOM.render(
     <App />,