From 1a0d085e208840fceff04e49113f61e385eefb5f Mon Sep 17 00:00:00 2001
From: Terry Acker <ackernaut@gmail.com>
Date: Wed, 24 Aug 2016 15:55:33 -0400
Subject: [PATCH 1/8] Rally Time What!

---
 .../components/UserDashboard/UserDashboard.js |   4 +-
 .../userDashboard/helpers/easterEggLink.js    |  38 ----
 .../userDashboard/helpers/getRallyLink.js     | 162 ++++++++++++++++++
 3 files changed, 164 insertions(+), 40 deletions(-)
 delete mode 100644 src/universal/modules/userDashboard/helpers/easterEggLink.js
 create mode 100644 src/universal/modules/userDashboard/helpers/getRallyLink.js

diff --git a/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js b/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js
index fe75f33b807..153bb6e2731 100644
--- a/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js
+++ b/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js
@@ -9,7 +9,7 @@ import {
 import look, {StyleSheet} from 'react-look';
 import UserActions from 'universal/modules/userDashboard/components/UserActions/UserActions';
 import UserColumnsContainer from 'universal/modules/userDashboard/containers/UserColumns/UserColumnsContainer';
-import easterEggLink from '../../helpers/easterEggLink';
+import getRallyLink from '../../helpers/getRallyLink';
 
 const UserDashboard = () => {
   const {styles} = UserDashboard;
@@ -17,7 +17,7 @@ const UserDashboard = () => {
     <DashMain>
       <DashHeader>
         <DashHeaderInfo title="My Dashboard">
-          {dashTimestamp} • {easterEggLink()}
+          {dashTimestamp} • {getRallyLink()}
         </DashHeaderInfo>
       </DashHeader>
       <DashContent>
diff --git a/src/universal/modules/userDashboard/helpers/easterEggLink.js b/src/universal/modules/userDashboard/helpers/easterEggLink.js
deleted file mode 100644
index c550a8aa842..00000000000
--- a/src/universal/modules/userDashboard/helpers/easterEggLink.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import theme from 'universal/styles/theme';
-
-const eggs = [
-  {
-    phrase: 'Carpe Diem',
-    link: 'https://youtu.be/veYR3ZC9wMQ'
-  },
-  {
-    phrase: 'Keep Moving Forward',
-    link: 'https://youtu.be/5HksV7ZFuhM'
-  },
-  {
-    phrase: 'Discombobulate',
-    link: 'https://youtu.be/UxfauhR7niY'
-  }
-];
-
-const egg = eggs[Math.floor(Math.random() * eggs.length)];
-
-const eggPhrase = `${egg.phrase}!`;
-
-const style = {
-  color: theme.palette.dark70l
-};
-
-export default function easterEggLink(hasStyle = true) {
-  return (
-    <a
-      href={egg.link}
-      style={hasStyle ? style : null}
-      target="_blank"
-      title={eggPhrase}
-    >
-      {eggPhrase}
-    </a>
-  );
-}
diff --git a/src/universal/modules/userDashboard/helpers/getRallyLink.js b/src/universal/modules/userDashboard/helpers/getRallyLink.js
new file mode 100644
index 00000000000..49d1404f5a9
--- /dev/null
+++ b/src/universal/modules/userDashboard/helpers/getRallyLink.js
@@ -0,0 +1,162 @@
+import React from 'react';
+import theme from 'universal/styles/theme';
+
+const rallyList = [
+  {
+    phrase: 'Carpe Diem',
+    link: 'https://youtu.be/veYR3ZC9wMQ'
+  },
+  {
+    phrase: 'Keep Moving Forward',
+    link: 'https://youtu.be/5HksV7ZFuhM'
+  },
+  {
+    phrase: 'Discombobulate',
+    link: 'https://youtu.be/UxfauhR7niY'
+  },
+  {
+    phrase: 'Be Happy',
+    link: 'https://youtu.be/d-diB65scQU'
+  },
+  {
+    phrase: 'Bring Your Friends',
+    link: 'https://youtu.be/hTWKbfoikeg'
+  },
+  {
+    phrase: 'The Best Times',
+    link: 'https://youtu.be/2H5uWRjFsGc'
+  },
+  {
+    phrase: 'Can’t Touch This',
+    link: 'https://youtu.be/ck6i3HtktaY'
+  },
+  {
+    phrase: 'C’mere! Get Free',
+    link: 'https://youtu.be/asOvnGHwtDU'
+  },
+  {
+    phrase: 'Don’t Stop Believin’',
+    link: 'https://youtu.be/Pw3GTTYgEV8'
+  },
+  {
+    phrase: 'Gimme Some New',
+    link: 'https://youtu.be/FPoKiGQzbSQ'
+  },
+  {
+    phrase: 'Go! Go! Go! Go',
+    link: 'https://youtu.be/8PaoLy7PHwk'
+  },
+  {
+    phrase: 'Hammertime',
+    link: 'https://youtu.be/VrqdbBZqT7U'
+  },
+  {
+    phrase: 'Harder, Better, Faster',
+    link: 'https://youtu.be/gAjR4_CbPpQ'
+  },
+  {
+    phrase: 'It’s A Lovely Day',
+    link: 'https://youtu.be/sYi7uEvEEmk'
+  },
+  {
+    phrase: 'Kill It With Kisses',
+    link: 'https://youtu.be/iWOyfLBYtuU'
+  },
+  {
+    phrase: 'Now or Never',
+    link: 'https://youtu.be/vx2u5uUu3DE'
+  },
+  {
+    phrase: 'On With The Show',
+    link: 'https://youtu.be/4ADh8Fs3YdU'
+  },
+  {
+    phrase: 'Rawr, Tiger',
+    link: 'https://youtu.be/btPJPFnesV4'
+  },
+  {
+    phrase: 'Right Here, Right Now',
+    link: 'https://youtu.be/F7jSp2xmmEE'
+  },
+  {
+    phrase: 'Ring That Bell',
+    link: 'https://youtu.be/OaBfFSOJ9H8'
+  },
+  {
+    phrase: 'Run This Mother',
+    link: 'https://youtu.be/VBmMU_iwe6U'
+  },
+  {
+    phrase: 'Serve It',
+    link: 'https://youtu.be/0J2QdDbelmY'
+  },
+  {
+    phrase: 'Sharpness Without Effort',
+    link: 'https://youtu.be/hpeTLTj2tww'
+  },
+  {
+    phrase: 'Stronger, Richer, Smarter',
+    link: 'https://youtu.be/Wmc8bQoL-J0'
+  },
+  {
+    phrase: 'Wax On',
+    link: 'https://youtu.be/Wd7PvbJece8'
+  },
+  {
+    phrase: 'The Whole Team Here',
+    link: 'https://youtu.be/RubBzkZzpUA'
+  },
+  {
+    phrase: 'The World Is Yours',
+    link: 'https://youtu.be/e5PnuIRnJW8'
+  },
+  {
+    phrase: 'You Are A Champion',
+    link: 'https://youtu.be/04854XqcfCY'
+  },
+  {
+    phrase: 'You Are Beautiful',
+    link: 'https://youtu.be/eAfyFTzZDMM'
+  },
+  {
+    phrase: 'You Bossy',
+    link: 'https://youtu.be/SSgp-IIgr4I'
+  },
+  {
+    phrase: 'You Came To Win',
+    link: 'https://youtu.be/KZaz7OqyTHQ'
+  },
+  {
+    phrase: 'You’re The Smart One',
+    link: 'https://youtu.be/bKQYK7PYQpQ'
+  },
+  {
+    phrase: 'You’ve Got A Bright Future',
+    link: 'https://youtu.be/kZGvnI37mxk'
+  },
+  {
+    phrase: 'Go Pro',
+    link: 'https://youtu.be/9mSMTXYj7pQ'
+  }
+];
+
+const rally = rallyList[Math.floor(Math.random() * rallyList.length)];
+
+const rallyPhrase = `${rally.phrase}!`;
+
+const style = {
+  color: theme.palette.dark70l
+};
+
+export default function getRallyLink(hasStyle = true) {
+  return (
+    <a
+      href={rally.link}
+      style={hasStyle ? style : null}
+      target="_blank"
+      title={rallyPhrase}
+    >
+      {rallyPhrase}
+    </a>
+  );
+}

From df16c37bbb7bc9e21598928d970d94f0c80e6509 Mon Sep 17 00:00:00 2001
From: Terry Acker <ackernaut@gmail.com>
Date: Thu, 25 Aug 2016 12:01:47 -0400
Subject: [PATCH 2/8] No rally link cray cray hover, updated copy

---
 .../landing/components/Landing/Landing.js     |  2 +-
 .../components/UserDashboard/UserDashboard.js | 19 ++++++++++++++++++-
 .../userDashboard/helpers/getRallyLink.js     |  7 ++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/universal/modules/landing/components/Landing/Landing.js b/src/universal/modules/landing/components/Landing/Landing.js
index 02620b169df..aadc011860b 100644
--- a/src/universal/modules/landing/components/Landing/Landing.js
+++ b/src/universal/modules/landing/components/Landing/Landing.js
@@ -40,7 +40,7 @@ export default class Landing extends Component {
             <img className={styles.actionLogo} src={actionLogo}/>
             <h1 className={styles.mainHeading}>Action</h1>
             <h2 className={styles.mainSubheading}>
-              The rhythm of meaningful work.
+              An open-source tool for adaptive teams.
             </h2>
             <button
               className={styles.ctaButton}
diff --git a/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js b/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js
index 153bb6e2731..8049a0c85cb 100644
--- a/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js
+++ b/src/universal/modules/userDashboard/components/UserDashboard/UserDashboard.js
@@ -7,6 +7,7 @@ import {
   dashTimestamp
 } from 'universal/components/Dashboard';
 import look, {StyleSheet} from 'react-look';
+// import theme from 'universal/styles/theme';
 import UserActions from 'universal/modules/userDashboard/components/UserActions/UserActions';
 import UserColumnsContainer from 'universal/modules/userDashboard/containers/UserColumns/UserColumnsContainer';
 import getRallyLink from '../../helpers/getRallyLink';
@@ -17,7 +18,7 @@ const UserDashboard = () => {
     <DashMain>
       <DashHeader>
         <DashHeaderInfo title="My Dashboard">
-          {dashTimestamp} • {getRallyLink()}
+          {dashTimestamp} • <span className={styles.crayCrayHover}>{getRallyLink()}!</span>
         </DashHeaderInfo>
       </DashHeader>
       <DashContent>
@@ -52,6 +53,22 @@ UserDashboard.styles = StyleSheet.create({
 
   projectsLayout: {
     width: '80%'
+  },
+
+  crayCrayHover: {
+    color: 'inherit',
+
+    // TODO: Play with cray cray hover some more (TA)
+    // ':hover': {
+    //   color: theme.palette.warm,
+    //   position: 'fixed',
+    //   transform: 'scale(10)'
+    // },
+    // ':focus': {
+    //   color: theme.palette.warm,
+    //   position: 'fixed',
+    //   transform: 'scale(10)'
+    // }
   }
 });
 
diff --git a/src/universal/modules/userDashboard/helpers/getRallyLink.js b/src/universal/modules/userDashboard/helpers/getRallyLink.js
index 49d1404f5a9..9afd00ac14a 100644
--- a/src/universal/modules/userDashboard/helpers/getRallyLink.js
+++ b/src/universal/modules/userDashboard/helpers/getRallyLink.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import theme from 'universal/styles/theme';
+// import theme from 'universal/styles/theme';
 
 const rallyList = [
   {
@@ -145,7 +145,8 @@ const rally = rallyList[Math.floor(Math.random() * rallyList.length)];
 const rallyPhrase = `${rally.phrase}!`;
 
 const style = {
-  color: theme.palette.dark70l
+  // color: theme.palette.dark70l
+  color: 'inherit'
 };
 
 export default function getRallyLink(hasStyle = true) {
@@ -156,7 +157,7 @@ export default function getRallyLink(hasStyle = true) {
       target="_blank"
       title={rallyPhrase}
     >
-      {rallyPhrase}
+      {rally.phrase}
     </a>
   );
 }

From dfb54fd1a3b7e83c0f1554c85686976c0c7d6364 Mon Sep 17 00:00:00 2001
From: Terry Acker <ackernaut@gmail.com>
Date: Thu, 25 Aug 2016 12:29:10 -0400
Subject: [PATCH 3/8] Improved Check-In question importance, aligned buttons

---
 .../meeting/components/CheckinCard/CheckinCard.js |  3 ++-
 .../components/MeetingCheckin/MeetingCheckin.js   | 15 +++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js b/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
index 889e9bb3663..c30bc8764d0 100644
--- a/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
+++ b/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
@@ -116,7 +116,8 @@ styles = StyleSheet.create({
   },
 
   buttonsBlock: {
-    display: 'inline-block'
+    display: 'inline-block',
+    textAlign: 'left'
   }
 });
 
diff --git a/src/universal/modules/meeting/components/MeetingCheckin/MeetingCheckin.js b/src/universal/modules/meeting/components/MeetingCheckin/MeetingCheckin.js
index ccde0311928..86a1f72ca79 100644
--- a/src/universal/modules/meeting/components/MeetingCheckin/MeetingCheckin.js
+++ b/src/universal/modules/meeting/components/MeetingCheckin/MeetingCheckin.js
@@ -5,7 +5,6 @@ import ProgressBar from 'universal/modules/meeting/components/ProgressBar/Progre
 import CheckinCards from 'universal/modules/meeting/components/CheckinCards/CheckinCards';
 import MeetingMain from 'universal/modules/meeting/components/MeetingMain/MeetingMain';
 import MeetingSection from 'universal/modules/meeting/components/MeetingSection/MeetingSection';
-import MeetingSectionHeading from 'universal/modules/meeting/components/MeetingSectionHeading/MeetingSectionHeading';
 import {
   CHECKIN,
 //  UPDATES,
@@ -15,11 +14,7 @@ import {withRouter} from 'react-router';
 import makePhaseItemFactory from 'universal/modules/meeting/helpers/makePhaseItemFactory';
 import makePushURL from 'universal/modules/meeting/helpers/makePushURL';
 import LoadingView from 'universal/components/LoadingView/LoadingView';
-import theme from 'universal/styles/theme';
-
-const style = {
-  color: theme.palette.warm
-};
+import Type from 'universal/components/Type/Type';
 
 const MeetingCheckin = (props) => {
   const {
@@ -76,9 +71,9 @@ const MeetingCheckin = (props) => {
       </MeetingSection>
       <MeetingSection flexToFill paddingBottom="2rem">
         <MeetingSection paddingBottom="2rem">
-          <MeetingSectionHeading>
-            <span>{checkInGreeting}, <span style={style}>{currentName}</span>—{checkInQuestion}?</span>
-          </MeetingSectionHeading>
+          <Type align="center" bold family="serif" scale="s6" theme="warm">
+            {checkInGreeting}, {currentName}—{checkInQuestion}?
+          </Type>
         </MeetingSection>
         {/* */}
         <CheckinCards
@@ -93,7 +88,7 @@ const MeetingCheckin = (props) => {
             iconPlacement="right"
             label={isLastMember ? 'Move on to updates' : 'Next teammate (press enter)'}
             scale="large"
-            theme="warm"
+            theme="cool"
             onClick={gotoNextItem}
           />
         </MeetingSection>

From fbcdf2aa8f24cbc70b76d4db8c3fec585786ade1 Mon Sep 17 00:00:00 2001
From: Terry Acker <ackernaut@gmail.com>
Date: Thu, 25 Aug 2016 12:34:31 -0400
Subject: [PATCH 4/8] Trying warm border color on active CheckInCard

---
 .../modules/meeting/components/CheckinCard/CheckinCard.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js b/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
index c30bc8764d0..ae54ffc36fe 100644
--- a/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
+++ b/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
@@ -82,7 +82,7 @@ styles = StyleSheet.create({
   },
 
   cardIsActive: {
-    borderColor: theme.palette.cool70l
+    borderColor: theme.palette.warm70l
   },
 
   cardIsBlurred: {

From 7381c40056c2081a700d2c5975e586ab658b830b Mon Sep 17 00:00:00 2001
From: Terry Acker <ackernaut@gmail.com>
Date: Thu, 25 Aug 2016 12:46:27 -0400
Subject: [PATCH 5/8] Quickly simplifying the check-in cards a bit

---
 .../components/CheckinCard/CheckinCard.js     |  9 +++++++--
 .../components/CheckinCards/CheckinCards.js   | 19 +++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js b/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
index ae54ffc36fe..ab7f8da525d 100644
--- a/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
+++ b/src/universal/modules/meeting/components/CheckinCard/CheckinCard.js
@@ -73,6 +73,7 @@ Card.propTypes = {
 
 styles = StyleSheet.create({
   card: {
+    // NOTE: This needs to match CheckinCards placeholder styles (TA)
     border: `1px solid ${theme.palette.mid50l}`,
     borderRadius: '.5rem',
     margin: '0 .5rem',
@@ -93,17 +94,21 @@ styles = StyleSheet.create({
   },
 
   cardName: {
+    color: theme.palette.dark,
     fontSize: theme.typography.s6,
     fontWeight: 400,
-    margin: '1rem 0 .5rem'
+    // margin: '1rem 0 .5rem' // when with cardLabel (TA)
+    margin: '1rem 0 2rem'
   },
 
   cardNameActive: {
-    color: theme.palette.cool
+    // color: theme.palette.cool
+    color: theme.palette.dark
   },
 
   cardLabel: {
     color: theme.palette.dark50l,
+    display: 'none',
     fontFamily: theme.typography.serif,
     fontSize: theme.typography.s4,
     fontStyle: 'italic',
diff --git a/src/universal/modules/meeting/components/CheckinCards/CheckinCards.js b/src/universal/modules/meeting/components/CheckinCards/CheckinCards.js
index 344578f8b23..6ca6c93b426 100644
--- a/src/universal/modules/meeting/components/CheckinCards/CheckinCards.js
+++ b/src/universal/modules/meeting/components/CheckinCards/CheckinCards.js
@@ -56,14 +56,16 @@ export default class CheckinCards extends Component {
 
     return (
       <div className={styles.base}>
-        {leftCard &&
-          <CheckinCard handleCardClick={this.handleCardClickFactory(memberIdx - 1)} member={leftCard}/>
+        {leftCard ?
+          <CheckinCard handleCardClick={this.handleCardClickFactory(memberIdx - 1)} member={leftCard}/> :
+          <div className={styles.placeholder}></div>
         }
         {activeCard &&
           <CheckinCard checkInPressFactory={makeCheckinPressFactory(activeCard.id)} member={activeCard} isActive/>
         }
-        {rightCard &&
-          <CheckinCard handleCardClick={this.handleCardClickFactory(memberIdx + 1)} member={rightCard}/>
+        {rightCard ?
+          <CheckinCard handleCardClick={this.handleCardClickFactory(memberIdx + 1)} member={rightCard}/> :
+          <div className={styles.placeholder}></div>
         }
       </div>
     );
@@ -75,5 +77,14 @@ styles = StyleSheet.create({
     display: 'flex',
     justifyContent: 'center',
     width: '100%'
+  },
+
+  placeholder: {
+    // NOTE: This box model matches CheckinCard for exact sizing (TA)
+    border: '1px solid transparent',
+    borderRadius: '.5rem',
+    margin: '0 .5rem',
+    padding: '3rem 1rem 1.5rem',
+    width: '18.75rem'
   }
 });

From d7af00247c7b095e6b68f76d995701422771d3e3 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Fri, 26 Aug 2016 11:17:37 -0400
Subject: [PATCH 6/8] Updated epics

---
 docs/epics/0001_Action_Epic_MVTP.md | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/docs/epics/0001_Action_Epic_MVTP.md b/docs/epics/0001_Action_Epic_MVTP.md
index bed01c6b5e5..fef33736f6e 100644
--- a/docs/epics/0001_Action_Epic_MVTP.md
+++ b/docs/epics/0001_Action_Epic_MVTP.md
@@ -111,9 +111,8 @@ their next step is (inputting projects, then waiting for their first action
 meeting from their TL), so they feel like their are working toward some kind
 of a tangible goal.
 
-- [ ] When a TM clicks on an invitation link and they _already_ have an
-active account, they'll want to accept the invitation from their dashboard,
-so that they don't have to walk through the new account wizard.
+- [X] When a TM clicks on an invitation link and they _already_ have an
+active account, the system should still process the invitation.
 
 ## Team Action Meeting
 
@@ -166,18 +165,18 @@ update the information they seek.
 will want to see a list of projects by TM, so that each participant has a
 moment to update the team on their work.
 
-- [ ] When a TM is asked to give project updates, they will want to know
+- [X] When a TM is asked to give project updates, they will want to know
 what to say, so that they understand what is being asked of them.
 
-- [ ] When a TM is asked to give project updates, they will want to be able
+- [X] When a TM is asked to give project updates, they will want to be able
 to make small updates to their projects (such as status, description, or
 ownership), so that they can make adjustment to their workload or update
 their team with the latest information.
 
-- [ ] When all project updates are complete, the F will want to advance the
+- [X] When all project updates are complete, the F will want to advance the
 meeting to "Agenda Building", so that they keep things moving forward.
 
-- [ ] When the TMs enter the agenda building phase, they will want to be
+- [X] When the TMs enter the agenda building phase, they will want to be
 able to add items to the agenda, so that they get a slot in the meeting to
 ask for what they need.
 
@@ -188,10 +187,18 @@ able to remove items, so they can spend their time on what they want.
 advance the meeting to the "Process Agenda" phase, so that new actions and
 projects can be created and TMs can request what they need of each other.
 
-- [ ] If a project update or agenda item should trigger a new agenda item
+- [X] If a project update or agenda item should trigger a new agenda item
 for a TM, they want to add it to the agenda, so that they have an opportunity
 to get what they need.
 
+- [ ] When the meeting advances from agenda item to agenda item, the F will
+want to know what to say ("what do you need?") and the TM will want to be
+able to process the agenda item into new projects or actions.
+
+- [ ] When the TM has created a project or action by mistake, the TM will
+want a control for deleting or canceling it, so that they don't add to the
+noise of the team.
+
 - [ ] When all agenda items have been processed, the TMs will want one more
 opportunity to add new items, so that they have one last chance to process
 something before the meeting ends.
@@ -231,7 +238,7 @@ and going.
 
 ## Personal Dashboard
 
-- [ ] When a user receives an invitation to a new team, they will want to
+- [X] When a user receives an invitation to a new team, they will want to
 be able to accept it, so that they can join their teammates.
 
 - [X] When a TM navigates to their own personal dashboard, they will

From afebeaae6b8f9a001b19ebefc639377127093664 Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Fri, 26 Aug 2016 14:48:35 -0400
Subject: [PATCH 7/8] Fix & a13n to tables called out in meeting migration

---
 .../database/migrations/20160722161700-meeting.js   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/server/database/migrations/20160722161700-meeting.js b/src/server/database/migrations/20160722161700-meeting.js
index 3e32c517909..314c7f128fb 100644
--- a/src/server/database/migrations/20160722161700-meeting.js
+++ b/src/server/database/migrations/20160722161700-meeting.js
@@ -1,31 +1,32 @@
 exports.up = async (r) => {
   const meetingTables = [
-    r.tableCreate('Meeting'),
-    r.tableCreate('Project'),
     r.tableCreate('Action'),
     r.tableCreate('AgendaItem'),
+    r.tableCreate('Meeting'),
     r.tableCreate('Participant'),
+    r.tableCreate('Project'),
     r.tableCreate('Outcome'),
     r.tableCreate('TaskOutcomeDiff')
   ];
   await Promise.all(meetingTables);
   const meetingIndices = [
-    r.table('Meeting').indexCreate('teamId'),
-    r.table('Project').indexCreate('teamMemberId'),
     r.table('Action').indexCreate('userId'),
     r.table('AgendaItem').indexCreate('teamId'),
+    r.table('Meeting').indexCreate('teamId'),
     r.table('Participant').indexCreate('meetingId'),
     r.table('Participant').indexCreate('userId'),
+    r.table('Project').indexCreate('teamMemberId')
   ];
   return await Promise.all(meetingIndices);
 };
 
 exports.down = async (r) => {
   const meetingTables = [
-    r.tableDrop('Meeting'),
-    r.tableDrop('Task'),
+    r.tableDrop('Action'),
     r.tableDrop('AgendaItem'),
+    r.tableDrop('Meeting'),
     r.tableDrop('Participant'),
+    r.tableDrop('Project'),
     r.tableDrop('Outcome'),
     r.tableDrop('TaskOutcomeDiff')
   ];

From 70ae71bcc0b25cd0d09146d8333349de84d538df Mon Sep 17 00:00:00 2001
From: Jordan Husney <jordan.husney@gmail.com>
Date: Fri, 26 Aug 2016 14:57:58 -0400
Subject: [PATCH 8/8] Fix for setting pic and prefferedName in createTeam
 mutation

---
 .../graphql/models/Team/teamMutation.js       | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/server/graphql/models/Team/teamMutation.js b/src/server/graphql/models/Team/teamMutation.js
index 03e517825df..5e1f8ca239d 100644
--- a/src/server/graphql/models/Team/teamMutation.js
+++ b/src/server/graphql/models/Team/teamMutation.js
@@ -15,9 +15,9 @@ import {
   CHECKIN,
   LOBBY,
   UPDATES,
-  FIRST_CALL,
+//  FIRST_CALL,
   AGENDA_ITEMS,
-  LAST_CALL,
+//  LAST_CALL,
   phaseArray, phaseOrder
 } from 'universal/utils/constants';
 import {auth0ManagementClient} from 'server/utils/auth0Helpers';
@@ -229,6 +229,7 @@ export default {
         teamId: newTeam.id,
         userId
       };
+
       const verifiedTeam = {
         ...newTeam,
         facilitatorPhase: LOBBY,
@@ -238,11 +239,25 @@ export default {
         meetingPhaseItem: null,
         activeFacilitator: null
       };
+
+      const dbTransaction = r.table('User')
+        .get(userId)
+        .do((user) =>
+          r.table('TeamMember').insert({
+            ...verifiedLeader,
+            // pull in picture and preferredName from user profile:
+            picture: user('picture').default(''),
+            preferredName: user('preferredName').default('')
+          })
+        )
+        .do(() =>
+          r.table('Team').insert(verifiedTeam)
+        );
+
       const oldtms = authToken.tms || [];
       const tms = oldtms.concat(newTeam.id);
       const dbPromises = [
-        r.table('TeamMember').insert(verifiedLeader),
-        r.table('Team').insert(verifiedTeam),
+        dbTransaction,
         auth0ManagementClient.users.updateAppMetadata({id: userId}, {tms})
       ];
       await Promise.all(dbPromises);