Merge branch 'develop' into dependabot/merge

Author: ohrie

.env.defaults

@@ -22,9 +22,9 @@ REGION=berlin
 
 # Select backend to connect to
 #
-# Backend URLs are configured in each region's configuration and in the 
+# Backend URLs are configured in each region's configuration and in the
 # default configuration in src/config/default/base.ts
-# 
+#
 # Available configurations for default region 'berlin':
 # - production
 # - staging
@@ -53,4 +53,4 @@ CYPRESS_PASSWORD=
 CYPRESS_BROWSER_WINDOW=
 
 # Removes ads during `npm install`
-ADBLOCK=true
+ADBLOCK=true

.nvmrc

@@ -1 +1 @@
-v16.14.2
+v18.4.0

netlify.toml

@@ -20,7 +20,7 @@
 
 [[redirects]]
     from = "/api/aachen/v1/*"
-    to = "https://fixmyaachen.herokuapp.com/api/:splat"
+    to = "https://api.radbuegel-aachen.de/api/:splat"
     status = 200
     force = true
     [redirects.headers]

package-lock.json

@@ -43,6 +43,7 @@
     "@material-ui/icons": "^4.11.3",
     "@material-ui/pickers": "^3.3.10",
     "@material-ui/styles": "^4.11.5",
+    "@sentry/react": "^6.19.6",
     "@turf/along": "^6.5.0",
     "@turf/boolean-within": "^6.5.0",
     "@turf/center": "^6.5.0",
@@ -71,19 +72,17 @@
     "prop-types": "^15.7.2",
     "rc-slider": "^10.0.0",
     "react": "^17.0.2",
-    "react-autosize-textarea": "^7.1.0",
     "react-collapsible": "^2.8.3",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^17.0.2",
     "react-helmet": "^6.1.0",
     "react-intersection-observer": "^8.31.0",
+    "react-intl": "^5.25.1",
     "react-is": "^16.13.1",
     "react-markdown": "^8.0.0",
-    "react-intl": "^5.25.1",
     "react-piwik": "^1.11.0",
     "react-redux": "^7.2.2",
     "react-router-dom": "^5.3.0",
-    "react-router-last-location": "^2.0.1",
     "react-router-prop-types": "^1.0.4",
     "react-slick": "^0.29.0",
     "react-spinners": "^0.10.6",
@@ -146,11 +145,11 @@
     "eslint": "^8.17.0",
     "eslint-config-airbnb": "^19.0.1",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-import-resolver-webpack": "^0.13.2",
+    "eslint-import-resolver-webpack": "~0.11.1",
     "eslint-plugin-chai-friendly": "^0.5.0",
     "eslint-plugin-cypress": "^2.11.2",
-    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-formatjs": "^3.1.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest-dom": "^4.0.1",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-prettier": "^4.0.0",

package.json

@@ -6,7 +6,6 @@ import { IntlProvider, IntlConfig } from 'react-intl';
 import ReactPiwik from 'react-piwik';
 import { connect } from 'react-redux';
 import { Router } from 'react-router-dom';
-import { LastLocationProvider } from 'react-router-last-location';
 import styled from 'styled-components';
 
 import ErrorBoundary from '~/components/ErrorBoundary';
@@ -68,16 +67,14 @@ const App = ({ dispatch, isEmbedMode }) => {
       >
         <GlobalStyles />
         <Router history={history}>
-          <LastLocationProvider>
-            <AppWrapper>
-              {!isEmbedMode && <Menu />}
-              <AppContent>
-                <ErrorBoundary>
-                  <Routes />
-                </ErrorBoundary>
-              </AppContent>
-            </AppWrapper>
-          </LastLocationProvider>
+          <AppWrapper>
+            {!isEmbedMode && <Menu />}
+            <AppContent>
+              <ErrorBoundary>
+                <Routes />
+              </ErrorBoundary>
+            </AppContent>
+          </AppWrapper>
         </Router>
       </IntlProvider>
     </ThemeProvider>

src/App.tsx

@@ -116,10 +116,6 @@ const StyledForm = styled(Form)`
   }
 `;
 
-const InvalidFormNotice = styled.p`
-  margin: 3em 0;
-`;
-
 const isProduction = process.env.NODE_ENV === 'production';
 
 const connector = connect(({ AppState }: RootState) => ({