diff --git a/client/package-lock.json b/client/package-lock.json index e303d7116..acd9c12a1 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -727,15 +727,6 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" }, - "axios": { - "version": "0.18.0", - "resolved": "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz", - "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", - "requires": { - "follow-redirects": "1.5.7", - "is-buffer": "1.1.6" - } - }, "axobject-query": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-0.1.0.tgz", diff --git a/client/package.json b/client/package.json index a946e913e..f6ffad973 100644 --- a/client/package.json +++ b/client/package.json @@ -6,7 +6,6 @@ "@material-ui/core": "^3.0.2", "@material-ui/icons": "^3.0.1", "apollo-boost": "^0.1.15", - "axios": "^0.18.0", "graphql": "^14.0.0", "react": "^16.4.2", "react-apollo": "^2.1.11", diff --git a/client/src/components/Home.js b/client/src/components/Home.js index 8d66be030..7768b4449 100644 --- a/client/src/components/Home.js +++ b/client/src/components/Home.js @@ -9,8 +9,6 @@ import React, { Component } from 'react' 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 { @@ -50,54 +48,6 @@ class Home extends Component { -
-
- -
-
- - -
-
-
-

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.

-
-
- - -
-

This

-

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.

-
-
-

That

-

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/Search.js b/client/src/components/Search.js index 64537b653..384377801 100644 --- a/client/src/components/Search.js +++ b/client/src/components/Search.js @@ -1,45 +1,15 @@ import React, { Component } from 'react' -import axios from 'axios' -import { Link } from 'react-router-dom' -import Pokeball from '../pokeball.png' class Search extends Component { state = { posts: [] } - componentDidMount(){ - axios.get('https://jsonplaceholder.typicode.com/posts/') - .then(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
- ); + render(){ return (
-
-

Search

- {postList} +
+
) diff --git a/client/src/img/stars.jpg b/client/src/img/stars.jpg deleted file mode 100644 index 1b47ce270..000000000 Binary files a/client/src/img/stars.jpg and /dev/null differ diff --git a/client/src/img/street.jpg b/client/src/img/street.jpg deleted file mode 100644 index 64c8fdb47..000000000 Binary files a/client/src/img/street.jpg and /dev/null differ diff --git a/client/src/index.css b/client/src/index.css index b11b7452b..8b1378917 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -1,127 +1 @@ - - - -#main{ - padding: 0px; - box-sizing: border-box; - width: 60%; - height: 100%; -} - -#main h1{ - color:#444; - text-align: center; -} - -#user-list{ - color: black; - padding: 0; -} - -#user-list-li{ - color: pink; - display: inline-block; - margin: 12px; - padding: 10px; - border-radius: 4px; - border: 1px solid #889E4F; - box-shadow: 1px 2px 3px rgba(0,0,0,3); - cursor: pointer; - color: #880E4F; -} - - -form button{ - color: #fff; - font-size: 2em; - background: #AD1457; - border: 0; - padding: 0 10px; - border-radius: 50%; - cursor: pointer; - position: absolute; - bottom: 10px; - left: 10px; -} - -#user-profile{ - position: fixed; - bottom: 0; - right: 0; - width: 40%; - height: 80%; - background: #AD1457; - padding: 30px; - overflow: auto; - box-shadow: -2px -3px 5px rgba(0,0,0,0.3); - box-sizing: border-box; - color: #fff; -} - - - - - - - - - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - background-color:rgb(255, 255, 255); -} - -nav a.active{ - border-bottom: 5px solid #333; - transition: all ease 0.5s; -} - -.container{ - margin-top: 20px; -} - -.home .post img{ - position: absolute; - top: 20px; - left: -100px; - opacity: 0.6; -} - -.home .post{ - overflow: hidden; - padding-left: 80px; -} - - -.module-name{ - text-decoration-color: white; -} - -header{ - background-color:rgb(48, 48, 54); - min-height: 50px; -} -@media screen and (max-width: 670px){ - header{ - min-height: 500px; - } -} -.section{ - padding-top: 4vw; - padding-bottom: 4vw; -} -.tabs .indicator{ - background-color: #1a237e; -} -.tabs .tab a:focus, .tabs .tab a:focus.active{ - background: transparent; -} - - -footer{ - background-color:rgb(48, 48, 54); - min-height: 50px; -}