Search v3

src/components/Translation/index.js

@@ -18,7 +18,7 @@ export default class Translation extends Component {
 
     return (
       <div id={index} className={`${styles.translation} ${isArabic && 'arabic'} translation`}>
-        <h4 className="montserrat">{translation.resourceName}</h4>
+        <h4 className="montserrat">{translation.resourceName || translation.author}</h4>
         <h2 className={`${isArabic ? 'text-right' : 'text-left'} text-translation times-new`}>
           <small
             dangerouslySetInnerHTML={{ __html: translation.text }}

src/components/Verse/index.js

@@ -267,7 +267,10 @@ class Verse extends Component {
         {this.renderPlayLink()}
         {this.renderCopyLink()}
         {this.renderBookmark()}
-        <Share chapter={chapter} verseKey={verse.verseKey} />
+        {
+          chapter &&
+          <Share chapter={chapter} verseKey={verse.verseKey} />
+        }
       </div>
     );
   }

src/containers/Search/index.js

@@ -17,7 +17,7 @@ import LocaleFormattedMessage from 'components/LocaleFormattedMessage';
 
 import { verseType, optionsType } from 'types';
 
-import Header from './Header';
+import Header from 'components/IndexHeader';
 
 const style = require('./style.scss');
 
@@ -123,7 +123,7 @@ class Search extends Component {
   renderBody() {
     const { location, isErrored, isLoading, results, options, verses } = this.props;
 
-    if (!location.q) {
+    if (!location.query.q) {
       return (
         <h3 className="text-center" style={{ padding: '15%' }}>
           <LocaleFormattedMessage id="search.nothing" defaultMessage="No search query." />
@@ -153,9 +153,8 @@ class Search extends Component {
 
     return results.map(result => (
       <Verse
-        verse={verses[result.verse]}
-        match={result.match}
-        key={result.verse}
+        verse={verses[result]}
+        key={result}
         tooltip={options.tooltip}
         isSearched
       />

src/containers/Search/style.scss

@@ -63,3 +63,10 @@
     }
   }
 }
+
+.logo{
+  padding-top: 10px;
+  padding-bottom: 10px;
+  height: auto;
+  width: 100%;
+}

src/redux/actions/search.js

@@ -9,7 +9,7 @@ import {
 export function search(params) {
   return {
     types: [SEARCH, SEARCH_SUCCESS, SEARCH_FAIL],
-    schema: { results: [{ ayah: versesSchema }] },
+    schema: { results: [versesSchema] },
     // TODO: We are doing this because of a weird obj.hasOwnProperty method missing on `params`
     promise: client => client.get('/api/v3/search', { params: { q: params.q, p: params.p } }),
     params

src/redux/modules/fontFaces.js

@@ -1,11 +1,10 @@
 import { LOAD_SUCCESS } from 'redux/constants/verses.js';
-import { SEARCH_SUCCESS } from 'redux/constants/search.js';
+// import { SEARCH_SUCCESS } from 'redux/constants/search.js';
 import LOAD from 'redux/constants/fontFace.js';
 
 export default function reducer(state = {}, action = {}) {
   switch (action.type) {
-    case LOAD_SUCCESS:
-    case SEARCH_SUCCESS: {
+    case LOAD_SUCCESS: {
       const verses = action.result.entities.verses;
       const classNames = {};
 

src/redux/modules/searchResults.js

@@ -27,12 +27,11 @@ export default function reducer(state = initialState, action = {}) {
         loaded: true,
         loading: false,
         errored: false,
-        total: action.result.result.total,
-        page: action.result.result.page,
-        size: action.result.result.size,
-        from: action.result.result.from,
-        took: action.result.result.took,
-        query: action.result.result.query,
+        total: action.result.total,
+        page: action.result.page,
+        size: action.result.result.results.length,
+        took: action.result.took,
+        query: action.result.query,
         results: action.result.result.results,
         entities: Object.assign({}, state.entities, action.result.entities.verses)
       };