diff --git a/assets/workspace.svg b/assets/workspace.svg new file mode 100644 index 0000000..ec6ca90 --- /dev/null +++ b/assets/workspace.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/Dashboard/Dashboard.jsx b/src/Dashboard/Dashboard.jsx index bb3900a..8c62503 100644 --- a/src/Dashboard/Dashboard.jsx +++ b/src/Dashboard/Dashboard.jsx @@ -8,6 +8,7 @@ import CreateButton from "../_ui/CreateButton/CreateButton"; import dropDownSvg from "../../assets/empty.svg"; import { CircularProgressLoader } from "../_ui/Loader/CircularProgress"; import { addToLocalStorage, getDataFromLocalStorage } from "../_helpers/utils"; +import DashboardStats from "./DashboardStats"; const Dashboard = () => { const { currentUser, setCurrentUser, signOut } = useAuthContext(); @@ -50,7 +51,7 @@ const Dashboard = () => {
-

Workspaces and Responses

+
diff --git a/src/Dashboard/DashboardCard.jsx b/src/Dashboard/DashboardCard.jsx index 23359fa..57d341d 100644 --- a/src/Dashboard/DashboardCard.jsx +++ b/src/Dashboard/DashboardCard.jsx @@ -56,7 +56,7 @@ const DashboardCard = ({ formData }) => { select { "aria-labelledby": "basic-button", }} > - Profile - My account + + Results + + Rename Delete diff --git a/src/Dashboard/DashboardStats.jsx b/src/Dashboard/DashboardStats.jsx new file mode 100644 index 0000000..cf6201e --- /dev/null +++ b/src/Dashboard/DashboardStats.jsx @@ -0,0 +1,12 @@ +import Box from "@mui/material/Box"; +import React from "react"; + +const DashboardStats = () => { + return ( + +

Workspaces and Responses

+
+ ); +}; + +export default DashboardStats; diff --git a/src/Editor/SortableItems.jsx b/src/Editor/SortableItems.jsx index 03f542f..38ade3f 100644 --- a/src/Editor/SortableItems.jsx +++ b/src/Editor/SortableItems.jsx @@ -39,13 +39,18 @@ const SortableItems = ({ id, selectedItem, item }) => { const open = Boolean(anchorEl); const handleClick = (event) => { + console.log(event.currentTarget.id); + // if (event) { + // event.stopPropagation(); + // } setAnchorEl(event.currentTarget); }; const handleDelete = () => { setAnchorEl(null); deleteForms(formData.id); }; - const handleClose = () => { + const handleClose = (event) => { + // event.stopPropagation(); setAnchorEl(null); }; diff --git a/src/LoginPage/index.jsx b/src/LoginPage/index.jsx index a5944a8..d5622b6 100644 --- a/src/LoginPage/index.jsx +++ b/src/LoginPage/index.jsx @@ -87,7 +87,6 @@ const LoginPage = () => { }, validationSchema: loginSchema, onSubmit: (values) => { - console.log(values); handleForm(values.email, values.password); }, }); @@ -115,7 +114,7 @@ const LoginPage = () => {
{/* add a wrapper div here */} - + {/* image will be used here now just the Name */} Dropform diff --git a/src/_layout/Header.jsx b/src/_layout/Header.jsx index e93ba68..0d28b7e 100644 --- a/src/_layout/Header.jsx +++ b/src/_layout/Header.jsx @@ -136,12 +136,12 @@ const Header = ({ layout }) => {
options
-
+
- +
- +
diff --git a/src/_styles/dashboard.scss b/src/_styles/dashboard.scss index 69a55cc..43fc562 100644 --- a/src/_styles/dashboard.scss +++ b/src/_styles/dashboard.scss @@ -40,6 +40,7 @@ } .left-dashboard-wrapper { width: 256px; + padding: 0px 20px; flex-shrink: 0; } .right-dashboard-wrapper { diff --git a/src/_styles/theme.scss b/src/_styles/theme.scss index 95d46a7..7f72376 100644 --- a/src/_styles/theme.scss +++ b/src/_styles/theme.scss @@ -84,6 +84,28 @@ img { height: 100%; } +#form-action-menu { + .MuiPaper-root { + box-shadow: rgba(0, 0, 0, 0.08) 0px 2px 4px, + rgba(0, 0, 0, 0.06) 0px 2px 12px; + border-radius: 8px; + color: $body-text-color; + } + .MuiMenuItem-root { + font-size: 14px; + font-family: $font-family; + } + .MuiMenuItem-root:first-child { + background-color: $white-color; + } + .MuiMenuItem-root:last-child { + color: $delete-color; + } + .MuiMenuItem-root:hover { + background-color: rgb(240, 240, 240); + } +} + // Main styles and reusable classes .main { height: 100%;