diff --git a/app/scripts/manage/components/VirtualizedAutoComplete.jsx b/app/scripts/manage/components/VirtualizedAutoComplete.jsx
deleted file mode 100644
index 9ba253c..0000000
--- a/app/scripts/manage/components/VirtualizedAutoComplete.jsx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* eslint-disable react/prop-types */
-/* eslint-disable react/display-name */
-import React from "react";
-import {
- useMediaQuery,
- ListSubheader,
- TextField,
- Typography,
- CircularProgress,
-} from "@material-ui/core";
-import Autocomplete from "@material-ui/lab/Autocomplete";
-import { useTheme, makeStyles } from "@material-ui/core/styles";
-import { VariableSizeList } from "react-window";
-import parse from "autosuggest-highlight/parse";
-import match from "autosuggest-highlight/match";
-import { matchSorter } from "match-sorter";
-
-const LISTBOX_PADDING = 8; // px
-
-const RenderRow = (props) => {
- const { data, index, style } = props;
- return React.cloneElement(data[index], {
- style: {
- ...style,
- top: style.top + LISTBOX_PADDING,
- },
- });
-};
-
-const OuterElementContext = React.createContext({});
-
-const OuterElementType = React.forwardRef((props, ref) => {
- const outerProps = React.useContext(OuterElementContext);
- return ;
-});
-
-// adapter for react-window
-const VirtualizedListboxComponent = React.forwardRef((props, ref) => {
- const { children, ...other } = props;
- const itemData = React.Children.toArray(children);
- const theme = useTheme();
- const smUp = useMediaQuery(theme.breakpoints.up("sm"), { noSsr: true });
- const itemCount = itemData.length;
- const itemSize = smUp ? 36 : 48;
-
- const getChildSize = (child) => {
- if (React.isValidElement(child) && child.type === ListSubheader) {
- return 48;
- }
-
- return itemSize;
- };
-
- const getHeight = () => {
- if (itemCount > 8) {
- return 8 * itemSize;
- }
- return itemData.map(getChildSize).reduce((a, b) => a + b, 0);
- };
-
- return (
-
-
- getChildSize(itemData[index])}
- overscanCount={5}
- itemCount={itemCount}
- >
- {RenderRow}
-
-
-
- );
-});
-
-const useStyles = makeStyles({
- listbox: {
- "& ul": {
- padding: 0,
- margin: 0,
- },
- },
-});
-
-export default function VirtualizedAutoComplete({
- label,
- onChange,
- error,
- helperText,
- ...props
-}) {
- const classes = useStyles();
-
- return (
-
- matchSorter(options, inputValue)
- }
- ListboxComponent={VirtualizedListboxComponent}
- renderInput={(params) => (
-
- {props.loading ? (
-
- ) : null}
- {params.InputProps.endAdornment}
- >
- ),
- }}
- error={error}
- helperText={helperText}
- />
- )}
- renderOption={(option, { inputValue }) => {
- const matches = match(option, inputValue);
- const parts = parse(option, matches);
-
- return (
-
- {parts.map((part, index) => (
-
- {part.text}
-
- ))}
-
- );
- }}
- onChange={(_event, value) => onChange(value)}
- {...props}
- />
- );
-}
diff --git a/app/scripts/manage/views/CategoriesFilterView.jsx b/app/scripts/manage/views/CategoriesFilterView.jsx
deleted file mode 100644
index 2a61e4a..0000000
--- a/app/scripts/manage/views/CategoriesFilterView.jsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/* eslint-disable react/display-name */
-/* eslint-disable react/prop-types */
-import React, { useEffect, useState } from "react";
-import { Grid } from "@material-ui/core";
-import VirtualizedAutoComplete from "../components/VirtualizedAutoComplete";
-import FilterTable from "../components/FilterTable";
-import { FETCH_CATEGORIES } from "../../constants/messages";
-
-const ERROR_OPTION = browser.i18n.getMessage("CategoriesMenuErrorOption");
-
-const CategoriesFilterView = () => {
- const [loading, setLoading] = useState(false);
- const [options, setOptions] = useState("options", []);
-
- const [categoryNameError, setCategoryNameError] = useState({
- error: false,
- helperText: "",
- });
-
- useEffect(() => {
- const loadOptions = async () => {
- setLoading(true);
- try {
- const options = await browser.runtime.sendMessage({
- action: FETCH_CATEGORIES,
- });
- setOptions(options);
- } catch (error) {
- console.error(error);
- setOptions([ERROR_OPTION]);
- }
- setLoading(false);
- };
- loadOptions();
- }, []);
-
- const columns = [
- {
- title: browser.i18n.getMessage("Filter_Categories_PropTitle_Name"),
- field: "name",
- editComponent: (props) => (
- option === ERROR_OPTION}
- label={browser.i18n.getMessage("CategoriesMenuLabel")}
- noOptionsText={browser.i18n.getMessage("CategoriesMenuNoOptionsText")}
- value={props.value}
- onChange={props.onChange}
- autoHighlight
- disableListWrap
- filterSelectedOptions
- selectOnFocus
- size="small"
- loading={loading}
- error={categoryNameError.error}
- helperText={categoryNameError.helperText ?? ""}
- />
- ),
- required: true,
- setError: setCategoryNameError,
- },
- ];
-
- return (
-
-
-
-
-
- );
-};
-
-export default CategoriesFilterView;
diff --git a/app/scripts/manage/views/DashboardView.jsx b/app/scripts/manage/views/DashboardView.jsx
index 874d6cc..0ac8a25 100644
--- a/app/scripts/manage/views/DashboardView.jsx
+++ b/app/scripts/manage/views/DashboardView.jsx
@@ -18,27 +18,20 @@ const DashboardView = () => {
return (
-
+
-
+
-
-
-
diff --git a/app/styles/content.css b/app/styles/content.css
index c324fb3..4f6a10d 100644
--- a/app/styles/content.css
+++ b/app/styles/content.css
@@ -35,15 +35,17 @@ body#deviantART-v7 {
/* === PLACEHOLDERS ===*/
-[da-filter-category],
[da-filter-keyword],
[da-filter-user] {
position: relative !important;
- pointer-events: none !important;
visibility: visible !important;
}
-[data-hook="deviation_link"][da-filter-category],
+body:not(.clickable-placeholders) [da-filter-keyword],
+body:not(.clickable-placeholders) [da-filter-user] {
+ pointer-events: none !important;
+}
+
[data-hook="deviation_link"][da-filter-keyword],
[data-hook="deviation_link"][da-filter-user] {
/* thumbnails on notification pages */
@@ -51,7 +53,6 @@ body#deviantART-v7 {
position: absolute !important;
}
-[data-hook="deviation_std_thumb"] [data-hook="deviation_link"][da-filter-category],
[data-hook="deviation_std_thumb"] [data-hook="deviation_link"][da-filter-keyword],
[data-hook="deviation_std_thumb"] [data-hook="deviation_link"][da-filter-user] {
/* thumbnails on browse/search pages, profile/group pages */
@@ -59,7 +60,6 @@ body#deviantART-v7 {
position: absolute !important;
}
-[role="complementary"] [data-hook="deviation_link"][da-filter-category],
[role="complementary"] [data-hook="deviation_link"][da-filter-keyword],
[role="complementary"] [data-hook="deviation_link"][da-filter-user] {
/* thumbnails in sidebar on individual deviation pages */
@@ -67,7 +67,6 @@ body#deviantART-v7 {
position: relative !important;
}
-[da-filter-category]::before,
[da-filter-keyword]::before,
[da-filter-user]::before {
/* the placeholder text and background, placed overtop the thumbnail */
@@ -92,7 +91,6 @@ body#deviantART-v7 {
flex-direction: column-reverse;
}
-[da-filter-category]::after,
[da-filter-keyword]::after,
[da-filter-user]::after {
/* the placeholder image ONLY, uses an SVG mask imitate programmatic color */
@@ -117,10 +115,6 @@ body#deviantART-v7 {
-webkit-mask-size: 80% 50%;
}
-[da-filter-category]::before {
- content: "__MSG_Placeholder_Category__: " attr(da-filter-category);
-}
-
[da-filter-keyword]::before {
content: "__MSG_Placeholder_Keyword__: " attr(da-filter-keyword);
}
@@ -138,6 +132,18 @@ body#deviantART-v7 {
content: "__MSG_Placeholder_User__: " attr(data-username);
}
+body.hide-placeholder-text [da-filter-category]::before,
+body.hide-placeholder-text [da-filter-keyword]::before,
+body.hide-placeholder-text [da-filter-keyword][da-filter-keyword-attribute]::before,
+body.hide-placeholder-text [da-filter-user]::before,
+body.hide-placeholder-text [da-filter-user][data-username]:not([data-username=""])::before {
+ /*
+ when the placeholder text is hidden, the content property is still needed (but it should be empty),
+ as the `before` pseudo-element, which has the background that blocks out the thumbnail, won't render without it
+ */
+ content: "" !important;
+}
+
/* === METADATA STATUS/INDICATORS === */
/* TODO: make these optional? */
diff --git a/docs/_config.yml b/docs/_config.yml
index 2c97c1a..9923393 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -3,7 +3,7 @@ remote_theme: pmarsceill/just-the-docs
title: DeviantArt Filter
email: rthaut@gmail.com
description: >-
- Have you ever want to block/filter deviations (a.k.a. submissions) while browsing DeviantArt? Well now you can! Simply install DeviantArt Filter in your web browser of choice and start filtering by user, keyword, and/or category.
+ Have you ever want to block/filter deviations (a.k.a. submissions) while browsing DeviantArt? Well now you can! Simply install DeviantArt Filter in your web browser of choice and start filtering by user and/or keyword.
baseurl: "/deviantART-Filter"
url: "https://rthaut.github.io"
plugins:
diff --git a/docs/pages/index.md b/docs/pages/index.md
index b9e2d4f..ea35413 100644
--- a/docs/pages/index.md
+++ b/docs/pages/index.md
@@ -7,13 +7,13 @@ nav_order: 1
# DeviantArt Filter
-DeviantArt Filter allows configurable filtering/removal of deviations by user, keyword, and/or category on DeviantArt.
+DeviantArt Filter allows configurable filtering/removal of deviations by user and/or keyword on DeviantArt.
* * *
## Overview
-Have you ever want to block/filter deviations (a.k.a. submissions) while browsing DeviantArt? **Well now you can!** Simply [install DeviantArt Filter](#installation) in your web browser of choice and start filtering by user, keyword, and/or category.
+Have you ever want to block/filter deviations (a.k.a. submissions) while browsing DeviantArt? **Well now you can!** Simply [install DeviantArt Filter](#installation) in your web browser of choice and start filtering by user and/or keyword.
![DeviantArt Filter Promotional Image](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/promo/Screenshot_1280x800.png)
diff --git a/docs/pages/installed.md b/docs/pages/installed.md
index 9c64c80..c919e22 100644
--- a/docs/pages/installed.md
+++ b/docs/pages/installed.md
@@ -7,7 +7,7 @@ nav_exclude: true
# DeviantArt Filter Installed
-🙏 **Thank you for installing DeviantArt Filter**, the browser extension that allows you to filter/block/hide deviations by user, keyword, and/or category on [DeviantArt](https://www.deviantart.com).
+🙏 **Thank you for installing DeviantArt Filter**, the browser extension that allows you to filter/block/hide deviations by user and/or keyword on [DeviantArt](https://www.deviantart.com).
* * *
diff --git a/docs/pages/releases/v6.2.0.md b/docs/pages/releases/v6.2.0.md
new file mode 100644
index 0000000..251a751
--- /dev/null
+++ b/docs/pages/releases/v6.2.0.md
@@ -0,0 +1,23 @@
+---
+layout: release
+title: Version 6.2.0
+permalink: /releases/v6.2.0/
+parent: Version 6
+grand_parent: Releases
+nav_order: 4
+---
+
+# Version 6.2.0 *(September 18, 2021)*
+
+## New Features
+
+### New Features
+
+- New context menu on Deviation links to create a User filter directly
+- New options for configuring the placeholders
+ - Leave filtered thumbnails clickable
+ - Hide the filter reason/type text on placeholders
+
+### Other
+
+- Removed Category filters, as [DeviantArt has basically deprecated categories](https://github.com/rthaut/deviantART-Filter/issues/153)
diff --git a/docs/pages/screenshots.md b/docs/pages/screenshots.md
index 166469a..94e22e1 100644
--- a/docs/pages/screenshots.md
+++ b/docs/pages/screenshots.md
@@ -20,7 +20,7 @@ nav_order: 4
|:---------- |:--------- |
| ![Screenshot of the filter creation modal](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Create-Filter-Modal-Initial-Light.png) | ![Screenshot of the filter creation modal (using Dark Mode)](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Create-Filter-Modal-Initial-Dark.png) |
-| ![Screenshot of the filter creation modal after selecting a category and some tags](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Create-Filter-Modal-Selected-Light.png) | ![Screenshot of the filter creation modal after selecting a category and some tags (using Dark Mode)](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Create-Filter-Modal-Selected-Dark.png) |
+| ![Screenshot of the filter creation modal after selecting the user and some tags](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Create-Filter-Modal-Selected-Light.png) | ![Screenshot of the filter creation modal after selecting the user and some tags (using Dark Mode)](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Create-Filter-Modal-Selected-Dark.png) |
### Create Filter Modal - Results
@@ -84,24 +84,6 @@ nav_order: 4
|:---------- |:--------- |
| ![Screenshot of editing a keyword filter](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Keywords-Editing-Light.png) | ![Screenshot of editing a keyword filter (using Dark Mode)](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Keywords-Editing-Dark.png) |
-* * *
-
-## Manage Categories
-
-*Screenshots from DeviantArt Filter v6.0.0.*
-{: .fs-2 }
-
-|:---------- |:--------- |
-| ![Screenshot of the filtered categories view](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Categories-Light.png) | ![Screenshot of the filtered categories view (using Dark Mode)](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Categories-Dark.png) |
-
-### Manage Categories - Editing a Filter
-
-*Screenshots from DeviantArt Filter v6.0.0.*
-{: .fs-2 }
-
-|:---------- |:--------- |
-| ![Screenshot of editing a category filter](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Categories-Editing-Light.png) | ![Screenshot of editing a category filter (using Dark Mode)](https://raw.githubusercontent.com/rthaut/deviantART-Filter/master/screenshots/Categories-Editing-Dark.png) |
-
diff --git a/docs/pages/usage.md b/docs/pages/usage.md
index 10de48d..b53d305 100644
--- a/docs/pages/usage.md
+++ b/docs/pages/usage.md
@@ -32,20 +32,19 @@ You can quickly create filters for any deviation you see while browsing from a c
1. While browsing DeviantArt, right click on any thumbnail image or link to a deviation.
2. Click the "Create Filters from this Deviation" option.
-3. Use the [form in the modal dialog]({{ '/screenshots#create-filter-modal' | absolute_url }}) that is displayed to create a user filter, a category filter, and/or keyword filters.
+3. Use the [form in the modal dialog]({{ '/screenshots#create-filter-modal' | absolute_url }}) that is displayed to create a user filter and/or keyword filters.
### Creating Filters Through the Management Page
For more advanced control of your filters, you should use the management page.
-1. After opening the [Management Page]({{ '/screenshots#dashboard' | absolute_url }}), navigate to any of the Manage [Users]({{ '/screenshots#manage-users' | absolute_url }})/[Keywords]({{ '/screenshots#manage-keywords' | absolute_url }})/[Categories]({{ '/screenshots#manage-categories' | absolute_url }}) views.
+1. After opening the [Management Page]({{ '/screenshots#dashboard' | absolute_url }}), navigate to any of the Manage [Users]({{ '/screenshots#manage-users' | absolute_url }})/[Keywords]({{ '/screenshots#manage-keywords' | absolute_url }}) views.
2. Use the table that is displayed to view all of your existing filters.
- You can sort the table by clicking the heading of any column.
- You can page through your filters using the pagination controls below the table.
3. To create a new filter, use the **plus icon (+)** above the table to the right of the search bar.
- For users, enter their username.
- For keywords, enter a single keyword (*no spaces*), then choose if the keyword should use wildcard matching by checking the wildcard checkbox.
- - For categories, select the category path from the menu (you can type in the field to filter results).
4. To change an existing filter, like the **pencil icon (✎)** next to the filter you want to change.
- Click the **check mark icon (✔)** to the left of the filter you are changing to **save** your change(s).
- Click the **cross icon (❌)** next to the left of the filter you are changing to **discard** your change(s).
diff --git a/package-lock.json b/package-lock.json
index 3e87d91..48d2d4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,9 +13,7 @@
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
- "autosuggest-highlight": "^3.1.1",
"lodash-es": "^4.17.21",
- "match-sorter": "^6.3.1",
"material-ui-confirm": "^2.1.3",
"notistack": "^1.0.10",
"react": "^17.0.2",
@@ -23,7 +21,6 @@
"react-dropzone": "^11.4.0",
"react-router-dom": "^5.3.0",
"react-use": "^17.3.1",
- "react-window": "^1.8.6",
"semver": "^7.3.5"
},
"devDependencies": {
@@ -3184,14 +3181,6 @@
"node": ">=4"
}
},
- "node_modules/autosuggest-highlight": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/autosuggest-highlight/-/autosuggest-highlight-3.1.1.tgz",
- "integrity": "sha512-MQ6GNIGMMZbeA5FlBLXXgkZEthysCdYNkMV4MahB2/qB/9cwBnVsePUPnIqkMuzjzclTtDa67xln7cgLDu2f/g==",
- "dependencies": {
- "diacritic": "0.0.2"
- }
- },
"node_modules/aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -5324,11 +5313,6 @@
"node": ">= 0.8.0"
}
},
- "node_modules/diacritic": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/diacritic/-/diacritic-0.0.2.tgz",
- "integrity": "sha1-/CqIe1pbwKCoVPthTHwvIJBh7gQ="
- },
"node_modules/dir-glob": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -8985,15 +8969,6 @@
"integrity": "sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==",
"dev": true
},
- "node_modules/match-sorter": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
- "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
- "dependencies": {
- "@babel/runtime": "^7.12.5",
- "remove-accents": "0.4.2"
- }
- },
"node_modules/material-ui-confirm": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/material-ui-confirm/-/material-ui-confirm-2.1.3.tgz",
@@ -11006,22 +10981,6 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
},
- "node_modules/react-window": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz",
- "integrity": "sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==",
- "dependencies": {
- "@babel/runtime": "^7.0.0",
- "memoize-one": ">=3.1.1 <6"
- },
- "engines": {
- "node": ">8.0.0"
- },
- "peerDependencies": {
- "react": "^15.0.0 || ^16.0.0 || ^17.0.0",
- "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0"
- }
- },
"node_modules/read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -11282,11 +11241,6 @@
"node": ">= 0.10.0"
}
},
- "node_modules/remove-accents": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
- "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
- },
"node_modules/request": {
"version": "2.88.2",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
@@ -16908,14 +16862,6 @@
"resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz",
"integrity": "sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg=="
},
- "autosuggest-highlight": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/autosuggest-highlight/-/autosuggest-highlight-3.1.1.tgz",
- "integrity": "sha512-MQ6GNIGMMZbeA5FlBLXXgkZEthysCdYNkMV4MahB2/qB/9cwBnVsePUPnIqkMuzjzclTtDa67xln7cgLDu2f/g==",
- "requires": {
- "diacritic": "0.0.2"
- }
- },
"aws-sign2": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -18617,11 +18563,6 @@
"integrity": "sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=",
"dev": true
},
- "diacritic": {
- "version": "0.0.2",
- "resolved": "https://registry.npmjs.org/diacritic/-/diacritic-0.0.2.tgz",
- "integrity": "sha1-/CqIe1pbwKCoVPthTHwvIJBh7gQ="
- },
"dir-glob": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -21535,15 +21476,6 @@
"integrity": "sha512-k1dB2HNeaNyORco8ulVEhctyEGkKHb2YWAhDsxeFlW2nROIirsctBYzKwwS3Vza+sKTS1zO4Z+n9/+9WbGLIxQ==",
"dev": true
},
- "match-sorter": {
- "version": "6.3.1",
- "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz",
- "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==",
- "requires": {
- "@babel/runtime": "^7.12.5",
- "remove-accents": "0.4.2"
- }
- },
"material-ui-confirm": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/material-ui-confirm/-/material-ui-confirm-2.1.3.tgz",
@@ -23084,15 +23016,6 @@
}
}
},
- "react-window": {
- "version": "1.8.6",
- "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz",
- "integrity": "sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==",
- "requires": {
- "@babel/runtime": "^7.0.0",
- "memoize-one": ">=3.1.1 <6"
- }
- },
"read-pkg": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
@@ -23304,11 +23227,6 @@
"commander": "^2.6.0"
}
},
- "remove-accents": {
- "version": "0.4.2",
- "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz",
- "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U="
- },
"request": {
"version": "2.88.2",
"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
diff --git a/package.json b/package.json
index 2db8739..15356e0 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "deviantart-filter",
"title": "DeviantArt Filter",
- "version": "6.1.1",
- "description": "Allows configurable filtering/removal of deviations by user, keyword, and/or category on DeviantArt",
+ "version": "6.2.0",
+ "description": "Allows configurable filtering/removal of deviations by user and/or keyword on DeviantArt",
"author": "Ryan Thaut (http://ryanthaut.com)",
"homepage": "https://github.com/rthaut/deviantART-Filter",
"license": "GPL-3.0",
@@ -39,9 +39,7 @@
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
- "autosuggest-highlight": "^3.1.1",
"lodash-es": "^4.17.21",
- "match-sorter": "^6.3.1",
"material-ui-confirm": "^2.1.3",
"notistack": "^1.0.10",
"react": "^17.0.2",
@@ -49,7 +47,6 @@
"react-dropzone": "^11.4.0",
"react-router-dom": "^5.3.0",
"react-use": "^17.3.1",
- "react-window": "^1.8.6",
"semver": "^7.3.5"
},
"devDependencies": {
diff --git a/screenshots/Categories-Dark.png b/screenshots/Categories-Dark.png
deleted file mode 100644
index e346a33..0000000
Binary files a/screenshots/Categories-Dark.png and /dev/null differ
diff --git a/screenshots/Categories-Editing-Dark.png b/screenshots/Categories-Editing-Dark.png
deleted file mode 100644
index f510566..0000000
Binary files a/screenshots/Categories-Editing-Dark.png and /dev/null differ
diff --git a/screenshots/Categories-Editing-Light.png b/screenshots/Categories-Editing-Light.png
deleted file mode 100644
index 00e8556..0000000
Binary files a/screenshots/Categories-Editing-Light.png and /dev/null differ
diff --git a/screenshots/Categories-Light.png b/screenshots/Categories-Light.png
deleted file mode 100644
index db6fbd0..0000000
Binary files a/screenshots/Categories-Light.png and /dev/null differ
diff --git a/screenshots/Create-Filter-Modal-Initial-Dark.png b/screenshots/Create-Filter-Modal-Initial-Dark.png
index d960dbe..96ab610 100644
Binary files a/screenshots/Create-Filter-Modal-Initial-Dark.png and b/screenshots/Create-Filter-Modal-Initial-Dark.png differ
diff --git a/screenshots/Create-Filter-Modal-Initial-Light.png b/screenshots/Create-Filter-Modal-Initial-Light.png
index aa77084..a148083 100644
Binary files a/screenshots/Create-Filter-Modal-Initial-Light.png and b/screenshots/Create-Filter-Modal-Initial-Light.png differ
diff --git a/screenshots/Create-Filter-Modal-Results-Dark.png b/screenshots/Create-Filter-Modal-Results-Dark.png
index 8591f4d..0ec5d71 100644
Binary files a/screenshots/Create-Filter-Modal-Results-Dark.png and b/screenshots/Create-Filter-Modal-Results-Dark.png differ
diff --git a/screenshots/Create-Filter-Modal-Results-Light.png b/screenshots/Create-Filter-Modal-Results-Light.png
index 32622ba..46d648d 100644
Binary files a/screenshots/Create-Filter-Modal-Results-Light.png and b/screenshots/Create-Filter-Modal-Results-Light.png differ
diff --git a/screenshots/Create-Filter-Modal-Selected-Dark.png b/screenshots/Create-Filter-Modal-Selected-Dark.png
index 5a0ef99..bf4f478 100644
Binary files a/screenshots/Create-Filter-Modal-Selected-Dark.png and b/screenshots/Create-Filter-Modal-Selected-Dark.png differ
diff --git a/screenshots/Create-Filter-Modal-Selected-Light.png b/screenshots/Create-Filter-Modal-Selected-Light.png
index c284559..a0eacda 100644
Binary files a/screenshots/Create-Filter-Modal-Selected-Light.png and b/screenshots/Create-Filter-Modal-Selected-Light.png differ
diff --git a/screenshots/Dashboard-Dark.png b/screenshots/Dashboard-Dark.png
index e0de7c7..9248ec7 100644
Binary files a/screenshots/Dashboard-Dark.png and b/screenshots/Dashboard-Dark.png differ
diff --git a/screenshots/Dashboard-Import-Results-Dark.png b/screenshots/Dashboard-Import-Results-Dark.png
index decc4a1..538ac6c 100644
Binary files a/screenshots/Dashboard-Import-Results-Dark.png and b/screenshots/Dashboard-Import-Results-Dark.png differ
diff --git a/screenshots/Dashboard-Import-Results-Light.png b/screenshots/Dashboard-Import-Results-Light.png
index ef5fbf1..534d145 100644
Binary files a/screenshots/Dashboard-Import-Results-Light.png and b/screenshots/Dashboard-Import-Results-Light.png differ
diff --git a/screenshots/Dashboard-Light.png b/screenshots/Dashboard-Light.png
index ac38868..6d33887 100644
Binary files a/screenshots/Dashboard-Light.png and b/screenshots/Dashboard-Light.png differ
diff --git a/screenshots/Filter Modal Screenshots.psd b/screenshots/Filter Modal Screenshots.psd
index c55208e..fb5cb5e 100644
Binary files a/screenshots/Filter Modal Screenshots.psd and b/screenshots/Filter Modal Screenshots.psd differ
diff --git a/screenshots/Keywords-Dark.png b/screenshots/Keywords-Dark.png
index e74740b..ac5d857 100644
Binary files a/screenshots/Keywords-Dark.png and b/screenshots/Keywords-Dark.png differ
diff --git a/screenshots/Keywords-Editing-Dark.png b/screenshots/Keywords-Editing-Dark.png
index 943389c..73d001c 100644
Binary files a/screenshots/Keywords-Editing-Dark.png and b/screenshots/Keywords-Editing-Dark.png differ
diff --git a/screenshots/Keywords-Editing-Light.png b/screenshots/Keywords-Editing-Light.png
index 2ffbff9..9700d82 100644
Binary files a/screenshots/Keywords-Editing-Light.png and b/screenshots/Keywords-Editing-Light.png differ
diff --git a/screenshots/Keywords-Light.png b/screenshots/Keywords-Light.png
index c2ffa8e..604249b 100644
Binary files a/screenshots/Keywords-Light.png and b/screenshots/Keywords-Light.png differ
diff --git a/screenshots/Management Window Screenshots.psd b/screenshots/Management Window Screenshots.psd
new file mode 100644
index 0000000..7734220
Binary files /dev/null and b/screenshots/Management Window Screenshots.psd differ
diff --git a/screenshots/Screenshots.psd b/screenshots/Screenshots.psd
deleted file mode 100644
index ba127ec..0000000
Binary files a/screenshots/Screenshots.psd and /dev/null differ
diff --git a/screenshots/Users-Dark.png b/screenshots/Users-Dark.png
index 9351371..fee256f 100644
Binary files a/screenshots/Users-Dark.png and b/screenshots/Users-Dark.png differ
diff --git a/screenshots/Users-Editing-Dark.png b/screenshots/Users-Editing-Dark.png
index b236364..03ad64c 100644
Binary files a/screenshots/Users-Editing-Dark.png and b/screenshots/Users-Editing-Dark.png differ
diff --git a/screenshots/Users-Editing-Light.png b/screenshots/Users-Editing-Light.png
index e7ef3bc..2700740 100644
Binary files a/screenshots/Users-Editing-Light.png and b/screenshots/Users-Editing-Light.png differ
diff --git a/screenshots/Users-Light.png b/screenshots/Users-Light.png
index f5e547c..76c4e83 100644
Binary files a/screenshots/Users-Light.png and b/screenshots/Users-Light.png differ
diff --git a/screenshots/firefox-permissions-6.0.0.jpg b/screenshots/firefox-permissions-6.0.0.jpg
new file mode 100644
index 0000000..6e990d3
Binary files /dev/null and b/screenshots/firefox-permissions-6.0.0.jpg differ