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
ba93033c
Commit
ba93033c
authored
Jan 01, 2018
by
Andrew Hrdy
Browse files
Removed some outdated code that was causing errors.
parent
8ff4459a
Pipeline
#1930
passed with stage
in 1 minute and 41 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/components/FacilitiesMap.js
View file @
ba93033c
...
...
@@ -54,7 +54,7 @@ class FacilitiesMap extends React.Component {
};
render
()
{
const
{
facilities
,
facility
,
classes
,
isMapOpen
}
=
this
.
props
;
const
{
facilities
,
facility
,
classes
}
=
this
.
props
;
const
{
fitBounds
,
maxBounds
,
fitBoundsOptions
,
mapDialogOpen
}
=
this
.
state
;
let
center
,
zoom
;
...
...
@@ -67,10 +67,7 @@ class FacilitiesMap extends React.Component {
}
return
(
<
div
className
=
{
classes
.
mapContainer
}
style
=
{{
transform
:
isMapOpen
?
'
translateY(0px)
'
:
'
translateY(436px)
'
}}
>
<
div
className
=
{
classes
.
mapContainer
}
>
<
Map
animationOptions
=
{{
animate
:
false
...
...
src/components/Sidebar.js
View file @
ba93033c
...
...
@@ -10,7 +10,7 @@ import WeekHours from './WeekHours';
import
FacilityTags
from
'
./FacilityTags
'
;
import
{
removeBrackets
}
from
'
../utils/nameUtils
'
;
const
Sidebar
=
({
facility
,
isSidebarOpen
,
isSidebarMapOpen
,
facilities
})
=>
{
const
Sidebar
=
({
facility
,
isSidebarOpen
,
facilities
})
=>
{
return
(
<
div
className
=
{
classNames
([
'
card-container-offset
'
,
(
isSidebarOpen
&&
'
card-container-offset-open
'
),
(
!
isSidebarOpen
&&
'
card-container-offset-closed
'
)])}
>
...
...
@@ -34,7 +34,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, facilities}) => {
<
/div
>
<
/div
>
<
div
className
=
{
'
sidebar-row2
'
}
>
<
FacilitiesMap
isMapOpen
=
{
isSidebarMapOpen
}
facilities
=
{
facilities
}
facility
=
{
facility
}
/
>
<
FacilitiesMap
facilities
=
{
facilities
}
facility
=
{
facility
}
/
>
<
/div
>
<
/Paper
>
<
/div
>
...
...
src/containers/Layout.js
View file @
ba93033c
...
...
@@ -37,7 +37,7 @@ class Layout extends React.Component {
};
render
()
{
const
{
isSidebarOpen
,
isSidebarMapOpen
,
selectedFacility
,
facilities
,
searchTerm
,
campusRegion
}
=
this
.
props
;
const
{
isSidebarOpen
,
selectedFacility
,
facilities
,
searchTerm
,
campusRegion
}
=
this
.
props
;
return
(
<
div
className
=
{
'
layout-root
'
}
>
...
...
@@ -50,8 +50,7 @@ class Layout extends React.Component {
<
/div
>
<
/div
>
<
Sidebar
facilities
=
{
facilities
}
facility
=
{
selectedFacility
}
isSidebarOpen
=
{
isSidebarOpen
}
isSidebarMapOpen
=
{
isSidebarMapOpen
}
/
>
<
Sidebar
facilities
=
{
facilities
}
facility
=
{
selectedFacility
}
isSidebarOpen
=
{
isSidebarOpen
}
/
>
<
/div
>
<
/div
>
);
...
...
@@ -66,8 +65,7 @@ function mapStateToProps(state) {
campusRegion
:
state
.
ui
.
search
.
campusRegion
,
isLoading
:
state
.
facilities
.
isLoading
,
selectedFacility
:
state
.
ui
.
selectedFacility
,
isSidebarOpen
:
state
.
ui
.
sidebar
.
isOpen
,
isSidebarMapOpen
:
state
.
ui
.
sidebar
.
isMapOpen
isSidebarOpen
:
state
.
ui
.
sidebar
.
isOpen
};
}
...
...
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