Skip to content

Commit 491d5bc

Browse files
committed
content uploaded
1 parent 1b842b9 commit 491d5bc

File tree

10 files changed

+122
-104
lines changed

10 files changed

+122
-104
lines changed
2.42 MB
Binary file not shown.

src/components/About/About.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React, { useContext } from 'react';
33
import './About.css';
44
import { ThemeContext } from '../../contexts/ThemeContext';
55
import { aboutData } from '../../data/aboutData'
6-
import Background from '../Background/Background';
76

87

98
function About() {
@@ -28,7 +27,7 @@ function About() {
2827
/>
2928
</div>
3029
</div>
31-
<Background />
30+
3231
</div>
3332

3433
)

src/components/Contacts/Contacts.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function Contacts() {
100100
const classes = useStyles();
101101

102102
return (
103-
<div className="contacts">
103+
<div id="contacts" className="contacts">
104104

105105
<div className="contactsHeader">
106106
<div style={{ backgroundColor: theme.secondary50, height: '1rem' }}> </div>

src/components/Landing/Landing.js

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -197,28 +197,39 @@ function Landing() {
197197
<p>{headerData.description}</p>
198198

199199
<div className='lcr-buttonContainer'>
200-
{headerData.resumePdf && (
200+
201201
<a
202202
href={headerData.resumePdf}
203203
download='resume'
204204
target='_blank'
205205
rel='noreferrer'
206206
>
207-
<Button className={classes.resumeBtn}>
208-
Download CV
209-
</Button>
207+
<Button
208+
style={{
209+
backgroundColor: theme.primary,
210+
color: theme.secondary70,
211+
width: '8rem',
212+
display: 'flex',
213+
alignItems: 'center',
214+
justifyContent: 'center',
215+
}} variant="contained">
216+
<a style={{ backgroundColor: 'none' }} href={headerData.resumePdf}>
217+
<h2>RESUME</h2></a>
218+
</Button>
210219
</a>
211-
)}
212-
<NavLink
213-
to='/#contacts'
214-
smooth={true}
215-
spy='true'
216-
duration={2000}
217-
>
218-
<Button className={classes.contactBtn}>
219-
Contact
220-
</Button>
221-
</NavLink>
220+
221+
<Button
222+
style={{
223+
backgroundColor: theme.primary,
224+
color: theme.secondary70,
225+
width: '8rem',
226+
display: 'flex',
227+
alignItems: 'center',
228+
justifyContent: 'center',
229+
}} variant="contained">
230+
<a style={{ backgroundColor: 'none' }} href="./formpage">
231+
<h2>CONTACT</h2></a>
232+
</Button>
222233
</div>
223234
</div>
224235
</div>

src/components/PreContact/PreContact.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ a:-webkit-any-link:hover
180180
{
181181
text-decoration: wavy;
182182
background-color: #232526;
183-
color: #212121;
183+
color: #eaeaea;
184184
font-weight: 800;
185185
}
186186

@@ -229,7 +229,7 @@ detailsIcon
229229
detailsIcon:hover
230230
{
231231
transform: 'scale(1.1)';
232-
color: '#667';
232+
color: '#eaeaea';
233233
background-color: '#232526';
234234
}
235235

src/components/PreContact/PreContact.js

Lines changed: 39 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
11
import * as React from 'react';
2-
import Button from '@mui/material/Button';
3-
// import CssBaseline from '@mui/material/CssBaseline';
4-
import TextField from '@mui/material/TextField';
5-
import FormControlLabel from '@mui/material/FormControlLabel';
6-
import Checkbox from '@mui/material/Checkbox';
7-
import Link from '@mui/material/Link';
82
import Paper from '@mui/material/Paper';
93
import Box from '@mui/material/Box';
104
import { Grid } from '@mui/material';
11-
import Typography from '@mui/material/Typography';
125
import { createTheme, ThemeProvider } from '@mui/material/styles';
13-
import Container from '@mui/material/Container';
146
import PsychologyIcon from '@mui/icons-material/Psychology';
157
import HandshakeIcon from '@mui/icons-material/Handshake';
168
import WorkIcon from '@mui/icons-material/Work';
179
import UpgradeIcon from '@mui/icons-material/Upgrade';
18-
import {
19-
FaTwitter,
20-
FaLinkedinIn,
21-
FaGithub,
22-
FaYoutube,
23-
FaStackOverflow,
24-
FaCodepen,
25-
} from 'react-icons/fa';
26-
import { SiReplit } from 'react-icons/si';
27-
import { FiPhone, FiAtSign } from 'react-icons/fi';
28-
import { HiOutlineLocationMarker } from 'react-icons/hi';
2910
import { styled } from '@mui/material/styles';
30-
import { socialsData } from '../../data/socialsData';
31-
import { contactsData } from '../../data/contactsData';
3211
import './PreContact.css';
3312

3413
const theme = createTheme({
@@ -65,63 +44,60 @@ const Item = styled(Paper)(({ theme }) => ({
6544
padding: theme.spacing(1),
6645
textAlign: 'center',
6746
color: theme.palette.text.secondary,
68-
6947
}
7048
)); console.log(theme.palette.mode)
7149

72-
50+
7351

7452
function PreContact() {
75-
7653

7754
return (
78-
79-
<ThemeProvider theme={theme}>
80-
<Grid item xs={12} sm={8} md={5} component={Paper} elevation={6} square>
81-
<Box
82-
sx={{
83-
84-
mx: 1,
85-
display: 'flex',
86-
flexDirection: 'column',
87-
alignItems: 'center',
88-
}}
89-
>
90-
<Grid spacing={2}>
91-
<Grid item xs={12}>
92-
<Item sx={{color:'#eaeaea', bgcolor: '#232526' }}><UpgradeIcon sx={{ p: '0.2rem', width: '3rem', height: '3rem', borderRadius: "50%", color:'#eaeaea', bgcolor: '#232526' }} />
93-
Looking to updgrade your website? </Item>
94-
</Grid>
55+
<ThemeProvider theme={theme}>
56+
<Grid item xs={12} sm={8} md={5} component={Paper} elevation={6} square>
57+
<Box
58+
sx={{
59+
60+
mx: 1,
61+
display: 'flex',
62+
flexDirection: 'column',
63+
alignItems: 'center',
64+
}}
65+
>
66+
<Grid spacing={2}>
67+
<Grid item xs={12}>
68+
<Item sx={{ color: '#eaeaea', bgcolor: '#232526' }}><UpgradeIcon sx={{ p: '0.2rem', width: '3rem', height: '3rem', borderRadius: "50%", color: '#eaeaea', bgcolor: '#232526' }} />
69+
Looking to updgrade your website? </Item>
9570
</Grid>
71+
</Grid>
9672

97-
<Grid spacing={2}>
98-
<Grid item xs={12}>
99-
<Item sx={{color:'#eaeaea', bgcolor: '#232526' }}><PsychologyIcon sx={{ p: '0.2rem', width: '3rem', height: '3rem', borderRadius: "50%", color:'#eaeaea', bgcolor: '#232526' }} />
100-
Got an idea for an app or website that you'd like to see come to life?</Item>
101-
</Grid>
73+
<Grid spacing={2}>
74+
<Grid item xs={12}>
75+
<Item sx={{ color: '#eaeaea', bgcolor: '#232526' }}><PsychologyIcon sx={{ p: '0.2rem', width: '3rem', height: '3rem', borderRadius: "50%", color: '#eaeaea', bgcolor: '#232526' }} />
76+
Got an idea for an app or website that you'd like to see come to life?</Item>
10277
</Grid>
78+
</Grid>
10379

104-
<Grid spacing={2}>
105-
<Grid item xs={12}>
106-
<Item sx={{color:'#eaeaea', bgcolor: '#232526' }}><HandshakeIcon sx={{ p: '0.2rem', width: '3rem', height: '3rem', borderRadius: "50%", color:'#eaeaea', bgcolor: '#232526' }} />
107-
Interested in collaborating or forming a team to create something amazing?</Item>
108-
</Grid>
80+
<Grid spacing={2}>
81+
<Grid item xs={12}>
82+
<Item sx={{ color: '#eaeaea', bgcolor: '#232526' }}><HandshakeIcon sx={{ p: '0.2rem', width: '3rem', height: '3rem', borderRadius: "50%", color: '#eaeaea', bgcolor: '#232526' }} />
83+
Interested in collaborating or forming a team to create something amazing?</Item>
10984
</Grid>
85+
</Grid>
86+
87+
<Grid spacing={2}>
88+
<Grid item xs={12}>
89+
<Item maxwidth sx={{ color: '#eaeaea', bgcolor: '#232526' }}><WorkIcon sx={{ p: '0.4rem', width: '3rem', height: '3rem', borderRadius: "50%", color: '#eaeaea', bgcolor: '#232526' }} />
90+
Hiring web developers with my skillset?</Item>
91+
</Grid>
92+
</Grid>
93+
94+
</Box>
95+
</Grid>
11096

111-
<Grid spacing={2}>
112-
<Grid item xs={12}>
113-
<Item maxwidth sx={{color:'#eaeaea', bgcolor: '#232526' }}><WorkIcon sx={{ p: '0.4rem', width: '3rem', height: '3rem', borderRadius: "50%", color:'#eaeaea', bgcolor: '#232526' }} />
114-
Hiring web developers with my skillset?</Item>
115-
</Grid>
116-
</Grid>
117-
118-
</Box>
119-
</Grid>
12097

12198

122-
123-
</ThemeProvider>
124-
);
99+
</ThemeProvider>
100+
);
125101
}
126102

127103
export default PreContact;

src/components/Testimonials/Testimonials.css

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.testimonials {
22
font-family: var(--primaryFont);
3-
height: 100vh;
3+
height: fit-content;
44
display: flex;
55
flex-direction: column;
66
align-items: center;
@@ -33,9 +33,15 @@
3333
.slick-dots {
3434
position: relative !important;
3535
bottom: 1rem !important;
36-
36+
37+
}
38+
#root > div > div:nth-child(1) > div.testimonials > div.testimonials--body > div > div > ul > li > button{
39+
background: #eaeaea;
40+
width: .5rem;
41+
height: .5rem;
3742
}
3843

44+
3945
.testimonials--header h1 {
4046
background: none;
4147
font-style: normal;
@@ -101,7 +107,7 @@
101107
.single--testimony {
102108
padding: 2rem;
103109
width: 100%;
104-
height: 500px;
110+
/* height: 500px; */
105111
position: relative;
106112
display: flex;
107113
flex-direction: column;

src/components/Testimonials/Testimonials.js

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { testimonialsData } from '../../data/testimonialsData';
66
import './Testimonials.css';
77
import Button from '@mui/material/Button';
88

9-
9+
1010
function Testimonials() {
1111
const { theme } = useContext(ThemeContext);
1212
const sliderRef = useRef();
@@ -37,7 +37,7 @@ function Testimonials() {
3737

3838
return (
3939
<>
40-
<div style={{ backgroundColor: theme.secondary50, height: '1rem' }}> </div>
40+
<div style={{ backgroundColor: theme.secondary50, height: '1rem' }}> </div>
4141
{testimonialsData.length > 0 && (
4242
<div
4343
className='testimonials'
@@ -109,17 +109,20 @@ function Testimonials() {
109109
</div>
110110
</div>
111111
<div className="formBtn">
112-
<h1 className="blink" style={{fontSize:'3rem'}}>👉</h1><a style={{ backgroundColor: 'none' }}href="./formpage"><Button
113-
style={{
114-
backgroundColor: theme.primary,
115-
color: theme.secondary70,
116-
width: '18rem',
117-
display: 'flex',
118-
alignItems: 'center',
119-
justifyContent: 'center',
120-
}} variant="contained"><h2>CONTACT ME</h2></Button></a><h1 className="blink2" style={{fontSize:'3rem'}}>👈</h1>
112+
<Button
113+
style={{
114+
backgroundColor: theme.primary,
115+
color: theme.secondary70,
116+
width: '18rem',
117+
display: 'flex',
118+
alignItems: 'center',
119+
justifyContent: 'center',
120+
}} variant="contained">
121+
<a style={{ backgroundColor: 'none' }} href="./formpage">
122+
<h2>CONTACT ME</h2></a>
123+
</Button>
121124
</div>
122-
125+
123126
</div>
124127
)}
125128
</>

src/pages/FormPage/FormPage.js

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import React from "react";
1+
import React from 'react';
2+
// import { ThemeContext } from '../../contexts/ThemeContext';
23
import { styled } from '@mui/material/styles';
34
import Paper from '@mui/material/Paper';
45
import { useForm, ValidationError } from "@formspree/react";
56
import { Container, Grid } from '@mui/material';
67
import ThanksBar from './ThanksBar';
78
import {headerData} from '../../data/headerData'
9+
import Button from '@mui/material/Button';
810

911
function ContactForm() {
1012
const [state, handleSubmit] = useForm("xaykzqea");
@@ -27,6 +29,8 @@ function ContactForm() {
2729
const formStatus = state.succeeded ?
2830
<h1>Thank you! I will get back to you shortly!</h1> : <img alt="jon christie web developer resume job portfolio" style={{height:'10rem', width:'10rem'}} src={headerData.BG} />
2931

32+
33+
3034
return (
3135
<>
3236
<ThanksBar view={formStatus}/>
@@ -92,6 +96,25 @@ function ContactForm() {
9296
</button>
9397
</Item>
9498
</Grid>
99+
<div className="formBtn">
100+
<h1 className="blink" style={{ fontSize: '3rem' }}>👉</h1>
101+
102+
<Button
103+
style={{
104+
backgroundColor: '#232526',
105+
color: '#eaeaea',
106+
width: '18rem',
107+
display: 'flex',
108+
alignItems: 'center',
109+
justifyContent: 'center',
110+
}} variant="contained">
111+
<a style={{ backgroundColor: 'none' }} href="./formpage">
112+
<h2>CONTACT ME</h2></a>
113+
</Button>
114+
115+
<h1 className="blink2" style={{ fontSize: '3rem' }}>👈</h1>
116+
</div>
117+
95118
</Grid>
96119
</Container>
97120
</div>

0 commit comments

Comments
 (0)