update dependencies

Author: awran5

package.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"name": "sidebar-navigation-toggle-react-fontawesome",
 	"version": "1.0.0",
 	"description": "sidebar navigation example using react and react-fontawesome",
@@ -33,3 +34,34 @@
 		"not op_mini all"
 	]
 }
+=======
+  "name": "sidebar-navigation-toggle-react-fontawesome",
+  "version": "1.0.0",
+  "description": "",
+  "keywords": [],
+  "main": "src/index.js",
+  "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "1.2.25",
+    "@fortawesome/free-solid-svg-icons": "5.11.2",
+    "@fortawesome/react-fontawesome": "0.1.8",
+    "react": "16.12.0",
+    "react-dom": "16.12.0",
+    "react-scripts": "3.0.1"
+  },
+  "devDependencies": {
+    "typescript": "3.3.3"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  },
+  "browserslist": [
+    ">0.2%",
+    "not dead",
+    "not ie <= 11",
+    "not op_mini all"
+  ]
+}
+>>>>>>> a5347c07e3147f8be046a12aaa589f4218a65a68

src/index.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import React, { useState } from 'react'
 import ReactDOM from 'react-dom'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -49,3 +50,67 @@ function App() {
 
 const rootElement = document.getElementById('root')
 ReactDOM.render(<App />, rootElement)
+=======
+import React, { useState } from "react";
+import ReactDOM from "react-dom";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+  faBars,
+  faTimes,
+  faCogs,
+  faTable,
+  faList,
+  faUser
+} from "@fortawesome/free-solid-svg-icons";
+
+import "./styles.css";
+
+function App() {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const handleTrigger = () => setIsOpen(!isOpen);
+
+  return (
+    <div className="App">
+      <div className="page">
+        <div className="content">
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://codepen.io/mejdej93/pen/eYYJGjd"
+          >
+            original Pen
+          </a>
+        </div>
+
+        <div className={`sidebar ${isOpen ? "sidebar--open" : ""}`}>
+          <div className="trigger" onClick={handleTrigger}>
+            <FontAwesomeIcon icon={isOpen ? faTimes : faBars} />
+          </div>
+
+          <div className="sidebar-position">
+            <FontAwesomeIcon icon={faUser} />
+            <span>Home</span>
+          </div>
+          <div className="sidebar-position">
+            <FontAwesomeIcon icon={faCogs} />
+            <span>Menu item 2</span>
+          </div>
+          <div className="sidebar-position">
+            <FontAwesomeIcon icon={faTable} />
+            <span>Menu item 3</span>
+          </div>
+
+          <div className="sidebar-position">
+            <FontAwesomeIcon icon={faList} />
+            <span>Position 4</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+const rootElement = document.getElementById("root");
+ReactDOM.render(<App />, rootElement);
+>>>>>>> a5347c07e3147f8be046a12aaa589f4218a65a68