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.

Sign up for GitHub

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

All 1.3 tn dev #198

Merged
merged 6 commits into from
Nov 4, 2024
Merged

All 1.3 tn dev #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc7c8eb
Issueid #0000 iframe height for fill in the blanks
ajinkyapandetekdi Oct 29, 2024
9383e69
Issueid #0000 feat: zoom in and out feature enable for fillintheblanks
ajinkyapandetekdi Nov 4, 2024
5f83137
Merge pull request #196 from ajinkyapandetekdi/all-1.3-tn-dev
gouravmore Nov 4, 2024
06b12f8
Issueid #0000 feat: zoom in and out feature enable for fillintheblanks
ajinkyapandetekdi Nov 4, 2024
3ac74e5
Merge pull request #197 from ajinkyapandetekdi/all-1.3-tn-dev
gouravmore Nov 4, 2024
2290938
Merge pull request #193 from ajinkyapandetekdi/fillintheblanks-all-de…
gouravmore Nov 4, 2024
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
113 changes: 102 additions & 11 deletions src/components/Practice/Mechanics3.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import correctSound from "../../assets/audio/correct.wav";
import wrongSound from "../../assets/audio/wrong.wav";
import removeSound from "../../assets/audio/remove.wav";
import VoiceAnalyser from "../../utils/VoiceAnalyser";
import { Modal } from "@mui/material";
import ZoomInIcon from "@mui/icons-material/ZoomIn";
import CloseIcon from "@mui/icons-material/Close";

const Mechanics2 = ({
page,
Expand Down Expand Up @@ -54,7 +57,7 @@ const Mechanics2 = ({
}) => {
const [words, setWords] = useState([]);
const [sentences, setSentences] = useState([]);

const [zoomOpen, setZoomOpen] = useState(false);
const [selectedWord, setSelectedWord] = useState("");
// const [loading, setLoading] = useState(false);
const [shake, setShake] = useState(false);
Expand Down Expand Up @@ -255,17 +258,105 @@ const Mechanics2 = ({
},
}}
>
{image && (
<img
src={image}
style={{
borderRadius: "20px",
maxWidth: "100%",
height: "clamp(150px, 20vw, 220px)",
<Box sx={{ position: "relative", cursor: "zoom-in" }}>
{image && (
<img
src={image}
style={{
borderRadius: "20px",
maxWidth: "100%",
height: "clamp(150px, 20vw, 220px)",
}}
alt=""
/>
)}

{/* Subtle gradient overlay across the top */}
<Box
sx={{
position: "absolute",
top: 0,
left: 0,
right: 0,
height: "40px", // Height of the gradient overlay
background:
"linear-gradient(to bottom, rgba(0, 0, 0, 0.4), transparent)",
borderTopLeftRadius: "20px",
borderTopRightRadius: "20px",
display: "flex",
alignItems: "center",
paddingLeft: "8px",
}}
alt=""
/>
)}
>
{/* Zoom icon positioned in the top-left corner */}
<ZoomInIcon
onClick={() => setZoomOpen(true)}
sx={{ color: "white", fontSize: "22px", cursor: "pointer" }}
/>
</Box>
</Box>
<Modal
open={zoomOpen}
onClose={() => setZoomOpen(false)}
sx={{
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
<Box
sx={{
position: "relative",
outline: "none",
height: "500px",
width: "500px",
}}
>
{/* Subtle gradient overlay at the top of the zoomed image */}
<Box
sx={{
position: "absolute",
top: 0,
left: 0,
right: 0,
height: "40px", // Adjust height as needed
background:
"linear-gradient(to bottom, rgba(0, 0, 0, 0.4), transparent)",
display: "flex",
alignItems: "center",
justifyContent: "flex-end",
paddingRight: "8px",
borderTopLeftRadius: "8px",
borderTopRightRadius: "8px",
}}
>
{/* Close icon positioned within the gradient overlay */}
<CloseIcon
onClick={() => setZoomOpen(false)}
sx={{
color: "white",
fontSize: "24px",
cursor: "pointer",
backgroundColor: "rgba(0, 0, 0, 0.5)",
borderRadius: "50%",
padding: "4px",
}}
/>
</Box>

<img
src={image}
alt="Zoomed content"
style={{
// maxWidth: "90vw",
// maxHeight: "90vh",
// height:"500px",
width: "100%",
borderRadius: "8px",
}}
/>
</Box>
</Modal>
</Grid>

<Box
Expand Down
8 changes: 4 additions & 4 deletions src/views/Practice/Practice.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,11 +716,11 @@ const Practice = () => {
questions[currentQuestion]?.contentSourceData || [];
const stringLengths = contentSourceData.map((item) => item.text.length);
const length =
(questions[currentQuestion]?.mechanics_data &&
questions[currentQuestion]?.mechanics_data &&
(questions[currentQuestion]?.mechanics_data[0]?.mechanics_id ===
"mechanic_2" ||
questions[currentQuestion]?.mechanics_data[0]?.mechanics_id ===
"mechanic_2") ||
questions[currentQuestion]?.mechanics_data[0]?.mechanics_id ===
"mechanic_1"
"mechanic_1")
? 500
: stringLengths[0];
window.parent.postMessage({ type: "stringLengths", length }, "*");
Expand Down
Loading