Skip to content

Commit

Permalink
Merge branch 'master' into signupFlow-alex
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandfox committed May 16, 2019
2 parents 8de006f + 9522824 commit 0a2578c
Show file tree
Hide file tree
Showing 13 changed files with 253 additions and 127 deletions.
96 changes: 36 additions & 60 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-moment": "^0.9.2",
"react-on-visible": "^1.6.0",
"react-router-dom": "^5.0.0",
"react-router-modal": "^1.5.2",
"react-scripts": "3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import Page404 from "./pages/Page404"

import { library } from '@fortawesome/fontawesome-svg-core';
import { faLinkedin, faTwitter, faProductHunt } from '@fortawesome/free-brands-svg-icons'
import { faPoo, faHeart, faMapMarkerAlt, faSearch, faComment} from '@fortawesome/free-solid-svg-icons'
library.add(faPoo, faHeart, faMapMarkerAlt, faLinkedin, faProductHunt, faTwitter, faSearch, faComment)
import { faPoo, faHeart, faMapMarkerAlt, faSearch, faComment, faTrophy} from '@fortawesome/free-solid-svg-icons'
library.add(faPoo, faHeart, faMapMarkerAlt, faLinkedin, faProductHunt, faTwitter, faSearch, faTrophy, faComment)


class App extends Component {
Expand Down
5 changes: 3 additions & 2 deletions src/components/IdeaListItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import UpvoteTest from "../components/UpvoteTest"
import SharedOptions from "../components/myIdeaOptions"
import Moment from 'react-moment';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import OnVisible from 'react-on-visible';

// accepts props:
// {...idea} --> directly reference any keys on "idea"
Expand Down Expand Up @@ -43,7 +44,7 @@ class ideaItem extends Component {
<DraftEdit id={this.props._id} creator_name={this.props.creator && this.props.creator.name} sendToParent={(e) => this.sendToParent(e)} />
</div>
:
<div className="publicItem">
<OnVisible className="publicItem" percent={10}>
<div className="publicItemInfos">

<div className="publicItemInfosPrimary">
Expand All @@ -70,7 +71,7 @@ class ideaItem extends Component {
<div className="publicItemUpvote">
<UpvoteTest idea={idea} loggedUser={this.props.loggedUser} />
</div>
</div>}
</OnVisible>}
</React.Fragment>
)
}
Expand Down
Loading

0 comments on commit 0a2578c

Please sign in to comment.