Skip to content

Commit

Permalink
some tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinle623 committed Oct 28, 2023
1 parent 8396aea commit 1895741
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 112 deletions.
14 changes: 2 additions & 12 deletions client/src/components/dashboard-component/index.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from "react";
import { Typography, Container, Box } from "@mui/material";
import { Typography, Container } from "@mui/material";
import InputAdornment from "@mui/material/InputAdornment";
import SearchIcon from "@mui/icons-material/Search";
import DashboardHeaderComponent from "./header-dashboard-component";
Expand Down Expand Up @@ -36,17 +36,7 @@ function DashboardComponent() {
Job Lead Updates
</Typography>
<Divider />
{jobUpdates.length > 0 ? (
<UpdatesCollection jobUpdates={jobUpdates} />
) : (
<Box textAlign="center" sx={{ mt: 4 }}>
<img
src="/noJobleadUpdates.svg"
alt="No Job Lead Updates"
style={{ width: "50%", margin: "20px" }}
/>
</Box>
)}
<UpdatesCollection jobUpdates={jobUpdates} />
</MainContainer>
<SearchFieldContainer>
<SearchField
Expand Down
174 changes: 87 additions & 87 deletions client/src/components/dashboard-component/mockData.jsx
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
// const mockData = [];
const mockData = [
{
action: "Added Job Lead",
adminName: "Employee Name",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "Employee Name",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "Employee Name",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
{
action: "Added Job Lead",
adminName: "AdminName",
userName: "Receptionist123",
companyName: "Company Name",
date: "1/1/2022",
},
];
const mockData = [];
// const mockData = [
// {
// action: "Added Job Lead",
// adminName: "Employee Name",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "Employee Name",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "Employee Name",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// {
// action: "Added Job Lead",
// adminName: "AdminName",
// userName: "Receptionist123",
// companyName: "Company Name",
// date: "1/1/2022",
// },
// ];

export default mockData;
Original file line number Diff line number Diff line change
@@ -1,22 +1,33 @@
import PropTypes from "prop-types";
import { Box } from "@mui/material";
import { JobUpdatesContainer, UpdateDivider } from "./index.styles";
import JobUpdateCardComponent from "../update-card-component";

function UpdatesCollection({ jobUpdates }) {
return (
<JobUpdatesContainer>
{jobUpdates.map((update) => (
<>
<JobUpdateCardComponent
action={update.action}
adminName={update.adminName}
userName={update.userName}
companyName={update.companyName}
date={update.date}
{jobUpdates.length > 0 ? (
jobUpdates.map((update) => (
<>
<JobUpdateCardComponent
action={update.action}
adminName={update.adminName}
userName={update.userName}
companyName={update.companyName}
date={update.date}
/>
<UpdateDivider />
</>
))
) : (
<Box textAlign="center" sx={{ mt: 4 }}>
<img
src="/noJobleadUpdates.svg"
alt="No Job Lead Updates"
style={{ width: "400px", marginTop: "20px" }}
/>
<UpdateDivider />
</>
))}
</Box>
)}
</JobUpdatesContainer>
);
}
Expand All @@ -29,7 +40,6 @@ UpdatesCollection.propTypes = {
userName: PropTypes.string.isRequired,
companyName: PropTypes.string.isRequired,
date: PropTypes.string.isRequired,
// eslint-disable-next-line
})

Check warning on line 43 in client/src/components/dashboard-component/update-collection-component/index.jsx

View workflow job for this annotation

GitHub Actions / client-tests-and-lint

Insert `,`
).isRequired,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Box } from "@mui/material";

const JobUpdatesContainer = styled(Box)`
height: 40vh;
min-height: 100px;
min-height: 300px;
overflow-y: auto;
overflow-x: hidden;
`;
Expand Down

0 comments on commit 1895741

Please sign in to comment.