diff --git a/client/src/components/Contact.js b/client/src/components/Contact.js index 07bdb5692..d0914b61b 100644 --- a/client/src/components/Contact.js +++ b/client/src/components/Contact.js @@ -3,10 +3,54 @@ import React from 'react' const Contact = () => { return (
-
-

Contact

-

Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae repudiandae repellat illo magni eligendi cupiditate voluptates eius nam voluptate. Incidunt nihil ullam quae quia officia quaerat, deserunt eligendi explicabo totam?

+
+
+
+

Get in Touch

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+

Mauris dolor augue, vulputate in pharetra ac, facilisis nec libero. Fusce condimentum gravida urna, vitae scelerisque erat ornare nec.

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+

Mauris dolor augue, vulputate in pharetra ac, facilisis nec libero. Fusce condimentum gravida urna, vitae scelerisque erat ornare nec.

+
+
+
+
+ email + + +
+
+ message + + +
+
+ date_range + + +
+
+

Services required:

+

+ +

+

+ +

+
+
+ +
+
+
+
) } diff --git a/client/src/components/Home.js b/client/src/components/Home.js index 5566de9fc..a3a40ac48 100644 --- a/client/src/components/Home.js +++ b/client/src/components/Home.js @@ -1,47 +1,99 @@ import React, { Component } from 'react' -import axios from 'axios' -import { Link } from 'react-router-dom' -import Pokeball from '../pokeball.png' + +// Images + +import PortraitImage from '../img/portrait.jpg' +import CityImage from '../img/city.jpg' +import NatureImage from '../img/nature.jpg' +import StreetImage from '../img/street.jpg' +import StarsImage from '../img/stars.jpg' class Home extends Component { - state = { - posts: [] - } - componentDidMount(){ - axios.get('https://jsonplaceholder.typicode.com/posts/') - .then(res => { - console.log(res); - this.setState({ - posts: res.data.slice(0,10) - }); - }) - } + render(){ - const { posts } = this.state - const postList = posts.length ? ( - posts.map(post => { - return ( -
- A Pokeball -
- - {post.title} - -

{post.body}

-
-
- ) - }) - ) : ( -
No posts to show
- ); return (
-
-

Home

- {postList} + +
+
+
+ +
+
+

Portraits

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+
+
+
+ +
+
+

Cityscapes

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+
+
+
+
+ +
+
+

Nature

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+
+
+
+ + +
+
+ +
+
+ + +
+
+
+

What I do..

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+

Mauris dolor augue, vulputate in pharetra ac, facilisis nec libero. Fusce condimentum gravida urna, vitae scelerisque erat ornare nec.

+
+
+ + +
+

Photography

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+

Mauris dolor augue, vulputate in pharetra ac, facilisis nec libero. Fusce condimentum gravida urna, vitae scelerisque erat ornare nec.

+
+
+

Editing

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum at lacus congue, suscipit elit nec, tincidunt orci.

+

Mauris dolor augue, vulputate in pharetra ac, facilisis nec libero. Fusce condimentum gravida urna, vitae scelerisque erat ornare nec.

+
+
+
+
+ + +
+
+ +
+
+ + + +
) } diff --git a/client/src/components/Navbar.js b/client/src/components/Navbar.js index 1e504a8d5..339fbf0f7 100644 --- a/client/src/components/Navbar.js +++ b/client/src/components/Navbar.js @@ -1,21 +1,46 @@ import React from 'react'; -import { Link, NavLink, withRouter } from 'react-router-dom' +import { NavLink, withRouter } from 'react-router-dom' const Navbar = (props) => { return ( - +
+ +
) } diff --git a/client/src/components/Search.js b/client/src/components/Search.js index 7468b3d1b..719b161e4 100644 --- a/client/src/components/Search.js +++ b/client/src/components/Search.js @@ -1,14 +1,50 @@ -import React from 'react' +import React, { Component } from 'react' +import axios from 'axios' +import { Link } from 'react-router-dom' +import Pokeball from '../pokeball.png' -const Search = () => { - return ( -
-
-

Search

-

Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae repudiandae repellat illo magni eligendi cupiditate voluptates eius nam voluptate. Incidunt nihil ullam quae quia officia quaerat, deserunt eligendi explicabo totam?

+class Search extends Component { + state = { + posts: [] + } + componentDidMount(){ + axios.get('https://jsonplaceholder.typicode.com/posts/') + .then(res => { + console.log(res); + this.setState({ + posts: res.data.slice(0,10) + }); + }) + } + render(){ + const { posts } = this.state + const postList = posts.length ? ( + posts.map(post => { + return ( +
+ A Pokeball +
+ + {post.title} + +

{post.body}

+
+
+ ) + }) + ) : ( +
No posts to show
+ ); + + return ( +
+
+

Search

+ {postList} +
-
- ) + ) + } } export default Search diff --git a/client/src/img/city.jpg b/client/src/img/city.jpg new file mode 100644 index 000000000..d68a6e5ce Binary files /dev/null and b/client/src/img/city.jpg differ diff --git a/client/src/img/man.jpg b/client/src/img/man.jpg new file mode 100644 index 000000000..c794190cf Binary files /dev/null and b/client/src/img/man.jpg differ diff --git a/client/src/img/nature.jpg b/client/src/img/nature.jpg new file mode 100644 index 000000000..46d9cd096 Binary files /dev/null and b/client/src/img/nature.jpg differ diff --git a/client/src/img/portrait.jpg b/client/src/img/portrait.jpg new file mode 100644 index 000000000..628cad284 Binary files /dev/null and b/client/src/img/portrait.jpg differ diff --git a/client/src/img/stars.jpg b/client/src/img/stars.jpg new file mode 100644 index 000000000..1b47ce270 Binary files /dev/null and b/client/src/img/stars.jpg differ diff --git a/client/src/img/street.jpg b/client/src/img/street.jpg new file mode 100644 index 000000000..64c8fdb47 Binary files /dev/null and b/client/src/img/street.jpg differ