From e3464f501e9649b1a653194dac2f4df4e4e8af04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=90=D0=BD?= =?UTF-8?q?=D0=B4=D1=80=D0=B5=D0=B5=D0=B2=D0=B0?= Date: Wed, 5 Feb 2025 14:29:48 +0400 Subject: [PATCH] add rollbar --- frontend/package-lock.json | 21 ++++ frontend/package.json | 1 + frontend/src/init.jsx | 35 ++++--- frontend/src/pages/LoginPage.jsx | 2 - package-lock.json | 164 +------------------------------ package.json | 5 +- 6 files changed, 43 insertions(+), 185 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 72f9eac..db58c38 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.0", "dependencies": { "@reduxjs/toolkit": "^2.4.0", + "@rollbar/react": "^0.12.0-beta", "@vitejs/plugin-react": "^4.3.4", "axios": "^1.7.9", "bootstrap": "^5.3.3", @@ -1402,6 +1403,20 @@ "react": ">=16.14.0" } }, + "node_modules/@rollbar/react": { + "version": "0.12.0-beta", + "resolved": "https://registry.npmjs.org/@rollbar/react/-/react-0.12.0-beta.tgz", + "integrity": "sha512-8udBX0lJwdBBq+O/jqDXpg/giHt8bo/Us1IlTkHEdCBO18Cjj7sxWJ80OPFxiPRNwZgZnhf2HbxQxvLN+4FeJA==", + "license": "MIT", + "dependencies": { + "tiny-invariant": "^1.1.0" + }, + "peerDependencies": { + "prop-types": "^15.7.2", + "react": "16.x || 17.x || 18.x", + "rollbar": "^2.26.4" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.28.1", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.28.1.tgz", @@ -6117,6 +6132,12 @@ "integrity": "sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==", "license": "MIT" }, + "node_modules/tiny-invariant": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", + "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", + "license": "MIT" + }, "node_modules/tiny-warning": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", diff --git a/frontend/package.json b/frontend/package.json index 5812fff..02a31a1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,6 +12,7 @@ }, "dependencies": { "@reduxjs/toolkit": "^2.4.0", + "@rollbar/react": "^0.12.0-beta", "@vitejs/plugin-react": "^4.3.4", "axios": "^1.7.9", "bootstrap": "^5.3.3", diff --git a/frontend/src/init.jsx b/frontend/src/init.jsx index f043112..b28fc37 100644 --- a/frontend/src/init.jsx +++ b/frontend/src/init.jsx @@ -3,7 +3,7 @@ import i18next from 'i18next'; import { ToastContainer } from 'react-toastify'; import { combineReducers, configureStore } from '@reduxjs/toolkit'; import * as filter from 'leo-profanity'; -// import { ErrorBoundary } from '@rollbar/react'; +import { Provider as RollbarProvider, ErrorBoundary } from '@rollbar/react'; import { chatApi } from './api/chatApi.js'; import activeChannelReducer from './slices/activeChannelSlice.js'; import modalsReducer from './slices/modalsSlice.js'; @@ -61,25 +61,28 @@ const init = async () => { draft.push({ payload }); })); }); - // const rollbarConfig = { - // accessToken: import.meta.env.VITE_ROLLBAR_ACCESS_TOKEN, - // environment: import.meta.env.MODE, - // }; + + const rollbarConfig = { + accessToken: '', + environment: 'testenv', + }; + filter.add(filter.getDictionary('en')); filter.add(filter.getDictionary('ru')); return ( - // - - - - - - - - - // - + + + + + + + + + + + + ); }; diff --git a/frontend/src/pages/LoginPage.jsx b/frontend/src/pages/LoginPage.jsx index 9d76d68..f3b0af5 100644 --- a/frontend/src/pages/LoginPage.jsx +++ b/frontend/src/pages/LoginPage.jsx @@ -7,7 +7,6 @@ import { useTranslation } from 'react-i18next'; import avatarLogin from '../assets/avatarLogin.jpg'; import useAuth from '../hooks/index.jsx'; import router from '../utils/routes.js'; -import { toast } from 'react-toastify'; const LoginPage = () => { const auth = useAuth(); @@ -32,7 +31,6 @@ const LoginPage = () => { if (axios.isAxiosError(err) && err.response.status === 401) { setAuthFailed(true); inputEl.current.select(); - toast.error(t('errors.axiosError')); return; } throw err; diff --git a/package-lock.json b/package-lock.json index 9b831d4..2e00568 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,10 +10,7 @@ "hasInstallScript": true, "license": "ISC", "dependencies": { - "@hexlet/chat-server": "^2.0.4", - "@rollbar/react": "^0.12.0-beta", - "leo-profanity": "^1.7.0", - "rollbar": "^2.26.4" + "@hexlet/chat-server": "^2.0.4" } }, "node_modules/@eslint-community/eslint-utils": { @@ -305,20 +302,6 @@ "node": ">= 8" } }, - "node_modules/@rollbar/react": { - "version": "0.12.0-beta", - "resolved": "https://registry.npmjs.org/@rollbar/react/-/react-0.12.0-beta.tgz", - "integrity": "sha512-8udBX0lJwdBBq+O/jqDXpg/giHt8bo/Us1IlTkHEdCBO18Cjj7sxWJ80OPFxiPRNwZgZnhf2HbxQxvLN+4FeJA==", - "license": "MIT", - "dependencies": { - "tiny-invariant": "^1.1.0" - }, - "peerDependencies": { - "prop-types": "^15.7.2", - "react": "16.x || 17.x || 18.x", - "rollbar": "^2.26.4" - } - }, "node_modules/@rtsao/scc": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", @@ -718,12 +701,6 @@ "license": "MIT", "peer": true }, - "node_modules/async": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "license": "MIT" - }, "node_modules/atomic-sleep": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/atomic-sleep/-/atomic-sleep-1.0.0.tgz", @@ -1030,12 +1007,6 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "license": "MIT" }, - "node_modules/console-polyfill": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/console-polyfill/-/console-polyfill-0.3.0.tgz", - "integrity": "sha512-w+JSDZS7XML43Xnwo2x5O5vxB0ID7T5BdqDtyqT6uiCAX2kZAgcWxNaGqT97tZfSHzfOcvrfsDAodKcJ3UvnXQ==", - "license": "MIT" - }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -1172,16 +1143,6 @@ } } }, - "node_modules/decache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/decache/-/decache-3.1.0.tgz", - "integrity": "sha512-p7D6wJ5EJFFq1CcF2lu1XeqKFLBob8jRQGNAvFLTsV3CbSKBl3VtliAVlUIGz2i9H6kEFnI2Amaft5ZopIG2Fw==", - "license": "MIT", - "optional": true, - "dependencies": { - "find": "^0.2.4" - } - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -1343,15 +1304,6 @@ } } }, - "node_modules/error-stack-parser": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", - "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", - "license": "MIT", - "dependencies": { - "stackframe": "^1.3.4" - } - }, "node_modules/es-abstract": { "version": "1.23.5", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.5.tgz", @@ -2274,16 +2226,6 @@ "node": ">=8" } }, - "node_modules/find": { - "version": "0.2.9", - "resolved": "https://registry.npmjs.org/find/-/find-0.2.9.tgz", - "integrity": "sha512-7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ==", - "license": "MIT", - "optional": true, - "dependencies": { - "traverse-chain": "~0.1.0" - } - }, "node_modules/find-my-way": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/find-my-way/-/find-my-way-8.2.2.tgz", @@ -2356,13 +2298,6 @@ "node": ">= 0.6" } }, - "node_modules/french-badwords-list": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/french-badwords-list/-/french-badwords-list-1.0.7.tgz", - "integrity": "sha512-H1ziKs2PJh2+UXZ9oCGJ/rRQpsI9NBykGf2Sc7WaKaj1OnWFuBXfsvANTdRcfVmOghGQaUmRyZ1hJOPbDpy04Q==", - "license": "MIT", - "optional": true - }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3325,12 +3260,6 @@ "license": "MIT", "peer": true }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "license": "ISC" - }, "node_modules/json5": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", @@ -3390,16 +3319,6 @@ "node": ">=0.10" } }, - "node_modules/leo-profanity": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/leo-profanity/-/leo-profanity-1.7.0.tgz", - "integrity": "sha512-88j1R08jrQzOib9Yxk4nxrzMlrHJi3DzFzAmv0L4APQ+ciGEfJ1rftVEvFjoqL0m+0KGFL3csQGRlxXGnYrA7w==", - "license": "MIT", - "optionalDependencies": { - "french-badwords-list": "^1.0.6", - "russian-bad-words": "^0.5.0" - } - }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -3467,12 +3386,6 @@ "loose-envify": "cli.js" } }, - "node_modules/lru-cache": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz", - "integrity": "sha512-Q5pAgXs+WEAfoEdw2qKQhNFFhMoFMTYqRVKKUMnzuiR7oKFHS7fWo848cPcTKw+4j/IdN17NyzdhVKgabFV0EA==", - "license": "MIT" - }, "node_modules/make-promises-safe": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/make-promises-safe/-/make-promises-safe-5.1.0.tgz", @@ -4164,19 +4077,6 @@ "integrity": "sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==", "license": "MIT" }, - "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "license": "MIT", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -4274,12 +4174,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/request-ip": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/request-ip/-/request-ip-3.3.0.tgz", - "integrity": "sha512-cA6Xh6e0fDBBBwH77SLJaJPBmD3nWVAcF9/XAcsrIHdjhFzFiB5aNQFytdjCGPezU3ROwrR11IddKAM08vohxA==", - "license": "MIT" - }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -4380,24 +4274,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rollbar": { - "version": "2.26.4", - "resolved": "https://registry.npmjs.org/rollbar/-/rollbar-2.26.4.tgz", - "integrity": "sha512-JKmrj6riYm9ZPJisgxljgH4uCsvjMHDHXrinDF7aAFaP+eoF51HomVPtLcDTYLsrJ568aKVNLUhedFajONBwSg==", - "license": "MIT", - "dependencies": { - "async": "~3.2.3", - "console-polyfill": "0.3.0", - "error-stack-parser": "^2.0.4", - "json-stringify-safe": "~5.0.0", - "lru-cache": "~2.2.1", - "request-ip": "~3.3.0", - "source-map": "^0.5.7" - }, - "optionalDependencies": { - "decache": "^3.0.5" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -4422,16 +4298,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/russian-bad-words": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/russian-bad-words/-/russian-bad-words-0.5.0.tgz", - "integrity": "sha512-euNvEYki6iYYpkNbeudW+lEMMYGEmN7EBwVF8ezlbv0bZoQpVYB7W10cCeUIGV7Ed50sJynLQ0c559q5iI0ejQ==", - "license": "MIT", - "optional": true, - "engines": { - "node": ">=10" - } - }, "node_modules/safe-array-concat": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", @@ -4716,15 +4582,6 @@ "atomic-sleep": "^1.0.0" } }, - "node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/split2": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz", @@ -4734,12 +4591,6 @@ "readable-stream": "^3.0.0" } }, - "node_modules/stackframe": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", - "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==", - "license": "MIT" - }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -4952,12 +4803,6 @@ "real-require": "^0.2.0" } }, - "node_modules/tiny-invariant": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", - "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", - "license": "MIT" - }, "node_modules/tmpl": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", @@ -4994,13 +4839,6 @@ "node": ">=0.6" } }, - "node_modules/traverse-chain": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz", - "integrity": "sha512-up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg==", - "license": "MIT", - "optional": true - }, "node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", diff --git a/package.json b/package.json index 124c783..641af8d 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,6 @@ }, "homepage": "https://github.com/Tatyana-js/frontend-project-12#readme", "dependencies": { - "@hexlet/chat-server": "^2.0.4", - "@rollbar/react": "^0.12.0-beta", - "leo-profanity": "^1.7.0", - "rollbar": "^2.26.4" + "@hexlet/chat-server": "^2.0.4" } }