Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-web
Commits
98b12aad
Commit
98b12aad
authored
Sep 27, 2017
by
Mattias J Duffy
Browse files
forgot to save some files
parent
5039a3a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/actions/ui.js
View file @
98b12aad
<<<<<<<
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
src/reducers/index.js
View file @
98b12aad
...
...
@@ -6,12 +6,7 @@ import {facilities} from './api'
const
reducers
=
combineReducers
({
router
:
routerReducer
,
ui
,
<<<<<<<
HEAD
facilities
,
})
=======
facilities
});
>>>>>>>
c3abe9389ebadac8437111d3fa63f4ac278bb160
export
default
reducers
;
src/reducers/ui.js
View file @
98b12aad
...
...
@@ -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
,{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment