Remove empty interfaces

kokororin · Apr 17, 2020 · 016242c · 016242c
1 parent 0ff258a
commit 016242c
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 118 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,6 +9,6 @@ module.exports = {
     'no-duplicate-imports': 'off',
     'react/display-name': 'off',
     'prettier/prettier': 'error',
-    '@typescript-eslint/no-empty-interface': 'off'
+    '@typescript-eslint/no-empty-interface': 'error'
   }
 };
diff --git a/src/containers/GalleryContainer.tsx b/src/containers/GalleryContainer.tsx
@@ -68,11 +68,6 @@ interface IGalleryContainerProps {
   dispatch: Dispatch<IGalleryAction> & TGalleryThunkDispatch;
 }
 
-interface IGalleryContainerState {
-  isDrawerOpen: boolean;
-  isSearchByPopularity: boolean;
-}
-
 const GalleryContainer: React.FunctionComponent<IGalleryContainerProps> = () => {
   const classes = useStyles();
   const intl = useIntl();

diff --git a/src/containers/IllustContainer.tsx b/src/containers/IllustContainer.tsx
@@ -150,9 +150,7 @@ interface IIllustContainerRouteInfo {
   illustId: string;
 }
 
-interface IIllustContainerProps {}
-
-const IllustContainer: React.FunctionComponent<IIllustContainerProps> = () => {
+const IllustContainer: React.FunctionComponent<{}> = () => {
   const [isSubmitting, setIsSubmitting] = React.useState(false);
   const [boxIndex, setBoxIndex] = React.useState(0);
   const [showBox, setShowBox] = React.useState(false);

diff --git a/src/containers/LoginContainer.tsx b/src/containers/LoginContainer.tsx
@@ -10,8 +10,6 @@ import Login, { ILoginHandles } from '@/components/Login';
 
 import { ICombinedState } from '@/reducers';
 
-interface ILoginContainerProps {}
-
 export interface ILoginContainerHandles {
   open: () => void;
   close: () => void;
@@ -39,119 +37,118 @@ export const UserButton = (props: IUserButtonProps) => {
   );
 };
 
-const LoginContainer = React.forwardRef<
-  ILoginContainerHandles,
-  ILoginContainerProps
->((props, ref) => {
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const [authData, setAuthData] = React.useState<any>(null);
-  const intl = useIntl();
-  const dispatch = useDispatch();
-  const loginRef = React.useRef<ILoginHandles>(null);
-
-  React.useEffect(() => {
-    const authData = api.getAuth();
-    setAuthData(authData);
-  }, []);
-
-  const open = () => {
-    loginRef.current?.open();
-  };
-
-  const close = () => {
-    loginRef.current?.close();
-  };
-
-  const onLoginClick = () => {
-    if (isSubmitting || !loginRef.current?.getIsOpen()) {
-      return;
-    }
-
-    const username = loginRef.current?.getUsername();
-    const password = loginRef.current?.getPassword();
-
-    if (username === '') {
-      return AlertModal.make(
-        'error',
-        intl.formatMessage({
-          id: 'pixiv ID or Email Address is Blank'
-        })
-      );
-    }
-
-    if (password === '') {
-      return AlertModal.make(
-        'error',
-        intl.formatMessage({ id: 'Password is Blank' })
-      );
-    }
-
-    setIsSubmitting(true);
-
-    api
-      .auth({
-        username,
-        password
-      })
-      .then((data: any) => {
-        if (data.status === 'success') {
-          const authData = data.response;
-          api.setAuth(authData, dispatch);
-          setAuthData(authData);
-          setTimeout(() => {
-            close();
-            loginRef.current?.reset();
-          }, 1500);
-        } else {
-          AlertModal.make('error', data.message);
-        }
-      })
-      .then(() => {
-        setIsSubmitting(false);
-      })
-      .catch(() => {
-        setIsSubmitting(false);
-        AlertModal.make(
+const LoginContainer = React.forwardRef<ILoginContainerHandles, {}>(
+  (props, ref) => {
+    const [isSubmitting, setIsSubmitting] = React.useState(false);
+    const [authData, setAuthData] = React.useState<any>(null);
+    const intl = useIntl();
+    const dispatch = useDispatch();
+    const loginRef = React.useRef<ILoginHandles>(null);
+
+    React.useEffect(() => {
+      const authData = api.getAuth();
+      setAuthData(authData);
+    }, []);
+
+    const open = () => {
+      loginRef.current?.open();
+    };
+
+    const close = () => {
+      loginRef.current?.close();
+    };
+
+    const onLoginClick = () => {
+      if (isSubmitting || !loginRef.current?.getIsOpen()) {
+        return;
+      }
+
+      const username = loginRef.current?.getUsername();
+      const password = loginRef.current?.getPassword();
+
+      if (username === '') {
+        return AlertModal.make(
           'error',
           intl.formatMessage({
-            id: 'Communication Error Occurred'
+            id: 'pixiv ID or Email Address is Blank'
           })
         );
-      });
-  };
-
-  const onLogoutClick = () => {
-    api.removeAuth(dispatch);
-    setAuthData(null);
-  };
+      }
 
-  const onKeydown = (event: KeyboardEvent) => {
-    if (loginRef.current?.getIsOpen() && event.keyCode === 13) {
-      onLoginClick();
-    }
-  };
+      if (password === '') {
+        return AlertModal.make(
+          'error',
+          intl.formatMessage({ id: 'Password is Blank' })
+        );
+      }
 
-  React.useImperativeHandle(ref, () => ({
-    open: () => open(),
-    close: () => close()
-  }));
+      setIsSubmitting(true);
 
-  return (
-    <>
-      <Login
-        ref={loginRef}
-        onLoginClick={onLoginClick}
-        onLogoutClick={onLogoutClick}
-        isSubmitting={isSubmitting}
-        authData={authData}
-      />
-      <EventListener
-        target={document}
-        // @ts-ignore
-        onKeydown={onKeydown}
-      />
-    </>
-  );
-});
+      api
+        .auth({
+          username,
+          password
+        })
+        .then((data: any) => {
+          if (data.status === 'success') {
+            const authData = data.response;
+            api.setAuth(authData, dispatch);
+            setAuthData(authData);
+            setTimeout(() => {
+              close();
+              loginRef.current?.reset();
+            }, 1500);
+          } else {
+            AlertModal.make('error', data.message);
+          }
+        })
+        .then(() => {
+          setIsSubmitting(false);
+        })
+        .catch(() => {
+          setIsSubmitting(false);
+          AlertModal.make(
+            'error',
+            intl.formatMessage({
+              id: 'Communication Error Occurred'
+            })
+          );
+        });
+    };
+
+    const onLogoutClick = () => {
+      api.removeAuth(dispatch);
+      setAuthData(null);
+    };
+
+    const onKeydown = (event: KeyboardEvent) => {
+      if (loginRef.current?.getIsOpen() && event.keyCode === 13) {
+        onLoginClick();
+      }
+    };
+
+    React.useImperativeHandle(ref, () => ({
+      open: () => open(),
+      close: () => close()
+    }));
+
+    return (
+      <>
+        <Login
+          ref={loginRef}
+          onLoginClick={onLoginClick}
+          onLogoutClick={onLogoutClick}
+          isSubmitting={isSubmitting}
+          authData={authData}
+        />
+        <EventListener
+          target={document}
+          // @ts-ignore
+          onKeydown={onKeydown}
+        />
+      </>
+    );
+  }
+);
 
 export default LoginContainer;