Commit 98b12aad authored by Mattias J Duffy's avatar Mattias J Duffy
Browse files

forgot to save some files

parent 5039a3a2
<<<<<<< HEAD
import { TOGGLE_DRAWER,SET_SIDEBAR,SET_SEARCH_TERM } from './action-types';
=======
import {
ADD_FAVORITE_FACILITY,
REMOVE_FAVORITE_FACILITY,
......@@ -8,7 +5,6 @@ import {
SET_SIDEBAR,
TOGGLE_DRAWER
} from './action-types';
>>>>>>> c3abe9389ebadac8437111d3fa63f4ac278bb160
export const toggleDrawer = () => ({
type: TOGGLE_DRAWER,
......@@ -19,14 +15,6 @@ export const setSidebar = (facility) => ({
facility,
});
<<<<<<< HEAD
export const setSearchTerm = (term) => {
return {
type:SET_SEARCH_TERM,
term,
}
}
=======
export const setSearchTerm = (term) => ({
type: SET_SEARCH_TERM,
term,
......@@ -41,5 +29,4 @@ export const removeFavoriteFacility = slug => ({
type: REMOVE_FAVORITE_FACILITY,
slug
});
>>>>>>> c3abe9389ebadac8437111d3fa63f4ac278bb160
......@@ -6,12 +6,7 @@ import {facilities} from './api'
const reducers = combineReducers({
router:routerReducer,
ui,
<<<<<<< HEAD
facilities,
})
=======
facilities
});
>>>>>>> c3abe9389ebadac8437111d3fa63f4ac278bb160
export default reducers;
......@@ -31,11 +31,6 @@ const sidebar = (state={},action) => {
const searchbarState = {
term:'',
<<<<<<< HEAD
}
const search = (state=searchbarState,action) =>{
=======
filteredList:[],
};
......@@ -43,7 +38,6 @@ const filterList = (state) =>{
};
const search = (state=searchbarState,facilities=[],action) =>{
>>>>>>> c3abe9389ebadac8437111d3fa63f4ac278bb160
switch(action.type){
case SET_SEARCH_TERM:
return Object.assign({},state,{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment