Skip to content

Commit 0666e26

Browse files
author
Mackenzie Browne
committed
refactors
1 parent 64bbf2e commit 0666e26

File tree

10 files changed

+101
-106
lines changed

10 files changed

+101
-106
lines changed

‎public/MackenzieBrowneResume.pdf‎

219 Bytes
Binary file not shown.

‎public/resume.pdf‎

219 Bytes
Binary file not shown.

‎src/App.style.tsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import styled from 'styled-components';
2+
3+
export const Title = styled.h1.attrs({
4+
className: 'mt-2'
5+
})``;
6+
7+
export const TitleLabel = styled.h2.attrs({
8+
className: 'my-4'
9+
})`
10+
font-size: 1.5rem;
11+
`;
12+
13+
export const Summary = styled.p.attrs({
14+
className: 'mb-1 font-weight-light'
15+
})``;

‎src/App.tsx‎

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,41 @@ import React from 'react';
22
import { Switch, Route, BrowserRouter as Router } from 'react-router-dom';
33
import CoverLetter from './CoverLetter';
44
import Resume from './Resume';
5+
import { Container, Row, Col } from 'react-bootstrap';
6+
import { Title, TitleLabel } from './App.style';
57

68
export default function App() {
79
return (
8-
<Router>
9-
<Switch>
10-
<Route path="/cv" component={CoverLetter} />
11-
<Route
12-
exact
13-
path="/resume"
14-
component={() => {
15-
window.location.replace('/resume.pdf');
16-
return null;
17-
}}
18-
/>
19-
<Route exact path="/" component={Resume} />
20-
</Switch>
21-
</Router>
10+
<Container className="px-md-0 py-5">
11+
<Row>
12+
<Col>
13+
<Row className="d-flex justify-content-between pr-5">
14+
<Col as={Title} md="auto">
15+
Mackenzie Browne
16+
</Col>
17+
<Col as={TitleLabel} md="auto">
18+
Full Stack and Mobile Developer
19+
</Col>
20+
<Col as={TitleLabel} md="auto">
21+
Amsterdam
22+
</Col>
23+
</Row>
24+
</Col>
25+
</Row>
26+
<Router>
27+
<Switch>
28+
<Route path="/cv" component={CoverLetter} />
29+
<Route
30+
exact
31+
path="/resume"
32+
component={() => {
33+
window.location.replace('/resume.pdf');
34+
return null;
35+
}}
36+
/>
37+
<Route exact path="/" component={Resume} />
38+
</Switch>
39+
</Router>
40+
</Container>
2241
);
2342
}

‎src/CoverLetter.tsx‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/companies/Miro.tsx renamed to src/CoverLetter/Miro.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { Summary } from '../Resume.style';
2+
import { Summary } from '../App.style';
33

44
export default () => (
55
<>

src/companies/Squla.tsx renamed to src/CoverLetter/Squla.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { Summary } from '../Resume.style';
2+
import { Summary } from '../App.style';
33

44
export default () => (
55
<>
@@ -9,7 +9,7 @@ export default () => (
99
with 10 years of development experience throughout my career. I like to
1010
approach problems holistically and pragmatically, solving real issues and
1111
not just their symptoms. I also have experience in professional education
12-
and have worked at a education-technology company similar to Squla.
12+
and have worked at an education-technology company similar to Squla.
1313
</Summary>
1414
<br />
1515
<Summary>

‎src/CoverLetter/index.tsx‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import React from 'react';
2+
import { Switch, Route, useRouteMatch } from 'react-router-dom';
3+
import { Container, Row, Col } from 'react-bootstrap';
4+
5+
import { Title, Summary } from '../App.style';
6+
7+
import Miro from './Miro';
8+
import Squla from './Squla';
9+
10+
export default function CoverLetter() {
11+
let { path } = useRouteMatch();
12+
13+
return (
14+
<>
15+
<Row>
16+
<Col>
17+
<Summary>Greetings!</Summary>
18+
<br />
19+
<Switch>
20+
<Route path={`${path}/miro`} component={Miro} />
21+
<Route path={`${path}/squla`} component={Squla} />
22+
<Route
23+
path={path}
24+
component={() => (
25+
<Container className="px-md-0 py-5">
26+
<Row className="d-flex justify-content-between pr-5">
27+
<Col as={Title} md="auto">
28+
COMPANY NOT FOUND
29+
</Col>
30+
</Row>
31+
</Container>
32+
)}
33+
/>
34+
</Switch>
35+
<div className="float-right">
36+
<Summary>Best Regards,</Summary>
37+
<Summary>Mackenzie Browne</Summary>
38+
</div>
39+
</Col>
40+
</Row>
41+
</>
42+
);
43+
}

src/Resume.style.jsx renamed to src/Resume/Resume.style.tsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@ export const Pill = styled(ListGroup.Item).attrs({
1616
font-weight: 400;
1717
`;
1818

19-
export const Title = styled.h1.attrs({
20-
className: 'mt-2'
21-
})``;
22-
23-
export const TitleLabel = styled.h2.attrs({
24-
className: 'my-4'
25-
})`
26-
font-size: 1.5rem;
27-
`;
28-
2919
export const SubTitle = styled.h2.attrs({
3020
className: 'mt-3'
3121
})``;
@@ -34,10 +24,6 @@ export const Education = styled.h2.attrs({
3424
className: 'mt-3'
3525
})``;
3626

37-
export const Summary = styled.p.attrs({
38-
className: 'mb-1 font-weight-light'
39-
})``;
40-
4127
export const Company = ({ name, location }) => (
4228
<Row>
4329
<Col as="h3" className="mb-0">
@@ -49,7 +35,7 @@ export const Company = ({ name, location }) => (
4935
</Row>
5036
);
5137

52-
export const Position = ({ title, time, duties = [] }) => (
38+
export const Position = ({ title, time, duties }) => (
5339
<>
5440
<Row>
5541
<Col as="h4" className="my-2">
@@ -67,7 +53,7 @@ export const Position = ({ title, time, duties = [] }) => (
6753
</>
6854
);
6955

70-
export const Pills = ({ title = null, list }) => (
56+
export const Pills = ({ title = '', list }) => (
7157
<>
7258
{title && <SubTitle>{title}</SubTitle>}
7359
<PillGroup>

src/Resume.tsx renamed to src/Resume/index.tsx

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import React from 'react';
2-
import { Container, Row, Col } from 'react-bootstrap';
2+
import { Row, Col } from 'react-bootstrap';
33

4+
import { Summary } from '../App.style';
45
import {
5-
Title,
6-
TitleLabel,
7-
Summary,
86
SubTitle,
97
ExperienceList,
108
Experience,
@@ -16,20 +14,9 @@ import {
1614

1715
export default function Resume() {
1816
return (
19-
<Container className="px-md-0 py-5">
17+
<>
2018
<Row>
2119
<Col>
22-
<Row className="d-flex justify-content-between pr-5">
23-
<Col as={Title} md="auto">
24-
Mackenzie Browne
25-
</Col>
26-
<Col as={TitleLabel} md="auto">
27-
Full Stack and Mobile Developer
28-
</Col>
29-
<Col as={TitleLabel} md="auto">
30-
Amsterdam
31-
</Col>
32-
</Row>
3320
<Summary>
3421
Organized, lifelong learner motivated by difficult challenges.
3522
Self-driven, and enjoys working independently and with teams. Uses a
@@ -155,12 +142,7 @@ export default function Resume() {
155142
/>
156143
<SideList
157144
title="Portfolio"
158-
list={[
159-
'what-to-do-in-quarantine.web.app',
160-
'syrup.life',
161-
'github.com/mackbrowne',
162-
'mackbrowne.com'
163-
]}
145+
list={['syrup.life', 'github.com/mackbrowne', 'mackbrowne.com']}
164146
/>
165147
<SideList
166148
title="Skills"
@@ -240,6 +222,6 @@ export default function Resume() {
240222
/>
241223
</Col>
242224
</Row>
243-
</Container>
225+
</>
244226
);
245227
}

0 commit comments

Comments
 (0)