Browse Source

Fixed bug with fetching config. Pushed version 1.7.0

Paweł Malak 3 years ago
parent
commit
7129fe83da

+ 1 - 1
.env

@@ -1,3 +1,3 @@
 PORT=5005
 PORT=5005
 NODE_ENV=development
 NODE_ENV=development
-VERSION=1.6.9
+VERSION=1.7.0

+ 3 - 1
CHANGELOG.md

@@ -1,8 +1,10 @@
-### v1.7.0 (TBA)
+### v1.7.0 (2021-10-11)
 - Search bar will now redirect if valid URL or IP is provided ([#67](https://github.com/pawelmalak/flame/issues/67))
 - Search bar will now redirect if valid URL or IP is provided ([#67](https://github.com/pawelmalak/flame/issues/67))
+- Users can now add their custom search providers ([#71](https://github.com/pawelmalak/flame/issues/71))
 - Fixed bug related to creating new apps/bookmarks with custom icon ([#83](https://github.com/pawelmalak/flame/issues/83))
 - Fixed bug related to creating new apps/bookmarks with custom icon ([#83](https://github.com/pawelmalak/flame/issues/83))
 - URL can now be assigned to notifications. Clicking on "New version is available" popup will now redirect to changelog ([#86](https://github.com/pawelmalak/flame/issues/86))
 - URL can now be assigned to notifications. Clicking on "New version is available" popup will now redirect to changelog ([#86](https://github.com/pawelmalak/flame/issues/86))
 - Added static fonts ([#94](https://github.com/pawelmalak/flame/issues/94))
 - Added static fonts ([#94](https://github.com/pawelmalak/flame/issues/94))
+- Fixed bug with overriding app icon created with docker labels
 
 
 ### v1.6.9 (2021-10-09)
 ### v1.6.9 (2021-10-09)
 - Added option for remote docker host ([#97](https://github.com/pawelmalak/flame/issues/97))
 - Added option for remote docker host ([#97](https://github.com/pawelmalak/flame/issues/97))

+ 1 - 1
client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.6.9
+REACT_APP_VERSION=1.7.0

+ 1 - 1
client/src/components/Settings/SearchSettings/SearchSettings.tsx

@@ -46,7 +46,7 @@ const SearchSettings = (props: Props): JSX.Element => {
   useEffect(() => {
   useEffect(() => {
     setFormData({
     setFormData({
       hideSearch: searchConfig('hideSearch', 0),
       hideSearch: searchConfig('hideSearch', 0),
-      defaultSearchProvider: searchConfig('defaultSearchProvider', 'd'),
+      defaultSearchProvider: searchConfig('defaultSearchProvider', 'l'),
       searchSameTab: searchConfig('searchSameTab', 0),
       searchSameTab: searchConfig('searchSameTab', 0),
     });
     });
   }, [props.loading]);
   }, [props.loading]);

+ 1 - 0
client/src/store/reducers/config.ts

@@ -17,6 +17,7 @@ const getConfig = (state: State, action: Action): State => {
   return {
   return {
     ...state,
     ...state,
     loading: false,
     loading: false,
+    config: action.payload,
   };
   };
 };
 };
 
 

+ 4 - 1
controllers/apps.js

@@ -131,7 +131,10 @@ exports.getApps = asyncWrapper(async (req, res, next) => {
         if (apps.some((app) => app.name === item.name)) {
         if (apps.some((app) => app.name === item.name)) {
           const app = apps.filter((e) => e.name === item.name)[0];
           const app = apps.filter((e) => e.name === item.name)[0];
 
 
-          if (item.icon === 'custom' || (item.icon === 'docker' && app.icon != 'docker')) {
+          if (
+            item.icon === 'custom' ||
+            (item.icon === 'docker' && app.icon != 'docker')
+          ) {
             await app.update({
             await app.update({
               name: item.name,
               name: item.name,
               url: item.url,
               url: item.url,