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.

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

fix: Reliability issue #88

Merged
merged 1 commit into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions src/screens/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ const About = ({ active }: ScreenProps) => {
const [visible, setVisible] = useState(false)
const [data, setData] = useState<DataModel>(technologiesItems[0])

const onClick = (technology: DataModel) => {
setVisible(true)
setData(technology)
}

return (
<article
style={{ padding: "30px" }}
Expand Down Expand Up @@ -49,10 +54,8 @@ const About = ({ active }: ScreenProps) => {
<ul className="testimonials-list has-scrollbar">
{technologiesItems.map(technology =>
<li key={technology.title}
onClick={() => {
setVisible(true)
setData(technology)
}}
onKeyDown={() => onClick(technology)}
onClick={() => onClick(technology)}
className="testimonials-item"
>
<div className="content-card">
Expand Down
4 changes: 2 additions & 2 deletions src/screens/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import { ModalProps } from "../types"

const Modal = ({ visible, setVisible, data }: ModalProps) =>
<div className={visible ? "modal-container active" : "modal-container"} >
<div className={visible ? "overlay active" : "overlay"} onClick={() => setVisible(false)}></div>
<div className={visible ? "overlay active" : "overlay"} onClick={() => setVisible(false)} onKeyDown={() => setVisible(false)}></div>
<section className="testimonials-modal">
<button className="modal-close-btn" onClick={() => setVisible(false)}>
<IconFont name="close1" color={"white"} size={10} />
</button>
<div className="modal-img-wrapper">
<figure className="modal-avatar-box">
<img style={{ padding: 10}} src={data.image} alt={data.title} width="80" />
<img style={{ padding: 10 }} src={data.image} alt={data.title} width="80" />
</figure>
<img src="./assets/icon-quote.svg" alt="quote icon" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/screens/ModalProjects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ModalProjects = ({ visible, setVisible, data }: ModalProjectProps) => {
const [overIos, setOverIos] = useState(false)
return (
<div className={visible ? "modal-container active" : "modal-container"} >
<div className={visible ? "overlay active" : "overlay"} onClick={() => setVisible(false)} />
<div className={visible ? "overlay active" : "overlay"} onKeyDown={() => setVisible(false)} onClick={() => setVisible(false)} />
<section style={{ width: 1050 }} className="testimonials-modal">
<button className="modal-close-btn" onClick={() => setVisible(false)}>
<IconFont name="close1" color={"white"} size={10} />
Expand Down
10 changes: 6 additions & 4 deletions src/screens/Projects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ const Projects = ({ active }: ScreenProps) => {

const items = ["All", "Mobile", "Software", "Web"]

const onClick = (project: DataProjectModel) => {
setData(project)
setVisible(true)
}
return (
<article
style={{ padding: "30px" }}
Expand Down Expand Up @@ -51,10 +55,8 @@ const Projects = ({ active }: ScreenProps) => {
<ul className="project-list">
{projects.filter(project => selectedCategory === "All" ? true : project.type.includes(selectedCategory)).map(project =>
<li
onClick={() => {
setData(project)
setVisible(true)
}}
onKeyDown={() => onClick(project)}
onClick={() => onClick(project)}
key={project.title} className="project-item active">
<a href="#">
<figure className="project-img">
Expand Down
7 changes: 6 additions & 1 deletion src/screens/Resume.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ const Resume = ({ active }: ScreenProps) => {
<div className="service-content-box">
<a href="#">
<h4 onClick={() => setVisible(true)}
onKeyDown={() => setVisible(true)}
className="h4 service-item-title"
style={{ textAlign: "center" }}>
Check full resume
</h4>
</a>
<a href="#">
<p onClick={downloadPdfResume}
onKeyDown={downloadPdfResume}
className="service-item-text"
style={{ textAlign: "center" }}>
Download resume
Expand All @@ -75,7 +77,10 @@ const Resume = ({ active }: ScreenProps) => {
</div>
</section>
<div className={visible ? "modal-container active" : "modal-container"} >
<div className={visible ? "overlay active" : "overlay"} onClick={() => setVisible(false)} />
<div className={visible ? "overlay active" : "overlay"}
onKeyDown={() => setVisible(false)}
onClick={() => setVisible(false)}
/>
<section style={{ width: 1050, height: 680, }} className="testimonials-modal">
<button className="modal-close-btn" onClick={() => setVisible(false)}>
<IconFont name="close1" color={"white"} size={10} />
Expand Down