Skip to content

Commit

Permalink
Revert "Presentational layer refactoring (#187)"
Browse files Browse the repository at this point in the history
This reverts commit 1b17f4b.
  • Loading branch information
amilajack committed Oct 17, 2016
1 parent 1b17f4b commit 03908c0
Show file tree
Hide file tree
Showing 17 changed files with 713 additions and 9,823 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"test": {
"plugins": [
["webpack-loaders", { "config": "webpack.config.mocha.js", "verbose": false }],
["babel-plugin-module-resolver", [
["babel-plugin-module-alias", [
{ "src": "node_modules/electron" , "expose": "electron" }
]],
"syntax-flow",
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ app/node_modules
dist
app/dist
app/main.js
.eslintcache
app/main.js.map
release

Expand Down
4 changes: 3 additions & 1 deletion app/actions/homePageActions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// @flow
/**
* @flow
*/
export function setActiveMode(activeMode: string, activeModeOptions: Object = {}) {
return {
type: 'SET_ACTIVE_MODE',
Expand Down
59 changes: 0 additions & 59 deletions app/actions/itemPageActions.js
Original file line number Diff line number Diff line change
@@ -1,59 +0,0 @@
/* eslint "fp/no-mutation": "error", "fp/no-unused-expression": "error" */
// @flow

export function setItem(item: Object) {
return {
type: 'SET_ITEM',
item
};
}

export function setCurrentPlayer(currentPlayer: string) {
return {
type: 'SET_CURRENT_PLAYER',
currentPlayer
};
}

export function setServingUrl(servingUrl: string) {
return {
type: 'SET_SERVING_URL',
servingUrl
};
}

export function setLoadingStatus(statusName: string, isLoading: boolean) {
return {
type: 'SET_LOADING_STATUS',
statusName,
isLoading
};
}

export function setInitialState() {
return {
type: 'SET_INITIAL_STATE'
};
}

export function setTorrentProgress(torrentInProgress: boolean) {
return {
type: 'SET_TORRENT_PROGRESS',
torrentInProgress
};
}

export function setProp(propName: boolean, propValue: any) {
return {
type: 'SET_PROP',
propName,
propValue
};
}

export function mergeProp(prop: any) {
return {
type: 'MERGE_PROP',
mergeProp: prop
};
}
24 changes: 12 additions & 12 deletions app/api/metadata/MetadataAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ async function handleRequest(method: string, args: Array<string>): Promise<any>
* @param {string} genre
* @param {string} sortBy
*/
function search(...args: Array<any>): Promise<Array<Object>> {
function search(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('search', args);
}

Expand All @@ -50,7 +50,7 @@ function search(...args: Array<any>): Promise<Array<Object>> {
*
* @param {string} imdbId
*/
function getMovie(...args: Array<any>): Promise<Array<Object>> {
function getMovie(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('getMovie', args);
}

Expand All @@ -62,7 +62,7 @@ function getMovie(...args: Array<any>): Promise<Array<Object>> {
* @param {string} genre
* @param {string} sortBy
*/
function getMovies(...args: Array<any>): Promise<Array<Object>> {
function getMovies(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('getMovies', args);
}

Expand All @@ -73,7 +73,7 @@ function getMovies(...args: Array<any>): Promise<Array<Object>> {
* @param {string} type | movie or show
* @param {number} limit | movie or show
*/
function getSimilar(...args: Array<any>): Promise<Array<Object>> {
function getSimilar(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('getSimilar', args);
}

Expand All @@ -84,7 +84,7 @@ function getSimilar(...args: Array<any>): Promise<Array<Object>> {
* @param {string} type | movie or show
* @param {number} limit | movie or show
*/
function getSeason(...args: Array<any>): Promise<Object> {
function getSeason(...args: Array<string>): Promise<Object> {
return handleRequest('getSeason', args);
}

Expand All @@ -95,7 +95,7 @@ function getSeason(...args: Array<any>): Promise<Object> {
* @param {string} type | movie or show
* @param {number} limit | movie or show
*/
function getSeasons(...args: Array<any>): Promise<Array<Object>> {
function getSeasons(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('getSeasons', args);
}

Expand All @@ -106,7 +106,7 @@ function getSeasons(...args: Array<any>): Promise<Array<Object>> {
* @param {string} type | movie or show
* @param {number} limit | movie or show
*/
function getEpisode(...args: Array<any>): Promise<Object> {
function getEpisode(...args: Array<string>): Promise<Object> {
return handleRequest('getEpisode', args);
}

Expand All @@ -117,7 +117,7 @@ function getEpisode(...args: Array<any>): Promise<Object> {
* @param {string} type | movie or show
* @param {number} limit | movie or show
*/
function getShow(...args: Array<any>): Promise<Object> {
function getShow(...args: Array<string>): Promise<Object> {
return handleRequest('getShow', args);
}

Expand All @@ -128,7 +128,7 @@ function getShow(...args: Array<any>): Promise<Object> {
* @param {string} type | movie or show
* @param {number} limit | movie or show
*/
function getShows(...args: Array<any>): Promise<Array<Object>> {
function getShows(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('getShows', args);
}

Expand All @@ -139,7 +139,7 @@ function getShows(...args: Array<any>): Promise<Array<Object>> {
* @param {string} filename
* @param {object} metadata
*/
function getSubtitles(...args: Array<any>): Promise<Array<Object>> {
function getSubtitles(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('getSubtitles', args);
}

Expand All @@ -150,7 +150,7 @@ function getSubtitles(...args: Array<any>): Promise<Array<Object>> {
* @param {object} metadata | Required only for `set` and `remove`
* @param {object} metadata | 'id', Required only remove
*/
function favorites(...args: Array<any>): Promise<Array<Object>> {
function favorites(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('favorites', args);
}

Expand All @@ -161,7 +161,7 @@ function favorites(...args: Array<any>): Promise<Array<Object>> {
* @param {object} metadata | Required only for `set` and `remove`
* @param {object} metadata | 'id', Required only remove
*/
function watchList(...args: Array<any>): Promise<Array<Object>> {
function watchList(...args: Array<string>): Promise<Array<Object>> {
return handleRequest('watchList', args);
}

Expand Down
6 changes: 5 additions & 1 deletion app/api/torrents/TorrentAdapter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
/**
* @flow
* @param {string} imdbId
* @param {object} extendedDetails
*/
/* eslint global-require: 0 */
// @flow
import {
determineQuality,
formatSeasonEpisodeToString,
Expand Down
4 changes: 2 additions & 2 deletions app/components/card/Card.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import Rating from './Rating';

export default function Card({ type, image, id, rating, title, starColor }) {
const placeholder = process.env.NODE_ENV === 'production'
? './images/posterholder.png'
: './app/images/posterholder.png';
? './images/posterholder.png'
: './app/images/posterholder.png';

const backgroundImageStyle = {
backgroundImage: `url(${image.toLowerCase() !== 'n/a' ? image : placeholder})`
Expand Down
8 changes: 2 additions & 6 deletions app/components/home/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,7 @@ Home.propTypes = {
PropTypes.number,
PropTypes.string
]),
genres: PropTypes.arrayOf(
PropTypes.string.isRequired
).isRequired
genres: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired
}).isRequired)
})
}).isRequired,
Expand All @@ -184,9 +182,7 @@ Home.propTypes = {
PropTypes.number,
PropTypes.string
]),
genres: PropTypes.arrayOf(
PropTypes.string.isRequired
).isRequired
genres: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired
})).isRequired,
isLoading: PropTypes.bool.isRequired,
infinitePagination: PropTypes.bool.isRequired
Expand Down
Loading

0 comments on commit 03908c0

Please sign in to comment.