+ <>
+
+ );
+}
+
+export default withRouter(Layout);
diff --git a/src/components/Layout/package.json b/client/src/components/Layout/package.json
similarity index 100%
rename from src/components/Layout/package.json
rename to client/src/components/Layout/package.json
diff --git a/src/components/Layout/styles.js b/client/src/components/Layout/styles.js
similarity index 100%
rename from src/components/Layout/styles.js
rename to client/src/components/Layout/styles.js
diff --git a/src/components/Notification/Notification.js b/client/src/components/Notification/Notification.js
similarity index 100%
rename from src/components/Notification/Notification.js
rename to client/src/components/Notification/Notification.js
diff --git a/src/components/Notification/package.json b/client/src/components/Notification/package.json
similarity index 100%
rename from src/components/Notification/package.json
rename to client/src/components/Notification/package.json
diff --git a/src/components/Notification/styles.js b/client/src/components/Notification/styles.js
similarity index 100%
rename from src/components/Notification/styles.js
rename to client/src/components/Notification/styles.js
diff --git a/src/components/PageTitle/PageTitle.js b/client/src/components/PageTitle/PageTitle.js
similarity index 100%
rename from src/components/PageTitle/PageTitle.js
rename to client/src/components/PageTitle/PageTitle.js
diff --git a/src/components/PageTitle/package.json b/client/src/components/PageTitle/package.json
similarity index 100%
rename from src/components/PageTitle/package.json
rename to client/src/components/PageTitle/package.json
diff --git a/src/components/PageTitle/styles.js b/client/src/components/PageTitle/styles.js
similarity index 100%
rename from src/components/PageTitle/styles.js
rename to client/src/components/PageTitle/styles.js
diff --git a/client/src/components/Routes/PrivateRoute.js b/client/src/components/Routes/PrivateRoute.js
new file mode 100644
index 00000000..afadd5fb
--- /dev/null
+++ b/client/src/components/Routes/PrivateRoute.js
@@ -0,0 +1,34 @@
+import { connect } from "mongoose";
+
+const PrivateRoute = ({ component, user, ...rest }) =>
+{
+ return (
+
+
+
+
+
+
+ -
+ {Object.keys(props.items).map(item => {
+ return (
+
+ {item} {props.items[item]["name"]}
+
+ );
+ })}
+
+
+ );
+};
+
+Search.propTypes = {
+ action: PropTypes.func.isRequired,
+};
+
+export default Search;
diff --git a/client/src/components/utils/util.css b/client/src/components/utils/util.css
new file mode 100644
index 00000000..31600f20
--- /dev/null
+++ b/client/src/components/utils/util.css
@@ -0,0 +1,18 @@
+.courseSearch
+{
+ margin:5px;
+ padding:5px;
+ background-color: rgba(116, 185, 255,1);
+ color: "#353b48";
+ height: 65vh;
+ overflow: auto;
+ text-align:justify;
+}
+
+.courseSearch :hover{
+ cursor: pointer;
+ background-color: #0984e3;
+}
+.input-field ::placeholder{
+ color: black;
+}
\ No newline at end of file
diff --git a/client/src/config/constants.js b/client/src/config/constants.js
new file mode 100644
index 00000000..8f1fb57e
--- /dev/null
+++ b/client/src/config/constants.js
@@ -0,0 +1,19 @@
+const prod = {
+ urls: {
+ studentLogin: "https://chronofactorem.herokuapp.com/"
+ }
+ };
+
+ const dev = {
+ urls: {
+ studentLogin: "http://localhost:3000"
+ }
+ };
+
+ const configuration = {
+ // Add common constants here
+ ...(process.env.NODE_ENV === "development" ? dev : prod)
+ };
+
+ export default configuration;
+
\ No newline at end of file
diff --git a/src/context/LayoutContext.js b/client/src/context/LayoutContext.js
similarity index 100%
rename from src/context/LayoutContext.js
rename to client/src/context/LayoutContext.js
diff --git a/src/context/UserContext.js b/client/src/context/UserContext.js
similarity index 100%
rename from src/context/UserContext.js
rename to client/src/context/UserContext.js
diff --git a/src/images/google.svg b/client/src/images/google.svg
similarity index 100%
rename from src/images/google.svg
rename to client/src/images/google.svg
diff --git a/client/src/images/landingbackground.jpg b/client/src/images/landingbackground.jpg
new file mode 100644
index 00000000..002cc46f
Binary files /dev/null and b/client/src/images/landingbackground.jpg differ
diff --git a/src/index.js b/client/src/index.js
similarity index 100%
rename from src/index.js
rename to client/src/index.js
diff --git a/src/pages/charts/Charts.js b/client/src/pages/charts/Charts.js
similarity index 100%
rename from src/pages/charts/Charts.js
rename to client/src/pages/charts/Charts.js
diff --git a/src/pages/charts/components/ApexHeatmap.js b/client/src/pages/charts/components/ApexHeatmap.js
similarity index 100%
rename from src/pages/charts/components/ApexHeatmap.js
rename to client/src/pages/charts/components/ApexHeatmap.js
diff --git a/src/pages/charts/components/ApexLineChart.js b/client/src/pages/charts/components/ApexLineChart.js
similarity index 100%
rename from src/pages/charts/components/ApexLineChart.js
rename to client/src/pages/charts/components/ApexLineChart.js
diff --git a/src/pages/charts/package.json b/client/src/pages/charts/package.json
similarity index 100%
rename from src/pages/charts/package.json
rename to client/src/pages/charts/package.json
diff --git a/client/src/pages/course-stats/CourseStats.jsx b/client/src/pages/course-stats/CourseStats.jsx
new file mode 100644
index 00000000..53975323
--- /dev/null
+++ b/client/src/pages/course-stats/CourseStats.jsx
@@ -0,0 +1,106 @@
+import React from "react";
+import Search from "../../components/utils/Search";
+import ItemList from "../../components/utils/ItemList";
+import Select from 'react-select';
+import * as TimeTableData from "../../Timetable.json";
+import axios from "axios";
+import { CircularProgressbar, buildStyles } from "react-circular-progressbar";
+import "react-circular-progressbar/dist/styles.css";
+console.log(TimeTableData);
+const courses = JSON.parse(JSON.stringify(TimeTableData)).default;
+console.log(courses);
+
+const CourseStats = props => {
+ const [courseData, setCourseData] = React.useState({
+ total: 0,
+ count: 0,
+ initial: courses,
+ current: courses,
+ });
+ const { total, count, initial, current } = courseData;
+
+ const stats = e => {
+ if(e===null)
+ return;
+ console.log(e);
+ let event = e.value;
+ try {
+ axios.get(`/api/courseStats/${event}`).then(res => {
+ console.log(res.data);
+ setCourseData({
+ ...courseData,
+ total: res.data.total,
+ count: res.data.count,
+ });
+ });
+ } catch (err) {
+ window.alert(
+ "Couldn't Fetch Data at the moment! Please Try Again Later.",
+ );
+ }
+ };
+ function getAtDepth(tt, depth){
+ if (depth == 1) {
+ return Object.keys(tt).map(function(code){
+ return {"value":code , "label":code+" "+tt[code]['name']};
+ });
+ }
+ else return Object.keys(tt).map(function(code){
+ return getAtDepth(tt[code], depth-1);
+ });
+ }
+ function filterItems(input) {
+ const userInput = input.target.value.toLowerCase();
+ let filterCourses = obj =>
+ Object.keys(obj)
+ .filter(
+ item =>
+ item.toLowerCase().search(userInput) !== -1 ||
+ obj[item]["name"].toLowerCase().search(userInput) !== -1,
+ )
+ .reduce((res, key) => ((res[key] = obj[key]), res), {});
+
+ let newCourses = filterCourses(initial);
+ setCourseData({ ...courseData, current: newCourses });
+ }
+ return (
+ <>
+
+ +
+
+
+
+
+ +
Interested Students {count}
+Total Students {total}
+ + ); +}; + +export default CourseStats; diff --git a/src/pages/dashboard/Dashboard.js b/client/src/pages/dashboard/Dashboard.js similarity index 60% rename from src/pages/dashboard/Dashboard.js rename to client/src/pages/dashboard/Dashboard.js index 3714140d..e4d3311b 100644 --- a/src/pages/dashboard/Dashboard.js +++ b/client/src/pages/dashboard/Dashboard.js @@ -1,22 +1,24 @@ -import React, { useState } from "react"; +import React, { useState, useEffect } from "react"; +import { connect } from "react-redux"; import { Grid, - LinearProgress, + //LinearProgress, Select, OutlinedInput, MenuItem, } from "@material-ui/core"; +import CourseStats from "../course-stats/CourseStats"; +import TimetableStats from "./components/TimetableStats"; import { useTheme } from "@material-ui/styles"; import { ResponsiveContainer, - ComposedChart, AreaChart, - LineChart, - Line, + //LineChart, + //Line, Area, - PieChart, - Pie, - Cell, + //PieChart, + //Pie, + //Cell, YAxis, XAxis, } from "recharts"; @@ -25,156 +27,124 @@ import { import useStyles from "./styles"; // components -import mock from "./mock"; +//import mock from "./mock"; import Widget from "../../components/Widget"; -import PageTitle from "../../components/PageTitle"; +//import PageTitle from "../../components/PageTitle"; import { Typography } from "../../components/Wrappers"; import Dot from "../../components/Sidebar/components/Dot"; -import Table from "./components/Table/Table"; -import BigStat from "./components/BigStat/BigStat"; +//import Table from "./components/Table/Table"; +//import BigStat from "./components/BigStat/BigStat"; -const mainChartData = getMainChartData(); -const PieChartData = [ +import { + getDashboardData, + getDataForPeriod, +} from "../../redux/actions/dashboard"; + +// const mainChartData = getMainChartData(); +/*const PieChartData = [ { name: "Group A", value: 400, color: "primary" }, { name: "Group B", value: 300, color: "secondary" }, { name: "Group C", value: 300, color: "warning" }, { name: "Group D", value: 200, color: "success" }, -]; +];*/ -export default function Dashboard(props) { +const Dashboard = ({ + y_max, + allData, + loginData, + getDashboardData, + getDataForPeriod, +}) => { + useEffect(() => { + getDashboardData(); + }, [getDashboardData]); var classes = useStyles(); var theme = useTheme(); // local - var [mainChartState, setMainChartState] = useState("monthly"); + var [mainChartState, setMainChartState] = useState("30"); return ( <> -
-
- 12, 678
-
-
-
-
-
+ {PieChartData.map(({ name, value, color }, index) => (
+
+
+ {name}
+
+
+ {value}
+
+
+ ))}
+
-
+ {/*
-
- Integration
-
-
-
-
- SDK
+ Timetable Stats
-
-
-
- Integration
-
-
-
-
- SDK
-
-
+ }
+ upperTitle
+ className={classes.card}
+ >
+
-
- Mobile
+ All
}
>
-
- Tablet
-
-
-
- Desktop
+ Unique
+ {ttYearData.map(({ name, value }, index) => (
+
+
+
+ {name}
+
+
+ {value}
+
+
+ ))}
+
+ {ttBranchData.map(({ name, value }, index) => (
+
+
+
+ {name}
+
+
+ {value}
+
+
+ ))}
+ No data recorded yet
+ ); +}; + +const mapStateToProps = state => { + return { + ttBranchData: state.dashboard.ttBranchData, + ttYearData: state.dashboard.ttYearData, + }; +}; + +export default connect(mapStateToProps, null)(TimetableStats); diff --git a/src/pages/dashboard/mock.js b/client/src/pages/dashboard/mock.js similarity index 100% rename from src/pages/dashboard/mock.js rename to client/src/pages/dashboard/mock.js diff --git a/src/pages/dashboard/package.json b/client/src/pages/dashboard/package.json similarity index 100% rename from src/pages/dashboard/package.json rename to client/src/pages/dashboard/package.json diff --git a/src/pages/dashboard/styles.js b/client/src/pages/dashboard/styles.js similarity index 100% rename from src/pages/dashboard/styles.js rename to client/src/pages/dashboard/styles.js diff --git a/client/src/pages/dashboard/themes.js b/client/src/pages/dashboard/themes.js new file mode 100644 index 00000000..25f7fc7e --- /dev/null +++ b/client/src/pages/dashboard/themes.js @@ -0,0 +1,68 @@ +import { createMuiTheme } from "@material-ui/core/styles"; + +export const ttBranchTheme = createMuiTheme({ + palette: { + BIO: { + main: "#000000", + }, + CHE: { + main: "#D9D9D9", + }, + CHEM: { + main: "#EFA0A3", + }, + CE: { + main: "#F9C1AD", + }, + CS: { + main: "#96191D", + }, + ECO: { + main: "#FAE8AC", + }, + ECE: { + main: "#CDA00D", + }, + EEE: { + main: "#ADD298", + }, + INSTR: { + main: "#2F4A20", + }, + MANU: { + main: "#BEE8E5", + }, + MATH: { + main: "#2F9AFF", + }, + ME: { + main: "#003F7A", + }, + PHA: { + main: "#CFB9DB", + }, + PHY: { + main: "#653F7A", + }, + }, +}); + +export const ttYearTheme = createMuiTheme({ + palette: { + 1: { + main: "#1BE7FF", + }, + 2: { + main: "#5DFF6B", + }, + 3: { + main: "#F3FF0B", + }, + 4: { + main: "#FFBB16", + }, + 5: { + main: "#FF5714", + }, + }, +}); diff --git a/src/pages/error/Error.js b/client/src/pages/error/Error.js similarity index 100% rename from src/pages/error/Error.js rename to client/src/pages/error/Error.js diff --git a/src/pages/error/logo.svg b/client/src/pages/error/logo.svg similarity index 100% rename from src/pages/error/logo.svg rename to client/src/pages/error/logo.svg diff --git a/src/pages/error/package.json b/client/src/pages/error/package.json similarity index 100% rename from src/pages/error/package.json rename to client/src/pages/error/package.json diff --git a/src/pages/error/styles.js b/client/src/pages/error/styles.js similarity index 100% rename from src/pages/error/styles.js rename to client/src/pages/error/styles.js diff --git a/src/pages/icons/Icons.js b/client/src/pages/icons/Icons.js similarity index 100% rename from src/pages/icons/Icons.js rename to client/src/pages/icons/Icons.js diff --git a/src/pages/icons/package.json b/client/src/pages/icons/package.json similarity index 100% rename from src/pages/icons/package.json rename to client/src/pages/icons/package.json diff --git a/src/pages/icons/styles.js b/client/src/pages/icons/styles.js similarity index 100% rename from src/pages/icons/styles.js rename to client/src/pages/icons/styles.js diff --git a/client/src/pages/login/CreateAccount.js b/client/src/pages/login/CreateAccount.js new file mode 100644 index 00000000..9042f198 --- /dev/null +++ b/client/src/pages/login/CreateAccount.js @@ -0,0 +1,305 @@ +import Button from '@material-ui/core/Button'; +import TextField from '@material-ui/core/TextField'; +import Dialog from '@material-ui/core/Dialog'; +import DialogActions from '@material-ui/core/DialogActions'; +import DialogContent from '@material-ui/core/DialogContent'; +import DialogContentText from '@material-ui/core/DialogContentText'; +import DialogTitle from '@material-ui/core/DialogTitle'; +import React from "react"; +import "./Landing.css"; +import { useState } from "react"; +import InputLabel from '@material-ui/core/InputLabel'; +import MenuItem from '@material-ui/core/MenuItem'; +import FormControl from '@material-ui/core/FormControl'; +import Select from '@material-ui/core/Select'; +import axios from 'axios'; +import Cookies from "js-cookie"; +import { Redirect } from 'react-router-dom'; +const depts = [ + "Biological Sciences", + "Chemical Engineering", + "Chemistry", + "Civil Engineering", + "Computer Science and Information Systems", + "Economics & Finance", + "Electrical & Electronics Engineering", + "Humanities", + "Mathematics", + "Mechanical Engineering", + "Pharmacy", + "Physics", +]; +const CreateAccount = (props) => { + const [open, setOpen] = useState({ + username: "", + password: "", + name: "", + department: "", + email: "", + confPass: "", + invalidEmail: false, + existingUsername: false, + weakPassword: false, + matchPass: true, + emptyUserField: true, + emptyPassField: true, + emptyNameField: true, + emptyDeptField: true, + emptyEmailField: true, + hitSubmit: false, + profAuthenticated: false, + }); + const { + username, + password, + name, + department, + email, + confPass, + invalidEmail, + existingUsername, + weakPassword, + matchPass, + emptyUserField, + emptyPassField, + emptyNameField, + emptyDeptField, + emptyEmailField, + hitSubmit, + profAuthenticated, + } = open; + const handleClose = () => { + props.action(); + setOpen({ + ...open, + hitSubmit: false + }); + } + const editUsername = (e) => { + e.preventDefault(); + setOpen({ + ...open, + username: e.target.value, + existingUsername: false, + emptyUserField: (e.target.value === null || e.target.value.length === 0) ? true : false + }); + } + const editPassword = (e) => { + e.preventDefault(); + setOpen({ + ...open, + password: e.target.value, + weakPassword: (e.target.value.length < 8) ? true : false, + emptyPassField: (e.target.value === null || e.target.value.length === 0) ? true : false + }); + } + const editConf = (e) => { + const eq = (e.target.value === password); + e.preventDefault(); + setOpen({ + ...open, + confPass: e.target.value, + matchPass: (eq) ? true : false, + emptyPassField: (e.target.value === null || e.target.value.length === 0) ? true : false + }); + } + const editName = (e) => { + e.preventDefault(); + setOpen({ + ...open, + name: e.target.value, + emptyNameField: (e.target.value === null || e.target.value.length === 0) ? true : false + }) + } + const editEmail = (e) => { + e.preventDefault(); + setOpen({ + ...open, + email: e.target.value, + emptyEmailField: (e.target.value === null || e.target.value.length === 0) ? true : false, + invalidEmail: (e.target.value.match("^([a-zA-Z0-9_\\-\\.]+)@([a-zA-Z0-9_\\-\\.]+)\\.([a-zA-Z]{2,5})$") === null) ? true : false, + }) + } + const editDept = (e) => { + e.preventDefault(); + setOpen({ + ...open, + department: e.target.value, + emptyDeptField: e.target.value === null ? true : false + }) + } + const submit = (e) => { + let iu = false, io = true, pa = false; + e.preventDefault(); + if (confPass === password + && !invalidEmail + && !weakPassword + && matchPass + && !emptyDeptField + && !emptyEmailField + && !emptyNameField + && !emptyUserField + && !emptyPassField + /*lol too tired to think better */) { + const config = { + headers: { + "Content-Type": "application/json", + "Access-Control-Allow-Origin": "*", + + } + }; + axios.post("/api/profAuth/createAcc", { + username: username, + password: password, + name: name, + email: email, + department: department + }, config).then( + (res, err) => { + if (err) { + console.log(err); + + } + else if (res.status === 206) { + iu = true; + + } + else if (!res) { + iu = false; + } + else { + iu = false; + io = false; + //window.alert("Submitted!"); //change the window.alert to something better, or just remove this + pa = false; + axios + .post( + "/api/ProfAuth", + { + username: username, + password: password + }, + config + ) + .then(function (res) { + //store the token in HTTP cookie + Cookies.set("token", res.data.token, { expires: 1 }); + pa = true; + handleClose(); + }) + .catch(err => { + console.log("Axios Error:", err); + }); + } + setOpen({ + ...open, + existingUsername: iu, + isOpen: io, + hitSubmit: true, + profAuthenticated: pa + }); + } + ).catch((err) => { + console.log("Server error: ", err); + } + ); + + } + else { + setOpen({ + ...open, + hitSubmit: true, + }) + } + } + return ( + ); +} +export default CreateAccount; \ No newline at end of file diff --git a/client/src/pages/login/Landing.css b/client/src/pages/login/Landing.css new file mode 100644 index 00000000..3413a44a --- /dev/null +++ b/client/src/pages/login/Landing.css @@ -0,0 +1,147 @@ +/* Global Styles */ +:root { + --primary-color: #17a2b8; + --dark-color: #343a40; + --light-color: #f4f4f4; + --landing-text-color: white; +} + +* { + box-sizing: border-box; + margin: 0; + padding: 0; +} + +.main { + margin: 0; + position: absolute; + top: 45%; + left: 50%; + transform: translate(-50%, -50%); +} + +img { + width: 100%; +} + +/* Utilities */ +.container { + max-width: 1100px; + margin: auto; +} + +/* Text Styles*/ +.text-x-large { + font-size: 4rem; + line-height: 1.2; + margin-bottom: 1rem; +} + +.text-large { + font-size: 3rem; + line-height: 1.2; + margin-bottom: 1rem; +} + +.text-landing { + color: var(--landing-text-color); +} + +.text-center { + text-align: center; +} + +.btn-landing { + display: inline-block; + background-color: #6699ff; + border: none; + color: #ffffff; + text-align: center; + font: 2.5rem "Fira Sans", sans-serif; + font-size: 28px; + padding: 20px; + height: 100px; + width: 200px; + transition: all 0.5s; + cursor: pointer; + margin: 1px; +} + +.btn-landing span { + cursor: pointer; + display: inline-block; + position: relative; + transition: 0.5s; +} + +.btn-landing span:after { + content: "\00bb"; + position: absolute; + opacity: 0; + top: 0; + right: -20px; + transition: 0.5s; +} + +.btn-landing:hover span { + padding-right: 25px; +} + +.btn-landing:hover span:after { + opacity: 1; + right: 0; +} + +.btn-left { + border-top-left-radius: 1rem; + border-bottom-left-radius: 1rem; + border-top-right-radius: 0rem; + border-bottom-right-radius: 0rem; +} + +.btn-right { + border-top-right-radius: 1rem; + border-bottom-right-radius: 1rem; + border-top-left-radius: 0rem; + border-bottom-left-radius: 0rem; +} + +/* Overlay */ +.dark-overlay { + background-color: rgba(0, 0, 0, 0.5); + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} + +/* Landing Page */ +.landing { + position: relative; + height: 100vh; + background: url("../../images/landingbackground.jpg") no-repeat center + center/cover; +} + +body { + display: flex; + flex-direction: column; +} + +section { + flex: 1; + min-height: 0; +} + +.landing-inner { + color: #fff; + height: 100%; + width: 100%; + margin: auto; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; +} diff --git a/client/src/pages/login/Login.js b/client/src/pages/login/Login.js new file mode 100644 index 00000000..b5c10ec7 --- /dev/null +++ b/client/src/pages/login/Login.js @@ -0,0 +1,185 @@ +import React from "react"; +import "./Landing.css"; +import { connect } from "react-redux"; +import { Redirect } from "react-router-dom"; +import { useState } from "react"; +import Button from "@material-ui/core/Button"; +import TextField from "@material-ui/core/TextField"; +import Dialog from "@material-ui/core/Dialog"; +import DialogActions from "@material-ui/core/DialogActions"; +import DialogContent from "@material-ui/core/DialogContent"; +import DialogContentText from "@material-ui/core/DialogContentText"; +import DialogTitle from "@material-ui/core/DialogTitle"; +import axios from "axios"; +import Cookies from "js-cookie"; +import { addProf } from "../../redux/actions/auth"; +import CreateAccount from "./CreateAccount"; +export const Landing = ({ isAuthenticated, addProf }) => { + let token = Cookies.get("token") ? Cookies.get("token") : null; + + addProf(token); + + const [open, setOpen] = useState({ + isOpen: true, + username: "", + password: "", + incorrectUsername: false, + incorrectPassword: false, + isCreate: false + }); + const { + isOpen, + username, + password, + incorrectUsername, + incorrectPassword, + isCreate + } = open; + const handleCreate = () => { + setOpen({ + ...open, + isCreate: !isCreate + }); + }; + + /* + const handleClose = () => { + setOpen({ ...open, isOpen: false }); + }; + */ + const editUsername = e => { + e.preventDefault(); + setOpen({ + ...open, + username: e.target.value, + incorrectUsername: false + }); + }; + const editPassword = e => { + e.preventDefault(); + setOpen({ + ...open, + password: e.target.value, + incorrectPassword: false + }); + }; + const config = { + headers: { + "Content-Type": "application/json", + "Access-Control-Allow-Origin": "*" + } + }; + const submit = async e => { + let iu = false, + ip = false; + e.preventDefault(); + await axios + .post( + "/api/ProfAuth", + { + username: username, + password: password + }, + config + ) + .then(function (res) { + if (!res || res.status === 204) { + iu = true; + } else { + iu = false; + if (res.status === 206) { + ip = true; + } else { + ip = false; + //store the token in HTTP cookie + Cookies.set("token", res.data.token, { expires: 1 }); + addProf(res.data.token); + } + } + setOpen({ + ...open, + incorrectUsername: iu, + incorrectPassword: ip + }); + }) + .catch(err => { + console.log("Axios Error:", err); + }); + }; + + + if (isAuthenticated) { + return
+
+
+
+
+
+
+
+
+
-
- setSearchOpen(!isSearchOpen)}
- >
-
-
- <>
-
- );
-}
-
-export default withRouter(Layout);
diff --git a/src/pages/login/Login.js b/src/pages/login/Login.js
deleted file mode 100644
index 0af17b51..00000000
--- a/src/pages/login/Login.js
+++ /dev/null
@@ -1,255 +0,0 @@
-import React, { useState } from "react";
-import {
- Grid,
- CircularProgress,
- Typography,
- Button,
- Tabs,
- Tab,
- TextField,
- Fade,
-} from "@material-ui/core";
-import { withRouter } from "react-router-dom";
-import classnames from "classnames";
-
-// styles
-import useStyles from "./styles";
-
-// logo
-import logo from "./logo.svg";
-import google from "../../images/google.svg";
-
-// context
-import { useUserDispatch, loginUser } from "../../context/UserContext";
-
-function Login(props) {
- var classes = useStyles();
-
- // global
- var userDispatch = useUserDispatch();
-
- // local
- var [isLoading, setIsLoading] = useState(false);
- var [error, setError] = useState(null);
- var [activeTabId, setActiveTabId] = useState(0);
- var [nameValue, setNameValue] = useState("");
- var [loginValue, setLoginValue] = useState("");
- var [passwordValue, setPasswordValue] = useState("");
-
- return (
-
-
-
-
-
-
-
- 
- Material Admin
-
-
-
- © 2014-2019 Flatlogic, LLC. All rights reserved.
-
-
-
- setActiveTabId(id)}
- indicatorColor="primary"
- textColor="primary"
- centered
- >
-
- {activeTabId === 0 && (
-
-
- Good Morning, User
-
-
-
-
- Something is wrong with your login or password :(
-
-
- setLoginValue(e.target.value)}
- margin="normal"
- placeholder="Email Adress"
- type="email"
- fullWidth
- />
- setPasswordValue(e.target.value)}
- margin="normal"
- placeholder="Password"
- type="password"
- fullWidth
- />
-
- )}
- {activeTabId === 1 && (
-
-
- Welcome!
-
-
- Create your account
-
-
-
- Something is wrong with your login or password :(
-
-
- setNameValue(e.target.value)}
- margin="normal"
- placeholder="Full Name"
- type="text"
- fullWidth
- />
- setLoginValue(e.target.value)}
- margin="normal"
- placeholder="Email Adress"
- type="email"
- fullWidth
- />
- setPasswordValue(e.target.value)}
- margin="normal"
- placeholder="Password"
- type="password"
- fullWidth
- />
-
- )}
-
-
-
- or
-
-
-
- {isLoading ? (
-
-
- {isLoading ? (
-
-
-
- or
-
-
-
-