Skip to content

Commit a439221

Browse files
Merge pull request #10 from Aritra203/main
Gallery Enhancement
2 parents 00e4643 + 90e2664 commit a439221

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

app/Gallery/page.tsx

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ const getImageWidth = () => {
3131
const Gallery = () => {
3232
const controls = useAnimation();
3333
const [isPaused, setIsPaused] = useState(false);
34-
<<<<<<< HEAD
3534
const [offset, setOffset] = useState(0);
3635
const [imageWidth, setImageWidth] = useState(getImageWidth());
3736

@@ -41,9 +40,6 @@ const Gallery = () => {
4140
window.addEventListener("resize", handleResize);
4241
return () => window.removeEventListener("resize", handleResize);
4342
}, []);
44-
=======
45-
const [offset, setOffset] = useState(0); // offset in px
46-
>>>>>>> f44a310707bb1d1606c8f6f0471ed10d89ff7476
4743

4844
// Start animation
4945
useEffect(() => {
@@ -66,27 +62,19 @@ const Gallery = () => {
6662
// When hover/tap, set offset so hovered image is first
6763
const handleMouseEnter = (idx: number) => {
6864
setIsPaused(true);
69-
<<<<<<< HEAD
7065
setOffset(-idx * imageWidth);
7166
controls.set({ x: -idx * imageWidth });
72-
=======
73-
setOffset(-idx * IMAGE_WIDTH);
74-
controls.set({ x: -idx * IMAGE_WIDTH });
75-
>>>>>>> f44a310707bb1d1606c8f6f0471ed10d89ff7476
7667
};
7768

7869
// On leave, resume animation from current offset
7970
const handleMouseLeave = () => {
8071
setIsPaused(false);
81-
<<<<<<< HEAD
8272
};
8373

8474
// For mobile: handle tap to pause and focus image
8575
const handleTouch = (idx: number) => {
8676
handleMouseEnter(idx);
8777
setTimeout(() => setIsPaused(false), 2000); // Resume after 2s
88-
=======
89-
>>>>>>> f44a310707bb1d1606c8f6f0471ed10d89ff7476
9078
};
9179

9280
return (

0 commit comments

Comments
 (0)