Merge dev to master

.babelrc

@@ -0,0 +1,4 @@
+{
+  "plugins": ["transform-object-rest-spread"],
+  "presets": ["@babel/preset-typescript"]
+}

.eslintrc.json

@@ -3,22 +3,96 @@
   "extends": "airbnb",
   "plugins": ["react", "jsx-a11y", "import"],
   "rules": {
-    "jsx-a11y/no-static-element-interactions": 0,
-    "jsx-a11y/click-events-have-key-events": 0,
-    "jsx-a11y/anchor-is-valid": 2,
-    "jsx-a11y/href-no-hash": "off",
-    "react/jsx-filename-extension": "off",
-    "react/button-has-type": 0,
     "allowArrowFunctions": true,
-    "no-underscore-dangle": 0,
+    "array-bracket-spacing": "off",
+    "arrow-parens": ["error", "as-needed", { "requireForBlockBody": false }],
+    "arrow-parens": [
+      "error",
+      "as-needed",
+      {
+        "requireForBlockBody": false
+      }
+    ],
+    "arrow-spacing": "off",
+    "block-spacing": "off",
+    "brace-style": "off",
     "comma-dangle": ["error", {
       "arrays": "always-multiline",
       "objects": "always-multiline",
       "imports": "always-multiline",
       "exports": "always-multiline",
       "functions": "ignore"
     }],
-    "arrow-parens": ["error", "as-needed", { "requireForBlockBody": false }]
+    "comma-spacing": "off",
+    "comma-style": "off",
+    "computed-property-spacing": "off",
+    "dot-location": "off",
+    "eol-last": "error",
+    "func-call-spacing": "off",
+    "function-paren-newline": "off",
+    "generator-star-spacing": "off",
+    "implicit-arrow-linebreak": "off",
+    "indent": "off",
+    "jsx-a11y/anchor-is-valid": 2,
+    "jsx-a11y/click-events-have-key-events": 0,
+    "jsx-a11y/href-no-hash": "off",
+    "jsx-a11y/no-static-element-interactions": 0,
+    "jsx-quotes": "off",
+    "key-spacing": "off",
+    "keyword-spacing": "off",
+    "max-len": ["error", {
+      "code": 100,
+      "ignoreUrls": true,
+      "ignoreStrings": true
+    }],
+    "new-parens": "off",
+    "newline-per-chained-call": "off",
+    "no-confusing-arrow": ["error", {"allowParens": true}],
+    "no-extra-semi": "off",
+    "no-floating-decimal": "off",
+    "no-mixed-spaces-and-tabs": "off",
+    "no-multi-spaces": "off",
+    "no-multiple-empty-lines": "off",
+    "no-spaced-func": "off",
+    "no-trailing-spaces": "off",
+    "no-underscore-dangle": 0,
+    "no-whitespace-before-property": "off",
+    "nonblock-statement-body-position": "off",
+    "object-curly-newline": "off",
+    "object-curly-spacing": "off",
+    "object-property-newline": "off",
+    "one-var-declaration-per-line": "off",
+    "operator-linebreak": "off",
+    "padded-blocks": "off",
+    "quote-props": "off",
+    "react/button-has-type": 0,
+    "react/jsx-closing-bracket-location": "off",
+    "react/jsx-closing-tag-location": "off",
+    "react/jsx-curly-spacing": "off",
+    "react/jsx-filename-extension": "off",
+    "react/jsx-first-prop-new-line": "off",
+    "react/jsx-indent": "off",
+    "react/jsx-indent-props": "off",
+    "react/jsx-max-props-per-line": "off",
+    "react/jsx-one-expression-per-line": "off",
+    "react/jsx-props-no-multi-spaces": "off",
+    "react/jsx-tag-spacing": "off",
+    "react/jsx-wrap-multilines": "off",
+    "rest-spread-spacing": "off",
+    "semi": "off",
+    "semi-spacing": "off",
+    "semi-style": "off",
+    "space-before-blocks": "off",
+    "space-before-function-paren": "off",
+    "space-in-parens": "off",
+    "space-infix-ops": "off",
+    "space-unary-ops": "off",
+    "switch-colon-spacing": "off",
+    "template-curly-spacing": "off",
+    "template-tag-spacing": "off",
+    "unicode-bom": "off",
+    "wrap-iife": "off",
+    "yield-star-spacing": "off"
   },
   "parserOptions": {
     "ecmaVersion": 8

.gitignore

@@ -1,4 +1,4 @@
 yarn-error.log
-yarn.lock
 
-/node_modules
+/node_modules
+server/config/dev.ts

.prettierignore

@@ -0,0 +1 @@
+package.json

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "printWidth": 100
+}

Dockerfile

@@ -0,0 +1,12 @@
+FROM node:9.6.1
+
+RUN mkdir client/usr/src/app
+WORKDIR /client/usr/src/app
+
+ENV PATH /usr/src/app/node_modules/.bin:$PATH
+
+COPY package.json /client/usr/src/app/package.json
+RUN npm install --silent
+RUN npm install react-scripts@1.1.1 -g --silent
+
+CMD ["npm", "start"]

README.md

@@ -1,2 +1,25 @@
-## CodeBuddy
-
+### Installation
+ ```sh
+$ git clone git@github.com:lydiahallie/CodeBuddy.git
+$ cd CodeBuddy
+$ yarn
+```
+Run client:
+```sh
+$ cd client 
+$ yarn
+$ cd ..
+$ yarn client
+```
+Run server:
+```sh
+$ cd server
+$ yarn
+$ cd ..
+$ ts-node -O '{"module":"commonjs"}' server
+```
+ ### Branches
+Whenever you open a PR, please use the `dev` branch as the base branch. 
+
+ ### First draft version
+![demo](preview1.gif)

client/config/paths.js

@@ -40,7 +40,7 @@ module.exports = {
   appBuild: resolveApp('build'),
   appPublic: resolveApp('public'),
   appHtml: resolveApp('public/index.html'),
-  appIndexJs: resolveApp('src/index.js'),
+  appIndexJs: resolveApp('src/index.tsx'),
   appPackageJson: resolveApp('package.json'),
   appSrc: resolveApp('src'),
   yarnLockFile: resolveApp('yarn.lock'),

client/config/webpack.config.dev.js

@@ -62,7 +62,8 @@ module.exports = {
     // This is the URL that app is served from. We use "/" in development.
     publicPath,
     // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
+    devtoolModuleFilenameTemplate: info =>
+      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
   },
   resolve: {
     // This allows you to set a fallback for where Webpack should look for modules.
@@ -71,17 +72,16 @@ module.exports = {
     // https://github.com/facebookincubator/create-react-app/issues/253
     modules: ['node_modules', paths.appNodeModules].concat(
       // It is guaranteed to exist because we tweak it in `env.js`
-      process.env.NODE_PATH.split(path.delimiter).filter(Boolean),
+      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
     ),
     // These are the reasonable defaults supported by the Node ecosystem.
     // We also include JSX as a common component filename extension to support
     // some tools, although we do not recommend using it, see:
     // https://github.com/facebookincubator/create-react-app/issues/290
     // `web` extension prefixes have been added for better support
     // for React Native Web.
-    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
+    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx', '.ts', '.tsx'],
     alias: {
-
       // Support React Native Web
       // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
       'react-native': 'react-native-web',
@@ -118,6 +118,8 @@ module.exports = {
         ],
         include: paths.appSrc,
       },
+      { test: /\.tsx?$/, loader: "awesome-typescript-loader" },
+      { enforce: "pre", test: /\.js$/, loader: "source-map-loader" },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall
@@ -140,7 +142,6 @@ module.exports = {
             include: paths.appSrc,
             loader: require.resolve('babel-loader'),
             options: {
-
               // This is a feature of `babel-loader` for webpack (not Babel itself).
               // It enables caching results in ./node_modules/.cache/babel-loader/
               // directory for faster rebuilds.
@@ -215,16 +216,16 @@ module.exports = {
     ],
   },
   plugins: [
-    // Makes some environment variables available in index.html.
-    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    // In development, this will be an empty string.
-    new InterpolateHtmlPlugin(env.raw),
     // Generates an `index.html` file with the <script> injected.
     new HtmlWebpackPlugin({
       inject: true,
       template: paths.appHtml,
     }),
+     // Makes some environment variables available in index.html.
+    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    // In development, this will be an empty string.
+    new InterpolateHtmlPlugin(env.raw),
     // Add module names to factory functions so they appear in browser profiler.
     new webpack.NamedModulesPlugin(),
     // Makes some environment variables available to the JS code, for example:
@@ -263,4 +264,4 @@ module.exports = {
   performance: {
     hints: false,
   },
-};
+};

client/config/webpackDevServer.config.js

@@ -1,4 +1,3 @@
-/* eslint-disable func-names */
 const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
 const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
 const ignoredFiles = require('react-dev-utils/ignoredFiles');
@@ -8,7 +7,7 @@ const paths = require('./paths');
 const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
 const host = process.env.HOST || '0.0.0.0';
 
-module.exports = function (proxy, allowedHost) {
+module.exports = function(proxy, allowedHost) {
   return {
     // WebpackDevServer 2.4.3 introduced a security fix that prevents remote
     // websites from potentially accessing local content through DNS rebinding:

client/package.json

@@ -3,6 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "apollo-boost": "^0.1.16",
+    "apollo-cache-inmemory": "^1.2.10",
+    "apollo-link-http": "^1.5.5",
     "autoprefixer": "7.1.6",
     "axios": "^0.18.0",
     "babel-core": "6.26.0",
@@ -11,6 +14,7 @@
     "babel-loader": "7.1.2",
     "babel-preset-react-app": "^3.1.1",
     "babel-runtime": "6.26.0",
+    "camelcase": "^5.0.0",
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "chart.js": "^1.1.1",
@@ -21,23 +25,29 @@
     "extract-text-webpack-plugin": "3.0.2",
     "file-loader": "1.1.5",
     "fs-extra": "3.0.1",
+    "graphql": "^14.0.2",
+    "graphql-tag": "^2.9.2",
     "html-webpack-plugin": "2.29.0",
     "jest": "20.0.4",
+    "lodash": "^4.17.10",
     "moment": "^2.22.2",
     "node-sass": "^4.9.0",
+    "node-sass-chokidar": "^1.3.4",
     "object-assign": "4.1.1",
     "postcss-flexbugs-fixes": "3.2.0",
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.2",
     "raf": "3.4.0",
     "react": "^16.4.0",
+    "react-apollo": "^2.1.11",
     "react-chartjs": "^1.2.0",
     "react-dev-utils": "^5.0.1",
     "react-dom": "^16.4.0",
     "react-particles-js": "^2.2.0",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.3.1",
+    "react-scripts-ts": "^3.1.0",
     "react-testing-library": "^5.0.0",
     "redux": "^4.0.0",
     "redux-devtools-extension": "^2.13.2",
@@ -49,15 +59,17 @@
     "style-loader": "^0.21.0",
     "styled-components": "^3.3.2",
     "sw-precache-webpack-plugin": "0.11.4",
+    "typescript": "^3.1.6",
     "url-loader": "0.6.2",
-    "webpack": "3.8.1",
     "webpack-dev-server": "2.9.4",
     "webpack-manifest-plugin": "1.3.2",
     "whatwg-fetch": "2.0.3"
   },
   "scripts": {
-    "start": "node scripts/start.js",
-    "build": "node scripts/build.js",
+    "build-css": "node-sass-chokidar src/ -o src/",
+    "watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive",
+    "start": "react-scripts-ts start",
+    "build": "react-scripts-ts build",
     "test": "node scripts/test.js --env=jsdom"
   },
   "jest": {
@@ -103,6 +115,9 @@
     },
     "/api/*": {
       "target": "http://localhost:5000"
+    },
+    "/graphql": {
+      "target": "http://localhost:5000"
     }
   },
   "babel": {

client/scripts/build.js

@@ -1,5 +1,3 @@
-/* eslint-disable global-require, import/no-dynamic-require, no-console */
-
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = 'production';
 process.env.NODE_ENV = 'production';
@@ -26,8 +24,7 @@ const printBuildError = require('react-dev-utils/printBuildError');
 const paths = require('../config/paths');
 const config = require('../config/webpack.config.prod');
 
-const { measureFileSizesBeforeBuild } = FileSizeReporter;
-const { printFileSizesAfterBuild } = FileSizeReporter;
+const { measureFileSizesBeforeBuild, printFileSizesAfterBuild } = FileSizeReporter;
 const useYarn = fs.existsSync(paths.yarnLockFile);
 
 // These sizes are pretty large. We'll warn for bundles exceeding them.