Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Pizza and modalz #102

Merged
merged 12 commits into from
Jun 30, 2014
Merged

[WIP] Pizza and modalz #102

merged 12 commits into from
Jun 30, 2014

Conversation

ZeeJab
Copy link
Member

@ZeeJab ZeeJab commented Jun 23, 2014

No description provided.

@ZeeJab ZeeJab changed the title [WIP} Pizza and modalz [WIP] Pizza and modalz Jun 24, 2014
@ZeeJab
Copy link
Member Author

ZeeJab commented Jun 24, 2014

@stevekinney I rebased this with master, and now some tests are failing? Can you take a look please :-(

@stevekinney
Copy link
Member

@ZeeJab Good news and bad news. Good news: The tests for mathz-and-modalz pass on my setup. Bad news: I don't know why they fail on yours. Which tests are failing?

@ZeeJab
Copy link
Member Author

ZeeJab commented Jun 24, 2014

neverminddd! i forgot to npm install :-p how does it look so far?

@stevekinney
Copy link
Member

It's looking pretty great!

zfb

Some thoughts and questions (knowing full well that it's still a work in progress and you probably have solutions for some/most of these planned):

  • It seems like there are both anchovies and olives after all, whoops. I just might look into cutting out the anchovies in a effort to keep it close to the book.
  • In the original one there were multiple pizzas on the conveyor belt. That way multiple students from the group can grab one, work on it, and put it back. The conveyor belt should have all pizzas not currently being worked on by another student.
  • Do we need an empty plate for the area we drag the pizza onto instead of a plate with a pizza already on it?

@stevekinney
Copy link
Member

@ZeeJab Also, if you need anything from @iamjessklein, we should probably let her know soon! 👰‍♀️

@ZeeJab
Copy link
Member Author

ZeeJab commented Jun 24, 2014

haha, I've been making the png's from the ai file, so I think we're all set with assets from 👰‍♀️ for now

Re: Pizza and conveyor... Yes, confirm. I'll replace both with just the plate

@stevekinney
Copy link
Member

@ZeeJab Yea, it should show the pizza in it's current state in the conveyor belt. If it makes sense to grab a cup of coffee in Manhattan (or I can head over the Mozilla office) so I can show you how the lesson works or something that works—I am always looking for an excuse to get out of the office.

@ZeeJab
Copy link
Member Author

ZeeJab commented Jun 25, 2014

@stevekinney Do you wanna meet at Flatiron School at 5 today? We can do a pre-man.js pair session

@stevekinney
Copy link
Member

Yea, that sounds like a good plan.

On Wed, Jun 25, 2014 at 12:19 PM, Zahra Jabini notifications@github.com
wrote:

Do you wanna meet at Flatiron School at 5 today? We can do a pre-man.js
pair session


Reply to this email directly or view it on GitHub
#102 (comment).

@ZeeJab
Copy link
Member Author

ZeeJab commented Jun 30, 2014

@stevekinney hi! Do you want to either pull this or merge it and then help me with a few things?

  • I updated all the conveyor stuff to what they should be... but I think you said you need to get rid of anchovies?
  • The productivity report renders all sorts of effed, and I'm not sure how to fix it in the js -- >
    screen shot 2014-06-30 at 9 59 49 am
  • other than those things I think the Pizza round is ready?

@ZeeJab
Copy link
Member Author

ZeeJab commented Jun 30, 2014

[update]: I think it should be merged before you work on it... it's too big for more changes?

@stevekinney
Copy link
Member

@ZeeJab, Alright, I think know how to fix that. I'm going to merge and then pull it down to take a look!

stevekinney added a commit that referenced this pull request Jun 30, 2014
@stevekinney stevekinney merged commit b85e858 into master Jun 30, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants