Skip to content

Commit

Permalink
Merge pull request #2 from ssetem/master
Browse files Browse the repository at this point in the history
upgrade to searchkit 0.7.0
  • Loading branch information
PAK90 committed Feb 15, 2016
2 parents d9a3f2e + 45ec69a commit af918ef
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"react-highcharts": "^6.0.0",
"react-toolbox": "^0.14.0",
"request": "^2.65.0",
"searchkit": "^0.6.1",
"searchkit": "^0.7.0",
"svg-loader": "0.0.2",
"svg-react-loader": "^0.3.2",
"underscore": "^1.8.3",
Expand Down
19 changes: 10 additions & 9 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ export class App extends React.Component<any, any> {
<div>
<SearchkitProvider searchkit={this.searchkit}>
<div>
<div className="layout">
<div className="sk-layout sk-layout__size-l">

<div className="layout__top-bar top-bar">
<div className="top-bar__content">
<div className="sk-layout__top-bar sk-top-bar">
<div className="sk-top-bar__content">
<div className="my-logo">Gatherer V2</div>
<SearchBox
translations={{"searchbox.placeholder":"search cards"}}
Expand All @@ -80,9 +80,9 @@ export class App extends React.Component<any, any> {
</div>
</div>

<div className="layout__body">
<div className="sk-layout__body">

<div className="layout__filters">
<div className="sk-layout__filters">
<RangeFilter id="cmc" min={0} max={15} title="Converted Cost" field="cmc" showHistogram={true}/>
<RefinementListFilter id="colours" title="Colours" field="colors.raw" size={6} operator="AND"/>
<RefinementListFilter id="symbols" title="Symbols" field="symbols" size={5} operator="AND" itemComponent={SymbolRefineList}/>
Expand All @@ -93,9 +93,9 @@ export class App extends React.Component<any, any> {
<RefinementListFilter id="codes" title="Set" field="codes.raw" size={5} operator="AND"/>
</div>

<div className="layout__results results-list">
<div className="results-list__action-bar action-bar">
<div className="action-bar__info">
<div className="sk-layout__results sk-results-list">
<div className="sk-results-list__action-bar sk-action-bar">
<div className="sk-action-bar__info">
<HitsStats />
<SortingSelector options={[
{label:"Name", field: "name.raw", order: "asc", defaultOption:true},
Expand All @@ -105,13 +105,14 @@ export class App extends React.Component<any, any> {
]}/>
</div>

<div className="action-bar__filters">
<div className="sk-action-bar__filters">
<SelectedFilters/>
<ResetFilters/>
</div>

</div>
<Hits hitsPerPage={12} highlightFields={["name"]}
mod="sk-hits-grid"
itemComponent={CardHitsItem}
scrollTo="body" />
<NoHits suggestionsField={"name"}/>
Expand Down

0 comments on commit af918ef

Please sign in to comment.