Skip to content

Commit

Permalink
Update Material UI and other deps (#334)
Browse files Browse the repository at this point in the history
  • Loading branch information
koistya authored Jul 8, 2019
1 parent 5752acd commit 6abebd2
Show file tree
Hide file tree
Showing 46 changed files with 1,785 additions and 1,170 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:carbon
- image: circleci/node:dubnium
steps:
- checkout
- restore_cache:
Expand Down
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ PGDEBUG=false

# Analytics

GA_TRACKING_ID=UA-XXXXX-Y
# GA_TRACKING_ID=UA-XXXXX-Y
6 changes: 6 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Start",
"program": "${workspaceFolder}/node_modules/react-app-tools/scripts/start.js"
},
{
"type": "node",
"request": "launch",
Expand Down
87 changes: 62 additions & 25 deletions .vscode/snippets/javascript.json
Original file line number Diff line number Diff line change
@@ -1,56 +1,93 @@
{
"React": {
"prefix": "react",
"ReactComponent": {
"prefix": "reactComponent",
"body": [
"import clsx from 'clsx';",
"import React from 'react';",
"import { withStyles } from '@material-ui/core/styles';",
"import { makeStyles } from '@material-ui/styles';",
"",
"const styles = theme => ({",
" root: {}",
"});",
"const useStyles = makeStyles(theme => ({",
" root: {},",
"}));",
"",
"function ${1:Component}(props) {",
" const { className, ...other } = props;",
" const s = useStyles();",
"",
"function ${1:Component}({ classes: s, ...props }) {",
" return (",
" <${2:div} className={s.root}>",
" <${2:div} className={clsx(s.root, className)} {...other}>",
" ${3:body}$0",
" </${2:div}>",
" );",
"}",
"",
"export default withStyles(styles)(${1:Component});",
"export default ${1:Component};",
""
],
"description": "React Component"
},
"Relay Fragment Container": {
"prefix": "relay",
"ReactRefComponent": {
"prefix": "reactRefComponent",
"body": [
"import clsx from 'clsx';",
"import React from 'react';",
"import { withStyles } from '@material-ui/core/styles';",
"import { graphql, createFragmentContainer } from 'react-relay';",
"import { makeStyles } from '@material-ui/styles';",
"",
"const useStyles = makeStyles(theme => ({",
" root: {},",
"}));",
"",
"const ${1:Component} = React.forwardRef(function ${1:Component}(props, ref) {",
" const { className, ...other } = props;",
" const s = useStyles();",
"",
"const styles = theme => ({",
" root: {}",
" return (",
" <${2:div} className={clsx(s.root, className)} ref={ref} {...other}>",
" ${3:body}$0",
" </${2:div}>",
" );",
"});",
"",
"function ${1:Component}({ classes: s, data, ...props }) {",
"export default ${1:Component};",
""
],
"description": "React Ref Component"
},
"React/Relay Fragment Container": {
"prefix": "reactFragmentContainer",
"body": [
"import clsx from 'clsx';",
"import React from 'react';",
"import { makeStyles } from '@material-ui/styles';",
"import { createFragmentContainer, graphql } from 'react-relay';",
"",
"const useStyles = makeStyles(theme => ({",
" root: {},",
"}));",
"",
"function ${1:Component}(props) {",
" const { className, data, ...other } = props;",
" const s = useStyles();",
"",
" return (",
" <${2:div} className={s.root}>",
" <${2:div} className={clsx(s.root, className)} {...other}>",
" ${3:body}$0",
" </${2:div}>",
" );",
"}",
"",
"export default withStyles(styles)(createFragmentContainer(",
"export default createFragmentContainer(",
" ${1:Component},",
" graphql`",
" fragment ${1:Component} on Query {",
" id",
" }",
" `,",
"));",
" {",
" data: graphql`",
" fragment ${1:Component} on Query {",
" id",
" }",
" `,",
" },",
");",
""
],
"description": "Relay Fragment Container"
"description": "React/Relay Fragment Container"
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Also, you need to be familiar with [HTML][html], [CSS][css], [JavaScript][js] ([

### Prerequisites

- [Node.js][nodejs] v8.15 or higher + [Yarn][yarn] v1.13 or higher &nbsp; (_HINT: On Mac install
- [Node.js][nodejs] v10.15 or higher + [Yarn][yarn] v1.16 or higher &nbsp; (_HINT: On Mac install
them via [Brew][brew]_)
- [VS Code][vc] editor (preferred) + [Project Snippets][vcsnippets], [EditorConfig][vceditconfig],
[ESLint][vceslint], [Flow][vcflow], [Prettier][vcprettier], and [Babel JavaScript][vcjs] plug-ins
Expand Down
79 changes: 40 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"main": "build/server.js",
"engines": {
"node": ">=8"
"node": "10"
},
"browserslist": [
">0.2%",
Expand All @@ -15,69 +15,70 @@
"dependencies": {
"@babel/polyfill": "^7.2.5",
"@babel/runtime": "^7.3.1",
"@firebase/app": "^0.3.11",
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.2",
"body-parser": "^1.18.3",
"classnames": "^2.2.6",
"cookie": "^0.3.1",
"@firebase/app": "^0.4.9",
"@material-ui/core": "^4.2.0",
"@material-ui/icons": "^4.2.1",
"@material-ui/styles": "^4.2.0",
"body-parser": "^1.19.0",
"clsx": "^1.0.4",
"cookie": "^0.4.0",
"cookie-parser": "^1.4.4",
"dataloader": "^1.4.0",
"dotenv": "^7.0.0",
"ejs": "^2.6.1",
"express": "^4.16.4",
"express-graphql": "^0.7.1",
"firebase-admin": "^7.0.0",
"firebase-functions": "^2.2.0",
"dotenv": "^8.0.0",
"ejs": "^2.6.2",
"express": "^4.17.1",
"express-graphql": "^0.8.0",
"firebase-admin": "^8.2.0",
"firebase-functions": "^3.0.2",
"got": "^9.6.0",
"graphql": "^14.1.1",
"graphql": "^14.4.2",
"graphql-relay": "^0.6.0",
"history": "^4.7.2",
"history": "^4.9.0",
"hoist-non-react-statics": "^3.3.0",
"idx": "^2.5.4",
"jsonwebtoken": "^8.5.0",
"idx": "^2.5.6",
"jsonwebtoken": "^8.5.1",
"jwt-passport": "^0.0.5",
"knex": "^0.16.3",
"knex": "^0.18.3",
"load-script": "^1.0.0",
"lodash": "^4.17.11",
"moment-timezone": "^0.5.23",
"moment-timezone": "^0.5.26",
"passport": "^0.4.0",
"passport-facebook": "^3.0.0",
"passport-google-oauth20": "^2.0.0",
"pg": "^7.8.2",
"pg": "^7.11.0",
"prop-types": "^15.7.2",
"query-string": "^6.3.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-relay": "^3.0.0",
"query-string": "^6.8.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-relay": "^5.0.0",
"recompose": "^0.30.0",
"relay-runtime": "^3.0.0",
"relay-runtime": "^5.0.0",
"request": "^2.88.0",
"request-promise-native": "^1.0.7",
"serialize-javascript": "^1.6.1",
"slug": "^1.0.0",
"universal-router": "^8.1.0",
"serialize-javascript": "^1.7.0",
"slug": "^1.1.0",
"universal-router": "^8.2.0",
"uuid": "^3.3.2",
"validator": "^10.11.0"
"validator": "^11.1.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"@babel/preset-flow": "^7.0.0",
"@babel/register": "^7.0.0",
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-relay": "^3.0.0",
"babel-plugin-relay": "^5.0.0",
"chai": "^4.2.0",
"eslint-config-prettier": "^4.1.0",
"eslint-plugin-flowtype": "^2.50.1",
"eslint-plugin-prettier": "^3.0.1",
"flow-bin": "^0.94.0",
"husky": "^1.3.1",
"lint-staged": "^8.1.5",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-flowtype": "^3.10.3",
"eslint-plugin-prettier": "^3.1.0",
"flow-bin": "^0.102.0",
"husky": "^3.0.0",
"lint-staged": "^9.1.0",
"minimist": "^1.2.0",
"prettier": "^1.16.4",
"raw-loader": "^1.0.0",
"prettier": "^1.18.2",
"raw-loader": "^3.0.0",
"react-app-tools": "^3.1.0-preview.7",
"relay-compiler": "^3.0.0"
"relay-compiler": "^5.0.0"
},
"lint-staged": {
"*.js": [
Expand Down
13 changes: 6 additions & 7 deletions src/admin/Layout.js → src/admin/AdminLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@
/* @flow */

import React from 'react';
import { graphql, createFragmentContainer } from 'react-relay';
import { createFragmentContainer, graphql } from 'react-relay';

function Layout({ children }) {
function AdminLayout({ children }) {
return <div>{children}</div>;
}

export default createFragmentContainer(
Layout,
graphql`
fragment LayoutAdmin on Query {
export default createFragmentContainer(AdminLayout, {
data: graphql`
fragment AdminLayout_data on Query {
me {
id
}
}
`,
);
});
36 changes: 36 additions & 0 deletions src/admin/AdminStoryList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* React Starter Kit for Firebase
* https://github.com/kriasoft/react-firebase-starter
* Copyright (c) 2015-present Kriasoft | MIT License
*/

/* @flow */

import React from 'react';
import Typography from '@material-ui/core/Typography';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import { createFragmentContainer, graphql } from 'react-relay';

function AdminStoryList(props) {
return (
<>
<Typography variant="h3">Stories</Typography>
<List>
<ListItem>Story A</ListItem>
<ListItem>Story B</ListItem>
<ListItem>Story C</ListItem>
</List>
</>
);
}

export default createFragmentContainer(AdminStoryList, {
data: graphql`
fragment AdminStoryList_data on Query {
me {
id
}
}
`,
});
36 changes: 36 additions & 0 deletions src/admin/AdminUserList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/**
* React Starter Kit for Firebase
* https://github.com/kriasoft/react-firebase-starter
* Copyright (c) 2015-present Kriasoft | MIT License
*/

/* @flow */

import React from 'react';
import Typography from '@material-ui/core/Typography';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import { createFragmentContainer, graphql } from 'react-relay';

function AdminUserList(props) {
return (
<>
<Typography variant="h3">Users</Typography>
<List>
<ListItem>User A</ListItem>
<ListItem>User B</ListItem>
<ListItem>User C</ListItem>
</List>
</>
);
}

export default createFragmentContainer(AdminUserList, {
data: graphql`
fragment AdminUserList_data on Query {
me {
id
}
}
`,
});
25 changes: 0 additions & 25 deletions src/admin/StoryList.js

This file was deleted.

Loading

0 comments on commit 6abebd2

Please sign in to comment.