From c11bc046c8990e3e34b9752130804f092e37ace4 Mon Sep 17 00:00:00 2001 From: Ryan Collins Date: Sun, 5 Feb 2017 21:28:42 -0500 Subject: [PATCH 1/8] Fix: update eslint version and add import plugin to eslint configuration file Update grommet version --- .eslintignore | 1 + .eslintrc.js | 3 +- .flowconfig | 1 + .gitignore | 6 + app/src/components/About/index.js | 18 +- app/src/components/AppFooter/index.js | 10 +- app/src/components/Contributor/index.js | 10 +- app/src/components/LoadingIndicator/index.js | 6 +- app/src/components/Navbar/index.js | 8 +- app/src/components/Navbar/styles.js | 2 +- app/src/components/WelcomeModal/index.js | 16 +- app/src/containers/AboutContainer/index.js | 8 +- app/src/containers/AppContainer/index.js | 2 +- app/src/containers/LandingContainer/index.js | 16 +- .../flow-typed/npm/grommet-udacity_v0.1.12.js | 5895 ---------------- config/flow-typed/npm/grommet_vx.x.x.js | 5896 +++++++++++++++++ package.json | 15 +- webpack.config.babel.js => webpack.config.js | 2 +- yarn.lock | 602 +- 19 files changed, 6178 insertions(+), 6339 deletions(-) delete mode 100644 config/flow-typed/npm/grommet-udacity_v0.1.12.js create mode 100644 config/flow-typed/npm/grommet_vx.x.x.js rename webpack.config.babel.js => webpack.config.js (98%) diff --git a/.eslintignore b/.eslintignore index ec21801..06b9e07 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,4 @@ app/build/ app/dist/ webpack.config.*.js +config/ \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index 22eba9b..5d6df99 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -11,7 +11,7 @@ module.exports = { "settings": { "import/resolver": { "webpack": { - "config": "webpack.config.babel.js" + "config": "webpack.config.js" } } }, @@ -30,6 +30,7 @@ module.exports = { }] }, "plugins": [ + "import", "react", "graphql", "jsx-a11y" diff --git a/.flowconfig b/.flowconfig index 22bc9b6..f64bd40 100644 --- a/.flowconfig +++ b/.flowconfig @@ -1,5 +1,6 @@ [ignore] .*/node_modules/.* +config/ [include] ./app/src/ diff --git a/.gitignore b/.gitignore index 6e4708d..5ef0bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,9 @@ jspm_packages # Optional REPL history .node_repl_history +.env +.vscode +/server/public/**/*.js +/server/public/**/*.css +/server/public/**/*.map +/server/public/**/*.json diff --git a/app/src/components/About/index.js b/app/src/components/About/index.js index f9e76ab..acdecc4 100644 --- a/app/src/components/About/index.js +++ b/app/src/components/About/index.js @@ -1,13 +1,13 @@ import React, { PropTypes } from 'react'; -import Box from 'grommet-udacity/components/Box'; -import Paragraph from 'grommet-udacity/components/Paragraph'; -import Article from 'grommet-udacity/components/Article'; -import Heading from 'grommet-udacity/components/Heading'; -import Markdown from 'grommet-udacity/components/Markdown'; -import Section from 'grommet-udacity/components/Section'; -import List from 'grommet-udacity/components/List'; -import ListItem from 'grommet-udacity/components/ListItem'; -import Anchor from 'grommet-udacity/components/Anchor'; +import Box from 'grommet/components/Box'; +import Paragraph from 'grommet/components/Paragraph'; +import Article from 'grommet/components/Article'; +import Heading from 'grommet/components/Heading'; +import Markdown from 'grommet/components/Markdown'; +import Section from 'grommet/components/Section'; +import List from 'grommet/components/List'; +import ListItem from 'grommet/components/ListItem'; +import Anchor from 'grommet/components/Anchor'; import { Divider } from 'components'; import readme from './_readme.md'; diff --git a/app/src/components/AppFooter/index.js b/app/src/components/AppFooter/index.js index 9d1b524..38c9284 100644 --- a/app/src/components/AppFooter/index.js +++ b/app/src/components/AppFooter/index.js @@ -1,10 +1,10 @@ import React from 'react'; import cssModules from 'react-css-modules'; -import Footer from 'grommet-udacity/components/Footer'; -import Box from 'grommet-udacity/components/Box'; -import Heading from 'grommet-udacity/components/Heading'; -import SocialShare from 'grommet-udacity/components/SocialShare'; -import Anchor from 'grommet-udacity/components/Anchor'; +import Footer from 'grommet/components/Footer'; +import Box from 'grommet/components/Box'; +import Heading from 'grommet/components/Heading'; +import SocialShare from 'grommet/components/SocialShare'; +import Anchor from 'grommet/components/Anchor'; import styles from './index.module.scss'; const AppFooter = () => ( diff --git a/app/src/components/Contributor/index.js b/app/src/components/Contributor/index.js index f1806ea..eb75230 100644 --- a/app/src/components/Contributor/index.js +++ b/app/src/components/Contributor/index.js @@ -1,11 +1,11 @@ import React, { PropTypes } from 'react'; import { Avatar } from 'components'; import cssModules from 'react-css-modules'; -import Heading from 'grommet-udacity/components/Heading'; -import Box from 'grommet-udacity/components/Box'; -import Paragraph from 'grommet-udacity/components/Paragraph'; -import Anchor from 'grommet-udacity/components/Anchor'; -import SocialGithubIcon from 'grommet-udacity/components/icons/base/SocialGithub'; +import Heading from 'grommet/components/Heading'; +import Box from 'grommet/components/Box'; +import Paragraph from 'grommet/components/Paragraph'; +import Anchor from 'grommet/components/Anchor'; +import SocialGithubIcon from 'grommet/components/icons/base/SocialGithub'; import styles from './index.module.scss'; const Contributor = ({ diff --git a/app/src/components/LoadingIndicator/index.js b/app/src/components/LoadingIndicator/index.js index c415e14..c79a197 100644 --- a/app/src/components/LoadingIndicator/index.js +++ b/app/src/components/LoadingIndicator/index.js @@ -1,9 +1,9 @@ // @flow import React from 'react'; import cssModules from 'react-css-modules'; -import Spinning from 'grommet-udacity/components/icons/Spinning'; -import Box from 'grommet-udacity/components/Box'; -import Heading from 'grommet-udacity/components/Heading'; +import Spinning from 'grommet/components/icons/Spinning'; +import Box from 'grommet/components/Box'; +import Heading from 'grommet/components/Heading'; import styles from './index.module.scss'; function LoadingIndicator(props: { diff --git a/app/src/components/Navbar/index.js b/app/src/components/Navbar/index.js index eb7a611..664d85f 100644 --- a/app/src/components/Navbar/index.js +++ b/app/src/components/Navbar/index.js @@ -1,9 +1,9 @@ // @flow import React from 'react'; -import Header from 'grommet-udacity/components/Header'; -import Title from 'grommet-udacity/components/Title'; -import Anchor from 'grommet-udacity/components/Anchor'; -import Search from 'grommet-udacity/components/Search'; +import Header from 'grommet/components/Header'; +import Title from 'grommet/components/Title'; +import Anchor from 'grommet/components/Anchor'; +import Search from 'grommet/components/Search'; import LogoImage from './logo.png'; import { StyledMenu, StyledLogo, LogoPlaceholder } from './styles'; diff --git a/app/src/components/Navbar/styles.js b/app/src/components/Navbar/styles.js index 37a6088..79e6056 100644 --- a/app/src/components/Navbar/styles.js +++ b/app/src/components/Navbar/styles.js @@ -1,5 +1,5 @@ import styled from 'styled-components'; -import Menu from 'grommet-udacity/components/Menu'; +import Menu from 'grommet/components/Menu'; export const StyledMenu = styled(Menu)` flex-direction: row !important; diff --git a/app/src/components/WelcomeModal/index.js b/app/src/components/WelcomeModal/index.js index f3b9f70..b17212e 100644 --- a/app/src/components/WelcomeModal/index.js +++ b/app/src/components/WelcomeModal/index.js @@ -1,12 +1,12 @@ import React, { PropTypes } from 'react'; -import Layer from 'grommet-udacity/components/Layer'; -import Form from 'grommet-udacity/components/Form'; -import FormFields from 'grommet-udacity/components/FormFields'; -import FormField from 'grommet-udacity/components/FormField'; -import Box from 'grommet-udacity/components/Box'; -import Heading from 'grommet-udacity/components/Heading'; -import Button from 'grommet-udacity/components/Button'; -import Footer from 'grommet-udacity/components/Footer'; +import Layer from 'grommet/components/Layer'; +import Form from 'grommet/components/Form'; +import FormFields from 'grommet/components/FormFields'; +import FormField from 'grommet/components/FormField'; +import Box from 'grommet/components/Box'; +import Heading from 'grommet/components/Heading'; +import Button from 'grommet/components/Button'; +import Footer from 'grommet/components/Footer'; import { Divider } from 'components'; import error from './utils/error'; diff --git a/app/src/containers/AboutContainer/index.js b/app/src/containers/AboutContainer/index.js index 2975ec9..3a5d28e 100644 --- a/app/src/containers/AboutContainer/index.js +++ b/app/src/containers/AboutContainer/index.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; -import Box from 'grommet-udacity/components/Box'; -import Section from 'grommet-udacity/components/Section'; -import Headline from 'grommet-udacity/components/Headline'; -import { Divider, About } from 'components'; // eslint-disable-line +import Box from 'grommet/components/Box'; +import Section from 'grommet/components/Section'; +import Headline from 'grommet/components/Headline'; +import { Divider, About } from 'components'; import links from './data'; class AboutContainer extends Component { // eslint-disable-line react/prefer-stateless-function diff --git a/app/src/containers/AppContainer/index.js b/app/src/containers/AppContainer/index.js index a41557a..7fdbc7c 100644 --- a/app/src/containers/AppContainer/index.js +++ b/app/src/containers/AppContainer/index.js @@ -1,7 +1,7 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import App from 'grommet-udacity/components/App'; +import App from 'grommet/components/App'; import { AppContainer as ReactHotLoader } from 'react-hot-loader'; import { Navbar, AppFooter } from 'components'; import * as AppContainerActionCreators from './actions'; diff --git a/app/src/containers/LandingContainer/index.js b/app/src/containers/LandingContainer/index.js index ef136f0..db24e84 100644 --- a/app/src/containers/LandingContainer/index.js +++ b/app/src/containers/LandingContainer/index.js @@ -2,14 +2,14 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import cssModules from 'react-css-modules'; -import Box from 'grommet-udacity/components/Box'; -import Section from 'grommet-udacity/components/Section'; -import Hero from 'grommet-udacity/components/Hero'; -import Headline from 'grommet-udacity/components/Headline'; -import Footer from 'grommet-udacity/components/Footer'; -import Button from 'grommet-udacity/components/Button'; -import Heading from 'grommet-udacity/components/Heading'; -import Columns from 'grommet-udacity/components/Columns'; +import Box from 'grommet/components/Box'; +import Section from 'grommet/components/Section'; +import Hero from 'grommet/components/Hero'; +import Headline from 'grommet/components/Headline'; +import Footer from 'grommet/components/Footer'; +import Button from 'grommet/components/Button'; +import Heading from 'grommet/components/Heading'; +import Columns from 'grommet/components/Columns'; import { LoadingIndicator, Divider, diff --git a/config/flow-typed/npm/grommet-udacity_v0.1.12.js b/config/flow-typed/npm/grommet-udacity_v0.1.12.js deleted file mode 100644 index c744342..0000000 --- a/config/flow-typed/npm/grommet-udacity_v0.1.12.js +++ /dev/null @@ -1,5895 +0,0 @@ -// flow-typed signature: dbac1bc52eeef945a82af2e742a5d11b -// flow-typed version: 4f8db0832e/grommet_v1.1.0/flow_>=v0.37.x - -/* eslint-disable flowtype/no-weak-types */ - -declare module 'grommet-udacity' { - declare module.exports: any; -} - -declare module 'grommet-udacity/components/Accordion' { - declare type Grommet$AccordionProps = { - active?: number | number[], - animate?: boolean, - onActive?: Function, - openMulti?: boolean - } - declare class Accordion extends React$Component { - props: Grommet$AccordionProps; - } - declare module.exports: Class; -} - -declare module 'grommet-udacity/components/AccordionPanel' { - declare type Grommet$AccordionPanelProps = { - a11yTitle?: string, - active?: boolean, - animate?: boolean, - heading?: ReactNode, - onChange?: Function, - pad?: any - } - declare class AccordionPanel extends React$Component { - props: Grommet$AccordionPanelProps; - } - declare module.exports: Class; -} - -declare module 'grommet-udacity/components/Animate' { - declare type Grommet$AnimateProps = { - component?: string | Function, - enter?: GrommetCustomTypes$AnimationDetails, - keep?: boolean, - leave?: GrommetCustomTypes$AnimationDetails, - visible?: "scroll" | boolean - } - declare class Animate extends React$Component { - props: Grommet$AnimateProps; - } - declare module.exports: Class; -} - -declare module 'grommet-udacity/components/App' { - declare type Grommet$AppProps = { - centered?: boolean, - inline?: boolean - } - declare class App extends React$Component { - props: Grommet$AppProps; - } - declare module.exports: Class; -} - -declare module 'grommet-udacity/components/Anchor' { - declare type Grommet$AnchorProps = { - a11yTitle?: string, - align?: "start" | "center" | "end", - animateIcon?: boolean, - disabled?: boolean, - href?: string, - icon?: ReactNode, - id?: string, - label?: string, - method?: "push" | "replace", - onClick?: Function, - path?: string, - primary?: boolean, - reverse?: boolean, - tag?: string, - target?: string - } - - declare class Anchor extends React$Component { - props: Grommet$AnchorProps; - } - declare module.exports: Class; -} - -declare module 'grommet-udacity/components/Article' { - declare type Grommet$ArticleProps = { - controls?: boolean, - onProgress?: Function, - onSelect?: Function, - scrollStep?: boolean, - selected?: number - } & Grommet$BoxProps
& Grommet$BoxFull - declare class Article extends React$Component { - props: Grommet$ArticleProps; - } - declare module.exports: Class
; -} - -declare module 'grommet-udacity/components/Box' { - declare type Grommet$BoxProps$BoxSizing = Grommet$BoxProps & Grommet$BoxSizing & Grommet$BoxFull; - declare class Box extends React$Component { - props: Grommet$BoxProps$BoxSizing; - } - declare module.exports: Class; -} - -declare module 'grommet-udacity/components/Button' { - declare type Grommet$ButtonProps = { - a11yTitle?: string, - accent?: boolean, - align?: "start" | "center" | "end", - fill?: boolean, - href?: string, - icon?: React$Element, - label?: ReactNode, - method?: "push" | "replace", - onClick?: Function, - path?: string, - plain?: boolean, - primary?: boolean, - reverse?: boolean, - secondary?: boolean, - type?: "button" | "reset" | "submit" - } - declare class Button extends React$Component{ - props: Grommet$ButtonProps; - } - declare module.exports: Class