feat(merge): resolve merge conflicts

EditVR · Jun 11, 2018 · 90e7652 · 90e7652
2 parents 634eba7 + e643804
commit 90e7652
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
     "@material-ui/core": "^1.0.0",
     "@material-ui/icons": "^1.1.0",
     "axios": "^0.18.0",
+    "classnames": "^2.2.6",
     "jsona": "^1.1.10",
     "prop-types": "^15.6.1",
     "qs": "^6.5.2",

diff --git a/src/components/SceneCards/SceneCards.js b/src/components/SceneCards/SceneCards.js
@@ -6,6 +6,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 import {
   withStyles,
@@ -38,7 +39,13 @@ const SceneCards = ({
           field_slug: slug,
           field_photosphere: photosphere
         }) => (
-          <Card key={id} raised={sceneSlug === slug} className={classes.card}>
+          <Card
+            key={id}
+            raised={sceneSlug === slug}
+            className={classNames(classes.card, {
+              [classes.cardActive]: sceneSlug === slug
+            })}
+          >
             {photosphere &&
               photosphere.meta.derivatives && (
                 <CardMedia

diff --git a/src/components/SceneCards/SceneCards.style.js b/src/components/SceneCards/SceneCards.style.js
@@ -7,6 +7,10 @@ export default theme => ({
   card: {
     marginTop: theme.spacing.unit * 2
   },
+  cardActive: {
+    border: '1px solid',
+    borderColor: theme.palette.secondary.dark
+  },
   cardActionButton: {
     marginRight: theme.spacing.unit
   },

diff --git a/src/components/SceneCards/__snapshots__/SceneCards.test.js.snap b/src/components/SceneCards/__snapshots__/SceneCards.test.js.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<SceneCards /> Matches its snapshot 1`] = `"<div><div class=\\"MuiPaper-root-5 MuiPaper-elevation8-15 MuiPaper-rounded-6 MuiCard-root-4 SceneCards-card-1\\"><div class=\\"MuiCardMedia-root-32 SceneCards-cardMedia-3\\" style=\\"background-image: url(https://image.path);\\" title=\\"test\\"></div><div class=\\"MuiCardContent-root-34\\"><h1 class=\\"MuiTypography-root-35 MuiTypography-headline-40 MuiTypography-gutterBottom-52\\">test</h1><p class=\\"MuiTypography-root-35 MuiTypography-body1-44\\">This scene does not yet have a description.</p></div><div class=\\"MuiCardActions-root-59\\"><a tabindex=\\"-1\\" class=\\"MuiButtonBase-root-85 MuiButtonBase-disabled-86 MuiButton-root-69 MuiButton-outlined-73 MuiButton-sizeSmall-82 MuiButton-disabled-79 SceneCards-cardActionButton-2\\" role=\\"button\\" href=\\"/experience/vreditor/test/test\\"><span class=\\"MuiButton-label-70\\"><svg class=\\"MuiSvgIcon-root-88\\" focusable=\\"false\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\"><g><path d=\\"M19 4H5c-1.11 0-2 .9-2 2v12c0 1.1.89 2 2 2h4v-2H5V8h14v10h-4v2h4c1.1 0 2-.9 2-2V6c0-1.1-.89-2-2-2zm-7 6l-4 4h3v6h2v-6h3l-4-4z\\"></path></g></svg></span></a></div></div></div>"`;
+exports[`<SceneCards /> Matches its snapshot 1`] = `"<div><div class=\\"MuiPaper-root-6 MuiPaper-elevation8-16 MuiPaper-rounded-7 MuiCard-root-5 SceneCards-card-1 SceneCards-cardActive-2\\"><div class=\\"MuiCardMedia-root-33 SceneCards-cardMedia-4\\" style=\\"background-image: url(https://image.path);\\" title=\\"test\\"></div><div class=\\"MuiCardContent-root-35\\"><h1 class=\\"MuiTypography-root-36 MuiTypography-headline-41 MuiTypography-gutterBottom-53\\">test</h1><p class=\\"MuiTypography-root-36 MuiTypography-body1-45\\">This scene does not yet have a description.</p></div><div class=\\"MuiCardActions-root-60\\"><a tabindex=\\"-1\\" class=\\"MuiButtonBase-root-86 MuiButtonBase-disabled-87 MuiButton-root-70 MuiButton-outlined-74 MuiButton-sizeSmall-83 MuiButton-disabled-80 SceneCards-cardActionButton-3\\" role=\\"button\\" href=\\"/experience/vreditor/test/test\\"><span class=\\"MuiButton-label-71\\"><svg class=\\"MuiSvgIcon-root-89\\" focusable=\\"false\\" viewBox=\\"0 0 24 24\\" aria-hidden=\\"true\\"><g><path d=\\"M19 4H5c-1.11 0-2 .9-2 2v12c0 1.1.89 2 2 2h4v-2H5V8h14v10h-4v2h4c1.1 0 2-.9 2-2V6c0-1.1-.89-2-2-2zm-7 6l-4 4h3v6h2v-6h3l-4-4z\\"></path></g></svg></span></a></div></div></div>"`;
diff --git a/yarn.lock b/yarn.lock
@@ -1939,6 +1939,10 @@ classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
+classnames@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
+
 clean-css@4.1.x:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"