From 188c5bc04b6a7bade12cded24259003dcc247999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Malak?= Date: Thu, 20 Jul 2023 19:04:31 +0200 Subject: [PATCH] Fixed react errors while importing named exports from JSON files --- .../components/Settings/GeneralSettings/GeneralSettings.tsx | 4 +++- client/src/components/Settings/Settings.tsx | 4 +++- client/src/utility/searchParser.ts | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx b/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx index 61bc6c2..4fc835f 100644 --- a/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx +++ b/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx @@ -15,7 +15,7 @@ import { Button, SettingsHeadline, InputGroup } from '../../UI'; import { inputHandler, generalSettingsTemplate } from '../../../utility'; // Data -import { queries } from '../../../utility/searchQueries.json'; +import searchQueries from '../../../utility/searchQueries.json'; // Redux import { State } from '../../../store/reducers'; @@ -32,6 +32,8 @@ export const GeneralSettings = (): JSX.Element => { const { updateConfig, sortApps, sortCategories, sortBookmarks } = bindActionCreators(actionCreators, dispatch); + const queries = searchQueries.queries; + // Initial state const [formData, setFormData] = useState( generalSettingsTemplate diff --git a/client/src/components/Settings/Settings.tsx b/client/src/components/Settings/Settings.tsx index 7a297c9..91d79ef 100644 --- a/client/src/components/Settings/Settings.tsx +++ b/client/src/components/Settings/Settings.tsx @@ -24,9 +24,11 @@ import { ProtectedRoute } from '../Routing/ProtectedRoute'; import { Container, Headline } from '../UI'; // Data -import { routes } from './settings.json'; +import clientRoutes from './settings.json'; export const Settings = (): JSX.Element => { + const routes = clientRoutes.routes; + const { isAuthenticated } = useSelector((state: State) => state.auth); const tabs = isAuthenticated ? routes : routes.filter((r) => !r.authRequired); diff --git a/client/src/utility/searchParser.ts b/client/src/utility/searchParser.ts index 92b80ac..62f8698 100644 --- a/client/src/utility/searchParser.ts +++ b/client/src/utility/searchParser.ts @@ -1,9 +1,11 @@ -import { queries } from './searchQueries.json'; +import searchQueries from './searchQueries.json'; import { SearchResult } from '../interfaces'; import { store } from '../store/store'; import { isUrlOrIp } from '.'; export const searchParser = (searchQuery: string): SearchResult => { + const queries = searchQueries.queries; + const result: SearchResult = { isLocal: false, isURL: false,