Skip to content

Commit 2fc85ea

Browse files
authored
Merge pull request #154 from SailingSteve/steveStaffClientMar29-845am
Import DonorBox csv report
2 parents 25bd117 + 50c2c35 commit 2fc85ea

52 files changed

Lines changed: 2774 additions & 6545 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"parserOptions": {
44
"sourceType": "module"
55
},
6-
76
"env": {
87
"browser": true,
98
"node": true,
@@ -50,7 +49,6 @@
5049
"quotes": [1, "single", "avoid-escape"],
5150
"radix": 0, // Dec 2018: We always use base 10, so specifying it each time seems excessive
5251
"react-hooks/exhaustive-deps": "warn", // Checks effect dependencies
53-
"react-hooks/rules-of-hooks": "error", // Checks rules of Hooks
5452
"react/button-has-type": 1,
5553
"react/jsx-one-expression-per-line": 0,
5654
"react/destructuring-assignment": 0, // Dec 2018: We should do this! But right now we have 3990 warnings/errors if enabled.

package-lock.json

Lines changed: 1718 additions & 1649 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
"babel-plugin-styled-components": "^2.1.4",
5959
"chromatic": "^10.1.0",
6060
"clean-webpack-plugin": "^4.0.0",
61-
"copy-webpack-plugin": "^12.0.2",
61+
"copy-webpack-plugin": "^14.0.0",
6262
"cross-env": "^10.1.0",
63-
"css-minimizer-webpack-plugin": "^6.0.0",
64-
"eslint": "^7.24.0",
63+
"css-minimizer-webpack-plugin": "^8.0.0",
64+
"eslint": "^7.32.0",
6565
"eslint-config-airbnb": "^18.2.1",
6666
"eslint-plugin-import": "^2.22.1",
6767
"eslint-plugin-jsx-a11y": "^6.4.1",
@@ -73,7 +73,7 @@
7373
"file-saver": "^2.0.5",
7474
"html-webpack-plugin": "^5.6.0",
7575
"jsdom": "^23.0.1",
76-
"mocha": "^10.2.0",
76+
"mocha": "^10.8.2",
7777
"pre-commit": "^1.0.10",
7878
"react-papaparse": "^4.4.0",
7979
"terser-webpack-plugin": "^5.1.2",

src/js/common/components/Search/SearchBar2024.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { blurTextFieldAndroid, focusTextFieldAndroid } from '../../utils/cordova
55
import { renderLog } from '../../utils/logging';
66
import SearchBase from './SearchBase';
77

8-
/* eslint-disable jsx-a11y/control-has-associated-label */
98
class SearchBar2024 extends Component {
109
constructor (props) {
1110
super(props);

src/js/common/components/Search/SearchBase.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class SearchBase extends React.Component {
3232
this.props.onFocus(event);
3333
}
3434
});
35-
}
35+
};
3636

3737
handleClear = () => {
3838
this.setState({ searchText: '' }, () => {
3939
if (this.props.onClear) {
4040
this.props.onClear();
4141
}
4242
});
43-
}
43+
};
4444

4545
render () {
4646
return (

src/js/common/node/webPackPostBuild.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ glob('./build/main.*.js', (err, files) => {
2020
// fs.renameSync(file0, destName);
2121
// console.log(`WebPackPostBuild: ${file0} has been renamed to ${destName}`);
2222
// next rename the <script defer="defer" src="/main.9871eda3cd9fbb2d224e.js"> in the generated index.html file
23-
// eslint-disable-next-line consistent-return
2423
// const indexFile = './build/index.html';
2524
// fs.readFile(indexFile, 'utf8', (err2, data) => {
2625
// if (err2) return console.log('read error: ', err);

src/js/common/utils/cordovaUtils.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ let polyfillsLoaded;
1111

1212
// Copy of this function also in ./appleSiliconUtils, but moved here to fix dependency cycle problem
1313
function dumpObjProps (name, obj) {
14-
// eslint-disable-next-line guard-for-in
1514
Object.keys(obj).forEach((key) => console.log(`Dump Object ${name} ${key}: ${obj[key]}`));
1615
}
1716

@@ -337,7 +336,6 @@ export function isIPad () {
337336
width: window.screen.width * ratio,
338337
height: window.screen.height * ratio,
339338
};
340-
/* eslint-disable no-extra-parens */
341339
if ((screen.width === 768 && screen.height === 1024) || // iPad, 9.7" 2010 and Gen 2, 2011 and Mini 2012
342340
(screen.width === 1536 && screen.height === 2048) || // iPad, 9.7" Gen 3 2012, Gen 4 2013, 2018 iPad, iPad Pro 2016, iPad Air 2013, and Mini Retina 2013
343341
(screen.width === 1668 && screen.height === 2224) || // iPad Pro 10.5" Gen 2 2017
@@ -675,7 +673,6 @@ export function restoreStylesAfterCordovaKeyboard (callerString) {
675673
if (isIOS()) {
676674
window.Keyboard.disableScroll(false);
677675
}
678-
// eslint-disable-next-line no-empty
679676
} catch (e) {
680677
console.log('error in restoreStylesAfterCordovaKeyboard', e);
681678
}

src/js/common/utils/js-cookie/Cookies.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@
55
/* eslint-disable func-names */
66
/* eslint-disable indent */
77
/* eslint-disable no-continue */
8-
/* eslint-disable no-empty */
98
/* eslint-disable no-param-reassign */
109
/* eslint-disable no-restricted-syntax */
1110
/* eslint-disable no-return-assign */
1211
/* eslint-disable no-shadow */
1312
/* eslint-disable object-shorthand */
1413
/* eslint-disable prefer-template */
1514
/* eslint-disable semi */
16-
/* eslint-disable semi */
1715
/* eslint-disable vars-on-top */
1816

1917
import { isIOS } from '../cordovaUtils';
@@ -103,7 +101,10 @@ function init (converter, defaultAttributes) {
103101
if (name === found) {
104102
break
105103
}
106-
} catch (e) {}
104+
// eslint-disable-next-line no-unused-vars
105+
} catch (e) {
106+
continue;
107+
}
107108
}
108109

109110
return name ? jar[name] : jar

src/js/common/utils/js-cookie/converter.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* eslint-disable comma-dangle */
22
/* eslint-disable func-names */
33
/* eslint-disable no-param-reassign */
4-
/* eslint-disable no-var */
54
/* eslint-disable object-shorthand */
65
/* eslint-disable semi */
76

@@ -19,4 +18,4 @@ export default {
1918
);
2019
}
2120
}
22-
/* eslint-enable no-var */
21+

src/js/common/utils/prepareDataPackageFromAppObservableStore.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)