diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 76e2895..0fe545c 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -6,6 +6,7 @@ import PrivateRoute from "./auth/PrivateRoute";
import Login from "./pages/Login";
import Dashboard from "./pages/Dashboard";
import MenuBar from "./components/MenuBar";
+import Settings from "./pages/Settings";
function App() {
return (
@@ -15,10 +16,14 @@ function App() {
-
-
+
+
+
+
+
+
diff --git a/frontend/src/components/MenuBar/index.tsx b/frontend/src/components/MenuBar/index.tsx
index d138120..baf36b6 100644
--- a/frontend/src/components/MenuBar/index.tsx
+++ b/frontend/src/components/MenuBar/index.tsx
@@ -3,13 +3,15 @@ import MenuIcon from '@material-ui/icons/Menu';
import {FunctionComponent, useState} from "react";
import {useAuth} from "../../auth/AuthProvider";
import {AccountCircle} from "@material-ui/icons";
+import {Link, useHistory} from "react-router-dom";
type MenuBarProps = {
-
+ pageName: string
}
-const MenuBar: FunctionComponent = () => {
+const MenuBar: FunctionComponent = ({pageName}) => {
const { user, logout } = useAuth()
+ const history = useHistory()
const [anchorEl, setAnchorEl] = useState(null)
const open = Boolean(anchorEl);
@@ -29,7 +31,12 @@ const MenuBar: FunctionComponent = () => {
- Threadule
+
+ Threadule - {pageName}
+
= () => {
open={open}
onClose={handleClose}
>
+
diff --git a/frontend/src/components/SettingsCard/index.tsx b/frontend/src/components/SettingsCard/index.tsx
new file mode 100644
index 0000000..c43ffc0
--- /dev/null
+++ b/frontend/src/components/SettingsCard/index.tsx
@@ -0,0 +1,23 @@
+import {FunctionComponent} from "react";
+import {Card, CardContent, CardHeader, Grid} from "@material-ui/core";
+
+export type SettingsCardProps = {
+ name: string
+}
+
+const SettingsCard: FunctionComponent = ({name, children}) => {
+ return (
+
+
+
+
+ {children}
+
+
+
+ )
+}
+
+export default SettingsCard
\ No newline at end of file
diff --git a/frontend/src/pages/Dashboard/Dashboard.module.css b/frontend/src/pages/Dashboard/Dashboard.module.css
index df7976a..e52db34 100644
--- a/frontend/src/pages/Dashboard/Dashboard.module.css
+++ b/frontend/src/pages/Dashboard/Dashboard.module.css
@@ -1,3 +1,8 @@
+.container {
+ margin-top: 40px;
+ box-sizing: border-box;
+}
+
.addButton {
position: fixed !important;
bottom: 50px;
diff --git a/frontend/src/pages/Dashboard/index.tsx b/frontend/src/pages/Dashboard/index.tsx
index f7a6dcf..94812a1 100644
--- a/frontend/src/pages/Dashboard/index.tsx
+++ b/frontend/src/pages/Dashboard/index.tsx
@@ -55,10 +55,7 @@ const Dashboard: FunctionComponent = () => {
return (
<>
-
+
{loading &&
}
diff --git a/frontend/src/pages/Settings/UserSettings.module.css b/frontend/src/pages/Settings/UserSettings.module.css
new file mode 100644
index 0000000..995aed5
--- /dev/null
+++ b/frontend/src/pages/Settings/UserSettings.module.css
@@ -0,0 +1,4 @@
+.container {
+ margin-top: 40px !important;
+ box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/frontend/src/pages/Settings/UserSettings/index.tsx b/frontend/src/pages/Settings/UserSettings/index.tsx
new file mode 100644
index 0000000..2ae38b1
--- /dev/null
+++ b/frontend/src/pages/Settings/UserSettings/index.tsx
@@ -0,0 +1,14 @@
+import {FunctionComponent} from "react";
+
+export type UserSettingsProps = {
+
+}
+
+const UserSettings: FunctionComponent = () => {
+ return (
+ <>
+ >
+ )
+}
+
+export default UserSettings
\ No newline at end of file
diff --git a/frontend/src/pages/Settings/index.tsx b/frontend/src/pages/Settings/index.tsx
new file mode 100644
index 0000000..feff23b
--- /dev/null
+++ b/frontend/src/pages/Settings/index.tsx
@@ -0,0 +1,21 @@
+import {FunctionComponent} from "react";
+import SettingsCard from "../../components/SettingsCard";
+import UserSettings from "./UserSettings";
+import {Grid} from "@material-ui/core";
+import styles from "./UserSettings.module.css"
+
+export type SettingsProps = {}
+
+const Settings: FunctionComponent = () => {
+ return (
+ <>
+
+
+
+
+
+ >
+ )
+}
+
+export default Settings
\ No newline at end of file