From fac8ef40278e984a120c18179ee31d5afc7e1120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Malak?= Date: Sat, 8 Jan 2022 14:03:10 +0100 Subject: [PATCH] Pushed version 2.2.1 --- .env | 2 +- CHANGELOG.md | 4 +- client/.env | 2 +- .../Settings/AppDetails/AppDetails.tsx | 68 +++++++++++-------- utils/jobs.js | 3 +- 5 files changed, 47 insertions(+), 32 deletions(-) diff --git a/.env b/.env index 71d9fdb..d5f54d5 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ PORT=5005 NODE_ENV=development -VERSION=2.2.0 +VERSION=2.2.1 PASSWORD=flame_password SECRET=e02eb43d69953658c6d07311d6313f2d4467672cb881f96b29368ba1f3f4da4b \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ce9aec0..9502adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ -### v2.X.Y (TBA) +### v2.2.1 (2022-01-08) - Local search will now include app descriptions ([#266](https://github.com/pawelmalak/flame/issues/266)) +- Fixed bug with unsupported characters in local search [#279](https://github.com/pawelmalak/flame/issues/279)) +- Background tasks optimization ([#283](https://github.com/pawelmalak/flame/issues/283)) ### v2.2.0 (2021-12-17) - Added option to set custom description for apps ([#201](https://github.com/pawelmalak/flame/issues/201)) diff --git a/client/.env b/client/.env index b41b338..edd69d9 100644 --- a/client/.env +++ b/client/.env @@ -1 +1 @@ -REACT_APP_VERSION=2.2.0 \ No newline at end of file +REACT_APP_VERSION=2.2.1 \ No newline at end of file diff --git a/client/src/components/Settings/AppDetails/AppDetails.tsx b/client/src/components/Settings/AppDetails/AppDetails.tsx index 1829a4d..efa1586 100644 --- a/client/src/components/Settings/AppDetails/AppDetails.tsx +++ b/client/src/components/Settings/AppDetails/AppDetails.tsx @@ -1,43 +1,57 @@ import { Fragment } from 'react'; + +// UI import { Button, SettingsHeadline } from '../../UI'; -import classes from './AppDetails.module.css'; -import { checkVersion } from '../../../utility'; import { AuthForm } from './AuthForm/AuthForm'; +import classes from './AppDetails.module.css'; + +// Store +import { useSelector } from 'react-redux'; +import { State } from '../../../store/reducers'; + +// Other +import { checkVersion } from '../../../utility'; export const AppDetails = (): JSX.Element => { + const { isAuthenticated } = useSelector((state: State) => state.auth); + return ( -
+ {isAuthenticated && ( + +
-
- -

- - Flame - {' '} - version {process.env.REACT_APP_VERSION} -

+
+ +

+ + Flame + {' '} + version {process.env.REACT_APP_VERSION} +

-

- See changelog{' '} - - here - -

+

+ See changelog{' '} + + here + +

- -
+ +
+
+ )}
); }; diff --git a/utils/jobs.js b/utils/jobs.js index 615c5ef..e509ef5 100644 --- a/utils/jobs.js +++ b/utils/jobs.js @@ -8,9 +8,8 @@ const logger = new Logger(); module.exports = async function () { const { WEATHER_API_KEY } = await loadConfig(); - const FEAT_WHEATHER_ENABLED = WEATHER_API_KEY != ''; - if (FEAT_WHEATHER_ENABLED) { + if (WEATHER_API_KEY != '') { // Update weather data every 15 minutes const weatherJob = schedule.scheduleJob( 'updateWeather',