From 957ccd566e22e132b47aa31b19d18a407d61bc5c Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 19 Jan 2021 19:54:33 +0100 Subject: [PATCH 1/2] add sentry --- package-lock.json | 82 ++++++++++++++++++++++++++++++++++++++++++ package.json | 2 ++ src/components/Home.js | 1 - src/index.js | 16 +++++++++ 4 files changed, 100 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 48c68ce..4f74edb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1502,6 +1502,88 @@ "resolved": "https://registry.npmjs.org/@rooks/use-mutation-observer/-/use-mutation-observer-3.4.0.tgz", "integrity": "sha512-q10+v3WbvSt5fj55VMikTPaUZ9Yl+IYDsymodWr2+cKx0PD97VBeWYjk3xHJPqJgejBHwnrwiNkJKGFY5iW+WQ==" }, + "@sentry/browser": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.0.0.tgz", + "integrity": "sha512-R4+MHb5FyVZCz3EVnaquvT1mwOM2MWP4gBqjYEADY5m0XWoHiJf0skFkWt8iEKJanzGbhl4PMb9gHuJj6YfVLw==", + "requires": { + "@sentry/core": "6.0.0", + "@sentry/types": "6.0.0", + "@sentry/utils": "6.0.0", + "tslib": "^1.9.3" + } + }, + "@sentry/core": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.0.0.tgz", + "integrity": "sha512-afAiOachs/WfGWc9LsJBFnJMhqQVENyzfSMnf7sLRvxPAw8n7IrXY0R09MKmG0SlAnTKN2pWoQFzFF+J3NuHBA==", + "requires": { + "@sentry/hub": "6.0.0", + "@sentry/minimal": "6.0.0", + "@sentry/types": "6.0.0", + "@sentry/utils": "6.0.0", + "tslib": "^1.9.3" + } + }, + "@sentry/hub": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.0.0.tgz", + "integrity": "sha512-s8IsW6LvEH7ACnniQcxxb/9uEyjmoQ/TAoryTJN2qyPzzrHTw8NCyMuJvK+8ivUvRViz5AvtuOFf8AJlh9lzeA==", + "requires": { + "@sentry/types": "6.0.0", + "@sentry/utils": "6.0.0", + "tslib": "^1.9.3" + } + }, + "@sentry/minimal": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.0.0.tgz", + "integrity": "sha512-daYdEzTr+ERMwViu6RpWHOfk0oZrSNqdx+7bejTqmFHqO4pt+9ZrMiw3vinL+MWQcKXwD95uXBz6O/ryrVdPtg==", + "requires": { + "@sentry/hub": "6.0.0", + "@sentry/types": "6.0.0", + "tslib": "^1.9.3" + } + }, + "@sentry/react": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/react/-/react-6.0.0.tgz", + "integrity": "sha512-GYX110NSodd8wGUbnyxemndTijM+U7dI/WjFSPOyJdLB2hzzPjJ9kUqtuobT/JlGzbWE2278WysAuySne6bUGw==", + "requires": { + "@sentry/browser": "6.0.0", + "@sentry/minimal": "6.0.0", + "@sentry/types": "6.0.0", + "@sentry/utils": "6.0.0", + "hoist-non-react-statics": "^3.3.2", + "tslib": "^1.9.3" + } + }, + "@sentry/tracing": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.0.0.tgz", + "integrity": "sha512-7Qes5godGCuvcEBxynFuRT5iiFR5aOfBdvdPmWnx29XbZKQvhjvBsDtdoVSQUmv/nCLtpH6UWeLwddFvXh3A2w==", + "requires": { + "@sentry/hub": "6.0.0", + "@sentry/minimal": "6.0.0", + "@sentry/types": "6.0.0", + "@sentry/utils": "6.0.0", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.0.0.tgz", + "integrity": "sha512-yueRSRGPCahuju/UMdtOt8LIIncbpwLINQd9Q8E4OXtoPpMHR6Oun8sMKCPd+Wq3piI5yRDzKkGCl+sH7mHVrA==" + }, + "@sentry/utils": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.0.0.tgz", + "integrity": "sha512-dMMWOT69bQ4CF1R33dOnXIOyiHRWsUAON3nFVljV1JNNTDA69YwaF9f5FIT0DKpO4qhgTlElsm8WgHI9prAVEQ==", + "requires": { + "@sentry/types": "6.0.0", + "tslib": "^1.9.3" + } + }, "@sheerun/mutationobserver-shim": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz", diff --git a/package.json b/package.json index 1b7bb91..be8ed71 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ "@fortawesome/free-solid-svg-icons": "^5.14.0", "@fortawesome/react-fontawesome": "^0.1.11", "@material-ui/core": "^4.11.0", + "@sentry/react": "^6.0.0", + "@sentry/tracing": "^6.0.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^7.2.1", diff --git a/src/components/Home.js b/src/components/Home.js index 889d019..d169d24 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -125,7 +125,6 @@ class Home extends Component { : null} - From 0d8c30c1ee5b847c4959ef167f53e3abeb8983c7 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 20 Jan 2021 11:33:06 +0100 Subject: [PATCH 2/2] add account information --- src/components/User/Account.js | 38 ++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/components/User/Account.js b/src/components/User/Account.js index 09a9545..fb9eb6b 100644 --- a/src/components/User/Account.js +++ b/src/components/User/Account.js @@ -16,15 +16,15 @@ import Link from '@material-ui/core/Link'; import Typography from '@material-ui/core/Typography'; import Tooltip from '@material-ui/core/Tooltip'; -import { faUser, faAt, faMapMarkerAlt, faCloudSunRain, faBox } from "@fortawesome/free-solid-svg-icons"; +import { faUser, faAt, faMapMarkerAlt, faCloudSunRain, faBox, faUserTag } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; export class Account extends Component { - render(){ - const {user} = this.props; - return( + render() { + const { user } = this.props; + return (
@@ -32,7 +32,7 @@ export class Account extends Component { Alle Angaben stammen von openSenseMap und können dort verwaltet werden. - + @@ -40,7 +40,7 @@ export class Account extends Component { - + @@ -48,30 +48,36 @@ export class Account extends Component { - + + + + + + + - -
+ +
{this.props.user.boxes.length < 1 ? Du hast noch keine senseBox registriert. Besuche openSenseMap um eine senseBox zu registrieren. - : - Du hast {this.props.user.boxes.length} {this.props.user.boxes.length === 1 ? 'senseBox' : 'senseBoxen'} registriert: + : + Du hast {this.props.user.boxes.length} {this.props.user.boxes.length === 1 ? 'senseBox' : 'senseBoxen'} registriert: }
{this.props.user.boxes.map((box, i) => { - var sensors = box.sensors.map(sensor => sensor.title ); + var sensors = box.sensors.map(sensor => sensor.title); return ( - {box.name} + {box.name} @@ -80,7 +86,7 @@ export class Account extends Component {
- Modell: + Modell: {box.model}
@@ -91,7 +97,7 @@ export class Account extends Component {
- Standort: + Standort: {`${box.exposure} (lon: ${box.currentLocation.coordinates[0]}, lat: ${box.currentLocation.coordinates[1]})`}
@@ -102,7 +108,7 @@ export class Account extends Component {
- Sensoren: + Sensoren: {sensors.join(', ')}