Skip to content

Commit 646622a

Browse files
lorensrlorensr
committed
Update packages, css, and linting; fix PropType and material-ui
1 parent 385c54d commit 646622a

File tree

8 files changed

+18505
-9716
lines changed

8 files changed

+18505
-9716
lines changed

‎.eslintrc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
{
2-
"extends": "react-app",
3-
"rules": {
4-
"jsx-a11y/accessible-emoji": 0
5-
}
2+
"extends": "react-app"
63
}

‎package-lock.json

Lines changed: 18340 additions & 9622 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 63 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,74 @@
22
"name": "guide",
33
"version": "0.1.0",
44
"private": true,
5-
"dependencies": {
6-
"ajv": "^6.5.0",
7-
"apollo-cache-inmemory": "^1.0.0",
8-
"apollo-client": "^2.2.7",
9-
"apollo-link": "^1.0.7",
10-
"apollo-link-context": "^1.0.3",
11-
"apollo-link-error": "^1.0.5",
12-
"apollo-link-http": "^1.0.0",
13-
"apollo-link-state": "^0.4.0",
14-
"apollo-link-ws": "^1.0.1",
15-
"apollo-utilities": "^1.0.3",
16-
"auth0-helpers": "^0.4.2",
17-
"auth0-js": "^9.0.2",
18-
"classnames": "^2.2.5",
19-
"cloudinary-core": "^2.5.0",
20-
"cloudinary-react": "^1.0.6",
21-
"date-fns": "^1.29.0",
22-
"formik": "^0.11.11",
23-
"graphql": "^0.13.2",
24-
"graphql-anywhere": "^4.1.1",
25-
"graphql-tag": "^2.5.0",
26-
"lodash": "^4.17.4",
27-
"material-ui": "1.0.0-beta.34",
28-
"material-ui-icons": "1.0.0-beta.17",
29-
"react": "^16.2.0",
30-
"react-apollo": "^2.1.3",
31-
"react-dom": "^16.3.2",
32-
"react-loading-skeleton": "^0.3.2",
33-
"react-markdown": "^3.3.0",
34-
"react-odometerjs": "^2.0.0",
35-
"react-router": "^4.2.0",
36-
"react-router-dom": "^4.2.2",
37-
"react-scripts": "1.1.4",
38-
"react-star-rating-component": "^1.3.0",
39-
"react-style-proptype": "^3.2.0",
40-
"react-transition-group": "^2.3.1",
41-
"recompose": "^0.26.0",
42-
"revalidate": "^1.2.0",
43-
"scroll-into-view-if-needed": "^2.2.0",
44-
"serve": "^6.4.3",
45-
"subscriptions-transport-ws": "^0.9.7",
46-
"typed.js": "^2.0.6"
47-
},
485
"scripts": {
496
"start": "react-scripts start",
507
"build": "react-scripts build",
518
"test": "react-scripts test --env=jsdom",
529
"eject": "react-scripts eject",
5310
"now-start": "serve --single ./build",
5411
"deploy": "now",
55-
"alias": "pbpaste | xargs -I % now alias % staging.graphql.guide"
56-
}
12+
"alias": "pbpaste | xargs -I % now alias % staging.graphql.guide",
13+
"lint": "eslint src/",
14+
"update-schema": "graphql get-schema -e https://api.graphql.guide/graphql -o schema.json",
15+
"update-schema-spacex": "graphql get-schema -e https://api.spacex.land/graphql -o spacex.json",
16+
"update-schema-local": "graphql get-schema -e http://localhost:4000/graphql -o schema.json"
17+
},
18+
"dependencies": {
19+
"@material-ui/core": "^3.9.2",
20+
"@material-ui/icons": "^3.0.2",
21+
"ajv": "^6.10.0",
22+
"apollo-cache-inmemory": "^1.5.1",
23+
"apollo-cache-persist": "^0.1.1",
24+
"apollo-client": "^2.5.1",
25+
"apollo-link": "^1.2.11",
26+
"apollo-link-context": "^1.0.17",
27+
"apollo-link-error": "^1.1.10",
28+
"apollo-link-http": "^1.5.14",
29+
"apollo-link-rest": "^0.7.0",
30+
"apollo-link-state": "^0.4.2",
31+
"apollo-link-ws": "^1.0.17",
32+
"apollo-utilities": "^1.2.1",
33+
"auth0-helpers": "^0.4.3",
34+
"auth0-js": "^9.10.1",
35+
"classnames": "^2.2.6",
36+
"cloudinary-core": "^2.6.2",
37+
"cloudinary-react": "^1.1.0",
38+
"date-fns": "^1.30.1",
39+
"formik": "^1.5.1",
40+
"graphql": "^14.1.1",
41+
"graphql-anywhere": "^4.2.1",
42+
"graphql-tag": "^2.10.1",
43+
"jss": "^9.8.7",
44+
"lodash": "^4.17.11",
45+
"react": "^16.8.5",
46+
"react-apollo": "^2.5.2",
47+
"react-dom": "^16.8.5",
48+
"react-loading-skeleton": "^1.1.1",
49+
"react-markdown": "^4.0.6",
50+
"react-odometerjs": "^2.1.1",
51+
"react-router": "^5.0.0",
52+
"react-router-dom": "^5.0.0",
53+
"react-scripts": "^2.1.8",
54+
"react-star-rating-component": "^1.4.1",
55+
"react-style-proptype": "^3.2.2",
56+
"react-transition-group": "^2.7.0",
57+
"recompose": "^0.30.0",
58+
"revalidate": "^1.2.0",
59+
"scroll-into-view-if-needed": "^2.2.20",
60+
"serve": "^10.1.2",
61+
"subscriptions-transport-ws": "^0.9.16",
62+
"typed.js": "^2.0.10",
63+
"typescript": "^3.3.4000"
64+
},
65+
"devDependencies": {
66+
"eslint-plugin-graphql": "^3.0.3",
67+
"graphql-cli": "^3.0.11"
68+
},
69+
"browserslist": [
70+
">0.2%",
71+
"not dead",
72+
"not ie <= 11",
73+
"not op_mini all"
74+
]
5775
}

‎src/components/Review.js

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,50 @@
11
import React, { Component } from 'react'
22
import PropTypes from 'prop-types'
3-
import Card, { CardHeader, CardContent, CardActions } from 'material-ui/Card'
4-
import IconButton from 'material-ui/IconButton'
5-
import Typography from 'material-ui/Typography'
6-
import Avatar from 'material-ui/Avatar'
7-
import Menu, { MenuItem } from 'material-ui/Menu'
8-
import MoreVertIcon from 'material-ui-icons/MoreVert'
9-
import FavoriteIcon from 'material-ui-icons/Favorite'
10-
import FavoriteBorderIcon from 'material-ui-icons/FavoriteBorder'
11-
import StarIcon from 'material-ui-icons/Star'
12-
import StarBorderIcon from 'material-ui-icons/StarBorder'
3+
import {
4+
Card,
5+
CardHeader,
6+
CardContent,
7+
CardActions,
8+
IconButton,
9+
Typography,
10+
Avatar,
11+
Menu,
12+
MenuItem,
13+
Dialog,
14+
DialogActions,
15+
DialogContent,
16+
DialogContentText,
17+
DialogTitle,
18+
Button,
19+
Modal
20+
} from '@material-ui/core'
21+
import {
22+
MoreVert,
23+
Favorite,
24+
FavoriteBorder,
25+
Star,
26+
StarBorder
27+
} from '@material-ui/icons'
1328
import distanceInWordsToNow from 'date-fns/distance_in_words_to_now'
1429
import times from 'lodash/times'
1530
import remove from 'lodash/remove'
1631
import find from 'lodash/find'
1732
import gql from 'graphql-tag'
1833
import { graphql, compose } from 'react-apollo'
1934
import { propType } from 'graphql-anywhere'
20-
import Dialog, {
21-
DialogActions,
22-
DialogContent,
23-
DialogContentText,
24-
DialogTitle
25-
} from 'material-ui/Dialog'
26-
import Button from 'material-ui/Button'
27-
import Modal from 'material-ui/Modal'
2835

2936
import ReviewForm from './ReviewForm'
3037

3138
import { REVIEW_ENTRY, REVIEWS_QUERY } from '../graphql/Review'
3239

3340
const StarRating = ({ rating }) => (
3441
<div>
35-
{times(rating, i => <StarIcon key={i} />)}
36-
{times(5 - rating, i => <StarBorderIcon key={i} />)}
42+
{times(rating, i => (
43+
<Star key={i} />
44+
))}
45+
{times(5 - rating, i => (
46+
<StarBorder key={i} />
47+
))}
3748
</div>
3849
)
3950

@@ -112,7 +123,7 @@ class Review extends Component {
112123
action={
113124
user && (
114125
<IconButton onClick={this.openMenu}>
115-
<MoreVertIcon />
126+
<MoreVert />
116127
</IconButton>
117128
)
118129
}
@@ -133,7 +144,7 @@ class Review extends Component {
133144
<div className="Review-spacer" />
134145
{user && (
135146
<IconButton onClick={this.toggleFavorite}>
136-
{favorited ? <FavoriteIcon /> : <FavoriteBorderIcon />}
147+
{favorited ? <Favorite /> : <FavoriteBorder />}
137148
</IconButton>
138149
)}
139150
</CardActions>

‎src/components/ReviewForm.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import React, { Component } from 'react'
22
import PropTypes from 'prop-types'
33
import StarInput from 'react-star-rating-component'
4-
import Button from 'material-ui/Button'
5-
import TextField from 'material-ui/TextField'
6-
import StarIcon from 'material-ui-icons/Star'
7-
import StarBorderIcon from 'material-ui-icons/StarBorder'
4+
import { Button, TextField } from '@material-ui/core'
5+
import { Star, StarBorder } from '@material-ui/icons'
86
import gql from 'graphql-tag'
97
import { graphql, compose } from 'react-apollo'
108
import classNames from 'classnames'
@@ -86,7 +84,7 @@ class ReviewForm extends Component {
8684
value={this.state.stars}
8785
onStarClick={this.updateStars}
8886
renderStarIcon={(currentStar, rating) =>
89-
currentStar > rating ? <StarBorderIcon /> : <StarIcon />
87+
currentStar > rating ? <StarBorder /> : <Star />
9088
}
9189
starColor={GREY}
9290
emptyStarColor={GREY}

‎src/components/Reviews.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import React, { Component } from 'react'
22
import PropTypes from 'prop-types'
33
import get from 'lodash/get'
4-
import FavoriteIcon from 'material-ui-icons/Favorite'
5-
import Button from 'material-ui/Button'
6-
import AddIcon from 'material-ui-icons/Add'
7-
import Modal from 'material-ui/Modal'
8-
import { MenuItem } from 'material-ui/Menu'
9-
import { FormControl } from 'material-ui/Form'
10-
import Select from 'material-ui/Select'
4+
import { Favorite, Add } from '@material-ui/icons'
5+
import { Fab, Modal, MenuItem, FormControl, Select } from '@material-ui/core'
116

127
import ReviewList from './ReviewList'
138
import { withUser } from '../lib/withUser'
@@ -41,7 +36,7 @@ class Reviews extends Component {
4136
<header className="Reviews-header">
4237
{favoriteCount ? (
4338
<div className="Reviews-favorite-count">
44-
<FavoriteIcon />
39+
<Favorite />
4540
{favoriteCount}
4641
</div>
4742
) : null}
@@ -65,14 +60,13 @@ class Reviews extends Component {
6560

6661
{user && (
6762
<div>
68-
<Button
63+
<Fab
6964
onClick={this.addReview}
70-
variant="fab"
7165
color="primary"
7266
className="Reviews-add"
7367
>
74-
<AddIcon />
75-
</Button>
68+
<Add />
69+
</Fab>
7670

7771
<Modal
7872
open={this.state.addingReview}

0 commit comments

Comments
 (0)