Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions src/components/Tutorials/subComps/ControlButtons.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from "react";
import React, {useState} from "react";
import Button from "@mui/material/Button";
import Snackbar from "@mui/material/Snackbar";
import Grid from "@mui/material/Grid";
Expand Down Expand Up @@ -39,6 +39,10 @@ const ControlButtons = ({
setStepData
}) => {
const classes = useStyles();
const [snackbarOpen, setSnackbarOpen] = useState(false);
const handleSnackbarClose = () => {
setSnackbarOpen(false);
}
if (!hide && stepsData) {
return (
<Grid>
Expand Down Expand Up @@ -73,15 +77,9 @@ const ControlButtons = ({
<Button
type="primary"
onClick={() => {
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message="tutorial complete"
/>;
if(!stepsData[currentStep].completed) {
setSnackbarOpen(true);
}
window.scrollTo(0, 0);
setStepData(prevSteps =>
prevSteps.map((step, index) =>
Expand All @@ -99,6 +97,16 @@ const ControlButtons = ({
</Button>
</Box>
</Box>
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={snackbarOpen}
autoHideDuration={6000}
onClose={handleSnackbarClose}
message="Tutorial Step complete"
/>
</Grid>
);
} else return null;
Expand Down
91 changes: 55 additions & 36 deletions src/components/Tutorials/subComps/ImageDrawer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,54 +50,42 @@ const ImageDrawer = ({ onClose, visible, owner, tutorial_id, imageURLs }) => {
}) => deleting_error
);

const [uploadSnackbarOpen, setUploadSnackbarOpen] = React.useState(false);
const [uploadErrorSnackbarOpen, setUploadErrorSnackbarOpen] = React.useState(false);
const [deleteSnackbarOpen, setDeleteSnackbarOpen] = React.useState(false);
const [deleteErrorSnackbarOpen, setDeleteErrorSnackbarOpen] = React.useState(false);

useEffect(() => {
if (uploading === false && uploading_error === false) {
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message="Image Uploaded successfully...."
/>;
setUploadSnackbarOpen(true);
} else if (uploading === false && uploading_error) {
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message={uploading_error}
/>;
setUploadErrorSnackbarOpen(true);
}
}, [uploading, uploading_error]);

useEffect(() => {
if (deleting === false && deleting_error === false) {
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message="Deleted Succefully...."
/>;
setDeleteSnackbarOpen(true);
} else if (deleting === false && deleting_error) {
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message={deleting_error}
/>;
setDeleteErrorSnackbarOpen(true);
}
}, [deleting, deleting_error]);

const handleSnackbarClose = () => {
switch(type){
case 'upload':
setUploadSnackbarOpen(false);
setUploadErrorSnackbarOpen(false);
break;
case 'delete':
setDeleteSnackbarOpen(false);
setDeleteErrorSnackbarOpen(false);
break;
default:
break;
}
}

useEffect(() => {
clearTutorialImagesReducer()(dispatch);
return () => {
Expand Down Expand Up @@ -127,6 +115,7 @@ const ImageDrawer = ({ onClose, visible, owner, tutorial_id, imageURLs }) => {
)(firebase, firestore, dispatch);

return (
<>
<Drawer
title="Images"
data-testid="imageDrawer"
Expand Down Expand Up @@ -206,6 +195,36 @@ const ImageDrawer = ({ onClose, visible, owner, tutorial_id, imageURLs }) => {
))}
</div>
</Drawer>
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={uploadErrorSnackbarOpen}
autoHideDuration={6000}
onClose={() => handleSnackbarClose("upload")}
message={uploading_error}
/>
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={deleteSnackbarOpen}
autoHideDuration={6000}
onClose={() => handleSnackbarClose("delete")}
message="Deleted Successfully...."
/>
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={deleteErrorSnackbarOpen}
autoHideDuration={6000}
onClose={() => handleSnackbarClose("delete")}
message={deleting_error}
/></>
);
};

Expand Down
40 changes: 21 additions & 19 deletions src/components/Tutorials/subComps/RemoveStepModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,16 @@ const RemoveStepModal = ({
const firestore = useFirestore();
const dispatch = useDispatch();
const [visible, setVisible] = useState(false);
const [snackbarOpen, setSnackbarOpen] = useState(false);
const [snackbarMessage, setSnackbarMessage] = useState("");

useEffect(() => {
setVisible(viewModal);
}, [viewModal]);

const handleOnOk = event => {
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message="Updating...."
/>;
setSnackbarOpen(true);
setSnackbarMessage("Updating...");
if (step_length > 1) {
event.preventDefault();
removeStep(
Expand All @@ -43,21 +38,18 @@ const RemoveStepModal = ({
currentStep
)(firebase, firestore, dispatch).then(() => {
setVisible(false);
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={true}
autoHideDuration={6000}
message="removed...."
/>;
setSnackbarOpen(true)
setSnackbarMessage("Removed...");
});
}
};
const handleOnCancel = () => setVisible(false);

const handleSnackbarClose = () =>{
setSnackbarOpen(false);
setSnackbarMessage("");
}
return (
<>
<Modal
open={visible}
onClose={handleOnCancel}
Expand Down Expand Up @@ -89,6 +81,16 @@ const RemoveStepModal = ({
</form>
</div>
</Modal>
<Snackbar
anchorOrigin={{
vertical: "bottom",
horizontal: "left"
}}
open={snackbarOpen}
autoHideDuration={6000}
onClose={handleSnackbarClose}
message={snackbarMessage}
/></>
);
};

Expand Down
Loading
Loading