Merge pull request #2 from Qolzam/next

Update to latest version
2018-06-29 18:07:56 +03:00
parent 6e5fff57ba 7eb8398316
commit fc4e807f8b
7 changed files with 4497 additions and 4121 deletions
--- a/.snyk
+++ b/.snyk
@@ -0,0 +1,89 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.12.0
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  'npm:hoek:20180212':
+    - npm > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > request > hawk > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > request > hawk > sntp > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > node-gyp > request > hawk > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - node-sass-chokidar > node-sass > request > hawk > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-20T11:28:44.870Z'
+    - npm > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > request > hawk > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > request > hawk > sntp > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > node-gyp > request > hawk > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - node-sass-chokidar > node-sass > request > hawk > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > libcipm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > sntp > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+    - npm > npm-lifecycle > node-gyp > request > hawk > cryptiles > boom > hoek:
+        patched: '2018-06-27T02:25:12.851Z'
+  'npm:tunnel-agent:20170305':
+    - node-sass-chokidar > node-sass > request > tunnel-agent:
+        patched: '2018-06-27T02:25:12.851Z'
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -13,7 +13,9 @@
    "build": "npm-run-all build-css build-js",
    "test": "react-scripts-ts test --env=jsdom",
    "eject": "react-scripts-ts eject",
-    "deploy:firebase": "npm run build && firebase deploy"
+    "deploy:firebase": "npm run build && firebase deploy",
+    "snyk-protect": "snyk protect",
+    "prepare": "npm run snyk-protect"
  },
  "author": "Amir Movahedi",
  "license": "MIT",
@@ -32,7 +34,7 @@
    "copy-to-clipboard": "^3.0.8",
    "crypto-js": "^3.1.9-1",
    "faker": "^4.1.0",
-    "firebase": "^5.0.4",
+    "firebase": "^4.11.0",
    "immutable": "^3.8.2",
    "install": "^0.10.2",
    "inversify": "^4.6.0",
@@ -72,7 +74,8 @@
    "reflect-metadata": "^0.1.10",
    "save": "^2.3.0",
    "typeface-roboto": "0.0.50",
-    "uuid": "^3.0.1"
+    "uuid": "^3.0.1",
+    "snyk": "^1.85.0"
  },
  "devDependencies": {
    "@types/classnames": "^2.2.3",
@@ -124,5 +127,6 @@
  ],
  "bugs": {
    "url": "https://github.com/Qolzam/react-social-network/issues"
-  }
+  },
+  "snyk": true
 }
--- a/src/components/circle/CircleComponent.tsx
+++ b/src/components/circle/CircleComponent.tsx
@@ -2,7 +2,7 @@
 import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { push } from 'react-router-redux'
-import {Map, List as ImuList} from 'immutable'
+import { Map, List as ImuList } from 'immutable'

 // - Material UI
 import ListItemText from '@material-ui/core/ListItemText'
@@ -21,7 +21,7 @@ import { Manager, Target, Popper } from 'react-popper'
 import Grow from '@material-ui/core/Grow'
 import ClickAwayListener from '@material-ui/core/ClickAwayListener'
 import classNames from 'classnames'
-import IconButtonElement from 'layouts/iconButtonElement'
+import IconButtonElement from 'layouts/IconButtonElement'
 import Dialog from '@material-ui/core/Dialog'
 import DialogActions from '@material-ui/core/DialogActions'
 import DialogContent from '@material-ui/core/DialogContent'
@@ -34,6 +34,7 @@ import SvgClose from '@material-ui/icons/Close'
 import AppBar from '@material-ui/core/AppBar'
 import Paper from '@material-ui/core/Paper'
 import Collapse from '@material-ui/core/Collapse'
+import Popover from '@material-ui/core/Popover'

 // - Import app components
 import UserAvatar from 'components/userAvatar'
@@ -109,7 +110,7 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
   * Component constructor
   * @param  {object} props is an object properties of component
   */
-  constructor (props: ICircleComponentProps) {
+  constructor(props: ICircleComponentProps) {
    super(props)

    // Defaul state
@@ -128,9 +129,9 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
      disabledSave: false,

      /**
-       * Whether meu is open
+       * Keep menu anchor
       */
-      isMenuOpen: false
+      anchorElMenu: null
    }

    // Binding functions to `this`
@@ -153,22 +154,21 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
      disabledSave: (!value || value.trim() === '')
    })
  }
-
  /**
   * Handle close menu
   */
  handleCloseMenu = () => {
    this.setState({
-      isMenuOpen: false
+      anchorElMenu: null
    })
  }

  /**
   * Handle open menu
   */
-  handleOpenMenu = () => {
+  handleOpenMenu = (event: any) => {
    this.setState({
-      isMenuOpen: true
+      anchorElMenu: event.currentTarget
    })
  }

@@ -225,7 +225,7 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
          >
            <UserAvatar fullName={fullName!} fileName={avatar} />
            <ListItemText inset primary={fullName} />
-            </ListItem>)
+          </ListItem>)

      })
      return usersParsed
@@ -236,43 +236,47 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
   * Reneder component DOM
   * @return {react element} return the DOM which rendered by component
   */
-  render () {
+  render() {

    const { circle, classes } = this.props
-    const { isMenuOpen } = this.state
+    const { anchorElMenu } = this.state
    /**
     * Right icon menue of circle
     *
     */
    // tslint:disable-next-line:member-ordering
    const rightIconMenu = (
-      <Manager>
-        <Target>
-          <IconButton
-            aria-owns={isMenuOpen! ? 'circle-menu' : ''}
-            aria-haspopup='true'
-            onClick={this.handleOpenMenu}
-          >
-            <MoreVertIcon />
-          </IconButton>
-        </Target>
-        <Popper
-          placement='bottom-start'
-          eventsEnabled={isMenuOpen}
-          className={classNames({ [classes.popperClose]: !isMenuOpen }, { [classes.popperOpen]: isMenuOpen })}
+      <div>
+
+        <IconButton
+          aria-owns={anchorElMenu! ? 'circle-menu' : ''}
+          aria-haspopup='true'
+          onClick={this.handleOpenMenu}
        >
-          <ClickAwayListener onClickAway={this.handleCloseMenu}>
-            <Grow in={isMenuOpen} >
-              <Paper>
-                <MenuList role='menu'>
-                  <MenuItem onClick={this.handleDeleteCircle} > Delete circle </MenuItem>
-                  <MenuItem onClick={this.props.openCircleSettings}> Circle settings </MenuItem>
-                </MenuList>
-              </Paper>
-            </Grow>
-          </ClickAwayListener>
-        </Popper>
-      </Manager>
+          <MoreVertIcon />
+        </IconButton>
+
+        <Popover
+          id='current-user-menu-root'
+          anchorEl={anchorElMenu}
+          open={Boolean(anchorElMenu)}
+          onClose={this.handleCloseMenu}
+          PaperProps={{
+            style: {
+              maxHeight: 200 * 4.5,
+              boxShadow: '0 1px 4px 0 rgba(0,0,0,0.14)',
+
+            },
+          }}
+        >
+          <Paper>
+            <MenuList role='menu'>
+              <MenuItem onClick={this.handleDeleteCircle} > Delete Circle </MenuItem>
+              <MenuItem onClick={this.props.openCircleSettings}> Setting </MenuItem>
+            </MenuList>
+          </Paper>
+        </Popover>
+      </div>
    )

    const circleTitle = (
@@ -296,7 +300,7 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
      </div>
    )
    return (
-    <div>
+      <div>
        <ListItem
          className={classes.root}
          key={this.props.id + '-CircleComponent'}
@@ -312,11 +316,11 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
        </ListItem>
        <Collapse component='li' in={this.state.open} timeout='auto' unmountOnExit>
          <List disablePadding>
-          {this.userList()}
+            {this.userList()}
          </List>
        </Collapse>
        <Dialog
-        PaperProps={{className: classes.fullPageXs}}
+          PaperProps={{ className: classes.fullPageXs }}
          key={this.props.id}
          open={this.props.openSetting!}
          onClose={this.props.closeCircleSettings}
@@ -327,7 +331,7 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
          <DialogTitle >{circleTitle}</DialogTitle>
          <DialogContent>
            <TextField
-            fullWidth
+              fullWidth
              autoFocus
              placeholder='Circle name'
              label='Circle name'
@@ -336,7 +340,7 @@ export class CircleComponent extends Component<ICircleComponentProps, ICircleCom
            />
          </DialogContent>
        </Dialog>
-        </div>
+      </div>
    )
  }
 }
@@ -372,11 +376,11 @@ const mapStateToProps = (state: Map<string, any>, ownProps: ICircleComponentProp
  const currentCircle: Map<string, any> = circles.get(ownProps.id, Map({}))
  const circleId = ownProps.circle.get('id')
  let usersOfCircle: Map<string, any> = Map({})
-  userTies.forEach((userTie , userTieId) => {
+  userTies.forEach((userTie, userTieId) => {
    const theUserTie: Map<string, any> = userTie
    const circleList: ImuList<string> = theUserTie.getIn(['circleIdList'])
-    if ( circleList.indexOf(ownProps.id) > -1) {
-      usersOfCircle =  usersOfCircle.set(userTieId!, theUserTie)
+    if (circleList.indexOf(ownProps.id) > -1) {
+      usersOfCircle = usersOfCircle.set(userTieId!, theUserTie)
    }
  })
  return {
--- a/src/components/circle/ICircleComponentState.ts
+++ b/src/components/circle/ICircleComponentState.ts
@@ -26,7 +26,7 @@ export interface ICircleComponentState {
  disabledSave: boolean

  /**
-   * Whether circle menu is open
+   * Keep menu anchor
   */
-  isMenuOpen: boolean
+  anchorElMenu: any
 }
--- a/src/components/post/PostComponent.tsx
+++ b/src/components/post/PostComponent.tsx
@@ -49,7 +49,7 @@ import CommentGroup from 'components/commentGroup'
 import ShareDialog from 'components/shareDialog'
 import PostWrite from 'components/postWrite'
 import Img from 'components/img'
-import IconButtonElement from 'layouts/iconButtonElement'
+import IconButtonElement from 'layouts/IconButtonElement'
 import UserAvatar from 'components/userAvatar'

 // - Import actions
--- a/yarn.lock
+++ b/yarn.lock
@@ -414,11 +414,12 @@ alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"

-amazon-cognito-identity-js@^1.21.0:
-  version "1.31.0"
-  resolved "https://registry.yarnpkg.com/amazon-cognito-identity-js/-/amazon-cognito-identity-js-1.31.0.tgz#1dcd0f26ce9404c198a35468e8bb00410503021d"
+amazon-cognito-identity-js@^2.0.0:
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/amazon-cognito-identity-js/-/amazon-cognito-identity-js-2.0.9.tgz#5a8fd6e97c513d753c14cc9e17091b105fb65d22"
  dependencies:
-    aws-sdk "2.177.0"
+    buffer "4.9.1"
+    crypto-browserify "1.0.9"
    js-cookie "^2.1.4"

 amdefine@>=0.0.4:
@@ -678,21 +679,6 @@ autoprefixer@^6.3.1:
    postcss "^5.2.16"
    postcss-value-parser "^3.2.3"

-aws-sdk@2.177.0:
-  version "2.177.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.177.0.tgz#d5fbf1f82bab250e55153699b030b44f687f600b"
-  dependencies:
-    buffer "4.9.1"
-    crypto-browserify "1.0.9"
-    events "^1.1.1"
-    jmespath "0.15.0"
-    querystring "0.2.0"
-    sax "1.2.1"
-    url "0.10.3"
-    uuid "3.1.0"
-    xml2js "0.4.17"
-    xmlbuilder "4.2.1"
-
 aws-sdk@^2.132.0:
  version "2.240.1"
  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.240.1.tgz#ed9f137573277f4543740c04ac628b46df244717"
@@ -2994,7 +2980,7 @@ eventemitter3@^3.0.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"

-events@1.1.1, events@^1.0.0, events@^1.1.1:
+events@1.1.1, events@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"

@@ -9825,7 +9811,7 @@ xml2js@0.4.17:
    sax ">=0.6.0"
    xmlbuilder "^4.1.0"

-xmlbuilder@4.2.1, xmlbuilder@^4.1.0:
+xmlbuilder@^4.1.0:
  version "4.2.1"
  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
  dependencies: