diff --git a/backend/index.js b/backend/index.js
index 2218a5c..322d9bb 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -147,6 +147,11 @@ app.post("/API/user/login", passport.authenticate('local-login'), function (req,
return res.status(status.OK).send("login success");
});
+app.delete("/API/user/logout", function (req, res) {
+ req.logout();
+ return res.status(status.OK).send("logout success");
+});
+
app.put("/API/user/create", function (req, res) {
let { email, password } = req.body;
if (email && password) {
diff --git a/frontend/src/components/accountMenu/accountMenu.js b/frontend/src/components/accountMenu/accountMenu.js
new file mode 100644
index 0000000..be4a719
--- /dev/null
+++ b/frontend/src/components/accountMenu/accountMenu.js
@@ -0,0 +1,74 @@
+import React from 'react';
+import MenuItem from '@material-ui/core/MenuItem';
+import Menu from '@material-ui/core/Menu';
+import AccountCircle from '@material-ui/icons/AccountCircle';
+import IconButton from '@material-ui/core/IconButton';
+import { Link } from 'react-router-dom';
+import Link1 from '@material-ui/core/Link';
+
+function MenuItemLink(props) {
+ return ;
+}
+
+export default function AccountMenu(props) {
+ const [anchorEl, setAnchorEl] = React.useState(null);
+ const openMenu = Boolean(anchorEl);
+
+ const handleMenu = (event) => {
+ setAnchorEl(event.currentTarget);
+ };
+
+ const handleClose = () => {
+ setAnchorEl(null);
+ };
+
+ const logout = async () => {
+ await fetch(`/simcompanies/API/user/logout`, {
+ method: 'DELETE',
+ mode: 'cors',
+ cache: 'no-cache',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ redirect: 'follow',
+ referrerPolicy: 'no-referrer'
+ }).then(
+ () => { window.location.reload() }
+ )
+ }
+
+ const handleLogout = () => {
+ logout()
+ };
+
+ return (
+
+
+ );
+}
diff --git a/frontend/src/components/content.js b/frontend/src/components/content.js
index 0174833..e0fc26e 100644
--- a/frontend/src/components/content.js
+++ b/frontend/src/components/content.js
@@ -6,6 +6,7 @@ import {
} from "react-router-dom";
import SelectResource from './selectResource';
import ResourceChart from './resourcechart/resourcechart';
+import Profile from './profile/profile';
const useStyles = makeStyles(theme => ({
@@ -23,6 +24,7 @@ export default function Content() {
+
diff --git a/frontend/src/components/navigation.js b/frontend/src/components/navigation.js
index 0598abe..5956fe4 100644
--- a/frontend/src/components/navigation.js
+++ b/frontend/src/components/navigation.js
@@ -23,6 +23,11 @@ import EmojiObjectsIcon from '@material-ui/icons/EmojiObjects';
import { ListItemIcon } from '@material-ui/core';
import Tooltip from '@material-ui/core/Tooltip';
import Zoom from '@material-ui/core/Zoom';
+import ApartmentIcon from '@material-ui/icons/Apartment';
+import MenuItem from '@material-ui/core/MenuItem';
+import Menu from '@material-ui/core/Menu';
+import AccountCircle from '@material-ui/icons/AccountCircle';
+import AccountMenu from './accountMenu/accountMenu';
const drawerWidth = 64;
const drawerWidthOpen = 240;
@@ -168,6 +173,20 @@ export default function Navigation() {
return ;
}
+ const showIcon = (text) => {
+ if (text === "Resources") {
+ return (
+
+ )
+ } else if (text === "Traders") {
+ return (
+
+ )
+ } else {
+ return null
+ }
+ }
+
return (
@@ -188,19 +207,7 @@ export default function Navigation() {
Sim Companies Dashboard
-
+
- {['Resources'].map((text, index) => (
-
+ {['Resources', 'Traders'].map((text, index) => (
-
-
+
+
+ {showIcon(text)}
+
-
-
-
))}
diff --git a/frontend/src/components/profile/profile.js b/frontend/src/components/profile/profile.js
new file mode 100644
index 0000000..0fc1d69
--- /dev/null
+++ b/frontend/src/components/profile/profile.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import Typography from '@material-ui/core/Typography';
+
+export default function Profile(props) {
+ return (
+
+
+ Profile Page
+
+
+ );
+}
diff --git a/frontend/src/components/selectResource/resourceCard.js b/frontend/src/components/selectResource/resourceCard.js
index 54ded6e..a3f24f2 100644
--- a/frontend/src/components/selectResource/resourceCard.js
+++ b/frontend/src/components/selectResource/resourceCard.js
@@ -2,12 +2,10 @@ import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
-import Typography from '@material-ui/core/Typography';
import Grid from '@material-ui/core/Grid';
import { Link } from 'react-router-dom';
import Link1 from '@material-ui/core/Link';
import ListItem from '@material-ui/core/ListItem';
-import ListItemText from '@material-ui/core/ListItemText';
import ListItemIcon from '@material-ui/core/ListItemIcon';
import Tooltip from '@material-ui/core/Tooltip';
import Zoom from '@material-ui/core/Zoom';