Skip to content

Improve flashcard controls and animations #2

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

Open
43jjoam wants to merge 1 commit into
base: main
Choose a base branch
from
+64 −34
Open

Improve flashcard controls and animations #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
98 changes: 64 additions & 34 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

/* Styles for the 3D card scene and individual cards */
.card-scene {
width: min(70vw, 400px);
height: min(70vh, 550px);
width: min(80vw, 380px);
height: min(55vh, 520px);
margin: 0 auto;
perspective: 1000px;
display: flex;
Expand All @@ -52,27 +52,27 @@

/* Swipe animations */
.card-3d.swiping-left {
transform: translateX(-150vw) rotateZ(-30deg) scale(0.5);
transform: translateX(-120vw) rotateZ(-20deg);
opacity: 0;
transition: all 0.6s cubic-bezier(0.6, -0.28, 0.735, 0.045);
transition: transform 0.5s ease-out, opacity 0.5s ease-out;
}

.card-3d.swiping-right {
transform: translateX(150vw) rotateZ(30deg) scale(0.5);
transform: translateX(120vw) rotateZ(20deg);
opacity: 0;
transition: all 0.6s cubic-bezier(0.6, -0.28, 0.735, 0.045);
transition: transform 0.5s ease-out, opacity 0.5s ease-out;
}

/* New card animation */
.card-3d.new-card {
opacity: 0;
transform: scale(0.8);
opacity: 0.5;
transform: scale(0.95) translateY(20px);
}

.card-3d.new-card.show {
opacity: 1;
transform: scale(1);
transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275);
transform: scale(1) translateY(0);
transition: transform 0.4s ease-out, opacity 0.4s ease-out;
}

/* Card faces (front and back) */
Expand Down Expand Up @@ -303,7 +303,7 @@
@media (max-width: 480px) {
.card-scene {
width: 90vw;
height: 60vh;
height: 55vh;
}
.mobile-center {
padding: 12px;
Expand Down Expand Up @@ -866,7 +866,7 @@

const handleTouchEnd = (e) => {
if (!isCurrent || !cardRef.current) return;

e.preventDefault();

const touchEndTime = Date.now();
Expand All @@ -892,8 +892,16 @@
currentTransform.current = { x: 0, rotation: 0 };
}
} else if (!isDragging.current && touchDuration < 300) {
setIsFlipped(!isFlipped);
onFlip && onFlip();
const target = e.target;
if (
!target.closest('.chinese-character') &&
!target.closest('.pinyin') &&
!target.closest('.english-translation') &&
!target.closest('.thai-translation')
) {
setIsFlipped(!isFlipped);
onFlip && onFlip();
}
} else {
cardRef.current.style.transform = '';
cardRef.current.style.opacity = '';
Expand All @@ -904,6 +912,19 @@
hasMovedEnough.current = false;
};

const handleClick = (e) => {
const target = e.target;
if (
!target.closest('.chinese-character') &&
!target.closest('.pinyin') &&
!target.closest('.english-translation') &&
!target.closest('.thai-translation')
) {
setIsFlipped(!isFlipped);
onFlip && onFlip();
}
};

const handlePronounce = (text, lang) => {
if (text && text.trim()) {
pronounceText(text.trim(), lang);
Expand All @@ -925,26 +946,31 @@
onTouchStart={handleTouchStart}
onTouchMove={handleTouchMove}
onTouchEnd={handleTouchEnd}
onClick={handleClick}
style={{ touchAction: 'none' }}
>
{/* Front Face */}
<div className="card-face flex flex-col items-center justify-center p-6">
<div className="card-content">
<div
className="chinese-character"
onClick={(e) => {
e.stopPropagation();
handlePronounce(chineseChar, 'zh-CN');
<div
className="chinese-character"
onClick={(e) => {
e.stopPropagation();
handlePronounce(chineseChar, 'zh-CN');
}}
onTouchStart={(e) => e.stopPropagation()}
onTouchEnd={(e) => e.stopPropagation()}
>
{chineseChar}
</div>
<div
className="pinyin"
onClick={(e) => {
e.stopPropagation();
handlePronounce(pinyin, 'zh-CN');
<div
className="pinyin"
onClick={(e) => {
e.stopPropagation();
handlePronounce(pinyin, 'zh-CN');
}}
onTouchStart={(e) => e.stopPropagation()}
onTouchEnd={(e) => e.stopPropagation()}
>
{pinyin}
</div>
Expand All @@ -955,21 +981,25 @@
{/* Back Face */}
<div className="card-face card-back flex flex-col items-center justify-center p-6">
<div className="card-content">
<div
className="english-translation"
onClick={(e) => {
e.stopPropagation();
handlePronounce(englishTranslation, 'en-US');
<div
className="english-translation"
onClick={(e) => {
e.stopPropagation();
handlePronounce(englishTranslation, 'en-US');
}}
onTouchStart={(e) => e.stopPropagation()}
onTouchEnd={(e) => e.stopPropagation()}
>
{englishTranslation}
</div>
<div
className="thai-translation"
onClick={(e) => {
e.stopPropagation();
handlePronounce(thaiTranslation, 'th-TH');
<div
className="thai-translation"
onClick={(e) => {
e.stopPropagation();
handlePronounce(thaiTranslation, 'th-TH');
}}
onTouchStart={(e) => e.stopPropagation()}
onTouchEnd={(e) => e.stopPropagation()}
>
{thaiTranslation}
</div>
Expand Down