Merge branch 'develop' into production

Author: xMartin

COPYRIGHT.txt

@@ -1,4 +1,4 @@
-All Grouptabs code is Copyright 2011 - 2018 by the original authors.
+All Grouptabs code is Copyright 2011 - 2020 by the original authors.
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 

package-lock.json

@@ -11,46 +11,60 @@
   },
   "homepage": "https://grouptabs.net/",
   "dependencies": {
-    "@types/jest": "^24.9.1",
-    "@types/node": "^12.12.53",
+    "@types/jest": "^26.0.19",
+    "@types/node": "^14.14.13",
     "@types/pouchdb": "^6.4.0",
-    "@types/react": "^16.9.43",
-    "@types/react-dom": "^16.9.8",
-    "@types/react-redux": "^7.1.9",
-    "@types/react-test-renderer": "^16.9.2",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@types/react-redux": "^7.1.12",
+    "@types/react-test-renderer": "^17.0.0",
     "@types/redux-first-router": "^2.1.5",
-    "@types/uuid": "^8.0.0",
-    "debug": "^4.1.1",
-    "husky": "^4.2.5",
-    "jest-localstorage-mock": "^2.4.3",
-    "lint-staged": "^10.2.11",
+    "@types/uuid": "^8.3.0",
+    "debug": "^4.3.1",
+    "husky": "^4.3.6",
+    "lint-staged": "^10.5.3",
     "lodash.orderby": "^4.6.0",
-    "pouchdb": "^7.2.1",
-    "pouchdb-adapter-memory": "^7.2.1",
+    "pouchdb": "^7.2.2",
+    "pouchdb-adapter-memory": "^7.2.2",
     "pouchdb-all-dbs": "github:xMartin/pouchdb-all-dbs#grouptabs",
-    "prettier": "^2.0.5",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
+    "prettier": "^2.2.1",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1",
     "react-redux": "^7.2.1",
-    "react-scripts": "3.4.1",
-    "react-test-renderer": "^16.13.1",
+    "react-scripts": "4.0.0",
+    "react-test-renderer": "^17.0.1",
     "redux": "^4.0.5",
     "redux-first-router": "^2.1.5",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "smooth-scroll": "^16.1.3",
-    "typescript": "^3.9.7",
-    "uuid": "^8.2.0"
+    "typescript": "~4.0.3",
+    "uuid": "^8.3.2",
+    "workbox-background-sync": "^5.1.4",
+    "workbox-broadcast-update": "^5.1.4",
+    "workbox-cacheable-response": "^5.1.4",
+    "workbox-core": "^5.1.4",
+    "workbox-expiration": "^5.1.4",
+    "workbox-google-analytics": "^5.1.4",
+    "workbox-navigation-preload": "^5.1.4",
+    "workbox-precaching": "^5.1.4",
+    "workbox-range-requests": "^5.1.4",
+    "workbox-routing": "^5.1.4",
+    "workbox-strategies": "^5.1.4",
+    "workbox-streams": "^5.1.4"
   },
   "scripts": {
     "start": "REACT_APP_GT_VERSION=`git describe HEAD` react-scripts start",
     "build": "REACT_APP_GT_VERSION=`git describe HEAD` react-scripts build",
     "pretest": "tsc",
-    "test": "react-scripts test",
+    "test": "LC_ALL=en_US react-scripts test",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
   },
   "browserslist": {
     "production": [

package.json

@@ -3,9 +3,19 @@ description: >
   Track expenses in a group of people!
 
 releases:
+  - version: 1.4.0
+    date: 2020-12-14
+    description: Clean URLs and smaller bugfixes and improvements
+    improved:
+      - Clean URLs without "#" based on HTML 5 history
+      - Improve auto-focusing of amount inputs and new participant inputs for direct transactions
+    fixed:
+      - Fix not displaying direct transaction form for legacy direct transaction
+    changed:
+      - Update libraries, in particular Create React App to version 4 which comes with a new service worker implementation for offline support
   - version: 1.3.1
     date: 2020-07-26
-    description: No changes - testing release process  
+    description: No changes - testing release process
   - version: 1.3.0
     date: 2020-07-26
     added:
@@ -25,7 +35,7 @@ releases:
     date: 2020-04-07
     description: Bugfixes and improvements
     fixed:
-      - Persist last opened tab on Android PWA (#171) 
+      - Persist last opened tab on Android PWA (#171)
       - Handle case of importing an already imported tab (#172)
     changed:
       - Manage state of the transaction form globally together with the rest of the app's state using Redux

release-notes.yml

@@ -1,5 +1,11 @@
 import { connect, ConnectedProps } from "react-redux";
-import selectors from "./redux/selectors";
+import {
+  getTabInfo,
+  getTotal,
+  getTabs,
+  getTransactions,
+  getAccounts,
+} from "./redux/selectors";
 import {
   navigateToTabs,
   selectTab,
@@ -29,25 +35,25 @@ function mapStateToProps(state: AllState) {
   return {
     location: state.location,
     initialLoadingDone: state.app.initialLoadingDone,
-    tabInfo: selectors.getTabInfo(state),
+    tabInfo: getTabInfo(state),
     transaction: state.app.docsById[
       state.location.payload.transactionId
     ] as Transaction,
-    total: selectors.getTotal(state),
+    total: getTotal(state),
     checkingRemoteTab: state.app.checkingRemoteTab,
     remoteTabError: state.app.remoteTabError,
     importingTab: state.app.importingTab,
     createTabInputValue: state.app.createTabInput,
     importTabInputValue: state.app.importTabInput,
-    tabs: selectors.getTabs(state),
-    transactions: selectors.getTransactions(state),
-    accounts: selectors.getAccounts(state),
+    tabs: getTabs(state),
+    transactions: getTransactions(state),
+    accounts: getAccounts(state),
     transactionFormState: state.app.transactionForm,
     error: state.app.error,
   };
 }
 
-var mapDispatchToProps = {
+const mapDispatchToProps = {
   onNavigateToTabs: navigateToTabs,
   onCreateTabInputChange: setCreateTabInputValue,
   onCreateTab: createTab,

src/app.ts

@@ -29,25 +29,6 @@ exports[`renders empty 1`] = `
       </select>
     </div>
   </div>
-  <div
-    className="form-row"
-    style={
-      Object {
-        "display": "none",
-      }
-    }
-  >
-    <div
-      className="form-row-input"
-    >
-      <input
-        onChange={[Function]}
-        placeholder="Name …"
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
   <div
     className="direct-transaction-amount"
   >
@@ -92,25 +73,6 @@ exports[`renders empty 1`] = `
       </select>
     </div>
   </div>
-  <div
-    className="form-row"
-    style={
-      Object {
-        "display": "none",
-      }
-    }
-  >
-    <div
-      className="form-row-input"
-    >
-      <input
-        onChange={[Function]}
-        placeholder="Name …"
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
 </div>
 `;
 
@@ -143,25 +105,6 @@ exports[`renders prefilled 1`] = `
       </select>
     </div>
   </div>
-  <div
-    className="form-row"
-    style={
-      Object {
-        "display": "none",
-      }
-    }
-  >
-    <div
-      className="form-row-input"
-    >
-      <input
-        onChange={[Function]}
-        placeholder="Name …"
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
   <div
     className="direct-transaction-amount"
   >
@@ -206,24 +149,5 @@ exports[`renders prefilled 1`] = `
       </select>
     </div>
   </div>
-  <div
-    className="form-row"
-    style={
-      Object {
-        "display": "none",
-      }
-    }
-  >
-    <div
-      className="form-row-input"
-    >
-      <input
-        onChange={[Function]}
-        placeholder="Name …"
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
 </div>
 `;