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

Change#205/adicionar popup de vídeo no nome do material #207

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Change#205/adicionar popup de vídeo no nome do material #207

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf8a5bd
Limpando código e fazendo com que nome do conteúdo também abra popup
710lucas Oct 29, 2023
bcef638
Merge pull request #206 from universi-me/main
710lucas Oct 29, 2023
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
15 changes: 12 additions & 3 deletions src/pages/Group/GroupTabs/GroupContents/GroupContentMaterials.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,18 @@
}
</Link>
}

<div className="info">
<Link to={material.url} target="_blank" className="material-name">{material.title}</Link>
{
youTubeMatch !== null
?
<div className="material-name" onClick={() => { const videoId = (youTubeMatch[1] ?? youTubeMatch[2]); if(!isMiniature || videoId!= playingVideo) handleVideoClick(videoId)}}>
{material.title}
</div>
:
<Link to={material.url} target="_blank" className="material-name">

Check warning on line 127 in src/pages/Group/GroupTabs/GroupContents/GroupContentMaterials.tsx

View check run for this annotation

Codecov / codecov/patch

src/pages/Group/GroupTabs/GroupContents/GroupContentMaterials.tsx#L127 

Added line #L127 was not covered by tests
{material.title}
</Link>
}
<p className="material-description">{material.description}</p>
</div>
</div>
Expand All @@ -129,7 +138,7 @@
const videoId = videoUrl[1] ?? videoUrl[2];

return (
<div className="icon-container" id={`icon-container-${videoId}`} onClick={() => { console.log("videoId: " + videoId+"\n playing: " + playingVideo + "\nMiniature: "+isMiniature);if(!isMiniature || videoId != playingVideo) handleVideoClick(videoId)}}>
<div className="icon-container" id={`icon-container-${videoId}`} onClick={() => {if(!isMiniature || videoId != playingVideo) handleVideoClick(videoId)}}>
<img src="/assets/imgs/video.png" className="material-image"></img>
{
playingVideo == videoId
Expand Down
Loading