Skip to content

Image Popup Feature by Gordon #48

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
G-Wang12 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Image Popup Feature by Gordon #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11d5011
Initial rough copy of the new image popup feature
G-Wang12 Apr 15, 2022
4a3d0c8
Finished Image Popup Feature.
G-Wang12 Apr 16, 2022
5ba285e
Removed unnecessary library
G-Wang12 Apr 16, 2022
5d6a24a
Added img alt
G-Wang12 Apr 16, 2022
c40cbae
updated react-modal
G-Wang12 Apr 27, 2022
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"axios": "^0.19.2",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-modal": "^3.15.1",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1"
},
Expand Down
17 changes: 15 additions & 2 deletions src/components/Gallery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
import React from "react";
import React, {useState} from "react";
import NoImages from "./NoImages";
import Image from "./Image";
import ImagePopup from "./ImagePopup";

const Gallery = props => {
const [showImage, setShowImage] = useState(false);
const [imageData, setImageData] = useState();
const results = props.data;
let images;
let noImages;

const onImageClick = (val, url) => {
setShowImage(true);
setImageData({...val, url});
}
const onModalClose = () => {
setShowImage(false)
}
// map variables to each item in fetched image array and return image component
if (results.length > 0) {
images = results.map(image => {
Expand All @@ -14,7 +26,7 @@ const Gallery = props => {
let secret = image.secret;
let title = image.title;
let url = `https://farm${farm}.staticflickr.com/${server}/${id}_${secret}_m.jpg`;
return <Image url={url} key={id} alt={title} />;
return <Image url={url} key={id} alt={title} onClick={() => onImageClick(image, url)}/>;
});
} else {
noImages = <NoImages />; // return 'not found' component if no images fetched
Expand All @@ -23,6 +35,7 @@ const Gallery = props => {
<div>
<ul>{images}</ul>
{noImages}
<ImagePopup show={showImage} data={imageData} closeModal={onModalClose}/>
</div>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/Image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from "react";

const Image = ({ url, title }) => (
const Image = ({ url, title, onClick }) => (
<li>
<img src={url} alt={title} />
<img src={url} alt={title} onClick={() => onClick(url)} />
</li>
);

Expand Down
25 changes: 25 additions & 0 deletions src/components/ImagePopup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from "react";
import Modal from "react-modal";
import { commonModalStyles } from "./commonModalStyles";

const ImagePopup = ({ show, data, closeModal }) => {
return (
<Modal
isOpen={show}
style={commonModalStyles()}
onRequestClose={closeModal}
>
<div className="popUpContainer">
<h2>{data ? data.title : ""}</h2>
<img alt={data ? data.url : "Image unavailable"} src={data ? data.url : ""} className="popupImage" />
<div className="buttonContainer">
<div onClick={closeModal} className="buttonStyle">
Close
</div>
</div>
</div>
</Modal>
);
};

export default ImagePopup;
27 changes: 27 additions & 0 deletions src/components/commonModalStyles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
export const commonModalStyles = (width = '400px', height = '270px') => {
return {
overlay: {
position: 'fixed',
top: 0,
left: 0,
right: 0,
bottom: 0,
zIndex: '200',
backgroundColor: 'rgba(0, 0, 0, 0.6)'
},
content: {
position: 'absolute',
top: '100px',
left: '100px',
right: '100px',
bottom: '100px',
border: '1px solid #ccc',
background: '#fff',
overflow: 'auto',
WebkitOverflowScrolling: 'touch',
borderRadius: '4px',
outline: 'none',
padding: '20px'
}
}
}
53 changes: 52 additions & 1 deletion src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,57 @@ input {
margin-right: auto;
}

.popupImage {
padding: 60px 50px;
border: 5px;
height: 350px;
}

.buttonContainer {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
margin-top: 5px;
}

.buttonContainer :hover {
opacity: 0.6;
}

.buttonStyle {
cursor: pointer;
background-color: #000;
color: white;
box-sizing: border-box;
padding: 5px 15px;
border-radius: 4px;
font-size: 22px;
display: flex;
justify-content: center;
}

.popUpContainer {
width: 100%;
min-height: 350px;
overflow: auto;
}

.imagePopupOverlay {
position: absolute;
background-color: rgba(0, 0, 0, 0.8);
width: 100%;
height: 100%;
}

.imagePopupModal {
background-color: red;
width: 500px;
height: 500px;
justify-content: center;
display: flex;
}

@keyframes spin {
0% {
transform: rotate(0deg);
Expand Down Expand Up @@ -232,4 +283,4 @@ input {
-o-transform: rotate(45deg);
box-shadow: 4px 4px 10px rgba(0, 0, 0, 0.8);
}
}
}
Loading