aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/ui/badge
diff options
context:
space:
mode:
authorLibravatar MCMXC <16797721+mcmxcdev@users.noreply.github.com>2023-07-29 21:12:16 -0600
committerLibravatar GitHub <noreply@github.com>2023-07-30 08:42:16 +0530
commit32f76b74a69ad4d60a014bf075c39517888436bc (patch)
tree753378cc30f52d1e0e51be64b5a83d39f08f39c8 /src/components/ui/badge
parent6.4.1-nightly.15 [skip ci] (diff)
downloadferdium-app-32f76b74a69ad4d60a014bf075c39517888436bc.tar.gz
ferdium-app-32f76b74a69ad4d60a014bf075c39517888436bc.tar.zst
ferdium-app-32f76b74a69ad4d60a014bf075c39517888436bc.zip
refactor: various improvements (#1296)
* refactor: various improvements - enable no-use-before-define eslint rule - shuffle code to conform to no-use-before-define eslint rule - remove btoa dependency which is deprecated and replace with Buffer.from(string).toString('base64') - convert some any types into useful ones - add type annotations where possible - remove unused @types/expect.js - install @types/semver and ts-node which were missing - repair and rewrite add-crowdin-contributors script - remove export keyword from variables which are never consumed in another file - remove unity indicator hack where linked issue was closed - remove module declaration for kebab-case which is unused - add missing state interface for certain components - remove default exports for files which already have a named export - export IRecipePreview so it can be used throughout codebase - remove unused removeCacheForCallWith method from CachedRequest.ts - cleanup unused colors and styles inside legacy theme * - improve ColorPickerInput - fix invalid DOM nesting with div inside p in EditSettingsForm - fix progressbarAccentColor color picker not updating input when using slider - install missing @types/react-color dependency
Diffstat (limited to 'src/components/ui/badge')
-rw-r--r--src/components/ui/badge/ProBadge.tsx14
-rw-r--r--src/components/ui/badge/index.tsx18
2 files changed, 16 insertions, 16 deletions
diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx
index 62c45b77c..a5947d3a8 100644
--- a/src/components/ui/badge/ProBadge.tsx
+++ b/src/components/ui/badge/ProBadge.tsx
@@ -7,13 +7,6 @@ import { Theme } from '../../../themes';
7import Icon from '../icon'; 7import Icon from '../icon';
8import Badge from './index'; 8import Badge from './index';
9 9
10interface IProps extends WithStylesProps<typeof styles> {
11 badgeClasses?: string;
12 iconClasses?: string;
13 inverted?: boolean;
14 className?: string;
15}
16
17const styles = (theme: Theme) => ({ 10const styles = (theme: Theme) => ({
18 badge: { 11 badge: {
19 height: 'auto', 12 height: 'auto',
@@ -32,6 +25,13 @@ const styles = (theme: Theme) => ({
32 }, 25 },
33}); 26});
34 27
28interface IProps extends WithStylesProps<typeof styles> {
29 badgeClasses?: string;
30 iconClasses?: string;
31 inverted?: boolean;
32 className?: string;
33}
34
35class ProBadgeComponent extends Component<IProps> { 35class ProBadgeComponent extends Component<IProps> {
36 render() { 36 render() {
37 const { classes, badgeClasses, iconClasses, inverted, className } = 37 const { classes, badgeClasses, iconClasses, inverted, className } =
diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx
index 33e2f5d53..44fbf2d4a 100644
--- a/src/components/ui/badge/index.tsx
+++ b/src/components/ui/badge/index.tsx
@@ -4,23 +4,17 @@ import injectStyle, { WithStylesProps } from 'react-jss';
4 4
5import { Theme } from '../../../themes'; 5import { Theme } from '../../../themes';
6 6
7interface IProps extends WithStylesProps<typeof styles> {
8 type: string;
9 className?: string;
10 children: ReactNode;
11}
12
13const badgeStyles = (theme: Theme) => { 7const badgeStyles = (theme: Theme) => {
14 const styles = {}; 8 const styles = {};
15 Object.keys(theme.styleTypes).map(style => { 9 Object.keys(theme.styleTypes).map(style =>
16 Object.assign(styles, { 10 Object.assign(styles, {
17 [style]: { 11 [style]: {
18 background: theme.styleTypes[style].accent, 12 background: theme.styleTypes[style].accent,
19 color: theme.styleTypes[style].contrast, 13 color: theme.styleTypes[style].contrast,
20 border: theme.styleTypes[style].border, 14 border: theme.styleTypes[style].border,
21 }, 15 },
22 }); 16 }),
23 }); 17 );
24 18
25 return styles; 19 return styles;
26}; 20};
@@ -44,6 +38,12 @@ const styles = (theme: Theme) => ({
44 ...badgeStyles(theme), 38 ...badgeStyles(theme),
45}); 39});
46 40
41interface IProps extends WithStylesProps<typeof styles> {
42 type: string;
43 className?: string;
44 children: ReactNode;
45}
46
47class BadgeComponent extends Component<IProps> { 47class BadgeComponent extends Component<IProps> {
48 public static defaultProps = { 48 public static defaultProps = {
49 type: 'primary', 49 type: 'primary',