Merge branch 'stuff' into 'master'

Stuff

See merge request !41
This commit is contained in:
Lucas 2017-01-31 12:16:23 +00:00
commit e2fa98f7c3
4 changed files with 11 additions and 1 deletions

View File

@ -10,6 +10,7 @@ export default function ListDetails(props) {
<div className="show-detail affix">
<h1 className="hidden-xs">{props.data.title}</h1>
<h3 className="visible-xs">{props.data.title}</h3>
<h4>{props.data.year}</h4>
{props.data.runtime &&
<p>
<i className="fa fa-clock-o"></i>

View File

@ -2,6 +2,10 @@ import React from 'react'
import { Control, Form } from 'react-redux-form';
export default function ListFilter(props) {
if (props.listSize === 0) {
return null;
}
return (
<div className="row">
<div className="col-xs-12 col-md-12 list-filter">

View File

@ -50,6 +50,8 @@ export default class ListPosters extends React.Component {
render() {
let elmts = this.props.data.slice();
const listSize = elmts.length;
const colSize = (listSize !== 0) ? "col-xs-5 col-md-8" : "col-xs-12";
// Filter the list of elements
if (this.props.filter !== "") {
@ -60,8 +62,9 @@ export default class ListPosters extends React.Component {
}
return (
<div className="col-xs-5 col-md-8">
<div className={colSize}>
<ListFilter
listSize={listSize}
formModel={this.props.formModel}
controlModel={this.props.controlModel}
controlPlaceHolder={this.props.controlPlaceHolder}

View File

@ -18,6 +18,8 @@ export default function movieStore(state = defaultState, action) {
let selectedImdbId = "";
// Select the first movie
if (action.payload.data.length > 0) {
// Sort by year
action.payload.data.sort((a,b) => b.year - a.year);
selectedImdbId = action.payload.data[0].imdb_id;
}
return Object.assign({}, state, {