From 32f76b74a69ad4d60a014bf075c39517888436bc Mon Sep 17 00:00:00 2001
From: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Date: Sat, 29 Jul 2023 21:12:16 -0600
Subject: 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
---
 src/components/ui/badge/ProBadge.tsx | 14 +++++++-------
 src/components/ui/badge/index.tsx    | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/components/ui/badge')

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';
 import Icon from '../icon';
 import Badge from './index';
 
-interface IProps extends WithStylesProps<typeof styles> {
-  badgeClasses?: string;
-  iconClasses?: string;
-  inverted?: boolean;
-  className?: string;
-}
-
 const styles = (theme: Theme) => ({
   badge: {
     height: 'auto',
@@ -32,6 +25,13 @@ const styles = (theme: Theme) => ({
   },
 });
 
+interface IProps extends WithStylesProps<typeof styles> {
+  badgeClasses?: string;
+  iconClasses?: string;
+  inverted?: boolean;
+  className?: string;
+}
+
 class ProBadgeComponent extends Component<IProps> {
   render() {
     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';
 
 import { Theme } from '../../../themes';
 
-interface IProps extends WithStylesProps<typeof styles> {
-  type: string;
-  className?: string;
-  children: ReactNode;
-}
-
 const badgeStyles = (theme: Theme) => {
   const styles = {};
-  Object.keys(theme.styleTypes).map(style => {
+  Object.keys(theme.styleTypes).map(style =>
     Object.assign(styles, {
       [style]: {
         background: theme.styleTypes[style].accent,
         color: theme.styleTypes[style].contrast,
         border: theme.styleTypes[style].border,
       },
-    });
-  });
+    }),
+  );
 
   return styles;
 };
@@ -44,6 +38,12 @@ const styles = (theme: Theme) => ({
   ...badgeStyles(theme),
 });
 
+interface IProps extends WithStylesProps<typeof styles> {
+  type: string;
+  className?: string;
+  children: ReactNode;
+}
+
 class BadgeComponent extends Component<IProps> {
   public static defaultProps = {
     type: 'primary',
-- 
cgit v1.2.3-54-g00ecf