Skip to content

Commit 685a74b

Browse files
DonatNathanDonatNathan
authored
Merge pull request #4 from DonatNathan/dev
Dev
2 parents 9c09967 + 52c7eda commit 685a74b

9 files changed

Lines changed: 69 additions & 73 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
run: npm test -- --coverage
1515
- name: Upload coverage reports to Codecov
1616
run: |
17-
# Replace `linux` below with the appropriate OS
18-
# Options are `alpine`, `linux`, `macos`, `windows`
1917
curl -Os https://uploader.codecov.io/latest/linux/codecov
2018
chmod +x codecov
2119
./codecov -t ${CODECOV_TOKEN}

‎src/components/Contact.js‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,54 +38,52 @@ const Contact = () => {
3838
const {theme} = useContext(ThemeContext);
3939

4040
return (
41-
<Box id="contact" sx={{display: "flex", justifyContent: "center", alignItems: "center", backgroundColor: theme.BackgroundColor, paddingTop: "80px"}}>
42-
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", backgroundColor: theme.BackgroundColor, padding: "80px", boxShadow: `-20px -20px 20px ${theme.SecondBackgroundColor}, 20px -20px 20px ${theme.SecondBackgroundColor}`}}>
43-
<Box sx={{display: "flex", flexDirection: "column", width: "50vh", textAlign: "left", justifyContent: "center"}}>
44-
<Typography sx={{fontSize: 30, color: theme.BoldTextColor, fontWeight: "bold"}}>Let's discuss your Project</Typography>
45-
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", marginTop: "20px"}}>
46-
<Info
47-
name={"Address:"}
48-
value={"Mont-Saxonnex, France"}
49-
icon={"address"}
50-
/>
51-
<Info
52-
name={"My Email:"}
53-
value={"nathandonatt@gmail.com"}
54-
icon={"email"}
55-
/>
56-
<Info
57-
name={"Call me:"}
58-
value={"07 77 75 52 92"}
59-
icon={"phone"}
60-
/>
61-
</Box>
62-
<Box sx={{display: "flex", flexDirection: "row", justifyContent: "left", marginTop: "20px"}}>
63-
<a href="https://www.instagram.com/nathandonatt/">
64-
<IoLogoInstagram size={20} color={theme.MainColor} />
65-
</a>
66-
<a href="https://www.linkedin.com/in/nathan-donat-filliod/">
67-
<IoLogoLinkedin style={{marginLeft: "20px"}} size={20} color={theme.MainColor} />
68-
</a>
69-
<a href="https://github.com/DonatNathan/">
70-
<IoLogoGithub style={{marginLeft: "20px"}} size={20} color={theme.MainColor} />
71-
</a>
72-
</Box>
41+
<Box id="contact" sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", backgroundColor: theme.BackgroundColor, padding: "80px", boxShadow: `-20px -20px 20px ${theme.SecondBackgroundColor}, 20px -20px 20px ${theme.SecondBackgroundColor}`}}>
42+
<Box sx={{display: "flex", flexDirection: "column", width: "30vw", minWidth: "300px", textAlign: "left", justifyContent: "center"}}>
43+
<Typography sx={{fontSize: 30, color: theme.BoldTextColor, fontWeight: "bold"}}>Let's discuss your Project</Typography>
44+
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", marginTop: "20px"}}>
45+
<Info
46+
name={"Address:"}
47+
value={"Mont-Saxonnex, France"}
48+
icon={"address"}
49+
/>
50+
<Info
51+
name={"My Email:"}
52+
value={"nathandonatt@gmail.com"}
53+
icon={"email"}
54+
/>
55+
<Info
56+
name={"Call me:"}
57+
value={"07 77 75 52 92"}
58+
icon={"phone"}
59+
/>
7360
</Box>
74-
<Box sx={{display: "flex", flexDirection: "column", width: "50vh", textAlign: "left", justifyContent: "center"}}>
75-
<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>
76-
<FormControl>
77-
<TextField required id="name" label="Name" variant="standard" />
78-
<TextField required id="email" label="Email" variant="standard" />
79-
<TextField id="location" label="Location" variant="standard" />
80-
<Box sx={{display: "flex", flexDirection: "row", justifyContent: "space-between"}}>
81-
<TextField required id="budget" label="Budget" variant="standard" />
82-
<TextField required id="subject" label="Subject" variant="standard" />
83-
</Box>
84-
<TextField required multiline id="message" label="Message" variant="standard" />
85-
<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>
86-
</FormControl>
61+
<Box sx={{display: "flex", flexDirection: "row", justifyContent: "left", marginTop: "20px"}}>
62+
<a href="https://www.instagram.com/nathandonatt/">
63+
<IoLogoInstagram size={20} color={theme.MainColor} />
64+
</a>
65+
<a href="https://www.linkedin.com/in/nathan-donat-filliod/">
66+
<IoLogoLinkedin style={{marginLeft: "20px"}} size={20} color={theme.MainColor} />
67+
</a>
68+
<a href="https://github.com/DonatNathan/">
69+
<IoLogoGithub style={{marginLeft: "20px"}} size={20} color={theme.MainColor} />
70+
</a>
8771
</Box>
8872
</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>
8987
</Box>
9088
);
9189
};

‎src/components/Introduction.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const Stat = ({main, secondary}) => {
77
const {theme} = useContext(ThemeContext);
88

99
return (
10-
<Box sx={{height: "70px", width: "300px", backgroundColor: theme.SecondBackgroundColor, margin: "2px", display: "flex", flexDirection: "column", padding: "10px", justifyContent: "center", alignItems: "center", textAlign: "center", borderRadius: "6px"}}>
10+
<Box sx={{height: "70px", width: "10vw", minWidth: "200px", backgroundColor: theme.SecondBackgroundColor, margin: "2px", display: "flex", flexDirection: "column", padding: "10px", justifyContent: "center", alignItems: "center", textAlign: "center", borderRadius: "6px"}}>
1111
<Typography sx={{fontSize: 20, fontColor: theme.BoldTextColor, fontWeight: "bold"}}>{main}</Typography>
1212
<Typography sx={{fontSize: 15, fontColor: theme.SubTextColor}}>{secondary}</Typography>
1313
</Box>
@@ -19,12 +19,12 @@ const Introduction = () => {
1919
const {theme} = useContext(ThemeContext);
2020

2121
return (
22-
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", textAlign: "center", backgroundColor: theme.BackgroundColor, paddingTop: "80px", paddingBottom: "80px"}}>
23-
<Box sx={{display: "flex", flexDirection: "column", textAlign: "left", justifyContent: "center", width: "60vh"}}>
24-
<Typography sx={{fontSize: 50, color: theme.BoldTextColor, fontWeight: "bold"}}>Hello, I'm Nathan Donat-Filliod</Typography>
25-
<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. Why not yours?</Typography>
22+
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", backgroundColor: theme.BackgroundColor, paddingTop: "80px", paddingBottom: "80px"}}>
23+
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", width: "40vw", minWidth: "300px"}}>
24+
<Typography sx={{fontSize: 50, color: theme.BoldTextColor, fontWeight: "bold"}}>Hello,<br /> I'm Nathan Donat-Filliod</Typography>
25+
<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>
2626
<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>
27-
<Box sx={{display: "flex", flexDirection: "row", marginTop: "50px", marginBottom: "50px", justifyContent: "left", alignItems: "center"}}>
27+
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", marginTop: "50px", marginBottom: "50px", alignItems: "center"}}>
2828
<Stat
2929
main={"4 Y."}
3030
secondary={"Experience"}
@@ -39,7 +39,7 @@ const Introduction = () => {
3939
/>
4040
</Box>
4141
</Box>
42-
<Box component="img" sx={{backgroundColor: theme.SecondBackgroundColor, borderRadius: "20px"}} alt={"Personal Picture"} src={"/images/me.png"} />
42+
<Box component="img" sx={{backgroundColor: theme.SecondBackgroundColor, borderRadius: "20px", width: "20vw", minWidth: "300px"}} alt={"Personal Picture"} src={"/images/me.png"} />
4343
</Box>
4444
);
4545
};

‎src/components/Portfolio.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const Project = ({type, name, description, path, link}) => {
88
const {theme} = useContext(ThemeContext);
99

1010
return (
11-
<Box sx={{":hover": {boxShadow: `-10px 10px 10px ${theme.SecondBackgroundColor}, 10px 10px 10px ${theme.SecondBackgroundColor}`, transitionDuration: "0.8s"}, transitionDuration: "0.8s", width: "50vh", backgroundColor: theme.BackgroundColor, border: 2, borderRadius: "8px", margin: "10px", borderColor: theme.SecondBackgroundColor}}>
11+
<Box sx={{":hover": {boxShadow: `-10px 10px 10px ${theme.SecondBackgroundColor}, 10px 10px 10px ${theme.SecondBackgroundColor}`, transitionDuration: "0.8s"}, transitionDuration: "0.8s", width: "25vw", minWidth: "300px", backgroundColor: theme.BackgroundColor, border: 2, borderRadius: "8px", margin: "10px", borderColor: theme.SecondBackgroundColor}}>
1212
<Box component="img" sx={{width: "100%", borderRadius: "8px", height: "250px", objectFit: "cover"}} alt={name} src={path} />
1313
<Box sx={{display: "flex", flexDirection: "column", textAlign: "left", padding: "30px"}}>
1414
<Typography sx={{fontSize: 12, color: theme.SubTextColor}}>{type}</Typography>

‎src/components/Process.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const Process = () => {
3636

3737
return (
3838
<Box id="process" sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", backgroundColor: theme.SecondBackgroundColor, paddingTop: "80px", paddingBottom: "80px"}}>
39-
<Box sx={{width: "50vh", display: "flex", flexDirection: "column", justifyContent: "center", textAlign: "left"}}>
39+
<Box sx={{width: "30vw", minWidth: "300px", display: "flex", flexDirection: "column", justifyContent: "center", textAlign: "left"}}>
4040
<Typography sx={{fontSize: 40, color: theme.BoldTextColor, fontWeight: "bold"}}>Work Process</Typography>
4141
<Typography sx={{fontSize: 15, color: theme.ClassicTextColor, marginTop: "10px", marginBottom: "20px"}}>In my process, I focus on understanding your vision, planning strategically, and delivering results. <br /><br />From initial brainstorming to design, development, and testing, I work closely with you at each stage to ensure the project aligns with your goals. <br /><br />I emphasize transparency, adaptability, and quality, so you stay informed, and your solution is built to succeed.</Typography>
4242
</Box>

‎src/components/Services.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const Service = ({name, description}) => {
77
const {theme} = useContext(ThemeContext);
88

99
return (
10-
<Box sx={{backgroundColor: theme.BackgroundColor, textAlign: "left", padding: "10px", width: "50vh", borderLeft: 3, ":hover": {borderLeftColor: theme.MainColor, transitionDuration: "0.8s"}, transitionDuration: "0.8s", borderLeftColor: theme.BackgroundColor, borderRadius: "6px", margin: "10px"}}>
10+
<Box sx={{backgroundColor: theme.BackgroundColor, textAlign: "left", padding: "10px", width: "30vw", minWidth: "300px", borderLeft: 3, ":hover": {borderLeftColor: theme.MainColor, transitionDuration: "0.8s"}, transitionDuration: "0.8s", borderLeftColor: theme.BackgroundColor, borderRadius: "6px", margin: "10px"}}>
1111
<Typography sx={{fontSize: 20, fontWeight: "bold", color: theme.BoldTextColor}}>{name}</Typography>
1212
<Typography sx={{fontSize: 15, color: theme.ClassicTextColor}}>{description}</Typography>
1313
</Box>
@@ -20,7 +20,7 @@ const Services = () => {
2020

2121
return (
2222
<Box id="services" sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", textAlign: "center", backgroundColor: theme.SecondBackgroundColor, paddingTop: "80px", paddingBottom: "80px"}}>
23-
<Box sx={{display: "flex", flexDirection: "column", justifyContent: "center", alignItems: "left", textAlign: "left", width: "50vh", marginBottom: "30px"}}>
23+
<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>
2626
<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>

‎src/modules/footer/Footer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ const Footer = () => {
88
const {theme} = useContext(ThemeContext);
99

1010
return (
11-
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", textAlign: "center", backgroundColor: theme.BoldTextColor, paddingTop: "200px", paddingBottom: "80px"}}>
11+
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", justifyContent: "space-around", alignItems: "center", textAlign: "center", backgroundColor: theme.BoldTextColor, paddingTop: "100px", paddingBottom: "50px"}}>
1212
<Box component={Link} to={"#home"} sx={{display: "flex", flexDirection: "row", alignItems: "center", textDecoration: "none"}}>
1313
<Box component="img" sx={{width: 50}} alt="White Logo Donat" src="/images/logo_white.png" />
1414
<Typography sx={{fontSize: 30, fontWeight: "bold", color: theme.BackgroundColor}}>Donat</Typography>
1515
</Box>
16-
<Box sx={{display: "flex", flexDirection: "row", alignItems: "center"}}>
16+
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", alignItems: "center", justifyContent: "center", marginBottom: "30px", marginTop: "30px"}}>
1717
{/* <Link to={"#home"} style={{color: theme.BackgroundColor, textDecoration: "none", margin: "10px"}}>Home</Link> */}
1818
<Link to={"#home"} style={{color: theme.BackgroundColor, textDecoration: "none", margin: "10px"}}>About</Link>
1919
<Link to={"#process"} style={{color: theme.BackgroundColor, textDecoration: "none", margin: "10px"}}>Process</Link>

‎src/modules/header/Header.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ const Header = () => {
1313
<Box component="img" sx={{width: 50}} alt="Black Logo Donat" src="/images/logo.png" />
1414
<Typography sx={{fontSize: 30, fontWeight: "bold", color: theme.BoldTextColor}}>Donat</Typography>
1515
</Box>
16-
<Box sx={{display: "flex", flexDirection: "row", alignItems: "center"}}>
16+
<Box sx={{display: "flex", flexWrap: "wrap", flexDirection: "row", alignItems: "center"}}>
1717
{/* <Link to={"#home"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "15px"}}>Home</Link> */}
18-
<Link to={"#home"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "15px"}}>About</Link>
19-
<Link to={"#process"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "15px"}}>Process</Link>
20-
<Link to={"#portfolio"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "15px"}}>Portfolio</Link>
21-
<Link to={"#services"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "15px"}}>Services</Link>
18+
<Link to={"#home"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>About</Link>
19+
<Link to={"#process"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>Process</Link>
20+
<Link to={"#portfolio"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>Portfolio</Link>
21+
<Link to={"#services"} style={{color: theme.BoldTextColor, textDecoration: "none", margin: "10px"}}>Services</Link>
2222
<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>
2323
</Box>
2424
</Box>

0 commit comments

Comments
 (0)