{"action":"created","comment":{"url":"https://api.github.com/repos/jakepeyser/steps/pulls/comments/90167464","pull_request_review_id":10690066,"id":90167464,"diff_hunk":"@@ -1,52 +1,80 @@\n import React from 'react';\n import { Link } from 'react-router'\n-import { SvgIcon } from 'material-ui';\n+\n+// style imports\n import { StepsActionButton } from '../material-style'\n import FontIcon from 'material-ui/FontIcon'\n+import InfoItem from '../widgets/InfoItem'\n+import { textLight } from '../colors'\n+\n+// other libs\n import { getCompletedWorkout, formatTime } from '../../utils'\n import moment from 'moment';\n \n export default ({ treatment, workoutFn, num }) => {\n   const completedWorkout = getCompletedWorkout(treatment.workouts);\n \n   return (\n-    <div className={`row workout ${completedWorkout ? 'completed' : ''}`}>\n-      <div className=\"workout-index\">#{num}</div>\n-      <img className=\"col-xs-3 workout-pic\" src={treatment.exercise.img_url} />\n-      <div className=\"col-xs-3 workout-info\">\n-        <h2>\n-          <Link to={`/plan/treatments/${treatment.id}`}>\n-            {treatment.exercise.title}\n-          </Link>\n-        </h2>\n-        <div className=\"workout-nums\">\n-          <p><span>Sets</span>{`: ${treatment.sets}`}</p>\n-          <p><span>Reps</span>{`: ${treatment.reps}`}</p>\n+    <div className={`workout ${completedWorkout ? 'completed' : ''}`}>\n+      <div className=\"workout-notes\">\n+        {\n+          // Show either treatment notes or workout comments (if completed)\n+          !completedWorkout ?\n+            <div>\n+              <InfoItem icon=\"description\" label=\"Description\" iconColor={ textLight }\n+                content={ treatment.exercise.description } />\n+              <InfoItem icon=\"speaker_notes\" label=\"Notes\" iconColor={ textLight }\n+                content={ treatment.notes ? treatment.notes : 'No notes specified' } />\n+            </div>\n+            : completedWorkout.comments ?\n+            <InfoItem icon=\"speaker_notes\" label=\"Comments\" iconColor={ textLight }\n+              content={ completedWorkout.comments } /> : null\n+        }\n+      </div>\n+      <div className=\"workout-banner\">\n+        <div className=\"workout-info\">\n+          <h2>\n+            <Link to={`/plan/treatments/${treatment.id}`}>\n+              {treatment.exercise.title}\n+            </Link>\n+          </h2>\n+          <div>\n+            <InfoItem icon=\"all_inclusive\" label=\"Sets\" iconColor={ textLight }\n+              content={ treatment.sets } />\n+            <InfoItem icon=\"layers\" label=\"Reps\" iconColor={ textLight }\n+              content={ treatment.reps } />\n+          </div>\n+          <div className=\"bonus-info\">\n+            <InfoItem icon=\"alarm\" label=\"Time\" iconColor={ textLight }\n+              content={ formatTime(treatment.time_per_exercise) } />\n+            <InfoItem icon=\"fitness_center\" label=\"Resistance\" iconColor={ textLight }\n+              content={ treatment.resistance } />\n+          </div>\n+        </div>\n+        <div className=\"workout-button\">\n+        {\n+          completedWorkout ?\n+            <StepsActionButton disabled={true}>\n+              {\n+                completedWorkout.pain ?\n+                  <img src={require(`../../../src/images/emojis/${completedWorkout.pain}pain.svg`)} /> :\n+                  <FontIcon className={'material-icons'}>check</FontIcon>\n+              }\n+            </StepsActionButton> :\n+            <Link to={`/plan/treatments/${treatment.id}/workout`}>\n+              <StepsActionButton>\n+                <FontIcon className={'material-icons'}>schedule</FontIcon>\n+              </StepsActionButton>\n+            </Link>\n+        }\n         </div>\n-        <p><span>Time</span>{`: ${formatTime(treatment.time_per_exercise)}`}</p>\n-        <p><span>Resistance</span>{`: ${treatment.resistance}`}</p>\n       </div>\n-      <p className=\"col-xs-4\">\n-        <span>Notes</span>\n-        {`: ${treatment.notes ? treatment.notes : 'No notes specified'}`}\n-      </p>\n-      <div className=\"col-xs-2 workout-button\">\n-      {\n-        completedWorkout ?\n-          <StepsActionButton disabled={true}>\n-            {/* TODO: Currently defaulting to pain level 3 when no input -> need real default */}\n-            {\n-              completedWorkout.pain ?\n-                <img src={require(`../../../src/images/emojis/${completedWorkout.pain}pain.svg`)} /> :\n-                <FontIcon className={'material-icons'}>check</FontIcon>\n-            }\n-          </StepsActionButton> :\n-          <Link to={`/plan/treatments/${treatment.id}/workout`}>\n-            <StepsActionButton>\n-              <FontIcon className={'material-icons'}>schedule</FontIcon>\n-            </StepsActionButton>\n-          </Link>\n-      }\n+      <div className=\"workout-index\">#{num}</div>\n+      <div className=\"workout-pic-wrapper\">\n+        <img\n+          className=\"workout-pic\"","path":"app/components/plan/Workout.js","position":111,"original_position":111,"commit_id":"9b55aaab37561c78e28ab15ba107e3ebeb38aa32","original_commit_id":"9b55aaab37561c78e28ab15ba107e3ebeb38aa32","user":{"login":"jakepeyser","id":1534503,"avatar_url":"https://avatars.githubusercontent.com/u/1534503?v=3","gravatar_id":"","url":"https://api.github.com/users/jakepeyser","html_url":"https://github.com/jakepeyser","followers_url":"https://api.github.com/users/jakepeyser/followers","following_url":"https://api.github.com/users/jakepeyser/following{/other_user}","gists_url":"https://api.github.com/users/jakepeyser/gists{/gist_id}","starred_url":"https://api.github.com/users/jakepeyser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakepeyser/subscriptions","organizations_url":"https://api.github.com/users/jakepeyser/orgs","repos_url":"https://api.github.com/users/jakepeyser/repos","events_url":"https://api.github.com/users/jakepeyser/events{/privacy}","received_events_url":"https://api.github.com/users/jakepeyser/received_events","type":"User","site_admin":false},"body":"Just tried using `img-responsive` here and it doesn't actually make a difference bc Im already adjusting min/max height. I agree something does need to be done about the various image sizes here, but we can figure that out later this week","created_at":"2016-11-30T04:36:01Z","updated_at":"2016-11-30T04:36:01Z","html_url":"https://github.com/jakepeyser/steps/pull/182#discussion_r90167464","pull_request_url":"https://api.github.com/repos/jakepeyser/steps/pulls/182","_links":{"self":{"href":"https://api.github.com/repos/jakepeyser/steps/pulls/comments/90167464"},"html":{"href":"https://github.com/jakepeyser/steps/pull/182#discussion_r90167464"},"pull_request":{"href":"https://api.github.com/repos/jakepeyser/steps/pulls/182"}}},"pull_request":{"url":"https://api.github.com/repos/jakepeyser/steps/pulls/182","id":95792708,"html_url":"https://github.com/jakepeyser/steps/pull/182","diff_url":"https://github.com/jakepeyser/steps/pull/182.diff","patch_url":"https://github.com/jakepeyser/steps/pull/182.patch","issue_url":"https://api.github.com/repos/jakepeyser/steps/issues/182","number":182,"state":"open","locked":false,"title":"Patient plan redesign and modularization","user":{"login":"jakepeyser","id":1534503,"avatar_url":"https://avatars.githubusercontent.com/u/1534503?v=3","gravatar_id":"","url":"https://api.github.com/users/jakepeyser","html_url":"https://github.com/jakepeyser","followers_url":"https://api.github.com/users/jakepeyser/followers","following_url":"https://api.github.com/users/jakepeyser/following{/other_user}","gists_url":"https://api.github.com/users/jakepeyser/gists{/gist_id}","starred_url":"https://api.github.com/users/jakepeyser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakepeyser/subscriptions","organizations_url":"https://api.github.com/users/jakepeyser/orgs","repos_url":"https://api.github.com/users/jakepeyser/repos","events_url":"https://api.github.com/users/jakepeyser/events{/privacy}","received_events_url":"https://api.github.com/users/jakepeyser/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-11-29T22:50:57Z","updated_at":"2016-11-30T04:36:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"401fa611057fda6c59696f1ffe5a121a1da0d124","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/jakepeyser/steps/pulls/182/commits","review_comments_url":"https://api.github.com/repos/jakepeyser/steps/pulls/182/comments","review_comment_url":"https://api.github.com/repos/jakepeyser/steps/pulls/comments{/number}","comments_url":"https://api.github.com/repos/jakepeyser/steps/issues/182/comments","statuses_url":"https://api.github.com/repos/jakepeyser/steps/statuses/9b55aaab37561c78e28ab15ba107e3ebeb38aa32","head":{"label":"jakepeyser:patient_plan_redesign","ref":"patient_plan_redesign","sha":"9b55aaab37561c78e28ab15ba107e3ebeb38aa32","user":{"login":"jakepeyser","id":1534503,"avatar_url":"https://avatars.githubusercontent.com/u/1534503?v=3","gravatar_id":"","url":"https://api.github.com/users/jakepeyser","html_url":"https://github.com/jakepeyser","followers_url":"https://api.github.com/users/jakepeyser/followers","following_url":"https://api.github.com/users/jakepeyser/following{/other_user}","gists_url":"https://api.github.com/users/jakepeyser/gists{/gist_id}","starred_url":"https://api.github.com/users/jakepeyser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakepeyser/subscriptions","organizations_url":"https://api.github.com/users/jakepeyser/orgs","repos_url":"https://api.github.com/users/jakepeyser/repos","events_url":"https://api.github.com/users/jakepeyser/events{/privacy}","received_events_url":"https://api.github.com/users/jakepeyser/received_events","type":"User","site_admin":false},"repo":{"id":73941955,"name":"steps","full_name":"jakepeyser/steps","owner":{"login":"jakepeyser","id":1534503,"avatar_url":"https://avatars.githubusercontent.com/u/1534503?v=3","gravatar_id":"","url":"https://api.github.com/users/jakepeyser","html_url":"https://github.com/jakepeyser","followers_url":"https://api.github.com/users/jakepeyser/followers","following_url":"https://api.github.com/users/jakepeyser/following{/other_user}","gists_url":"https://api.github.com/users/jakepeyser/gists{/gist_id}","starred_url":"https://api.github.com/users/jakepeyser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakepeyser/subscriptions","organizations_url":"https://api.github.com/users/jakepeyser/orgs","repos_url":"https://api.github.com/users/jakepeyser/repos","events_url":"https://api.github.com/users/jakepeyser/events{/privacy}","received_events_url":"https://api.github.com/users/jakepeyser/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jakepeyser/steps","description":null,"fork":false,"url":"https://api.github.com/repos/jakepeyser/steps","forks_url":"https://api.github.com/repos/jakepeyser/steps/forks","keys_url":"https://api.github.com/repos/jakepeyser/steps/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jakepeyser/steps/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jakepeyser/steps/teams","hooks_url":"https://api.github.com/repos/jakepeyser/steps/hooks","issue_events_url":"https://api.github.com/repos/jakepeyser/steps/issues/events{/number}","events_url":"https://api.github.com/repos/jakepeyser/steps/events","assignees_url":"https://api.github.com/repos/jakepeyser/steps/assignees{/user}","branches_url":"https://api.github.com/repos/jakepeyser/steps/branches{/branch}","tags_url":"https://api.github.com/repos/jakepeyser/steps/tags","blobs_url":"https://api.github.com/repos/jakepeyser/steps/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jakepeyser/steps/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jakepeyser/steps/git/refs{/sha}","trees_url":"https://api.github.com/repos/jakepeyser/steps/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jakepeyser/steps/statuses/{sha}","languages_url":"https://api.github.com/repos/jakepeyser/steps/languages","stargazers_url":"https://api.github.com/repos/jakepeyser/steps/stargazers","contributors_url":"https://api.github.com/repos/jakepeyser/steps/contributors","subscribers_url":"https://api.github.com/repos/jakepeyser/steps/subscribers","subscription_url":"https://api.github.com/repos/jakepeyser/steps/subscription","commits_url":"https://api.github.com/repos/jakepeyser/steps/commits{/sha}","git_commits_url":"https://api.github.com/repos/jakepeyser/steps/git/commits{/sha}","comments_url":"https://api.github.com/repos/jakepeyser/steps/comments{/number}","issue_comment_url":"https://api.github.com/repos/jakepeyser/steps/issues/comments{/number}","contents_url":"https://api.github.com/repos/jakepeyser/steps/contents/{+path}","compare_url":"https://api.github.com/repos/jakepeyser/steps/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jakepeyser/steps/merges","archive_url":"https://api.github.com/repos/jakepeyser/steps/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jakepeyser/steps/downloads","issues_url":"https://api.github.com/repos/jakepeyser/steps/issues{/number}","pulls_url":"https://api.github.com/repos/jakepeyser/steps/pulls{/number}","milestones_url":"https://api.github.com/repos/jakepeyser/steps/milestones{/number}","notifications_url":"https://api.github.com/repos/jakepeyser/steps/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jakepeyser/steps/labels{/name}","releases_url":"https://api.github.com/repos/jakepeyser/steps/releases{/id}","deployments_url":"https://api.github.com/repos/jakepeyser/steps/deployments","created_at":"2016-11-16T17:03:55Z","updated_at":"2016-11-20T03:48:19Z","pushed_at":"2016-11-30T03:08:06Z","git_url":"git://github.com/jakepeyser/steps.git","ssh_url":"git@github.com:jakepeyser/steps.git","clone_url":"https://github.com/jakepeyser/steps.git","svn_url":"https://github.com/jakepeyser/steps","homepage":null,"size":39100,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":36,"forks":1,"open_issues":36,"watchers":0,"default_branch":"master"}},"base":{"label":"jakepeyser:master","ref":"master","sha":"ba2b9f61e05379f2d23438e6ded179e69c7510e6","user":{"login":"jakepeyser","id":1534503,"avatar_url":"https://avatars.githubusercontent.com/u/1534503?v=3","gravatar_id":"","url":"https://api.github.com/users/jakepeyser","html_url":"https://github.com/jakepeyser","followers_url":"https://api.github.com/users/jakepeyser/followers","following_url":"https://api.github.com/users/jakepeyser/following{/other_user}","gists_url":"https://api.github.com/users/jakepeyser/gists{/gist_id}","starred_url":"https://api.github.com/users/jakepeyser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakepeyser/subscriptions","organizations_url":"https://api.github.com/users/jakepeyser/orgs","repos_url":"https://api.github.com/users/jakepeyser/repos","events_url":"https://api.github.com/users/jakepeyser/events{/privacy}","received_events_url":"https://api.github.com/users/jakepeyser/received_events","type":"User","site_admin":false},"repo":{"id":73941955,"name":"steps","full_name":"jakepeyser/steps","owner":{"login":"jakepeyser","id":1534503,"avatar_url":"https://avatars.githubusercontent.com/u/1534503?v=3","gravatar_id":"","url":"https://api.github.com/users/jakepeyser","html_url":"https://github.com/jakepeyser","followers_url":"https://api.github.com/users/jakepeyser/followers","following_url":"https://api.github.com/users/jakepeyser/following{/other_user}","gists_url":"https://api.github.com/users/jakepeyser/gists{/gist_id}","starred_url":"https://api.github.com/users/jakepeyser/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jakepeyser/subscriptions","organizations_url":"https://api.github.com/users/jakepeyser/orgs","repos_url":"https://api.github.com/users/jakepeyser/repos","events_url":"https://api.github.com/users/jakepeyser/events{/privacy}","received_events_url":"https://api.github.com/users/jakepeyser/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jakepeyser/steps","description":null,"fork":false,"url":"https://api.github.com/repos/jakepeyser/steps","forks_url":"https://api.github.com/repos/jakepeyser/steps/forks","keys_url":"https://api.github.com/repos/jakepeyser/steps/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jakepeyser/steps/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jakepeyser/steps/teams","hooks_url":"https://api.github.com/repos/jakepeyser/steps/hooks","issue_events_url":"https://api.github.com/repos/jakepeyser/steps/issues/events{/number}","events_url":"https://api.github.com/repos/jakepeyser/steps/events","assignees_url":"https://api.github.com/repos/jakepeyser/steps/assignees{/user}","branches_url":"https://api.github.com/repos/jakepeyser/steps/branches{/branch}","tags_url":"https://api.github.com/repos/jakepeyser/steps/tags","blobs_url":"https://api.github.com/repos/jakepeyser/steps/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jakepeyser/steps/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jakepeyser/steps/git/refs{/sha}","trees_url":"https://api.github.com/repos/jakepeyser/steps/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jakepeyser/steps/statuses/{sha}","languages_url":"https://api.github.com/repos/jakepeyser/steps/languages","stargazers_url":"https://api.github.com/repos/jakepeyser/steps/stargazers","contributors_url":"https://api.github.com/repos/jakepeyser/steps/contributors","subscribers_url":"https://api.github.com/repos/jakepeyser/steps/subscribers","subscription_url":"https://api.github.com/repos/jakepeyser/steps/subscription","commits_url":"https://api.github.com/repos/jakepeyser/steps/commits{/sha}","git_commits_url":"https://api.github.com/repos/jakepeyser/steps/git/commits{/sha}","comments_url":"https://api.github.com/repos/jakepeyser/steps/comments{/number}","issue_comment_url":"https://api.github.com/repos/jakepeyser/steps/issues/comments{/number}","contents_url":"https://api.github.com/repos/jakepeyser/steps/contents/{+path}","compare_url":"https://api.github.com/repos/jakepeyser/steps/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jakepeyser/steps/merges","archive_url":"https://api.github.com/repos/jakepeyser/steps/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jakepeyser/steps/downloads","issues_url":"https://api.github.com/repos/jakepeyser/steps/issues{/number}","pulls_url":"https://api.github.com/repos/jakepeyser/steps/pulls{/number}","milestones_url":"https://api.github.com/repos/jakepeyser/steps/milestones{/number}","notifications_url":"https://api.github.com/repos/jakepeyser/steps/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jakepeyser/steps/labels{/name}","releases_url":"https://api.github.com/repos/jakepeyser/steps/releases{/id}","deployments_url":"https://api.github.com/repos/jakepeyser/steps/deployments","created_at":"2016-11-16T17:03:55Z","updated_at":"2016-11-20T03:48:19Z","pushed_at":"2016-11-30T03:08:06Z","git_url":"git://github.com/jakepeyser/steps.git","ssh_url":"git@github.com:jakepeyser/steps.git","clone_url":"https://github.com/jakepeyser/steps.git","svn_url":"https://github.com/jakepeyser/steps","homepage":null,"size":39100,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":36,"forks":1,"open_issues":36,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/jakepeyser/steps/pulls/182"},"html":{"href":"https://github.com/jakepeyser/steps/pull/182"},"issue":{"href":"https://api.github.com/repos/jakepeyser/steps/issues/182"},"comments":{"href":"https://api.github.com/repos/jakepeyser/steps/issues/182/comments"},"review_comments":{"href":"https://api.github.com/repos/jakepeyser/steps/pulls/182/comments"},"review_comment":{"href":"https://api.github.com/repos/jakepeyser/steps/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/jakepeyser/steps/pulls/182/commits"},"statuses":{"href":"https://api.github.com/repos/jakepeyser/steps/statuses/9b55aaab37561c78e28ab15ba107e3ebeb38aa32"}}}}
{"actor":{"display_login":"jakepeyser"}}