Skip to content

Commit 9488333

Browse files
authored
Merge pull request #842 from kushalShukla-web/notification
Notification
2 parents 7ee4352 + c90db5f commit 9488333

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

cypress/e2e/components/auth/forgotPassword/forgotpassword.cy.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe("Forgot Password Page | CodeLabz", () => {
1111
});
1212
});
1313

14-
14+
1515
before(function () {
1616
indexedDB.deleteDatabase("firebaseLocalStorageDb");
1717
});
@@ -24,6 +24,7 @@ describe("Forgot Password Page | CodeLabz", () => {
2424
it("empty email ", function () {
2525
cy.visit(`${this.base_url}forgotpassword`);
2626
cy.get("[data-testId=forgotPasswordButton]").should('be.disabled');
27+
2728
});
2829
it("successfull ", function () {
2930
cy.visit(`${this.base_url}forgotpassword`);

src/components/AuthPage/ForgotPassword/index.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ const ForgotPassword = ({
6363
[dispatch]
6464
);
6565

66-
6766
const onSubmit = async (values) => {
6867
values.preventDefault();
6968
setError("");

src/components/Notification/NotificationBox.jsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Grid, Card, Menu, MenuItem } from "@mui/material";
22
import IconButton from "@mui/material/IconButton";
3-
import MoreVertOutlinedIcon from "@mui/icons-material/MoreVertOutlined";
3+
import MoreHorizOutlinedIcon from '@mui/icons-material/MoreHorizOutlined';
44
import Typography from "@mui/material/Typography";
55
import Avatar from "@mui/material/Avatar";
66
import Box from "@mui/material/Box";
@@ -27,7 +27,7 @@ const NotificationBox = ({ notification }) => {
2727
<>
2828
<Card
2929
className={classes.Notification}
30-
style={{ backgroundColor: notification.isRead ? "#fff" : blue[50] }}
30+
style={{ backgroundColor: notification.isRead ? "#fff" : blue[50],borderRadius: "16px"}}
3131
>
3232
{!notification.isRead && <Box className={classes.unread}></Box>}
3333
<Avatar
@@ -61,8 +61,9 @@ const NotificationBox = ({ notification }) => {
6161
}}
6262
aria-label="share"
6363
data-testId="MoreIcon"
64+
style={{ position: 'absolute', top: 0, right: 0 }}
6465
>
65-
<MoreVertOutlinedIcon />
66+
<MoreHorizOutlinedIcon />
6667
</IconButton>
6768
<Menu anchorEl={anchorRef.current} open={open} onClose={handleClose}>
6869
<MenuItem onClick={handleRead}>Mark as read</MenuItem>

src/routes.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const Routes = () => {
8989
<AuthIsLoaded>
9090
<CodeLabzAppBar />
9191
{/* <Navbar /> */}
92-
<Switch>
92+
<Switch>
9393
<Route exact path={"/"} component={HomePage} />
9494
<Route
9595
exact

0 commit comments

Comments
 (0)