councilforeconed / interactive-activities

Council for Economic Education
http://interactives.councilforeconed.org
Mozilla Public License 2.0
6 stars 2 forks source link

Initial UI for "Pizza Productivity" activity #40

Closed jugglinmike closed 10 years ago

jugglinmike commented 10 years ago

This implements the basic client-side interaction for one "round" of the Pizza Productivity activity:

This includes models and collections that should be suitable for re-use in the server process, located in the activity's shared/ directory.

The following client UI still needs to be implemented:

I plan to do that work in one or more additional pull requests.

mzgoddard commented 10 years ago

@jugglinmike All done. Let me know what you think.

jugglinmike commented 10 years ago

@mzgoddard I think I've covered everything. You'll want to pay special attention to 2f98fcf, since it includes the most change. It's my attempt to make the configuration data structures a little more logical. Tell me what you think.

mzgoddard commented 10 years ago

Only thing I notice is food-states.js and config.js contain duplicate source.

After resolving that, squash your changes, and I'll merge.

jugglinmike commented 10 years ago

@mzgoddard I've removed food-states.js since it is no longer referenced.

Squashing all this into a legible history will take me a little time. I'll ping you when it's ready.

jugglinmike commented 10 years ago

Alright @mzgoddard. I've extracted the changes to non-pizza/ code into separate commits and squashed everything in pizza/ to a single commit. If you think we should have more granularity, just let me know; I've saved the original commit history in a branch on my fork named pizza-ui-prebase.