Merge pull request #432 from pawelmalak/v2.3.1

pawelmalak · web-flow · commit 3c347c854c4c · 2023-07-23T14:51:23.000+02:00
Version 2.3.1
diff --git a/.env b/.env
@@ -1,5 +1,5 @@
 PORT=5005
 NODE_ENV=development
-VERSION=2.3.0
+VERSION=2.3.1
 PASSWORD=flame_password
 SECRET=e02eb43d69953658c6d07311d6313f2d4467672cb881f96b29368ba1f3f4da4b
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### v2.3.1 (2023-07-23)
+- Fixed bug where "Open search results in the same tab" setting was not respected if "Local search" was set as primary search provider ([#270](https://github.com/pawelmalak/flame/issues/270))
+- Fixed bug where search bar had rounded input field on iOS ([#394](https://github.com/pawelmalak/flame/issues/394))
+- Updated link to Material Design Icons reference page ([#414](https://github.com/pawelmalak/flame/issues/414))
+- Fixed bug where color inputs in theme creator/editor were too small ([#429](https://github.com/pawelmalak/flame/issues/429))
+- Changed input labels in settings for more consistent naming ([#430](https://github.com/pawelmalak/flame/issues/430))
+
 ### v2.3.0 (2022-03-25)
 - Added custom theme editor ([#246](https://github.com/pawelmalak/flame/issues/246))
 - Added option to set secondary search provider ([#295](https://github.com/pawelmalak/flame/issues/295))
diff --git a/client/.env b/client/.env
@@ -1 +1 @@
-REACT_APP_VERSION=2.3.0
+REACT_APP_VERSION=2.3.1
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -24,7 +24,7 @@
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.6",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.3",
+    "react-scripts": "^5.0.1",
     "redux": "^4.1.2",
     "redux-devtools-extension": "^2.13.9",
     "redux-thunk": "^2.4.0",
diff --git a/client/src/components/Apps/AppForm/AppForm.tsx b/client/src/components/Apps/AppForm/AppForm.tsx
@@ -165,7 +165,7 @@ export const AppForm = ({ modalHandler }: Props): JSX.Element => {
           />
           <span>
             Use icon name from MDI or pass a valid URL.
-            <a href="https://materialdesignicons.com/" target="blank">
+            <a href="https://pictogrammers.com/library/mdi/" target="blank">
               {' '}
               Click here for reference
             </a>
diff --git a/client/src/components/SearchBar/SearchBar.module.css b/client/src/components/SearchBar/SearchBar.module.css
@@ -9,6 +9,7 @@
   border-bottom: 2px solid var(--color-accent);
   opacity: 0.5;
   transition: all 0.2s;
+  border-radius: 0px;
 }
 
 .SearchBar:focus {
diff --git 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<GeneralForm>(
     generalSettingsTemplate
diff --git 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/components/Settings/Themer/ThemeBuilder/ThemeCreator.module.css b/client/src/components/Settings/Themer/ThemeBuilder/ThemeCreator.module.css
@@ -2,5 +2,4 @@
   display: grid;
   grid-template-columns: repeat(3, 1fr);
   grid-gap: 10px;
-  margin-bottom: 20px;
 }
diff --git a/client/src/components/Settings/UISettings/UISettings.tsx b/client/src/components/Settings/UISettings/UISettings.tsx
@@ -223,9 +223,9 @@ export const UISettings = (): JSX.Element => {
         </select>
       </InputGroup>
 
-      {/* HIDE CATEGORIES */}
+      {/* HIDE BOOKMARK CATEGORIES */}
       <InputGroup>
-        <label htmlFor="hideCategories">Hide categories</label>
+        <label htmlFor="hideCategories">Hide bookmarks</label>
         <select
           id="hideCategories"
           name="hideCategories"
diff --git a/client/src/components/UI/Forms/InputGroup/InputGroup.module.css b/client/src/components/UI/Forms/InputGroup/InputGroup.module.css
@@ -40,5 +40,11 @@
 }
 
 .InputGroup input[type='color'] {
-  all: unset;
+  margin: 0;
+  padding: 0;
+  background-color: transparent;
+}
+
+.InputGroup input[type='color']:hover {
+  cursor: pointer;
 }
diff --git a/client/src/components/UI/Headlines/SettingsHeadline/SettingsHeadline.tsx b/client/src/components/UI/Headlines/SettingsHeadline/SettingsHeadline.tsx
@@ -1,4 +1,4 @@
-const classes = require('./SettingsHeadline.module.css');
+import classes from './SettingsHeadline.module.css';
 
 interface Props {
   text: string;
diff --git a/client/src/utility/redirectUrl.ts b/client/src/utility/redirectUrl.ts
@@ -4,7 +4,7 @@ export const redirectUrl = (url: string, sameTab: boolean) => {
   const parsedUrl = urlParser(url)[1];
 
   if (sameTab) {
-    document.location.replace(parsedUrl);
+    document.location.assign(parsedUrl);
   } else {
     window.open(parsedUrl);
   }
diff --git 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,
@@ -53,10 +55,10 @@ export const searchParser = (searchQuery: string): SearchResult => {
 
     if (prefix === 'l') {
       result.isLocal = true;
-    } else {
-      result.sameTab = config.searchSameTab;
     }
 
+    result.sameTab = config.searchSameTab;
+
     if (secondarySearch) {
       result.secondarySearch = secondarySearch;
     }
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-REACT_APP_VERSION=2.3.0`
	`1`	`+REACT_APP_VERSION=2.3.1`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`border-bottom: 2px solid var(--color-accent);`
`10`	`10`	`opacity: 0.5;`
`11`	`11`	`transition: all 0.2s;`
	`12`	`+ border-radius: 0px;`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`.SearchBar:focus {`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,4 @@`
`2`	`2`	`display: grid;`
`3`	`3`	`grid-template-columns: repeat(3, 1fr);`
`4`	`4`	`grid-gap: 10px;`
`5`		`- margin-bottom: 20px;`
`6`	`5`	`}`