From 833937c1c07847b9842ef056290be3999460d376 Mon Sep 17 00:00:00 2001
From: RithickB <rithick0907@gmail.com>
Date: Mon, 14 Dec 2020 07:38:42 +0530
Subject: [PATCH 1/5] 3 tabs added to navbar

---
 .../src/Components/BloomLogic.jsx             |  5 ++
 .../src/Components/CustomNavbar.jsx           | 54 +++++++++++++++++++
 qp-generator-frontend/src/Components/Help.jsx |  5 ++
 qp-generator-frontend/src/Components/QP.jsx   |  7 +++
 qp-generator-frontend/src/Layout/App.js       | 28 +++++-----
 qp-generator-frontend/src/route.js            | 26 +++++++--
 6 files changed, 107 insertions(+), 18 deletions(-)
 create mode 100644 qp-generator-frontend/src/Components/BloomLogic.jsx
 create mode 100644 qp-generator-frontend/src/Components/CustomNavbar.jsx
 create mode 100644 qp-generator-frontend/src/Components/Help.jsx
 create mode 100644 qp-generator-frontend/src/Components/QP.jsx

diff --git a/qp-generator-frontend/src/Components/BloomLogic.jsx b/qp-generator-frontend/src/Components/BloomLogic.jsx
new file mode 100644
index 0000000..8bef638
--- /dev/null
+++ b/qp-generator-frontend/src/Components/BloomLogic.jsx
@@ -0,0 +1,5 @@
+import React from "react";
+
+const BloomLogic = () => <></>;
+
+export default BloomLogic;
diff --git a/qp-generator-frontend/src/Components/CustomNavbar.jsx b/qp-generator-frontend/src/Components/CustomNavbar.jsx
new file mode 100644
index 0000000..6379c84
--- /dev/null
+++ b/qp-generator-frontend/src/Components/CustomNavbar.jsx
@@ -0,0 +1,54 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import {
+  Collapse,
+  Navbar,
+  NavbarToggler,
+  NavbarBrand,
+  Nav,
+  NavItem,
+} from "reactstrap";
+
+const CustomNavbar = (props) => {
+  const [collapsed, setCollapsed] = useState(false);
+  const toggleNavbar = () => setCollapsed(!collapsed);
+
+  return (
+    <>
+      <Navbar expand="md" style={{ backgroundColor: "#6868CB" }} light>
+        <NavbarBrand>
+          <Link to="/" className="text-white text-decoration-none">
+            QP-Generator
+          </Link>
+        </NavbarBrand>
+        <NavbarToggler onClick={toggleNavbar} className="ml-auto" />
+        <Collapse isOpen={collapsed} navbar>
+          <Nav className="ml-auto text-white" navbar>
+            <NavItem className="m-2">
+              <Link
+                to="/questionPaper"
+                className="text-white text-decoration-none"
+              >
+                QP
+              </Link>
+            </NavItem>
+            <NavItem className="m-2">
+              <Link
+                to="/bloomLogic"
+                className="text-white text-decoration-none"
+              >
+                Bloom Logic
+              </Link>
+            </NavItem>
+            <NavItem className="m-2">
+              <Link to="/help" className="text-white text-decoration-none">
+                Help
+              </Link>
+            </NavItem>
+          </Nav>
+        </Collapse>
+      </Navbar>
+    </>
+  );
+};
+export default CustomNavbar;
diff --git a/qp-generator-frontend/src/Components/Help.jsx b/qp-generator-frontend/src/Components/Help.jsx
new file mode 100644
index 0000000..643cd6c
--- /dev/null
+++ b/qp-generator-frontend/src/Components/Help.jsx
@@ -0,0 +1,5 @@
+import React from "react";
+
+const Help = () => <></>;
+
+export default Help;
diff --git a/qp-generator-frontend/src/Components/QP.jsx b/qp-generator-frontend/src/Components/QP.jsx
new file mode 100644
index 0000000..f32d29c
--- /dev/null
+++ b/qp-generator-frontend/src/Components/QP.jsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+const QP = () => (
+  <div className="text-center my-3">Welcome to Question Paper Section</div>
+);
+
+export default QP;
diff --git a/qp-generator-frontend/src/Layout/App.js b/qp-generator-frontend/src/Layout/App.js
index fd0b65a..d5e0db2 100644
--- a/qp-generator-frontend/src/Layout/App.js
+++ b/qp-generator-frontend/src/Layout/App.js
@@ -1,32 +1,32 @@
 import React, { Component } from "react";
-import { Route, Switch } from "react-router-dom";
-import Navbar from '../Components/Navbar'
+import { Route, Switch, Redirect } from "react-router-dom";
+import Navbar from "../Components/Navbar";
+import CustomNavbar from "./../Components/CustomNavbar";
 import routes from "../route.js";
 
 class App extends Component {
-
-  getRoutes = routes => {
+  getRoutes = (routes) => {
     return routes.map((prop, key) => {
       return (
         <Route
-          exact path={prop.path}
-          render={props => (
-            <prop.component
-              {...props}
-            />
-          )}
+          exact
+          path={prop.path}
+          render={(props) => <prop.component {...props} />}
           key={key}
         />
       );
     });
-  }
+  };
 
   render() {
     return (
       <div className="wrapper">
         <div id="main-panel" className="main-panel" ref="mainPanel">
-          <Navbar />
-          <Switch>{this.getRoutes(routes)}
+          {/* <Navbar /> */}
+          <CustomNavbar />
+          <Switch>
+            {this.getRoutes(routes)}
+            <Redirect to="/" />
           </Switch>
         </div>
       </div>
@@ -34,4 +34,4 @@ class App extends Component {
   }
 }
 
-export default App;
\ No newline at end of file
+export default App;
diff --git a/qp-generator-frontend/src/route.js b/qp-generator-frontend/src/route.js
index 12db384..41286bd 100644
--- a/qp-generator-frontend/src/route.js
+++ b/qp-generator-frontend/src/route.js
@@ -1,11 +1,29 @@
-import QPGenerate from './Views/qp-generator'
+import QPGenerate from "./Views/qp-generator";
+import QP from "./Components/QP";
+import BloomLogic from "./Components/BloomLogic";
+import Help from "./Components/Help";
 
 const Routes = [
+  {
+    path: "/questionPaper",
+    name: "QP",
+    component: QP,
+  },
+  {
+    path: "/bloomLogic",
+    name: "bloomLogic",
+    component: BloomLogic,
+  },
+  {
+    path: "/help",
+    name: "help",
+    component: Help,
+  },
   {
     path: "/",
     name: "createQP",
-    component: QPGenerate
-  }
+    component: QPGenerate,
+  },
 ];
 
-export default Routes;
\ No newline at end of file
+export default Routes;

From 341b24dad2c31bdf2a5f0ece0c1de2bf69c431ee Mon Sep 17 00:00:00 2001
From: RithickB <rithick0907@gmail.com>
Date: Mon, 14 Dec 2020 13:30:43 +0530
Subject: [PATCH 2/5] Pages moved to correct directory

---
 .../src/Components/CustomNavbar.jsx           | 21 +++++++++++--------
 .../src/{Components => Views}/BloomLogic.jsx  |  0
 .../src/{Components => Views}/Help.jsx        |  0
 .../src/{Components => Views}/QP.jsx          |  0
 qp-generator-frontend/src/route.js            |  6 +++---
 5 files changed, 15 insertions(+), 12 deletions(-)
 rename qp-generator-frontend/src/{Components => Views}/BloomLogic.jsx (100%)
 rename qp-generator-frontend/src/{Components => Views}/Help.jsx (100%)
 rename qp-generator-frontend/src/{Components => Views}/QP.jsx (100%)

diff --git a/qp-generator-frontend/src/Components/CustomNavbar.jsx b/qp-generator-frontend/src/Components/CustomNavbar.jsx
index 6379c84..0c9c758 100644
--- a/qp-generator-frontend/src/Components/CustomNavbar.jsx
+++ b/qp-generator-frontend/src/Components/CustomNavbar.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from "react";
-import { Link } from "react-router-dom";
+import { NavLink } from "react-router-dom";
 import {
   Collapse,
   Navbar,
@@ -17,33 +17,36 @@ const CustomNavbar = (props) => {
     <>
       <Navbar expand="md" style={{ backgroundColor: "#6868CB" }} light>
         <NavbarBrand>
-          <Link to="/" className="text-white text-decoration-none">
+          <NavLink
+            to="/"
+            className="font-weight-bold text-white text-decoration-none"
+          >
             QP-Generator
-          </Link>
+          </NavLink>
         </NavbarBrand>
         <NavbarToggler onClick={toggleNavbar} className="ml-auto" />
         <Collapse isOpen={collapsed} navbar>
           <Nav className="ml-auto text-white" navbar>
             <NavItem className="m-2">
-              <Link
+              <NavLink
                 to="/questionPaper"
                 className="text-white text-decoration-none"
               >
                 QP
-              </Link>
+              </NavLink>
             </NavItem>
             <NavItem className="m-2">
-              <Link
+              <NavLink
                 to="/bloomLogic"
                 className="text-white text-decoration-none"
               >
                 Bloom Logic
-              </Link>
+              </NavLink>
             </NavItem>
             <NavItem className="m-2">
-              <Link to="/help" className="text-white text-decoration-none">
+              <NavLink to="/help" className="text-white text-decoration-none">
                 Help
-              </Link>
+              </NavLink>
             </NavItem>
           </Nav>
         </Collapse>
diff --git a/qp-generator-frontend/src/Components/BloomLogic.jsx b/qp-generator-frontend/src/Views/BloomLogic.jsx
similarity index 100%
rename from qp-generator-frontend/src/Components/BloomLogic.jsx
rename to qp-generator-frontend/src/Views/BloomLogic.jsx
diff --git a/qp-generator-frontend/src/Components/Help.jsx b/qp-generator-frontend/src/Views/Help.jsx
similarity index 100%
rename from qp-generator-frontend/src/Components/Help.jsx
rename to qp-generator-frontend/src/Views/Help.jsx
diff --git a/qp-generator-frontend/src/Components/QP.jsx b/qp-generator-frontend/src/Views/QP.jsx
similarity index 100%
rename from qp-generator-frontend/src/Components/QP.jsx
rename to qp-generator-frontend/src/Views/QP.jsx
diff --git a/qp-generator-frontend/src/route.js b/qp-generator-frontend/src/route.js
index 41286bd..7aad6d3 100644
--- a/qp-generator-frontend/src/route.js
+++ b/qp-generator-frontend/src/route.js
@@ -1,7 +1,7 @@
 import QPGenerate from "./Views/qp-generator";
-import QP from "./Components/QP";
-import BloomLogic from "./Components/BloomLogic";
-import Help from "./Components/Help";
+import QP from "./Views/QP";
+import BloomLogic from "./Views/BloomLogic";
+import Help from "./Views/Help";
 
 const Routes = [
   {

From cbd22b9f5e83e2de337f466200ed001d82336f4a Mon Sep 17 00:00:00 2001
From: RithickB <rithick0907@gmail.com>
Date: Mon, 14 Dec 2020 15:10:51 +0530
Subject: [PATCH 3/5] Existing Navbar Updated

---
 .../src/Components/CustomNavbar.jsx           | 57 ------------
 .../src/Components/Navbar.js                  | 87 +++++++++++--------
 qp-generator-frontend/src/Layout/App.js       |  6 +-
 3 files changed, 54 insertions(+), 96 deletions(-)
 delete mode 100644 qp-generator-frontend/src/Components/CustomNavbar.jsx

diff --git a/qp-generator-frontend/src/Components/CustomNavbar.jsx b/qp-generator-frontend/src/Components/CustomNavbar.jsx
deleted file mode 100644
index 0c9c758..0000000
--- a/qp-generator-frontend/src/Components/CustomNavbar.jsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import React, { useState } from "react";
-import { NavLink } from "react-router-dom";
-import {
-  Collapse,
-  Navbar,
-  NavbarToggler,
-  NavbarBrand,
-  Nav,
-  NavItem,
-} from "reactstrap";
-
-const CustomNavbar = (props) => {
-  const [collapsed, setCollapsed] = useState(false);
-  const toggleNavbar = () => setCollapsed(!collapsed);
-
-  return (
-    <>
-      <Navbar expand="md" style={{ backgroundColor: "#6868CB" }} light>
-        <NavbarBrand>
-          <NavLink
-            to="/"
-            className="font-weight-bold text-white text-decoration-none"
-          >
-            QP-Generator
-          </NavLink>
-        </NavbarBrand>
-        <NavbarToggler onClick={toggleNavbar} className="ml-auto" />
-        <Collapse isOpen={collapsed} navbar>
-          <Nav className="ml-auto text-white" navbar>
-            <NavItem className="m-2">
-              <NavLink
-                to="/questionPaper"
-                className="text-white text-decoration-none"
-              >
-                QP
-              </NavLink>
-            </NavItem>
-            <NavItem className="m-2">
-              <NavLink
-                to="/bloomLogic"
-                className="text-white text-decoration-none"
-              >
-                Bloom Logic
-              </NavLink>
-            </NavItem>
-            <NavItem className="m-2">
-              <NavLink to="/help" className="text-white text-decoration-none">
-                Help
-              </NavLink>
-            </NavItem>
-          </Nav>
-        </Collapse>
-      </Navbar>
-    </>
-  );
-};
-export default CustomNavbar;
diff --git a/qp-generator-frontend/src/Components/Navbar.js b/qp-generator-frontend/src/Components/Navbar.js
index 623dfc2..e5408bc 100644
--- a/qp-generator-frontend/src/Components/Navbar.js
+++ b/qp-generator-frontend/src/Components/Navbar.js
@@ -1,40 +1,57 @@
-import React from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import AppBar from '@material-ui/core/AppBar';
-import Toolbar from '@material-ui/core/Toolbar';
-import Typography from '@material-ui/core/Typography';
-import Button from '@material-ui/core/Button';
-import IconButton from '@material-ui/core/IconButton';
-import MenuIcon from '@material-ui/icons/Menu';
+import React, { useState } from "react";
+import { NavLink } from "react-router-dom";
+import {
+  Collapse,
+  Navbar,
+  NavbarToggler,
+  NavbarBrand,
+  Nav,
+  NavItem,
+} from "reactstrap";
 
-const useStyles = makeStyles((theme) => ({
-  root: {
-    flexGrow: 1,
-  },
-  menuButton: {
-    marginRight: theme.spacing(2),
-  },
-  title: {
-    flexGrow: 1,
-  },
-}));
-
-export default function ButtonAppBar() {
-  const classes = useStyles();
+const CustomNavbar = (props) => {
+  const [collapsed, setCollapsed] = useState(false);
+  const toggleNavbar = () => setCollapsed(!collapsed);
 
   return (
-    <div className={classes.root}>
-      <AppBar position="static">
-        <Toolbar>
-          <IconButton edge="start" className={classes.menuButton} color="inherit" aria-label="menu">
-            <MenuIcon />
-          </IconButton>
-          <Typography variant="h6" className={classes.title}>
+    <>
+      <Navbar expand="md" style={{ backgroundColor: "#6868CB" }} light>
+        <NavbarBrand>
+          <NavLink
+            to="/"
+            className="font-weight-bold text-white text-decoration-none"
+          >
             QP-Generator
-          </Typography>
-          <Button color="inherit">Help</Button>
-        </Toolbar>
-      </AppBar>
-    </div>
+          </NavLink>
+        </NavbarBrand>
+        <NavbarToggler onClick={toggleNavbar} className="ml-auto" />
+        <Collapse isOpen={collapsed} navbar>
+          <Nav className="ml-auto text-white" navbar>
+            <NavItem className="m-2">
+              <NavLink
+                to="/questionPaper"
+                className="text-white text-decoration-none"
+              >
+                QP
+              </NavLink>
+            </NavItem>
+            <NavItem className="m-2">
+              <NavLink
+                to="/bloomLogic"
+                className="text-white text-decoration-none"
+              >
+                Bloom Logic
+              </NavLink>
+            </NavItem>
+            <NavItem className="m-2">
+              <NavLink to="/help" className="text-white text-decoration-none">
+                Help
+              </NavLink>
+            </NavItem>
+          </Nav>
+        </Collapse>
+      </Navbar>
+    </>
   );
-}
\ No newline at end of file
+};
+export default CustomNavbar;
diff --git a/qp-generator-frontend/src/Layout/App.js b/qp-generator-frontend/src/Layout/App.js
index d5e0db2..ea472ff 100644
--- a/qp-generator-frontend/src/Layout/App.js
+++ b/qp-generator-frontend/src/Layout/App.js
@@ -1,7 +1,6 @@
 import React, { Component } from "react";
 import { Route, Switch, Redirect } from "react-router-dom";
-import Navbar from "../Components/Navbar";
-import CustomNavbar from "./../Components/CustomNavbar";
+import Navbar from "./../Components/Navbar";
 import routes from "../route.js";
 
 class App extends Component {
@@ -22,8 +21,7 @@ class App extends Component {
     return (
       <div className="wrapper">
         <div id="main-panel" className="main-panel" ref="mainPanel">
-          {/* <Navbar /> */}
-          <CustomNavbar />
+          <Navbar />
           <Switch>
             {this.getRoutes(routes)}
             <Redirect to="/" />

From 4183c815375bf17fb61f94fbbf360cc20d911c0e Mon Sep 17 00:00:00 2001
From: RithickB <rithick0907@gmail.com>
Date: Mon, 14 Dec 2020 15:22:09 +0530
Subject: [PATCH 4/5] Existing Navbar Updated

---
 qp-generator-frontend/src/Components/Navbar.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/qp-generator-frontend/src/Components/Navbar.js b/qp-generator-frontend/src/Components/Navbar.js
index e5408bc..81456d7 100644
--- a/qp-generator-frontend/src/Components/Navbar.js
+++ b/qp-generator-frontend/src/Components/Navbar.js
@@ -10,6 +10,7 @@ import {
 } from "reactstrap";
 
 const CustomNavbar = (props) => {
+  const navLinkClasses = "font-weight-normal text-white text-decoration-none";
   const [collapsed, setCollapsed] = useState(false);
   const toggleNavbar = () => setCollapsed(!collapsed);
 
@@ -28,23 +29,17 @@ const CustomNavbar = (props) => {
         <Collapse isOpen={collapsed} navbar>
           <Nav className="ml-auto text-white" navbar>
             <NavItem className="m-2">
-              <NavLink
-                to="/questionPaper"
-                className="text-white text-decoration-none"
-              >
+              <NavLink to="/questionPaper" className={navLinkClasses}>
                 QP
               </NavLink>
             </NavItem>
             <NavItem className="m-2">
-              <NavLink
-                to="/bloomLogic"
-                className="text-white text-decoration-none"
-              >
+              <NavLink to="/bloomLogic" className={navLinkClasses}>
                 Bloom Logic
               </NavLink>
             </NavItem>
             <NavItem className="m-2">
-              <NavLink to="/help" className="text-white text-decoration-none">
+              <NavLink to="/help" className={navLinkClasses}>
                 Help
               </NavLink>
             </NavItem>

From da24cf94ca2273d28f7131261514fec3a52aa5d7 Mon Sep 17 00:00:00 2001
From: RithickB <rithick0907@gmail.com>
Date: Mon, 14 Dec 2020 15:25:37 +0530
Subject: [PATCH 5/5] Existing Navbar Updated

---
 qp-generator-frontend/src/index.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/qp-generator-frontend/src/index.js b/qp-generator-frontend/src/index.js
index faa08cc..fc4ae87 100644
--- a/qp-generator-frontend/src/index.js
+++ b/qp-generator-frontend/src/index.js
@@ -1,19 +1,19 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './Layout/App';
+import React from "react";
+import ReactDOM from "react-dom";
+import "./index.css";
+import App from "./Layout/App";
 import { Route, Switch, HashRouter } from "react-router-dom";
 
-import '@fortawesome/fontawesome-free/css/all.min.css';
-import 'bootstrap-css-only/css/bootstrap.min.css';
-import 'mdbreact/dist/css/mdb.css';
-import 'bootstrap/dist/css/bootstrap.css';
+import "@fortawesome/fontawesome-free/css/all.min.css";
+import "bootstrap-css-only/css/bootstrap.min.css";
+import "mdbreact/dist/css/mdb.css";
+import "bootstrap/dist/css/bootstrap.css";
 
 ReactDOM.render(
   <HashRouter>
     <Switch>
-      <Route path="/" render={props => <App {...props} />} />
+      <Route path="/" render={(props) => <App {...props} />} />
     </Switch>
   </HashRouter>,
-  document.getElementById('root')
-);
\ No newline at end of file
+  document.getElementById("root")
+);