Skip to content

Commit

Permalink
Merge pull request #174 from UTD-CRSS/develop
Browse files Browse the repository at this point in the history
Develop into master
  • Loading branch information
toriannwin authored Nov 17, 2020
2 parents b6b9139 + 0b5dac6 commit b53e734
Show file tree
Hide file tree
Showing 105 changed files with 15,949 additions and 11,880 deletions.
5 changes: 1 addition & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ rules:
- 2
- always
react/jsx-uses-react: 1
react/jsx-uses-vars: 1
env:
es6: true
browser: true
node: true
extends: 'eslint:recommended'
ecmaFeatures:
jsx: true
experimentalObjectRestSpread: true,
modules: true
plugins:
- react
8 changes: 3 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
# Test directories (cache, results)
.jest-cache
test-results

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ env:
- secure: BxzEKVUOOSRPJK3zY8wEmXumd2sBWj5WQZoLsXWb/4aFUmFHWjB/sxRTdgySUgZLwRxQt9nya4vH4wimwWbbOtof17C++xZvaMXZ94Xdks6kZ4ULLzMyFgWHsrwfqGW+PrL4IcQCtJSHAvj9w3vY40jucsNfqjkkXDDZuItNt0c8lVZy8V4jm/PQNDY87LOqyC7bVuuUNlNt2J18y87DBB6BhO7cgjYQWIzx5QWa/RDQNL3TuXM4bWh3fR6n/MQ+cKXOno61PYfNsL7zSVE4aJfPN6/V8i3trIadBgFXV4eNn5x/uU8kV50ngo/8VGXGotnSjzjHAJyU5z/0FeoLcNBAEZ+SOYJ0exEHWNubPk5jq2paw9wQXUYjbXMMhr5wks8ei+Vztq++EZ9AYzKROHR3pB4kbJfPzKxsx1z3a93/zwUL5+KwdDa5Iddvp/BwmbzC78p2MpUCF5noY7yHdWHeaC5Lzod5ONSB0/jnVyLQ3479Q5g2BdU1eHFWVpiy/cNdg5OnGCmLUkZzo7m0mKPdwFV0VJY25q6ZjvuXwv6RuNbMB8NUpxWxH06ec+rGRT0+h84FvqpAlAuA2ZGcTEtGbFhWqoH6FF6V2iZI/FgIXEedQtoxls2k+CD4hEmIqVdrULLmwdlkpjNJruYpORvtNfzDy5pztKDdZjrjqhU=
notifications:
slack:
secure: jbTPrBk3fg1k529RvW99/K69NqhG0r1d3+L+kCycPgj+YHheyyU3RUoK4ZnLkWAxIHK8FNgy5yq9n/rAKN+v20kXANV/Td5ZYZUrNoIyYE5L6aipjzxgYxvaBC8DglA+0DN7woUitYdSkDkoljVMzZVKsrYN5hR7ycJu5bmTMz4xJSnVZi4UY6oLLpaFjHXXDSVm8bOqJaeQhhr7sf4m/LYdF6D23FK4O4Y/qBycNfMopDMY34RUeiDnPzU0TX2tnpXpo+q0UWPqyuQ66w4R4SS7EaNgqaEHG7xdG/tXylB/9+ZCoGz6tcSxCJMshuN54K/c4KqWAJXkkbfGpq6ZuQ2f7dwqgNEKDt2yPSxjZyt4JZP7fl+oGZ6ecawrbT9ylpbq++dSBmvhBHIbZzFVXAjOibkHV2vVpY4jT1rxL7HMkpbrtWlyLHMOEo4aA7g0gi4Lt2oSOXBlJtwwePF+irmg6mlAHZfbHSsucSVrv2jWwENcBfz49ugdG133ypzq1sznyoJZyxKFL8M0vCa9mgyp2g/vO/+IlMijlLqj+dv9rab+mqHF3N+n/YY/h16K0VcC9qSY+Y/M/35V5siQsVBqKeC98j0sAqAUSWdt6LDRdDOJZCLWUYad5SURd6gkGV4WfG0cDNfRky4/O+TltUXCXlgjbU7z+tPq5go90oQ=
secure: jbTPrBk3fg1k529RvW99/K69NqhG0r1d3+L+kCycPgj+YHheyyU3RUoK4ZnLkWAxIHK8FNgy5yq9n/rAKN+v20kXANV/Td5ZYZUrNoIyYE5L6aipjzxgYxvaBC8DglA+0DN7woUitYdSkDkoljVMzZVKsrYN5hR7ycJu5bmTMz4xJSnVZi4UY6oLLpaFjHXXDSVm8bOqJaeQhhr7sf4m/LYdF6D23FK4O4Y/qBycNfMopDMY34RUeiDnPzU0TX2tnpXpo+q0UWPqyuQ66w4R4SS7EaNgqaEHG7xdG/tXylB/9+ZCoGz6tcSxCJMshuN54K/c4KqWAJXkkbfGpq6ZuQ2f7dwqgNEKDt2yPSxjZyt4JZP7fl+oGZ6ecawrbT9ylpbq++dSBmvhBHIbZzFVXAjOibkHV2vVpY4jT1rxL7HMkpbrtWlyLHMOEo4aA7g0gi4Lt2oSOXBlJtwwePF+irmg6mlAHZfbHSsucSVrv2jWwENcBfz49ugdG133ypzq1sznyoJZyxKFL8M0vCa9mgyp2g/vO/+IlMijlLqj+dv9rab+mqHF3N+n/YY/h16K0VcC9qSY+Y/M/35V5siQsVBqKeC98j0sAqAUSWdt6LDRdDOJZCLWUYad5SURd6gkGV4WfG0cDNfRky4/O+TltUXCXlgjbU7z+tPq5go90oQ=
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,18 @@

## Development

This project requires Node >=12.X and npm >=6.X You should install node using [nvm][].
This project requires Node >=12.8 and npm >=6.X You should install node using [nvm][].

### Start Hacking

1. `npm install` to grab all the goodies
2. `npm run dev` to start a hot-reloading development server
3. No step 3

Other useful commands:

* `npm test` to run the tests
* `npm run tdd` to continuously run tests as you code
* `npm run lint` to check your changes against the linting guidelines
- `npm test` to run the tests
- `npm run tdd` to continuously run tests as you code
- `npm run lint` to check your changes against the linting guidelines

**Note about HTTPS and the development server:** the development server uses a
self-signed SSL certificate. When you open the development server for the first
Expand Down Expand Up @@ -66,7 +65,6 @@ Source lives in `src/`. Compiled output goes in `dist/`. Configuration goes in
- `containers/`: [Stateful][dumb-comp] react components. These are usually top-level route handlers.
- `components/`: [Stateless/Dumb][dumb-comp] react components. These guys determininstically render based on props.


### Configuration Values

Configuration values are stored in the `config/` directory. You gain access to the configuration values by importing the config object from `config/index.js`. The configuration values are loaded as such:
Expand Down
12 changes: 12 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"presets": [
"@babel/preset-react",
"@babel/preset-env"
],
"plugins": [
"@babel/plugin-transform-runtime",
"@babel/plugin-syntax-export-default-from",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-syntax-jsx"
]
}
9 changes: 6 additions & 3 deletions dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ webpackConfig.entry = [].concat([
"webpack-hot-middleware/client"
], webpackConfig.entry);

webpackConfig.debug = true;

webpackConfig.devtool = "#eval-source-map";

webpackConfig.plugins = [].concat(webpackConfig.plugins, [
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.optimize.OccurrenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin()
new webpack.NoEmitOnErrorsPlugin(),
new webpack.LoaderOptionsPlugin({
debug: true
})
]);

var bundler = webpack(webpackConfig);
Expand Down
Loading

0 comments on commit b53e734

Please sign in to comment.