diff --git a/client/.env b/client/.env index 6079712596cef8f2e27f6b5f874e2b01d0142f82..18588d564d76981349b41314289254c946b6d807 100644 --- a/client/.env +++ b/client/.env @@ -1 +1 @@ -REACT_APP_VERSION=1.5.1 \ No newline at end of file +REACT_APP_VERSION=1.5.2 \ No newline at end of file diff --git a/client/src/components/Apps/AppCard/AppCard.tsx b/client/src/components/Apps/AppCard/AppCard.tsx index 79e09fe0844ad623aa3508e407d15a92304d1563..43d7b72820a620f5aac463f312baf652b9bcebc8 100644 --- a/client/src/components/Apps/AppCard/AppCard.tsx +++ b/client/src/components/Apps/AppCard/AppCard.tsx @@ -16,7 +16,7 @@ const AppCard = (props: ComponentProps): JSX.Element => { return ( diff --git a/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.tsx b/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.tsx index b0536d9237d3a85213154562f092ac82607d1e2f..f2535b563b46d201d9fcc55d2ca2fd97a4040cf7 100644 --- a/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.tsx +++ b/client/src/components/Bookmarks/BookmarkCard/BookmarkCard.tsx @@ -19,7 +19,7 @@ const BookmarkCard = (props: ComponentProps): JSX.Element => { return ( {bookmark.icon && ( diff --git a/client/src/components/Settings/OtherSettings/OtherSettings.tsx b/client/src/components/Settings/OtherSettings/OtherSettings.tsx index 329b068f0ce4f0908db478b17b4f4f63fd6f5f6a..e3f3aefb611e6f58f598dc1b0a36ee5337e1069a 100644 --- a/client/src/components/Settings/OtherSettings/OtherSettings.tsx +++ b/client/src/components/Settings/OtherSettings/OtherSettings.tsx @@ -36,7 +36,9 @@ const OtherSettings = (props: ComponentProps): JSX.Element => { hideCategories: 0, hideSearch: 0, useOrdering: 'createdAt', - openSameTab: 0 + appsSameTab: 0, + bookmarksSameTab: 0, + searchSameTab: 0 }) // Get config @@ -50,7 +52,9 @@ const OtherSettings = (props: ComponentProps): JSX.Element => { hideCategories: searchConfig('hideCategories', 0), hideSearch: searchConfig('hideSearch', 0), useOrdering: searchConfig('useOrdering', 'createdAt'), - openSameTab: searchConfig('openSameTab', 0) + appsSameTab: searchConfig('appsSameTab', 0), + bookmarksSameTab: searchConfig('bookmarksSameTab', 0), + searchSameTab: searchConfig('searchSameTab', 0) }) }, [props.loading]); @@ -139,18 +143,41 @@ const OtherSettings = (props: ComponentProps): JSX.Element => { - + + + + + + + + + - {/* MODULES OPTIONS */}

Modules

diff --git a/client/src/interfaces/Forms.ts b/client/src/interfaces/Forms.ts index b5e58eeeeb945d2db98b96b59d7326f8817adfdd..bba2d72993d4af04e5e6a7a71c57eeab564ccebe 100644 --- a/client/src/interfaces/Forms.ts +++ b/client/src/interfaces/Forms.ts @@ -14,5 +14,7 @@ export interface SettingsForm { hideCategories: number; hideSearch: number; useOrdering: string; - openSameTab: number; + appsSameTab: number; + bookmarksSameTab: number; + searchSameTab: number; } \ No newline at end of file diff --git a/client/src/utility/searchParser.ts b/client/src/utility/searchParser.ts index 6cba533f24d35edca3593eebe24fc8eac09c894c..1f1037ad9222ae7e1bcdb4aae92df3eb6a9fb655 100644 --- a/client/src/utility/searchParser.ts +++ b/client/src/utility/searchParser.ts @@ -11,7 +11,7 @@ export const searchParser = (searchQuery: string): boolean => { const query = queries.find((q: Query) => q.prefix === prefix); if (query) { - const sameTab = searchConfig('openSameTab', false); + const sameTab = searchConfig('searchSameTab', false); if (sameTab) { document.location.replace(`${query.template}${search}`); diff --git a/utils/initialConfig.json b/utils/initialConfig.json index fe68dfe2341690742a47b453f5db2fb34bfaaa5a..c4a76cb67d28105a79e14ac8a22b266d32dd771c 100644 --- a/utils/initialConfig.json +++ b/utils/initialConfig.json @@ -37,7 +37,15 @@ "value": "createdAt" }, { - "key": "openSameTab", + "key": "appsSameTab", + "value": false + }, + { + "key": "bookmarksSameTab", + "value": false + }, + { + "key": "searchSameTab", "value": false }, {