Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notification #842

Merged
merged 10 commits into from
Jul 23, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe("Forgot Password Page | CodeLabz", () => {
});
});


before(function () {
indexedDB.deleteDatabase("firebaseLocalStorageDb");
});
Expand All @@ -24,6 +24,7 @@ describe("Forgot Password Page | CodeLabz", () => {
it("empty email ", function () {
cy.visit(`${this.base_url}forgotpassword`);
cy.get("[data-testId=forgotPasswordButton]").should('be.disabled');

});
it("successfull ", function () {
cy.visit(`${this.base_url}forgotpassword`);
Expand Down
1 change: 0 additions & 1 deletion src/components/AuthPage/ForgotPassword/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const ForgotPassword = ({
[dispatch]
);


const onSubmit = async (values) => {
values.preventDefault();
setError("");
Expand Down
7 changes: 4 additions & 3 deletions src/components/Notification/NotificationBox.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Grid, Card, Menu, MenuItem } from "@mui/material";
import IconButton from "@mui/material/IconButton";
import MoreVertOutlinedIcon from "@mui/icons-material/MoreVertOutlined";
import MoreHorizOutlinedIcon from '@mui/icons-material/MoreHorizOutlined';
import Typography from "@mui/material/Typography";
import Avatar from "@mui/material/Avatar";
import Box from "@mui/material/Box";
Expand All @@ -27,7 +27,7 @@ const NotificationBox = ({ notification }) => {
<>
<Card
className={classes.Notification}
style={{ backgroundColor: notification.isRead ? "#fff" : blue[50] }}
style={{ backgroundColor: notification.isRead ? "#fff" : blue[50],borderRadius: "16px"}}
>
{!notification.isRead && <Box className={classes.unread}></Box>}
<Avatar
Expand Down Expand Up @@ -61,8 +61,9 @@ const NotificationBox = ({ notification }) => {
}}
aria-label="share"
data-testId="MoreIcon"
style={{ position: 'absolute', top: 0, right: 0 }}
>
<MoreVertOutlinedIcon />
<MoreHorizOutlinedIcon />
</IconButton>
<Menu anchorEl={anchorRef.current} open={open} onClose={handleClose}>
<MenuItem onClick={handleRead}>Mark as read</MenuItem>
Expand Down
2 changes: 1 addition & 1 deletion src/routes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const Routes = () => {
<AuthIsLoaded>
<CodeLabzAppBar />
{/* <Navbar /> */}
<Switch>
<Switch>
<Route exact path={"/"} component={HomePage} />
<Route
exact
Expand Down
Loading