auth for game edit

johngibbons · Feb 27, 2016 · 9d00618 · 9d00618
1 parent f4c2ad6
commit 9d00618
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 11 deletions.
diff --git a/build/bundle.js b/build/bundle.js
diff --git a/sass/components/answer.scss b/sass/components/answer.scss
@@ -17,6 +17,8 @@
   font-weight: 300;
   color: $gray-light;
   padding: 0.5rem 1.25rem;
+  background-color: white;
+  transition: $base-transition;
 
   .right-centered {
     position: absolute;
@@ -38,12 +40,17 @@
     width: calc(100% - 1em);
   }
 
-  &.selected, &:focus, &:visited {
+  &.selected, &:focus {
     color: $brand-primary;
     background-color: lighten($brand-primary, 40%);
     border-radius: 0;
   }
 
+  &a:hover {
+    background-color: $gray-lightest;
+    color: $gray-dark;
+  }
+
   &.selected {
     font-weight: 500;
     font-size: 1rem;;

diff --git a/sass/main.scss b/sass/main.scss
@@ -107,3 +107,17 @@ a {
 .is-clickable {
   cursor: pointer;
 }
+
+.navbar-light .navbar-brand {
+  font-weight: 300;
+  text-transform: uppercase;
+  letter-spacing: 0.1rem;
+  color: $gray-light;
+  transition: $base-transition;
+}
+
+.action-link {
+  text-transform: uppercase;
+  font-weight: 500;
+  font-size: 0.8rem;
+}
diff --git a/src/components/Game.js b/src/components/Game.js
@@ -67,10 +67,9 @@ const Game = (props) => {
             active={props.context === 'show'}
             url={`/games/${props.id}`}
           >Leaderboard</NavLink>
-        {!Object.keys(props.currentUserEntry).length &&
-          !props.hasGameStarted &&
+        {!props.hasGameStarted && !props.isOwner &&
           <NavLink
-            active={props.contex === 'preview'}
+            active={props.context === 'preview'}
             url={`/games/${props.id}/preview`}
           >Game Preview</NavLink>}
         {props.isOwner &&

diff --git a/src/components/GameEdit.js b/src/components/GameEdit.js
@@ -22,6 +22,7 @@ const GameEdit = ({
 }) => {
 
   return(
+    isOwner ?
     <div className='container game-edit'>
       <QuestionList
         questions={questions}
@@ -35,6 +36,8 @@ const GameEdit = ({
         isEditable={isOwner}
       />
     </div>
+      :
+    window.location = '/'
 );};
 
 GameEdit.defaultProps = {

diff --git a/src/components/GameRun.js b/src/components/GameRun.js
@@ -8,10 +8,10 @@ const GameRun = ({
   questions,
   answersById,
   onSelectAnswer,
-  admin
+  isOwner
 }) => {
   return (
-    currentUser && currentUser.id === admin ?
+    isOwner ?
     <div>
       <div className='container game-run'>
         <QuestionList questions={questions}

diff --git a/src/components/NewestGames.js b/src/components/NewestGames.js
@@ -37,7 +37,11 @@ const NewestGames = ({games, onCloneGame, onClickGame}) => {
                 {game.questions ? game.questions.length : 0}
               </div>
               <div className='table-cell'>
-                <a href='#' onClick={() => onCloneGame(game)}>clone this game</a>
+                <a
+                  href='#'
+                  className='action-link'
+                  onClick={() => onCloneGame(game)}
+                >clone this game</a>
               </div>
             </div>
           </div>

diff --git a/src/components/SmRemoveBtn.js b/src/components/SmRemoveBtn.js
@@ -4,7 +4,7 @@ import Icon from './Icon';
 const SmRemoveBtn = ({id, handleRemove}) => {
   return (
     <span
-      className='remove'
+      className='remove action-link'
       onClick={() => handleRemove(id)}
     >
       delete