fixed vite related issues, leftover issues from Moving to MUI, some visual changes

This commit is contained in:
QkoSad
2024-09-24 22:43:21 +03:00
parent d9455d002b
commit be03889ff3
22 changed files with 355 additions and 283 deletions
+1 -2
View File
@@ -121,7 +121,6 @@ export const addPost =
(formData: { text: string }): AppThunk =>
async (dispatch) => {
try {
console.log(1);
const res = await api.post("/posts", formData);
dispatch(addPostAction(res.data));
@@ -170,7 +169,6 @@ export const getPost =
}
}
};
// Add comment
export const addComment =
(postId: string, formData: { text: string }): AppThunk =>
async (dispatch) => {
@@ -181,6 +179,7 @@ export const addComment =
dispatch(createAlert("Comment Added", "success"));
} catch (err: unknown) {
console.log(err);
if (err instanceof AxiosError) {
if (
err !== undefined &&
+1
View File
@@ -96,6 +96,7 @@ export const createProfile =
try {
const res = await api.post("/profile", formData);
console.log(res);
dispatch(getProfile(res.data));
dispatch(
+53 -28
View File
@@ -3,27 +3,46 @@ import { deleteEducation } from "../../actions/profile";
import formatDate from "../../utils/formatDate";
import { EducationType } from "../../types";
import { useAppDispatch } from "../../utils/hooks";
import { Box, Typography } from "@mui/material";
import {
Box,
Button,
TableRow,
Table,
TableBody,
TableCell,
TableHead,
Typography,
TableContainer,
} from "@mui/material";
const Education = ({ education }: { education: EducationType[] }) => {
const dispatch = useAppDispatch();
if (!education) return <></>;
const educations = education.map((edu) => (
<tr key={edu._id}>
<td>{edu.school}</td>
<td className="hide-sm">{edu.degree}</td>
<td>
<TableRow key={edu._id}>
<TableCell
// style={{
// wordWrap: "break-word",
// }}
>
{edu.school}
</TableCell>
<TableCell
// style={{ wordWrap: "break-word" }}
>
{edu.degree}
</TableCell>
<TableCell
// style={{ wordWrap: "break-word" }}
>
{formatDate(edu.from)} - {edu.to ? formatDate(edu.to) : "Now"}
</td>
<td>
<button
onClick={async () => await dispatch(deleteEducation(edu._id))}
className="btn btn-danger"
>
</TableCell>
<TableCell>
<Button onClick={async () => await dispatch(deleteEducation(edu._id))}>
Delete
</button>
</td>
</tr>
</Button>
</TableCell>
</TableRow>
));
if (education.length === 0)
@@ -35,20 +54,26 @@ const Education = ({ education }: { education: EducationType[] }) => {
</Box>
);
return (
<>
<Typography variant="h5">Education Credentials</Typography>
<table className="table">
<thead>
<tr>
<th>School</th>
<th className="hide-sm">Degree</th>
<th className="hide-sm">Years</th>
<th />
</tr>
</thead>
<tbody>{educations}</tbody>
</table>
</>
<Box>
<Typography variant="h2">Education Credentials</Typography>
<Table
// style={{
// tableLayout: "fixed",
// width: "50%",
// alignSelf: "left",
// }}
>
<TableHead>
<TableRow>
<TableCell>School</TableCell>
<TableCell>Degree</TableCell>
<TableCell>Years</TableCell>
<TableCell />
</TableRow>
</TableHead>
<TableBody>{educations}</TableBody>
</Table>
</Box>
);
};
+37 -28
View File
@@ -1,29 +1,36 @@
import { Typography } from "@mui/material";
import React from "react";
import { deleteExperience } from "../../actions/profile";
import { ExperienceType } from "../../types";
import formatDate from "../../utils/formatDate";
import { useAppDispatch } from "../../utils/hooks";
import {
Box,
Button,
TableRow,
Table,
TableBody,
TableCell,
TableContainer,
TableHead,
Typography,
} from "@mui/material";
const Experience = ({ experience }: { experience: ExperienceType[] }) => {
const dispatch = useAppDispatch();
if (!experience) return <></>;
const experiences = experience.map((exp) => (
<tr key={exp._id}>
<td>{exp.company}</td>
<td className="hide-sm">{exp.title}</td>
<td>
<TableRow key={exp._id}>
<TableCell>{exp.company}</TableCell>
<TableCell>{exp.title}</TableCell>
<TableCell>
{formatDate(exp.from)} - {exp.to ? formatDate(exp.to) : "Now"}
</td>
<td>
<button
onClick={async () => dispatch(deleteExperience(exp._id))}
className="btn btn-danger"
>
</TableCell>
<TableCell>
<Button onClick={async () => dispatch(deleteExperience(exp._id))}>
Delete
</button>
</td>
</tr>
</Button>
</TableCell>
</TableRow>
));
if (experiences.length === 0)
@@ -34,20 +41,22 @@ const Experience = ({ experience }: { experience: ExperienceType[] }) => {
);
return (
<>
<h2 className="my-2">Experience Credentials</h2>
<table className="table">
<thead>
<tr>
<th>Company</th>
<th className="hide-sm">Title</th>
<th className="hide-sm">Years</th>
<th />
</tr>
</thead>
<tbody>{experiences}</tbody>
</table>
</>
<Box>
<Typography variant="h2">Experience Credentials</Typography>
<TableContainer>
<Table>
<TableHead>
<TableRow>
<TableCell>Company</TableCell>
<TableCell>Title</TableCell>
<TableCell>Years</TableCell>
<TableCell />
</TableRow>
</TableHead>
<TableBody>{experiences}</TableBody>
</Table>
</TableContainer>
</Box>
);
};
+15 -8
View File
@@ -1,15 +1,22 @@
import React from "react";
import { Box } from "@mui/material";
import AlertMUI from "@mui/material/Alert";
import { useAppSelector } from "../../utils/hooks";
const Alert = () => {
const alerts = useAppSelector((state) => state.alert);
return (
<div className="alert-wrapper">
{alerts.map((alert) => (
<div key={alert.id} className={`alert alert-${alert.alertType}`}>
{alert.msg}
</div>
))}
</div>
<Box sx={{ position: "fixed" }}>
{alerts.map((alert) =>
alert.alertType === "danger" ? (
<AlertMUI key={alert.id} severity="error">
{alert.msg}
</AlertMUI>
) : (
<AlertMUI key={alert.id} severity="success">
{alert.msg}
</AlertMUI>
),
)}
</Box>
);
};
+3 -3
View File
@@ -16,9 +16,9 @@ const CommentForm = ({ postId }: { postId: string }) => {
flexDirection="column"
alignItems="left"
gap="1rem"
onSubmit={async (e) => {
onSubmit={(e) => {
e.preventDefault();
await dispatch(addComment(postId, { text }));
dispatch(addComment(postId, { text }));
setText("");
}}
>
@@ -31,7 +31,7 @@ const CommentForm = ({ postId }: { postId: string }) => {
value={text}
onChange={(e) => setText(e.target.value)}
/>
<Button>Submit</Button>
<Button type="submit">Submit</Button>
</Box>
</Container>
);
+5 -9
View File
@@ -34,18 +34,14 @@ const CommentItem = ({
title={<Link to={`/profile/${user}`}>{name}</Link>}
subheader={formatDate(date)}
/>
{!auth.loading && auth.user !== null && user === auth.user._id && (
<Button onClick={() => dispatch(deleteComment(postId, _id))}>
<DeleteIcon />
</Button>
)}
<CardContent>
<Typography variant="subtitle1">{text}</Typography>
</CardContent>
<Box display={"inline"}>
{!auth.loading && auth.user !== null && user === auth.user._id && (
<Button
onClick={async () => await dispatch(deleteComment(postId, _id))}
>
<DeleteIcon />
</Button>
)}
</Box>
</Card>
</Container>
);
+8 -6
View File
@@ -6,8 +6,9 @@ import { useAppDispatch } from "../../utils/hooks";
const PostForm = () => {
const [text, setText] = useState("");
const dispatch = useAppDispatch();
const handleSumbit = {};
return (
<Box>
<Container>
<Typography>Say Something...</Typography>
<Box
component="form"
@@ -15,10 +16,9 @@ const PostForm = () => {
gap="1rem"
noValidate
sx={{ mt: 3, mb: 3 }}
onSubmit={async (e) => {
console.log(1);
onSubmit={(e) => {
e.preventDefault();
await dispatch(addPost({ text }));
dispatch(addPost({ text }));
setText("");
}}
>
@@ -32,9 +32,11 @@ const PostForm = () => {
rows={3}
required
/>
<Button variant="contained">Submit</Button>
<Button type="submit" variant="contained">
Submit
</Button>
</Box>
</Box>
</Container>
);
};
+39 -24
View File
@@ -6,13 +6,14 @@ import { Post } from "../../types";
import { useAppDispatch, useAppSelector } from "../../utils/hooks";
import {
Avatar,
Box,
Button,
Card,
CardContent,
CardHeader,
CardMedia,
Container,
Table,
TableCell,
TableRow,
Typography,
} from "@mui/material";
import ThumbDownIcon from "@mui/icons-material/ThumbDown";
@@ -38,28 +39,42 @@ const PostItem = ({
<Typography variant="subtitle1">{text}</Typography>
</CardContent>
</Card>
<Box>
<Button onClick={async () => await dispatch(addLike(_id))}>
<ThumbUpIcon />
</Button>
<Typography display="inline-flex" variant="button">
{likes.length}
</Typography>
<Button onClick={async () => await dispatch(removeLike(_id))}>
<ThumbDownIcon />
</Button>
<Button component={Link} to={`/posts/${_id}`}>
<Typography>Comments </Typography>
</Button>
<Typography display="inline-flex" variant="button">
{comments.length}
</Typography>
{!auth.loading && auth.user !== null && user === auth.user._id && (
<Button onClick={async () => await dispatch(deletePost(_id))}>
<DeleteIcon />
</Button>
)}
</Box>
<Table>
<TableRow>
<TableCell>
<Button onClick={async () => await dispatch(addLike(_id))}>
<ThumbUpIcon />
</Button>
</TableCell>
<TableCell>
<Typography display="inline-flex" variant="button">
{likes.length}
</Typography>
</TableCell>
<TableCell>
<Button onClick={async () => await dispatch(removeLike(_id))}>
<ThumbDownIcon />
</Button>
</TableCell>
<TableCell>
<Button component={Link} to={`/posts/${_id}`}>
<Typography>Comments </Typography>
</Button>
</TableCell>
<TableCell>
<Typography display="inline-flex" variant="button">
{comments.length}
</Typography>
</TableCell>
<TableCell>
{!auth.loading && auth.user !== null && user === auth.user._id && (
<Button onClick={async () => await dispatch(deletePost(_id))}>
<DeleteIcon />
</Button>
)}
</TableCell>
</TableRow>
</Table>
</Container>
);
};
@@ -49,7 +49,7 @@ const AddEducation = () => {
formData;
const onChange = (
event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>
event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
) => setFormData({ ...formData, [event.target.name]: event.target.value });
return (
@@ -71,7 +71,7 @@ const AddEducation = () => {
onSubmit={async (e) => {
e.preventDefault();
await dispatch(addEducation(formData)).then(() =>
navigate("/dashboard")
navigate("/dashboard"),
);
}}
>
@@ -79,34 +79,52 @@ const AddEducation = () => {
name="school"
label="School or Bootcamp"
fullWidth
value={school}
onChange={onChange}
autoFocus
/>
<TextField name="degree" label="Gegree or Certificate" fullWidth />
<TextField name="fieldofstudy" label="Field of Study" fullWidth />
<TextField
value={degree}
onChange={onChange}
name="degree"
label="Gegree or Certificate"
fullWidth
/>
<TextField
value={fieldofstudy}
onChange={onChange}
name="fieldofstudy"
label="Field of Study"
fullWidth
/>
<Typography variant="body1">From Date</Typography>
<StyledInput type="date" name="from" value={from} onChange={onChange} />
<Typography>
<FormControlLabel
control={
<Checkbox
checked={current}
onChange={() => setFormData({ ...formData, current: !current })}
inputProps={{ "aria-label": "controlled" }}
/>
}
label="Current"
/>
</Typography>
{/* <Typography> */}
{/* <FormControlLabel */}
{/* control={ */}
{/* <Checkbox */}
{/* checked={current} */}
{/* onChange={() => setFormData({ ...formData, current: !current })} */}
{/* inputProps={{ "aria-label": "controlled" }} */}
{/* /> */}
{/* } */}
{/* label="Current" */}
{/* /> */}
{/* </Typography> */}
<Typography>To Date</Typography>
<StyledInput type="date" name="from" value={to} onChange={onChange} />
<StyledInput type="date" name="to" value={to} onChange={onChange} />
<TextField
name="desc"
name="description"
value={description}
onChange={onChange}
label="Program description"
multiline
rows={4}
fullWidth
/>
<Button variant="contained">Sumbit Query</Button>
<Button variant="contained" type="submit">
Submit Changes
</Button>
</Box>
<Button component={Link} to="/dashboard">
Go Back
@@ -48,7 +48,7 @@ const AddExperience = () => {
}
`;
const onChange = (
e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>
e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,
) => setFormData({ ...formData, [e.target.name]: e.target.value });
return (
@@ -70,37 +70,59 @@ const AddExperience = () => {
onSubmit={async (e) => {
e.preventDefault();
await dispatch(addExperience(formData)).then(() =>
navigate("/dashboard")
navigate("/dashboard"),
);
}}
>
<TextField name="title" label="Job Title" fullWidth required />
<TextField name="company" label="Company" required />
<TextField name="location" label="Location" />
<TextField
name="title"
value={title}
label="Job Title"
onChange={onChange}
fullWidth
required
/>
<TextField
onChange={onChange}
value={company}
name="company"
label="Company"
required
/>
<TextField
onChange={onChange}
value={location}
name="location"
label="Location"
/>
<Typography variant="body1">From Date</Typography>
<StyledInput type="date" name="from" value={from} onChange={onChange} />
<Typography>
<FormControlLabel
control={
<Checkbox
checked={current}
onChange={() => setFormData({ ...formData, current: !current })}
inputProps={{ "aria-label": "controlled" }}
/>
}
label="Current"
/>
</Typography>
{/* <Typography> */}
{/* <FormControlLabel */}
{/* control={ */}
{/* <Checkbox */}
{/* checked={current} */}
{/* onChange={() => setFormData({ ...formData, current: !current })} */}
{/* inputProps={{ "aria-label": "controlled" }} */}
{/* /> */}
{/* } */}
{/* label="Current" */}
{/* /> */}
{/* </Typography> */}
<Typography>To Date</Typography>
<StyledInput type="date" name="from" value={to} onChange={onChange} />
<StyledInput type="date" name="to" value={to} onChange={onChange} />
<TextField
name="desc"
name="description"
label="Job description"
multiline
rows={4}
fullWidth
value={description}
onChange={onChange}
/>
<Button variant="contained">Sumbit Query</Button>
<Button variant="contained" type="submit">
Submit Changes
</Button>
</Box>
<Button component={Link} to="/dashboard">
Go Back
@@ -86,7 +86,6 @@ const ProfileForm = () => {
const linkedin = data.get("linkedin") as string;
const instagram = data.get("instagram") as string;
const status = data.get("status") as string;
console.log(data);
await dispatch(
createProfile(
{
@@ -105,13 +104,14 @@ const ProfileForm = () => {
},
editing,
),
).then(() => {
).then((res) => {
console.log(res);
if (!editing) navigate("/dashboard");
});
};
return (
<Container maxWidth='md'>
<Container maxWidth="md">
<Typography component="h1" variant="h4">
{creatingProfile ? "Create Your Profile" : "Edit Your Profile"}
</Typography>
@@ -128,7 +128,7 @@ const ProfileForm = () => {
</Grid>
<Grid item xs={6}>
<Typography paddingY="1rem">
Could be your own company or onee you work for
Could be your own company or one you work for
</Typography>
</Grid>
<Grid item xs={6}>
@@ -152,7 +152,7 @@ const ProfileForm = () => {
</Grid>
<Grid item xs={6}>
<Typography>
Please use comma separeted values(eg. HTML, CSS, JavaScript, PHP)
Please use comma separeted values (eg. HTML, CSS, JavaScript, PHP)
</Typography>
</Grid>
<Grid item xs={6}>
@@ -160,8 +160,8 @@ const ProfileForm = () => {
</Grid>
<Grid item xs={6}>
<Typography>
If you want your latest reepos add a Github link, include your
username
If you want your latest repositories, add a Github link and
include your username
</Typography>
</Grid>
<Grid item xs={6}>
@@ -237,7 +237,7 @@ const ProfileForm = () => {
) : null}
<Grid item xs={8}>
<Button variant="contained" type="submit">
Sumbit query
Submit Changes
</Button>
</Grid>
<Grid item xs={2}>
+2 -2
View File
@@ -37,11 +37,11 @@ const Profile = () => {
auth.loading === false &&
auth.user !== null &&
auth.user._id === profile.user._id && (
<Button component={Link} to="/edit-profilee">
<Button component={Link} to="/edit-profile">
Edit Profile
</Button>
)}
<Paper elevation={9} sx={{width:'90%'}}>
<Paper elevation={9} sx={{ width: "90%" }}>
<ProfileTop profile={profile} />
<ProfileAbout profile={profile} />
<Box>
@@ -21,7 +21,7 @@ const ProfileAbout = ({
<Typography>Skill Set</Typography>
<Box>
{skills.map((skill, index) => (
<Box>
<Box key={index}>
<Typography>{skill}</Typography>
</Box>
))}
+13 -8
View File
@@ -1,4 +1,11 @@
import { Box, Button, Paper, Typography } from "@mui/material";
import {
Box,
Button,
List,
ListItemText,
Paper,
Typography,
} from "@mui/material";
import React from "react";
import { Link } from "react-router-dom";
import { ProfileType } from "../../types";
@@ -15,8 +22,8 @@ const ProfileItem = ({
profile: ProfileType;
}) => {
return (
<Paper>
<img src={avatar} alt="" className="round-img" />
<Paper sx={{ padding: "100px" }}>
<img src={avatar} alt="" />
<Box>
<Typography>{name}</Typography>
<Typography>
@@ -27,13 +34,11 @@ const ProfileItem = ({
View Profile
</Button>
</Box>
<ul>
<List>
{skills.slice(0, 4).map((skill, index) => (
<li key={index} className="text-primary">
<i className="fas fa-check" /> {skill}
</li>
<ListItemText key={index}>{skill}</ListItemText>
))}
</ul>
</List>
</Paper>
);
};
+1 -1
View File
@@ -27,7 +27,7 @@ const Profiles = () => {
<Typography variant="h6">
Browse and connect with developers
</Typography>
<Box>
<Box display="flex" flexDirection="row">
{profiles.length > 0 && Array.isArray(profiles) ? (
profiles.map((profile) => (
<ProfileItem key={profile._id} profile={profile} />