Merge pull request #2 from Micky373/react_components

Finalize the component branch
Micky373 · Mar 23, 2022 · 9f6d502 · 9f6d502
2 parents 441ff4a + 1f441d4
commit 9f6d502
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 136 deletions.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -0,0 +1,10 @@
+{
+    "extends": ["stylelint-config-standard"],
+    "plugins": ["stylelint-scss", "stylelint-csstree-validator"],
+    "rules": {
+      "at-rule-no-unknown": null,
+      "scss/at-rule-no-unknown": true,
+      "csstree/validator": true
+    },
+    "ignoreFiles": ["build/**", "dist/**", "**/reset*.css", "**/bootstrap*.css", "**/*.js", "**/*.jsx"]
+  }
diff --git a/public/index.html b/public/index.html
@@ -10,34 +10,11 @@
       content="Web site created using create-react-app"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>React App</title>
+    <title>Math Magician App</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/src/App.css b/src/App.css
@@ -1,39 +1,46 @@
-.App {
-  text-align: center;
-}
-
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
+body {
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
+button {
+  border: 1px solid #dadada;
+  font-size: 2rem;
+  padding: 1rem;
 }
 
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
+.calculator_container {
   display: flex;
   flex-direction: column;
-  align-items: center;
   justify-content: center;
-  font-size: calc(10px + 2vmin);
+  align-items: center;
+  margin-top: 25%;
+}
+
+.display {
+  align-self: flex-end;
+  background-color: #6b705c;
+  width: 100%;
+  height: 4rem;
+}
+
+h1 {
+  margin: 0 0 0 80%;
+  padding: 1rem;
   color: white;
 }
 
-.App-link {
-  color: #61dafb;
+.button_container {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
 }
 
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
+.item0 {
+  grid-column-start: 1;
+  grid-column-end: 3;
+}
 
-  to {
-    transform: rotate(360deg);
-  }
+.operator {
+  background-color: #e85d04;
 }
diff --git a/src/App.js b/src/App.js
@@ -1,29 +1,20 @@
-import logo from './logo.svg';
+import React from 'react';
+import Calculator from './components/calculator';
 import './App.css';
 
-function App() {
-  return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit
-          {' '}
-          <code>src/App.js</code>
-          {' '}
-          and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
-    </div>
-  );
+class App extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    return (
+      <div className="App">
+        <Calculator />
+      </div>
+    );
+  }
 }
 
 export default App;
diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/components/calculator.js b/src/components/calculator.js
@@ -0,0 +1,41 @@
+import React from 'react';
+
+class Calculator extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
+  render() {
+    return (
+      <div className="calculator_container">
+        <div className="display">
+          <h1>0</h1>
+        </div>
+        <div className="button_container">
+          <button type="button" className="button">AC</button>
+          <button type="button" className="button">+/-</button>
+          <button type="button" className="button">%</button>
+          <button type="button" className="button operator">/</button>
+          <button type="button" className="button">7</button>
+          <button type="button" className="button">8</button>
+          <button type="button" className="button">9</button>
+          <button type="button" className="button operator">x</button>
+          <button type="button" className="button">4</button>
+          <button type="button" className="button">5</button>
+          <button type="button" className="button">6</button>
+          <button type="button" className="button operator">-</button>
+          <button type="button" className="button">1</button>
+          <button type="button" className="button">2</button>
+          <button type="button" className="button">3</button>
+          <button type="button" className="button operator">+</button>
+          <button type="button" className="button item0">0</button>
+          <button type="button" className="button">.</button>
+          <button type="button" className="button operator">=</button>
+        </div>
+      </div>
+    );
+  }
+}
+
+export default Calculator;
diff --git a/src/index.css b/src/index.css
diff --git a/src/index.js b/src/index.js
@@ -1,17 +1,10 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import './index.css';
 import App from './App';
-import reportWebVitals from './reportWebVitals';
 
 ReactDOM.render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,
   document.getElementById('root'),
 );
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
diff --git a/src/logo.svg b/src/logo.svg
diff --git a/src/reportWebVitals.js b/src/reportWebVitals.js
diff --git a/src/setupTests.js b/src/setupTests.js