From 1220c56fc5d2d3dcf9bdd1da0e6cd04e5e5748dc Mon Sep 17 00:00:00 2001
From: pawelmalak <24780509+pawelmalak@users.noreply.github.com>
Date: Mon, 15 Nov 2021 16:34:12 +0100
Subject: [PATCH 01/73] Fixed bug with adding new apps with custom icon (#180)
* Bump url-parse from 1.5.1 to 1.5.3 in /client
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)
---
updated-dependencies:
- dependency-name: url-parse
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
- No bookmarks match your search criteria -
- ); + bookmarks =
+
+
{children}
; +}; diff --git a/client/src/components/UI/index.ts b/client/src/components/UI/index.ts index e1c0917..23d5f73 100644 --- a/client/src/components/UI/index.ts +++ b/client/src/components/UI/index.ts @@ -12,3 +12,4 @@ export * from './Forms/InputGroup/InputGroup'; export * from './Forms/ModalForm/ModalForm'; export * from './Buttons/ActionButton/ActionButton'; export * from './Buttons/Button/Button'; +export * from './Text/Message/Message'; diff --git a/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx b/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx index 1664eff..d300328 100644 --- a/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx +++ b/client/src/components/Widgets/WeatherWidget/WeatherWidget.tsx @@ -71,7 +71,7 @@ export const WeatherWidget = (): JSX.Element => { {config.isCelsius ? ( {weather.tempC}°C ) : ( - {weather.tempF}°F + {Math.round(weather.tempF)}°F )} {/* ADDITIONAL DATA */} From dfdd49cf4a33ea37bbea513dae998bf945d6fa9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Malak?=You can drag and drop single rows to reorder categories
- ) : ( -- Custom order is disabled. You can change it in{' '} - settings -
- )} -- {category.name} - | -- {category.isPublic ? 'Visible' : 'Hidden'} - | - {!snapshot.isDragging && ( -
-
- deleteCategoryHandler(category)
- }
- onKeyDown={(e) =>
- keyboardActionHandler(
- e,
- category,
- deleteCategoryHandler
- )
- }
- tabIndex={0}
- >
-
-
- props.updateHandler(category)
- }
- tabIndex={0}
- >
-
- pinCategory(category)}
- onKeyDown={(e) =>
- keyboardActionHandler(
- e,
- category,
- pinCategory
- )
- }
- tabIndex={0}
- >
- {category.isPinned ? (
-
- |
- )}
-
{bookmark.bookmark.name} | -{bookmark.bookmark.url} | -{bookmark.bookmark.icon} | -{bookmark.bookmark.isPublic ? 'Visible' : 'Hidden'} | -{bookmark.categoryName} | -
- deleteBookmarkHandler(bookmark.bookmark)}
- tabIndex={0}
- >
-
- props.updateHandler(bookmark.bookmark)}
- tabIndex={0}
- >
-
- |
-
+ Switch to grid view and click on the name of category you want to + edit +
++ Editing bookmarks from {categoryInEdit.name} category +
+{bookmark.name} | +{bookmark.url} | +{bookmark.icon} | ++ {bookmark.isPublic ? 'Visible' : 'Hidden'} + | ++ {categoryInEdit.name} + | + + {!snapshot.isDragging && ( +
You can drag and drop single rows to reorder categories
+ ) : ( ++ Custom order is disabled. You can change it in the{' '} + settings +
+ )} +{category.name} | ++ {category.isPublic ? 'Visible' : 'Hidden'} + | + + {!snapshot.isDragging && ( +
You can drag and drop single rows to reorder application
) : ( @@ -98,7 +97,7 @@ export const AppTable = (props: Props): JSX.Element => { settings )} -- Switch to grid view and click on the name of category you want to - edit -
-- Editing bookmarks from {categoryInEdit.name} category -
-You can drag and drop single rows to reorder categories
) : ( @@ -108,7 +105,7 @@ export const CategoryTable = ({ openFormForUpdating }: Props): JSX.Element => { settings )} -{children}
; +export const Message = ({ children, isPrimary = true }: Props): JSX.Element => { + const style = isPrimary ? classes.message : classes.messageCenter; + + return{children}
; }; From f49ab6fd0d5e978be93111041654c203bff811e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Malak?=Custom order is disabled. You can change it in the{' '} - settings + settings
)} diff --git a/client/src/components/Bookmarks/Table/CategoryTable.tsx b/client/src/components/Bookmarks/Table/CategoryTable.tsx index d909cab..5a88097 100644 --- a/client/src/components/Bookmarks/Table/CategoryTable.tsx +++ b/client/src/components/Bookmarks/Table/CategoryTable.tsx @@ -102,7 +102,7 @@ export const CategoryTable = ({ openFormForUpdating }: Props): JSX.Element => { ) : (Custom order is disabled. You can change it in the{' '} - settings + settings
)} diff --git a/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx b/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx index 8c2e5fd..4173c72 100644 --- a/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx +++ b/client/src/components/Settings/GeneralSettings/GeneralSettings.tsx @@ -23,12 +23,14 @@ import { bindActionCreators } from 'redux'; import { actionCreators } from '../../../store'; export const GeneralSettings = (): JSX.Element => { - const { loading, customQueries, config } = useSelector( - (state: State) => state.config - ); + const { + config: { loading, customQueries, config }, + bookmarks: { categories }, + } = useSelector((state: State) => state); const dispatch = useDispatch(); - const { updateConfig } = bindActionCreators(actionCreators, dispatch); + const { updateConfig, sortApps, sortCategories, sortBookmarks } = + bindActionCreators(actionCreators, dispatch); // Initial state const [formData, setFormData] = useState