From 6ba958fafa6108289d86dabb6e1410b611d3187c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Ytterstr=C3=B6m?= <anders.ytterstrom@kundo.se>
Date: Thu, 5 Mar 2020 18:09:48 +0100
Subject: [PATCH] Replace interfaces with Types

---
 src/components/album-list.tsx     |  6 +++---
 src/components/album.tsx          | 11 ++++++-----
 src/components/filter-input.tsx   |  6 +++---
 src/components/modal.tsx          | 12 ++++++------
 src/components/sort-select.tsx    |  6 +++---
 src/containers/modal.ts           |  1 -
 src/containers/sort-select.ts     |  1 -
 src/reducers/albums.ts            |  6 +++---
 src/reducers/index.ts             | 12 ++++++++++++
 src/reducers/selected-album.ts    |  6 +++---
 src/reducers/sort-key.ts          |  6 +++---
 src/reducers/visibility-filter.ts |  6 +++---
 12 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/src/components/album-list.tsx b/src/components/album-list.tsx
index 9b9b11c..0b8914c 100644
--- a/src/components/album-list.tsx
+++ b/src/components/album-list.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import Album from "./album";
 import * as interfaces from "../interfaces";
 
-export default (props: AlbumList) => {
+export default (props: Props) => {
     const { albums, handleOnClick, blurred } = props;
     const classNames = blurred ? "blur" : "";
     return (
@@ -18,8 +18,8 @@ export default (props: AlbumList) => {
     );
 };
 
-interface AlbumList {
+type Props = {
     albums: Array<interfaces.Album>;
     handleOnClick: Function;
     blurred: boolean;
-}
+};
diff --git a/src/components/album.tsx b/src/components/album.tsx
index 8c8614f..30eb3df 100644
--- a/src/components/album.tsx
+++ b/src/components/album.tsx
@@ -1,7 +1,7 @@
 import React from "react";
-import * as interfaces from "../interfaces";
+import { Album } from "../interfaces";
 
-export default (props: Album) => {
+export default (props: Props) => {
     const handleKeyPress = (e: KeyboardEvent, callback: Function) => {
         const SPACE_KEY = 32;
         const ENTER_KEY = 13;
@@ -37,7 +37,8 @@ export default (props: Album) => {
     );
 };
 
-interface Album {
-    album: interfaces.Album;
+type Props = {
+    key: number;
+    album: Album;
     handleOnClick: Function;
-}
+};
diff --git a/src/components/filter-input.tsx b/src/components/filter-input.tsx
index 701bcdd..55e1782 100644
--- a/src/components/filter-input.tsx
+++ b/src/components/filter-input.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-export default (props: FilterInput) => {
+export default (props: Props) => {
     const { value, handleOnChange } = props;
     return (
         <div>
@@ -14,7 +14,7 @@ export default (props: FilterInput) => {
     );
 };
 
-interface FilterInput {
+type Props = {
     value: string;
     handleOnChange: Function;
-}
+};
diff --git a/src/components/modal.tsx b/src/components/modal.tsx
index fd103a9..bebd3af 100644
--- a/src/components/modal.tsx
+++ b/src/components/modal.tsx
@@ -1,12 +1,7 @@
 import React from "react";
 import { Album } from "../interfaces";
 
-interface Modal {
-    album: Album;
-    handleOnClick: Function;
-}
-
-export default (props: Modal) => {
+export default (props: Props) => {
     const handleKeyPress = (e: KeyboardEvent, callback: Function) => {
         console.log(e.charCode);
         callback();
@@ -40,3 +35,8 @@ export default (props: Modal) => {
         </div>
     );
 };
+
+type Props = {
+    album: Album;
+    handleOnClick(): void;
+};
diff --git a/src/components/sort-select.tsx b/src/components/sort-select.tsx
index a3b9814..b0f8378 100644
--- a/src/components/sort-select.tsx
+++ b/src/components/sort-select.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-export default (props: SortSelect) => {
+export default (props: Props) => {
     const { value, handleOnChange } = props;
     return (
         <div hidden>
@@ -18,7 +18,7 @@ export default (props: SortSelect) => {
     );
 };
 
-interface SortSelect {
+type Props = {
     value: string;
     handleOnChange: Function;
-}
+};
diff --git a/src/containers/modal.ts b/src/containers/modal.ts
index 9a23ba7..8d8a61d 100644
--- a/src/containers/modal.ts
+++ b/src/containers/modal.ts
@@ -1,4 +1,3 @@
-import React from "react";
 import { connect } from "react-redux";
 import Modal from "../components/modal";
 import { unselectAlbum } from "../actions";
diff --git a/src/containers/sort-select.ts b/src/containers/sort-select.ts
index 1dafcaf..00bc47b 100644
--- a/src/containers/sort-select.ts
+++ b/src/containers/sort-select.ts
@@ -1,4 +1,3 @@
-import React from "react";
 import { connect } from "react-redux";
 import SortSelect from "../components/sort-select";
 import { setSortKey } from "../actions";
diff --git a/src/reducers/albums.ts b/src/reducers/albums.ts
index 051e6e1..82f9d42 100644
--- a/src/reducers/albums.ts
+++ b/src/reducers/albums.ts
@@ -1,14 +1,14 @@
 import { LOAD_ALBUMS_OK } from "../actions";
 import { Album } from "../interfaces";
 
-interface AlbumsAction {
+type Action = {
     type: string;
     payload: {
         albums: Array<Album>;
     };
-}
+};
 
-export default (state: Array<Album> = [], action: AlbumsAction) => {
+export default (state: Array<Album> = [], action: Action) => {
     switch (action.type) {
         case LOAD_ALBUMS_OK:
             const { albums } = action.payload;
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
index e69de29..c226517 100644
--- a/src/reducers/index.ts
+++ b/src/reducers/index.ts
@@ -0,0 +1,12 @@
+import { combineReducers } from "redux";
+import albums from "./albums";
+import visibilityFilter from "./visibility-filter";
+import sortKey from "./sort-key";
+import selectedAlbum from "./selected-album";
+
+export default combineReducers({
+    albums,
+    visibilityFilter,
+    sortKey,
+    selectedAlbum
+});
diff --git a/src/reducers/selected-album.ts b/src/reducers/selected-album.ts
index 02c59f0..2424425 100644
--- a/src/reducers/selected-album.ts
+++ b/src/reducers/selected-album.ts
@@ -1,14 +1,14 @@
 import { SELECT_ALBUM, UNSELECT_ALBUM } from "../actions";
 import { Album } from "../interfaces";
 
-interface AlbumAction {
+type Action = {
     type: string;
     payload: {
         album: Album;
     };
-}
+};
 
-export default (state: Object = {}, action: AlbumAction) => {
+export default (state: Object = {}, action: Action) => {
     switch (action.type) {
         case SELECT_ALBUM:
             return action.payload.album;
diff --git a/src/reducers/sort-key.ts b/src/reducers/sort-key.ts
index 2e7774d..47388c1 100644
--- a/src/reducers/sort-key.ts
+++ b/src/reducers/sort-key.ts
@@ -1,13 +1,13 @@
 import { SET_SORT_KEY } from "../actions";
 
-interface SortKeyAction {
+type Action = {
     type: string;
     payload: {
         key: string;
     };
-}
+};
 
-export default (state: string = "id", action: SortKeyAction) => {
+export default (state: string = "id", action: Action) => {
     switch (action.type) {
         case SET_SORT_KEY:
             return action.payload.key;
diff --git a/src/reducers/visibility-filter.ts b/src/reducers/visibility-filter.ts
index 7cd24d4..b61fb53 100644
--- a/src/reducers/visibility-filter.ts
+++ b/src/reducers/visibility-filter.ts
@@ -1,13 +1,13 @@
 import { SET_VISIBILITY_FILTER } from "../actions";
 
-interface VisibilityFilterAction {
+type Action = {
     type: string;
     payload: {
         filter: string;
     };
-}
+};
 
-export default (state: string = "", action: VisibilityFilterAction) => {
+export default (state: string = "", action: Action) => {
     switch (action.type) {
         case SET_VISIBILITY_FILTER:
             return action.payload.filter;