Skip to content
This repository was archived by the owner on May 1, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 47 additions & 35 deletions qp-generator-frontend/src/Components/Navbar.js
Original file line number Diff line number Diff line change
@@ -1,40 +1,52 @@
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 navLinkClasses = "font-weight-normal text-white text-decoration-none";
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={navLinkClasses}>
QP
</NavLink>
</NavItem>
<NavItem className="m-2">
<NavLink to="/bloomLogic" className={navLinkClasses}>
Bloom Logic
</NavLink>
</NavItem>
<NavItem className="m-2">
<NavLink to="/help" className={navLinkClasses}>
Help
</NavLink>
</NavItem>
</Nav>
</Collapse>
</Navbar>
</>
);
}
};
export default CustomNavbar;
24 changes: 11 additions & 13 deletions qp-generator-frontend/src/Layout/App.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
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 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)}
<Switch>
{this.getRoutes(routes)}
<Redirect to="/" />
</Switch>
</div>
</div>
);
}
}

export default App;
export default App;
5 changes: 5 additions & 0 deletions qp-generator-frontend/src/Views/BloomLogic.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import React from "react";

const BloomLogic = () => <></>;

export default BloomLogic;
5 changes: 5 additions & 0 deletions qp-generator-frontend/src/Views/Help.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import React from "react";

const Help = () => <></>;

export default Help;
7 changes: 7 additions & 0 deletions qp-generator-frontend/src/Views/QP.jsx
Original file line number Diff line number Diff line change
@@ -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;
22 changes: 11 additions & 11 deletions qp-generator-frontend/src/index.js
Original file line number Diff line number Diff line change
@@ -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')
);
document.getElementById("root")
);
26 changes: 22 additions & 4 deletions qp-generator-frontend/src/route.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,29 @@
import QPGenerate from './Views/qp-generator'
import QPGenerate from "./Views/qp-generator";
import QP from "./Views/QP";
import BloomLogic from "./Views/BloomLogic";
import Help from "./Views/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;
export default Routes;