Skip to content

Commit

Permalink
Merge pull request #137 from caktus/develop
Browse files Browse the repository at this point in the history
Production Release August 22, 2022
  • Loading branch information
Afani97 authored Aug 22, 2022
2 parents d0f1b17 + 180571f commit 80c7fd8
Show file tree
Hide file tree
Showing 147 changed files with 87,764 additions and 12,120 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.16-alpine as static_files
FROM node:16.16-alpine3.16 as static_files

WORKDIR /code
ENV PATH /code/node_modules/.bin:$PATH
Expand Down
Binary file added Traffic Stop Data Tables Reference Key.xlsx
Binary file not shown.
5 changes: 5 additions & 0 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
{
"parserOptions": {
// Required for certain syntax usages
"ecmaVersion": 2020
},
"extends": ["airbnb", "prettier"],
"plugins": ["prettier", "cypress"],
"env": {
Expand All @@ -14,6 +18,7 @@
],
"prefer-template": "off",
"react/prop-types": "off",
"react/require-default-props": "off",
"dot-notation": "off",
"no-use-before-define": "off",
"no-underscore-dangle": "off",
Expand Down
2 changes: 1 addition & 1 deletion frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ We're using [React Router](https://reactrouter.com/web/guides/quick-start) for s

## Async bundles

This project makes use of [code-splitting](https://reactjs.org/docs/code-splitting.html) in tandem with routing, to allow dynamic loading of bundles based on the URL visited. See [AsyncRoute.js](src/Components/Containers/AsyncRoute.js) for implementation, and [Charts.js](src/Components/Charts/Charts.js) for example usage.
This project makes use of [code-splitting](https://reactjs.org/docs/code-splitting.html) in tandem with routing, to allow dynamic loading of bundles based on the URL visited. See [FJRoute.js](src/Components/Containers/FJRoute.js) for implementation, and [Charts.js](src/Components/Charts/Charts.js) for example usage.

## Loading/Skeletons

Expand Down
2 changes: 1 addition & 1 deletion frontend/cypress/integration/charts_spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AGENCY_DATA_SLUG, AGENCY_LIST_SLUG } from '../../src/Routes/slugs';
import { MIN_DELAY } from '../../src/Components/Containers/AsyncRoute';
import { MIN_DELAY } from '../../src/Components/Containers/FJRoute';
import { getStopsByReasonURL } from '../../src/Services/endpoints';

describe('Chart behavior', () => {
Expand Down
3 changes: 2 additions & 1 deletion frontend/cypress/plugins/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
/**
* @type {Cypress.PluginConfig}
*/
// eslint-disable-next-line no-unused-vars
module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config
}
};
2 changes: 1 addition & 1 deletion frontend/cypress/support/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// ***********************************************************

// Import commands.js using ES2015 syntax:
import './commands'
import './commands';

// Alternatively you can use CommonJS syntax:
// require('./commands')
Loading

0 comments on commit 80c7fd8

Please sign in to comment.