Skip to content

Commit 8c4be75

Browse files
DonatNathanDonatNathan
authored
Merge pull request #5 from DonatNathan/hotfix/removeForm
Hotfix/remove form
2 parents 52c7eda + 4a9eb43 commit 8c4be75

7 files changed

Lines changed: 25 additions & 39 deletions

File tree

‎package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@emotion/react": "^11.11.4",
7-
"@emotion/styled": "^11.11.5",
8-
"@mui/icons-material": "^5.15.16",
9-
"@mui/material": "^5.15.16",
10-
"@mui/styled-engine-sc": "^6.0.0-alpha.18",
11-
"@testing-library/jest-dom": "^5.17.0",
12-
"@testing-library/react": "^13.4.0",
13-
"@testing-library/user-event": "^13.5.0",
6+
"@emotion/react": "^11.14.0",
7+
"@emotion/styled": "^11.14.1",
8+
"@mui/icons-material": "^7.2.0",
9+
"@mui/material": "^7.2.0",
10+
"@mui/styled-engine-sc": "^7.2.0",
11+
"@testing-library/jest-dom": "^6.6.3",
12+
"@testing-library/react": "^16.3.0",
13+
"@testing-library/user-event": "^14.6.1",
1414
"mui": "^0.0.1",
15-
"react": "^18.2.0",
16-
"react-dom": "^18.2.0",
15+
"react": "^19.1.0",
16+
"react-dom": "^19.1.0",
1717
"react-helmet": "^6.1.0",
18-
"react-icons": "^5.4.0",
19-
"react-router-dom": "^6.21.0",
18+
"react-icons": "^5.5.0",
19+
"react-router-dom": "^7.6.3",
2020
"react-router-hash-link": "^2.4.3",
2121
"react-scripts": "5.0.1",
22-
"react-social-icons": "^6.16.0",
23-
"styled-components": "^6.1.9",
24-
"web-vitals": "^2.1.4"
22+
"react-social-icons": "^6.24.0",
23+
"styled-components": "^6.1.19",
24+
"web-vitals": "^5.0.3"
2525
},
2626
"scripts": {
2727
"start": "react-scripts start",
@@ -48,8 +48,8 @@
4848
]
4949
},
5050
"devDependencies": {
51-
"@babel/preset-env": "^7.23.9",
52-
"@babel/preset-react": "^7.23.3",
53-
"jest": "^27.5.1"
51+
"@babel/preset-env": "^7.27.2",
52+
"@babel/preset-react": "^7.27.1",
53+
"jest": "^30.0.3"
5454
}
5555
}

‎src/components/Contact.js‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { Box, Button, FormControl, TextField, Typography } from "@mui/material"
1+
import { Box, Typography } from "@mui/material"
22
import { ThemeContext } from "../utils/themes/ThemeContext";
33
import { useContext } from "react";
4-
import { IoSendOutline } from "react-icons/io5";
54
import { IoLocationOutline } from "react-icons/io5";
65
import { IoMailOutline } from "react-icons/io5";
76
import { IoCallOutline } from "react-icons/io5";
@@ -70,20 +69,7 @@ const Contact = () => {
7069
</a>
7170
</Box>
7271
</Box>
73-
<Box sx={{display: "flex", flexDirection: "column", width: "30vw", minWidth: "300px", textAlign: "left", justifyContent: "center"}}>
74-
<Typography sx={{fontSize: 15, color: theme.SubTextColor, marginBottom: "20px"}}>Describe your project as best you can and I will send you a quote for its completion.</Typography>
75-
<FormControl>
76-
<TextField required id="name" label="Name" variant="standard" />
77-
<TextField required id="email" label="Email" variant="standard" />
78-
<TextField id="location" label="Location" variant="standard" />
79-
<Box sx={{display: "flex", flexDirection: "row", justifyContent: "space-between"}}>
80-
<TextField required id="budget" label="Budget" variant="standard" />
81-
<TextField required id="subject" label="Subject" variant="standard" />
82-
</Box>
83-
<TextField required multiline id="message" label="Message" variant="standard" />
84-
<Button sx={{":hover": {backgroundColor: theme.ClassicTextColor}, width: "fit-content", backgroundColor: theme.MainColor, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "50px"}}>Submit <IoSendOutline style={{marginLeft: "10px"}} size={20} /></Button>
85-
</FormControl>
86-
</Box>
72+
<Box component="img" sx={{width: 100, marginTop: "50px"}} alt="Black Logo Donat" src="/images/logo.png" />
8773
</Box>
8874
);
8975
};

‎src/components/Introduction.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const Introduction = () => {
2323
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", width: "40vw", minWidth: "300px"}}>
2424
<Typography sx={{fontSize: 50, color: theme.BoldTextColor, fontWeight: "bold"}}>Hello,<br /> I'm Nathan Donat-Filliod</Typography>
2525
<Typography sx={{fontSize: 15, color: theme.ClassicTextColor, marginTop: "10px", marginBottom: "20px"}}>I'm a Freelance Developer based in Lyon, France. I spend my free time doing projects that I find interesting.<br /> Why not yours?</Typography>
26-
<Button href="#contact" sx={{width: "fit-content", textTransform: "none", backgroundColor: theme.MainColor, ":hover": {backgroundColor: theme.ClassicTextColor}, ":visited": {color: theme.BackgroundColor}, color: theme.BackgroundColor, fontSize: 15}}>Contact me</Button>
26+
<Button href="#contact" style={{width: "fit-content", textTransform: "none", backgroundColor: theme.MainColor, color: theme.BackgroundColor, fontSize: 15}}>Contact me</Button>
2727
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", marginTop: "50px", marginBottom: "50px", alignItems: "center"}}>
2828
<Stat
2929
main={"4 Y."}

‎src/components/Portfolio.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const Portfolio = () => {
7272
link={"https://github.com/DonatNathan/2D-map-generator"}
7373
/>
7474
</Box>
75-
<Button href="https://github.com/DonatNathan" sx={{width: "fit-content", backgroundColor: theme.MainColor, ":hover": {backgroundColor: theme.ClassicTextColor}, ":visited": {color: theme.BackgroundColor}, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "50px"}}>More Projects</Button>
75+
<Button href="https://github.com/DonatNathan" style={{width: "fit-content", backgroundColor: theme.MainColor, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "50px"}}>More Projects</Button>
7676
</Box>
7777
);
7878
};

‎src/components/ProjectIdea.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const ProjectIdea = () => {
1111
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", alignItems: "center", textAlign: "center", backgroundColor: theme.BoldTextColor, color: theme.BackgroundColor, paddingTop: "80px", paddingBottom: "80px"}}>
1212
<Typography sx={{fontSize: 40, fontWeight: "bold"}}>Do you have Project Idea?</Typography>
1313
<Typography sx={{fontSize: 40, fontWeight: "bold"}}>Let's discuss your project!</Typography>
14-
<Button href="#contact" sx={{width: "fit-content", backgroundColor: theme.MainColor, ":hover": {backgroundColor: theme.ClassicTextColor}, ":visited": {color: theme.BackgroundColor}, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "30px"}}>Let's work Together <IoArrowForward style={{marginLeft: "10px"}} size={20} /></Button>
14+
<Button href="#contact" style={{width: "fit-content", backgroundColor: theme.MainColor, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "30px"}}>Let's work Together <IoArrowForward style={{marginLeft: "10px"}} size={20} /></Button>
1515
</Box>
1616
);
1717
};

‎src/components/Services.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const Services = () => {
2323
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", alignItems: "left", textAlign: "left", width: "30vw", minWidth: "300px", marginBottom: "30px"}}>
2424
<Typography sx={{fontSize: 40, fontWeight: "bold", color: theme.BoldTextColor}}>What I do?</Typography>
2525
<Typography sx={{fontSize: 15, color: theme.ClassicTextColor, marginTop: "15px", marginBottom: "15px"}}>I offer comprehensive development services for any project like websites, mobile apps, software, and even video games. <br /><br />With a versatile skill set across platforms and technologies, I bring ideas to life with solutions tailored to your goals, ensuring seamless performance, engaging user experiences, and long-term success.</Typography>
26-
<Button href="https://github.com/DonatNathan" sx={{width: "fit-content", backgroundColor: theme.MainColor, ":hover": {backgroundColor: theme.ClassicTextColor}, ":visited": {color: theme.BackgroundColor}, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "10px"}}>See what I did</Button>
26+
<Button href="https://github.com/DonatNathan" style={{width: "fit-content", backgroundColor: theme.MainColor, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, marginTop: "10px"}}>See what I did</Button>
2727
</Box>
2828
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", alignItems: "center"}}>
2929
<Service

‎src/modules/header/Header.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const Header = () => {
1919
<Link to={"#process"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>Process</Link>
2020
<Link to={"#portfolio"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>Portfolio</Link>
2121
<Link to={"#services"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>Services</Link>
22-
<Button href="#contact" sx={{width: "fit-content", backgroundColor: theme.MainColor, ":hover": {backgroundColor: theme.ClassicTextColor}, ":visited": {color: theme.BackgroundColor}, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, margin: "15px"}}>Contact</Button>
22+
<Button href="#contact" style={{width: "fit-content", backgroundColor: theme.MainColor, color: theme.BackgroundColor, textTransform: "none", fontSize: 15, margin: "15px"}}>Contact</Button>
2323
</Box>
2424
</Box>
2525
)

0 commit comments

Comments
 (0)