From ec27059fbd363c7ccbf0ccee1def383fbf0839c4 Mon Sep 17 00:00:00 2001 From: apurv-wednesday Date: Thu, 9 May 2024 18:51:39 +0530 Subject: [PATCH] Revert "Merge branch 'main' into feat/add-jest-annotation" This reverts commit 8b5fe425f1cb47f01b4cacf8e21a4ab7ea4a9fb9, reversing changes made to 75b4108791eb996104d5112a729f62864218b6f4. --- .github/workflows/ci.yml | 20 +++----- .github/workflows/jest-coverage.yml | 40 --------------- jest.config.ts | 10 ++++ .../T/tests/__snapshots__/index.test.tsx.snap | 3 +- src/common/styled/index.tsx | 1 + src/containers/Repos/index.tsx | 50 +++++++------------ .../repos/components/ErrorState/index.tsx | 4 +- .../tests/__snapshots__/index.test.tsx.snap | 13 +++-- .../ErrorState/tests/index.test.tsx | 2 +- .../tests/__snapshots__/index.test.tsx.snap | 6 ++- src/themes/index.ts | 8 +-- src/themes/mui/index.ts | 3 +- src/themes/mui/palette.ts | 11 +--- src/translations/en.js | 2 +- src/translations/en.po | 16 +++--- src/translations/hi.js | 2 +- src/translations/hi.po | 16 +++--- src/utils/linguiUtils.ts | 1 + src/utils/testUtils.tsx | 8 +-- 19 files changed, 76 insertions(+), 140 deletions(-) delete mode 100644 .github/workflows/jest-coverage.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af21df7..34724c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,23 +33,15 @@ jobs: - name: Build Project run: yarn build - - # commenting for now to make CI green , will try this - # - name: run Lighthouse CI - # run: | - # yarn global add @lhci/cli@0.8.x - # lhci autorun --collect.staticDistDir - - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: sonarsource/sonarqube-scan-action@master env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} - # commenting for now to make CI green , will try this - # - uses: sonarsource/sonarqube-quality-gate-action@master - # timeout-minutes: 5 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + - name: Test and generate coverage report + uses: artiomtr/jest-coverage-report-action@v2.0-rc.4 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + package-manager: yarn + custom-title: Jest Coverage Report \ No newline at end of file diff --git a/.github/workflows/jest-coverage.yml b/.github/workflows/jest-coverage.yml deleted file mode 100644 index dcec65d..0000000 --- a/.github/workflows/jest-coverage.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Jest Coverage Report with Annotations (CI) -on: - pull_request: - branches: [main] - push: - branches: [main] -jobs: - coverage_report: - name: Jest Coverage Report - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [20.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - cache: 'yarn' - - - name: Get Threshold - id: threshold - uses: notiz-dev/github-action-json-property@release - with: - path: 'jest.config.ts' - prop_path: 'coverageThreshold.global.statements' - - - name: Install dependencies - run: yarn - - - name: Test and generate coverage report - uses: artiomtr/jest-coverage-report-action@v2.0-rc.4 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - # Threshold to be enabled after adding test cases - # threshold: ${{steps.threshold.outputs.prop}} - package-manager: yarn - custom-title: Jest Coverage Report \ No newline at end of file diff --git a/jest.config.ts b/jest.config.ts index 6c5e28c..022e375 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -6,6 +6,16 @@ const createJestConfig = nextJest({ dir: "./" }); const jestConfig: Config = { preset: "ts-jest", testEnvironment: "jsdom", + // uncomment later after adding tests + // coverageThreshold: { + // global: { + // statements: 90, + // branches: 90, + // functions: 90, + // lines: 90, + // }, + // }, + coverageReporters: ["json-summary", "text", "lcov"], collectCoverageFrom: ["src/**/**/*.{js,jsx,ts,tsx}"], reporters: [ "default", diff --git a/src/common/T/tests/__snapshots__/index.test.tsx.snap b/src/common/T/tests/__snapshots__/index.test.tsx.snap index 1d6125c..0823830 100644 --- a/src/common/T/tests/__snapshots__/index.test.tsx.snap +++ b/src/common/T/tests/__snapshots__/index.test.tsx.snap @@ -3,10 +3,11 @@ exports[` should render and match the snapshot 1`] = ` .emotion-0 { margin: 0; - font-family: fontFamily; + font-family: "Roboto","Helvetica","Arial",sans-serif; font-weight: 400; font-size: 1rem; line-height: 1.5; + letter-spacing: 0.00938em; } diff --git a/src/common/styled/index.tsx b/src/common/styled/index.tsx index 3f5653e..8dacb97 100644 --- a/src/common/styled/index.tsx +++ b/src/common/styled/index.tsx @@ -24,6 +24,7 @@ export const CustomCard = styled(Card)<{ maxwidth?: React.CSSProperties["maxWidt padding: 1rem; max-width: ${props => props.maxwidth}px; color: ${props => props.color}; + ${props => props.color && `color: ${props.color}`}; } `; diff --git a/src/containers/Repos/index.tsx b/src/containers/Repos/index.tsx index dcc8357..2d82f95 100644 --- a/src/containers/Repos/index.tsx +++ b/src/containers/Repos/index.tsx @@ -1,5 +1,5 @@ import { Container, CustomCard, If, T } from "@common"; -import { Box, Divider, OutlinedInput, Pagination } from "@mui/material"; +import { Box, Divider, Link, OutlinedInput, Pagination } from "@mui/material"; import { ErrorState, RepoList } from "@features/repos/components"; import { IRepoError } from "@features/repos/types"; import React, { memo, useEffect, useState } from "react"; @@ -8,82 +8,68 @@ import { useFetchRecommendationQuery } from "@features/repos/api/getRecommendati import { useRouter } from "next/router"; import { Trans } from "@lingui/macro"; import { skipToken } from "@reduxjs/toolkit/query"; -import styled from "@emotion/styled"; -import Link from "next/link"; interface RepoContainerProps { padding?: number; maxwidth?: number; } -const StyledSpan = styled.span` - color: darkblue; -`; - -const StyledLink = styled(Link)` - text-decoration: none; -`; const Repos: React.FC = ({ maxwidth }) => { const router = useRouter(); - const [repoName, setRepoName] = useState(""); + const [repoName, setRepoName] = useState("react"); const [page, setPage] = useState(1); const { data, error, isLoading, isFetching } = useFetchRecommendationQuery( isEmpty(repoName) ? skipToken : { - repoName, - page, - }, + repoName, + page: Number(page), + }, { skip: router.isFallback } ); const handlePageChange = (_: React.ChangeEvent, pageNumber: number) => { setPage(pageNumber); - updateUrlParams(repoName, pageNumber); + router.push(`/?search=${repoName}&page=${pageNumber}`, undefined, { + shallow: true, + scroll: true, + }); }; const handleRepoSearch = debounce((repoName: string) => { setRepoName(repoName); setPage(1); - updateUrlParams(repoName, 1); // Update URL params immediately }, 500); - const updateUrlParams = (repoName: string, pageNumber: number) => { - router.push(`/?search=${repoName}&page=${pageNumber}`, undefined, { - shallow: true, - scroll: true, - }); - }; useEffect(() => { if (router.isReady) { - const searchParam = router.query?.search as string; - setRepoName(searchParam || ""); - setPage(Number(router.query?.page) || 1); + setRepoName(router.query?.search as string); + setPage(router.query?.page as unknown as number); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [router.isReady]); useEffect(() => { if (!isEmpty(repoName)) { - updateUrlParams(repoName, page); + router.push(`/?search=${repoName}&page=${page}`); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [data]); return ( - + Recommendation - + - - You Are Awesome - + You Are Awesome - + diff --git a/src/features/repos/components/ErrorState/index.tsx b/src/features/repos/components/ErrorState/index.tsx index d4219f3..7fb007f 100644 --- a/src/features/repos/components/ErrorState/index.tsx +++ b/src/features/repos/components/ErrorState/index.tsx @@ -9,7 +9,6 @@ import get from "lodash/get"; import { T, CustomCard } from "@common"; import { IResponse } from "@features/repos/api/getRecommendations"; import { Trans, t } from "@lingui/macro"; -import theme from "@app/themes"; interface ErrorStateProps { loading: boolean; @@ -24,8 +23,9 @@ const ErrorState: React.FC = ({ reposData, reposError, loading } else if (!get(reposData, "totalCount", 0)) { repoError = t`Search Default`; } + return !loading && repoError ? ( - + Repository List diff --git a/src/features/repos/components/ErrorState/tests/__snapshots__/index.test.tsx.snap b/src/features/repos/components/ErrorState/tests/__snapshots__/index.test.tsx.snap index d42507f..6f3665a 100644 --- a/src/features/repos/components/ErrorState/tests/__snapshots__/index.test.tsx.snap +++ b/src/features/repos/components/ErrorState/tests/__snapshots__/index.test.tsx.snap @@ -15,30 +15,33 @@ exports[` should render and match the snapshot 1`] = ` margin: 20px 0; padding: 1rem; max-width: px; - color: #f44336; + color: grey; + color: grey; } .emotion-1 { margin: 0; - font-family: fontFamily; + font-family: "Roboto","Helvetica","Arial",sans-serif; font-weight: 500; font-size: 0.875rem; line-height: 1.57; + letter-spacing: 0.00714em; } .emotion-2 { margin: 0; - font-family: fontFamily; + font-family: "Roboto","Helvetica","Arial",sans-serif; font-weight: 400; font-size: 1rem; line-height: 1.5; + letter-spacing: 0.00938em; }
should render and match the snapshot 1`] = ` class="MuiTypography-root MuiTypography-body1 emotion-2" data-testid="t" > - Internal Service Error + Search Default

diff --git a/src/features/repos/components/ErrorState/tests/index.test.tsx b/src/features/repos/components/ErrorState/tests/index.test.tsx index 1f9b2f8..5891423 100644 --- a/src/features/repos/components/ErrorState/tests/index.test.tsx +++ b/src/features/repos/components/ErrorState/tests/index.test.tsx @@ -13,7 +13,7 @@ describe("", () => { intl: {}, loading: false, reposData: undefined, - reposError: "Internal Service Error", + reposError: undefined, }; it("should render and match the snapshot", () => { diff --git a/src/features/repos/components/RepoList/tests/__snapshots__/index.test.tsx.snap b/src/features/repos/components/RepoList/tests/__snapshots__/index.test.tsx.snap index 84799c6..62ac7ef 100644 --- a/src/features/repos/components/RepoList/tests/__snapshots__/index.test.tsx.snap +++ b/src/features/repos/components/RepoList/tests/__snapshots__/index.test.tsx.snap @@ -53,18 +53,20 @@ exports[` should render and match the snapshot 1`] = ` .emotion-2 { margin: 0; - font-family: fontFamily; + font-family: "Roboto","Helvetica","Arial",sans-serif; font-weight: 400; font-size: 1rem; line-height: 1.5; + letter-spacing: 0.00938em; } .emotion-3 { margin: 0; - font-family: fontFamily; + font-family: "Roboto","Helvetica","Arial",sans-serif; font-weight: 400; font-size: 1rem; line-height: 1.5; + letter-spacing: 0.00938em; margin-bottom: 8px; } diff --git a/src/themes/index.ts b/src/themes/index.ts index eed9b3f..16a30c7 100644 --- a/src/themes/index.ts +++ b/src/themes/index.ts @@ -1,10 +1,6 @@ import styles from "./styles"; -import { theme, CustomPalette, font, palette } from "./mui"; +import { theme, font, palette } from "./mui"; export { styles, font, palette }; -const customTheme = theme as Omit & { - palette: typeof theme.palette & CustomPalette -} - -export default customTheme; \ No newline at end of file +export default theme; diff --git a/src/themes/mui/index.ts b/src/themes/mui/index.ts index 85ccef9..01b623b 100644 --- a/src/themes/mui/index.ts +++ b/src/themes/mui/index.ts @@ -1,5 +1,5 @@ import { createTheme } from "@mui/material/styles"; -import { palette, CustomPalette } from "./palette"; +import { palette } from "./palette"; import { typography, font } from "./typography"; import { breakpoints } from "./breakpoints"; @@ -10,4 +10,3 @@ const theme = createTheme({ }); export { font, theme, palette }; -export type {CustomPalette} diff --git a/src/themes/mui/palette.ts b/src/themes/mui/palette.ts index 9cece45..dea4667 100644 --- a/src/themes/mui/palette.ts +++ b/src/themes/mui/palette.ts @@ -1,23 +1,14 @@ import { PaletteOptions } from "@mui/material/styles"; import { blue, purple, green, red, amber } from "@mui/material/colors"; -import { Color } from "@mui/material"; -export type CustomPalette = { - customColor: { - main: Color | string; - } -} /** * @desc Refer documentation for clarity * @link https://mui.com/material-ui/customization/palette/ */ -export const palette: PaletteOptions & CustomPalette = { +export const palette: PaletteOptions = { primary: blue, secondary: purple, success: green, error: red, warning: amber, - customColor: { - main: "#141414", - } }; diff --git a/src/translations/en.js b/src/translations/en.js index 12d5bbe..c195aa9 100644 --- a/src/translations/en.js +++ b/src/translations/en.js @@ -1 +1 @@ -/*eslint-disable*/module.exports={messages:JSON.parse("{\"7SNCOA\":\"<0>You Are Awesome\",\"WDU3y1\":\"Back to Search\",\"r0p32h\":[\"Forks: \",[\"forks\"]],\"a93ona\":\"Get details of repositories\",\"EqGTpW\":\"No records found\",\"R7WSDI\":\"Recommendation\",\"UD9q2J\":[\"Repository full name: \",[\"0\"]],\"8HzLs9\":\"Repository List\",\"LfaRkD\":[\"Repository Name: \",[\"0\"]],\"zSqOVn\":\"Repository Search\",\"uyzu5f\":[\"Repository stars: \",[\"0\"]],\"aJQKDu\":\"Search Default\",\"vS9Vr8\":[\"Search query: \",[\"repoName\"]],\"xqZxK1\":\"Something Went Wrong\",\"TWYokB\":[\"Stars: \",[\"stargazersCount\"]],\"jVytD5\":[\"Total number of matching repos: \",[\"totalCount\"]],\"4HJq+W\":[\"Watchers: \",[\"watchers\"]],\"Z01zNq\":\"You are Offline!\"}")}; \ No newline at end of file +/*eslint-disable*/module.exports={messages:JSON.parse("{\"WDU3y1\":\"Back to Search\",\"r0p32h\":[\"Forks: \",[\"forks\"]],\"a93ona\":\"Get details of repositories\",\"EqGTpW\":\"No records found\",\"R7WSDI\":\"Recommendation\",\"UD9q2J\":[\"Repository full name: \",[\"0\"]],\"8HzLs9\":\"Repository List\",\"LfaRkD\":[\"Repository Name: \",[\"0\"]],\"zSqOVn\":\"Repository Search\",\"uyzu5f\":[\"Repository stars: \",[\"0\"]],\"aJQKDu\":\"Search Default\",\"vS9Vr8\":[\"Search query: \",[\"repoName\"]],\"xqZxK1\":\"Something Went Wrong\",\"TWYokB\":[\"Stars: \",[\"stargazersCount\"]],\"jVytD5\":[\"Total number of matching repos: \",[\"totalCount\"]],\"4HJq+W\":[\"Watchers: \",[\"watchers\"]],\"FTHiRv\":\"You Are Awesome\",\"Z01zNq\":\"You are Offline!\"}")}; \ No newline at end of file diff --git a/src/translations/en.po b/src/translations/en.po index 971b445..aa87712 100644 --- a/src/translations/en.po +++ b/src/translations/en.po @@ -13,10 +13,6 @@ msgstr "" "Language-Team: \n" "Plural-Forms: \n" -#: src/containers/Repos/index.tsx:82 -msgid "<0>You Are Awesome" -msgstr "<0>You Are Awesome" - #: src/features/info/components/RepoInfo/index.tsx:20 msgid "Back to Search" msgstr "Back to Search" @@ -25,7 +21,7 @@ msgstr "Back to Search" msgid "Forks: {forks}" msgstr "Forks: {forks}" -#: src/containers/Repos/index.tsx:94 +#: src/containers/Repos/index.tsx:80 msgid "Get details of repositories" msgstr "Get details of repositories" @@ -33,7 +29,7 @@ msgstr "Get details of repositories" msgid "No records found" msgstr "No records found" -#: src/containers/Repos/index.tsx:76 +#: src/containers/Repos/index.tsx:64 msgid "Recommendation" msgstr "Recommendation" @@ -49,7 +45,7 @@ msgstr "Repository List" msgid "Repository Name: {0}" msgstr "Repository Name: {0}" -#: src/containers/Repos/index.tsx:91 +#: src/containers/Repos/index.tsx:77 msgid "Repository Search" msgstr "Repository Search" @@ -57,7 +53,7 @@ msgstr "Repository Search" msgid "Repository stars: {0}" msgstr "Repository stars: {0}" -#: src/features/repos/components/ErrorState/index.tsx:25 +#: src/features/repos/components/ErrorState/index.tsx:24 msgid "Search Default" msgstr "Search Default" @@ -82,6 +78,10 @@ msgstr "Total number of matching repos: {totalCount}" msgid "Watchers: {watchers}" msgstr "Watchers: {watchers}" +#: src/containers/Repos/index.tsx:70 +msgid "You Are Awesome" +msgstr "You Are Awesome" + #: src/pages/_offline.tsx:7 msgid "You are Offline!" msgstr "You are Offline!" diff --git a/src/translations/hi.js b/src/translations/hi.js index aa1719f..4553643 100644 --- a/src/translations/hi.js +++ b/src/translations/hi.js @@ -1 +1 @@ -/*eslint-disable*/module.exports={messages:JSON.parse("{\"7SNCOA\":\"<0>आप अद्भुत हैं\",\"WDU3y1\":\"खोज में वापस\",\"r0p32h\":[\"फोर्क्स: \",[\"forks\"]],\"a93ona\":\"रिपॉज़िटरी का विवरण प्राप्त करें\",\"EqGTpW\":\"कोई रिकॉर्ड नहीं मिला\",\"R7WSDI\":\"सिफारिश\",\"UD9q2J\":[\"रिपॉज़िटरी पूरा नाम: \",[\"0\"]],\"8HzLs9\":\"रिपॉज़िटरी सूची\",\"LfaRkD\":[\"रिपॉज़िटरी का नाम: \",[\"0\"]],\"zSqOVn\":\"रिपॉज़िटरी खोज\",\"uyzu5f\":[\"रिपॉज़िटरी तारे: \",[\"0\"]],\"aJQKDu\":\"डिफ़ॉल्ट खोज\",\"vS9Vr8\":[\"खोज क्वेरी: \",[\"repoName\"]],\"xqZxK1\":\"कुछ गलत हो गया\",\"TWYokB\":[\"तारे: \",[\"stargazersCount\"]],\"jVytD5\":[\"मिलती रिपॉज़िटरी की कुल संख्या: \",[\"totalCount\"]],\"4HJq+W\":[\"नजरदार: \",[\"watchers\"]],\"Z01zNq\":\"आप ऑफ़लाइन हैं!\"}")}; \ No newline at end of file +/*eslint-disable*/module.exports={messages:JSON.parse("{\"WDU3y1\":\"खोज में वापस\",\"r0p32h\":[\"फोर्क्स: \",[\"forks\"]],\"a93ona\":\"रिपॉज़िटरी का विवरण प्राप्त करें\",\"EqGTpW\":\"कोई रिकॉर्ड नहीं मिला\",\"R7WSDI\":\"सिफारिश\",\"UD9q2J\":[\"रिपॉज़िटरी पूरा नाम: \",[\"0\"]],\"8HzLs9\":\"रिपॉज़िटरी सूची\",\"LfaRkD\":[\"रिपॉज़िटरी का नाम: \",[\"0\"]],\"zSqOVn\":\"रिपॉज़िटरी खोज\",\"uyzu5f\":[\"रिपॉज़िटरी तारे: \",[\"0\"]],\"aJQKDu\":\"डिफ़ॉल्ट खोज\",\"vS9Vr8\":[\"खोज क्वेरी: \",[\"repoName\"]],\"xqZxK1\":\"कुछ गलत हो गया\",\"TWYokB\":[\"तारे: \",[\"stargazersCount\"]],\"jVytD5\":[\"मिलती रिपॉज़िटरी की कुल संख्या: \",[\"totalCount\"]],\"4HJq+W\":[\"नजरदार: \",[\"watchers\"]],\"FTHiRv\":\"आप अद्भुत हैं\",\"Z01zNq\":\"आप ऑफ़लाइन हैं!\"}")}; \ No newline at end of file diff --git a/src/translations/hi.po b/src/translations/hi.po index c911e54..1c0862c 100644 --- a/src/translations/hi.po +++ b/src/translations/hi.po @@ -13,10 +13,6 @@ msgstr "" "Language-Team: \n" "Plural-Forms: \n" -#: src/containers/Repos/index.tsx:82 -msgid "<0>You Are Awesome" -msgstr "<0>आप अद्भुत हैं" - #: src/features/info/components/RepoInfo/index.tsx:20 msgid "Back to Search" msgstr "खोज में वापस" @@ -25,7 +21,7 @@ msgstr "खोज में वापस" msgid "Forks: {forks}" msgstr "फोर्क्स: {forks}" -#: src/containers/Repos/index.tsx:94 +#: src/containers/Repos/index.tsx:80 msgid "Get details of repositories" msgstr "रिपॉज़िटरी का विवरण प्राप्त करें" @@ -33,7 +29,7 @@ msgstr "रिपॉज़िटरी का विवरण प्राप् msgid "No records found" msgstr "कोई रिकॉर्ड नहीं मिला" -#: src/containers/Repos/index.tsx:76 +#: src/containers/Repos/index.tsx:64 msgid "Recommendation" msgstr "सिफारिश" @@ -49,7 +45,7 @@ msgstr "रिपॉज़िटरी सूची" msgid "Repository Name: {0}" msgstr "रिपॉज़िटरी का नाम: {0}" -#: src/containers/Repos/index.tsx:91 +#: src/containers/Repos/index.tsx:77 msgid "Repository Search" msgstr "रिपॉज़िटरी खोज" @@ -57,7 +53,7 @@ msgstr "रिपॉज़िटरी खोज" msgid "Repository stars: {0}" msgstr "रिपॉज़िटरी तारे: {0}" -#: src/features/repos/components/ErrorState/index.tsx:25 +#: src/features/repos/components/ErrorState/index.tsx:24 msgid "Search Default" msgstr "डिफ़ॉल्ट खोज" @@ -82,6 +78,10 @@ msgstr "मिलती रिपॉज़िटरी की कुल सं msgid "Watchers: {watchers}" msgstr "नजरदार: {watchers}" +#: src/containers/Repos/index.tsx:70 +msgid "You Are Awesome" +msgstr "आप अद्भुत हैं" + #: src/pages/_offline.tsx:7 msgid "You are Offline!" msgstr "आप ऑफ़लाइन हैं!" diff --git a/src/utils/linguiUtils.ts b/src/utils/linguiUtils.ts index 865ee93..beb266d 100644 --- a/src/utils/linguiUtils.ts +++ b/src/utils/linguiUtils.ts @@ -10,6 +10,7 @@ export async function loadCatalog(locale: string) { export function useLinguiInit(messages: Messages) { const router = useRouter(); const locale = router.locale || router.defaultLocale!; + console.log("locale",locale) const isClient = typeof window !== "undefined"; if (!isClient && locale !== i18n.locale) { diff --git a/src/utils/testUtils.tsx b/src/utils/testUtils.tsx index be75d4c..4e5c9c3 100644 --- a/src/utils/testUtils.tsx +++ b/src/utils/testUtils.tsx @@ -6,8 +6,6 @@ import React from "react"; import { Provider as ReduxProvider } from "react-redux"; import { SerializedStyles } from "@emotion/react"; import { store } from "../store"; -import { ThemeProvider } from "@mui/material"; -import theme from "@themes"; /** * Renders the passed in components or tree with all the providers. @@ -18,11 +16,7 @@ import theme from "@themes"; export const WithAllProviders: React.FC<{ children: React.ReactNode }> = ({ children }) => { return ( - - - {children} - - + {children} ); };