fixed some search bugs -- search button appearance still problematic"

bpiv400 · Dec 12, 2017 · e1992b4 · e1992b4
1 parent 9e0bcb9
commit e1992b4
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 22 deletions.
diff --git a/public/javascripts/search.js b/public/javascripts/search.js
diff --git a/search/debug.log b/search/debug.log
@@ -2,3 +2,5 @@
 [1209/131846.312:ERROR:crash_report_database_win.cc(427)] unexpected header
 [1210/152025.139:ERROR:crash_report_database_win.cc(427)] unexpected header
 [1210/173310.454:ERROR:crash_report_database_win.cc(427)] unexpected header
+[1212/015808.681:ERROR:crash_report_database_win.cc(427)] unexpected header
+[1212/024125.601:ERROR:crash_report_database_win.cc(427)] unexpected header
diff --git a/search/src/actions/index.js b/search/src/actions/index.js
@@ -21,7 +21,7 @@ const type = (value) => {
 const order = (choice) => {
   var value;
   if (!choice) {
-    value = 1;
+    value = -1;
   } else {
     value = choice.value;
   }

diff --git a/search/src/components/ResultsContainer.js b/search/src/components/ResultsContainer.js
@@ -125,8 +125,8 @@ export default class ResultsContainer extends React.Component {
     var ascendingLabel = 'Low to High';
     var descendingLabel = 'High to Low';
     if (this.state.sort === 'date') {
-      ascendingLabel = 'Most Recent First';
-      descendingLabel = 'Oldest First';
+      ascendingLabel = 'Oldest First';
+      descendingLabel = 'Most Recent First';
     }
     out.push({value : 1 , label : ascendingLabel});
     out.push({value : -1, label : descendingLabel});
@@ -168,6 +168,24 @@ export default class ResultsContainer extends React.Component {
     var sortOptions = this.getSortOptions();
     var orderOptions = this.getOrderOptions();
     var limitOptions = this.getLimitOptions();
+    var prevButton = null;
+    if (this.state.page !== 1) {
+      prevButton = (
+        <div className = 'col-xs-2'>
+          <button className = 'btn'
+            onClick = {this.onPrevPage}>
+            {'Prev'}
+          </button>
+        </div>
+      );
+    }
+    var nextButton = (
+      <div className = 'col-xs-2'>
+        <button className = 'btn'
+          onClick = {this.onNextPage}>
+          {'Next'}
+        </button>
+      </div>);
     var termArray = initialState.possTerms.map( function(currTerm) {
       return (
         <label>
@@ -281,21 +299,11 @@ export default class ResultsContainer extends React.Component {
                     onChange = {this.onLimit}
                   /> </label>
               </div>
-              <div className = 'col-xs-2'>
-                <button className = 'btn'
-                  onClick = {this.onPrevPage}>
-                  {'Prev'}
-                </button>
-              </div>
+              {prevButton}
               <div className = 'col-xs-2'>
                 <p> {'Page: ' + this.state.page} </p>
               </div>
-              <div className = 'col-xs-2'>
-                <button className = 'btn'
-                  onClick = {this.onNextPage}>
-                  {'Next'}
-                </button>
-              </div>
+              {nextButton}
             </div>
           </div>
         </div>

diff --git a/search/src/reducers/index.js b/search/src/reducers/index.js
@@ -19,21 +19,33 @@ const mainReducer = (state, action) => {
         apartments: newApartments});
     }
     case 'ORDER': {
-      return _.assign({}, state, {ord : action.value});
+      return _.assign({}, state, {
+        ord : action.value,
+        page : 1
+      });
     }
 
     case 'FURNISH': {
-      return _.assign({}, state, {furnished : action.value});
+      return _.assign({}, state, {
+        furnished : action.value,
+        page: 1
+      });
     }
     case 'PAGE': {
       return _.assign({}, state, {page : action.value});
     }
     case 'TERM': {
       console.log(action.value);
-      return _.assign({}, state, {term : action.value});
+      return _.assign({}, state, {
+        term : action.value,
+        page : 1
+      });
     }
     case 'OCCUPANCY': {
-      return _.assign({}, state, {occupancy : action.value});
+      return _.assign({}, state, {
+        occupancy : action.value,
+        page : 1
+      });
     }
     case 'LIMIT': {
       return _.assign({}, state, {
@@ -44,7 +56,8 @@ const mainReducer = (state, action) => {
     case 'PRICE': {
       return _.assign({}, state, {
         minPrice: action.min,
-        maxPrice: action.max
+        maxPrice: action.max,
+        page: 1
       });
     }
     default : {