fix googles data structure errors

Aturberv · Feb 2, 2017 · ee05b99 · ee05b99
1 parent 6962dda
commit ee05b99
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/BreweryPageMeta/BreweryPageMeta.js b/src/BreweryPageMeta/BreweryPageMeta.js
@@ -25,11 +25,7 @@ const BreweryPageMeta = (
           {
             brewery.brewInfo.hours && brewery.brewInfo.hours.map && 
             brewery.brewInfo.hours.map((day) =>
-              <div itemProp="openingHoursSpecification" itemType="http://schema.org/OpeningHoursSpecification" key={day.open.day}>
-                  <link itemProp="dayOfWeek" href={`http://schema.org/${config.days[day.open.day]}`} /> 
-                  <meta itemProp="opens" content={day.open.time} />
-                  <meta itemProp="closes" content={day.close.time} />
-              </div>
+                <meta itemProp="openingHours" content={`${config.days[day.open.day].slice(0, 2)} ${day.open.time}-${day.close.time}`} />
             )
           }
 
@@ -38,7 +34,10 @@ const BreweryPageMeta = (
           <meta itemProp="url" content={currentUrl} />
           <meta itemProp="logo" content={brewery.breweryLogo} />
           <meta itemProp="description" content={brewery.breweryDescription} />
-          <meta itemProp="image" content={brewery.images} />
+          { 
+            brewery.photos.length > 0 &&
+              <meta itemProp="image" content={brewery.photos[0]} />
+          }
           <div itemProp="geo" itemScope itemType="http://schema.org/GeoCoordinates">
               <meta itemProp="latitude" content={brewery.location.lat} />
               <meta itemProp="longitude" content={brewery.location.lng} />

diff --git a/src/Header/Header.js b/src/Header/Header.js
@@ -50,7 +50,6 @@ class Header extends Component {
         this.props.ratingFilter(rating);
     }
 
-
     uniqueBeerTypes(breweries) {
         return Object.keys(breweries).reduce((result, key) => {
             return [...new Set(result.concat(breweries[key].beerTypes))];
@@ -64,7 +63,6 @@ class Header extends Component {
     }
 
 
-
     render() {
         const { breweries, breweryKey, allCities, city, router } = this.props;
         return (
@@ -81,7 +79,7 @@ class Header extends Component {
                                                 state: { breweryKey: null}
                                             }}>
                                                 <Icon type="left"/> Map
-                                            </Link>
+                                            </Link> 
                                         )
                                     :
                                         `${allCities[city].name} Breweries`
@@ -90,6 +88,12 @@ class Header extends Component {
                             <Navbar.Toggle/>
                         </Navbar.Header>
                     </Col>
+                    {
+                        breweryKey ?
+                            (
+                                <div />
+                            )
+                        :
                 <Navbar.Collapse>
                     <Col xs={12} sm={2}>
                         <div className="nav-element">
@@ -155,6 +159,7 @@ class Header extends Component {
                         </div>
                     </Col>
                 </Navbar.Collapse>
+            }
                 </Row>
             </Navbar>
         );