Merge pull request #20772 from code-dot-org/dtp_candidate_a5089d38

DTP (Test > Production: a5089d3)
code-dot-org · Feb 20, 2018 · e4aa8c8 · e4aa8c8
2 parents cd4e5e7 + a5089d3
commit e4aa8c8
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 11 deletions.
diff --git a/apps/src/templates/BaseDialog.story.jsx b/apps/src/templates/BaseDialog.story.jsx
@@ -10,7 +10,7 @@ const EXAMPLE_DIALOG_BODY = (
 
 export default storybook => {
   return storybook
-    .storiesOf('BaseDialog', module)
+    .storiesOf('Dialogs/BaseDialog', module)
     .addStoryTable([
       {
         name:'hiding the backdrop',

diff --git a/apps/src/templates/ChallengeDialog.story.jsx b/apps/src/templates/ChallengeDialog.story.jsx
@@ -9,7 +9,7 @@ const wrapperStyle = {
 
 export default storybook => {
   return storybook
-    .storiesOf('ChallengeDialog', module)
+    .storiesOf('Dialogs/ChallengeDialog', module)
     .addStoryTable([
       {
         name: 'Starting Dialog',

diff --git a/apps/src/templates/Dialog.story.jsx b/apps/src/templates/Dialog.story.jsx
@@ -5,7 +5,7 @@ import {action} from '@storybook/addon-actions';
 
 export default storybook => {
   return storybook
-    .storiesOf('Dialog', module)
+    .storiesOf('Dialogs/Dialog', module)
     .addStoryTable([
       {
         name: 'basic example',

diff --git a/apps/src/templates/FinishDialog.story.jsx b/apps/src/templates/FinishDialog.story.jsx
@@ -44,7 +44,7 @@ const studentCode = {
 
 export default storybook =>
   storybook
-    .storiesOf('FinishDialog', module)
+    .storiesOf('Dialogs/FinishDialog', module)
     .addStoryTable([
       {
         name: 'Dialog with overlay',

diff --git a/apps/src/templates/MakerLanding.jsx b/apps/src/templates/MakerLanding.jsx
@@ -41,7 +41,7 @@ export default class MakerLanding extends Component {
         title: i18n.makerSetupTitle(),
         description: i18n.makerSetupDesc(),
         link: "/maker/setup",
-        image: "applab-tutorial",
+        image: "maker",
         buttonText: i18n.makerSetupButton()
       }
     ];

diff --git a/apps/src/templates/VerticalImageResourceCard.jsx b/apps/src/templates/VerticalImageResourceCard.jsx
@@ -118,6 +118,7 @@ class VerticalImageResourceCard extends Component {
       require('@cdo/static/resource_cards/thirdpartyteacher.png'),
       "third-party-teacher-small":
       require('@cdo/static/resource_cards/thirdpartyteachersmall.png'),
+      "maker": require('@cdo/static/resource_cards/maker.png')
     };
     const imgSrc = filenameToImgUrl[image];
 

diff --git a/apps/src/templates/publishDialog/PublishDialog.story.jsx b/apps/src/templates/publishDialog/PublishDialog.story.jsx
@@ -7,7 +7,7 @@ const PROJECT_TYPE = 'MY_PROJECT_TYPE';
 
 export default storybook => {
   return storybook
-    .storiesOf('PublishDialog', module)
+    .storiesOf('Dialogs/PublishDialog', module)
     .addStoryTable([
       {
         name: 'dialog open',

diff --git a/apps/src/templates/teacherDashboard/RosterDialog.story.jsx b/apps/src/templates/teacherDashboard/RosterDialog.story.jsx
@@ -7,7 +7,7 @@ const ROSTER_DIALOG_CLOSE_CALLBACKS = ['handleImport', 'handleCancel'];
 
 export default storybook => {
   return storybook
-    .storiesOf('RosterDialog', module)
+    .storiesOf('Dialogs/RosterDialog', module)
     .addStoryTable([
       {
         name: 'Select a Classroom',

diff --git a/apps/static/resource_cards/maker.png b/apps/static/resource_cards/maker.png
diff --git a/dashboard/app/models/regional_partner.rb b/dashboard/app/models/regional_partner.rb
@@ -18,6 +18,7 @@
 #  created_at         :datetime         not null
 #  updated_at         :datetime         not null
 #  deleted_at         :datetime
+#  properties         :text(65535)
 #
 # Indexes
 #
@@ -37,6 +38,13 @@ class RegionalPartner < ActiveRecord::Base
   has_many :pd_workshops_organized, class_name: 'Pd::Workshop', through: :regional_partner_program_managers
   has_many :mappings, -> {order :state, :zip_code}, class_name: Pd::RegionalPartnerMapping, dependent: :destroy
 
+  include SerializedProperties
+
+  serialized_attrs %w(
+    cohort_capacity_csd
+    cohort_capacity_csp
+  )
+
   # Upcoming and not ended
   def future_pd_workshops_organized
     pd_workshops_organized.future

diff --git a/dashboard/config/scripts/levels/New Game Lab Jr Project.level b/dashboard/config/scripts/levels/New Game Lab Jr Project.level
@@ -214,11 +214,21 @@
     "helper_libraries": [
       "GameLabJr"
     ],
-    "contained_level_names": null
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ],
+    "droplet_tooltips_disabled": "false",
+    "lock_zero_param_functions": "false",
+    "start_animations": "{\r\n  \"orderedKeys\": [\r\n    \"d19383c3-9b64-482d-811d-07f8997533ea\",\r\n    \"62c23e14-37e1-4b40-9dc8-68553ff35ff9\"\r\n  ],\r\n  \"propsByKey\": {\r\n    \"d19383c3-9b64-482d-811d-07f8997533ea\": {\r\n      \"name\": \"dog\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/fyCTcQ6s52URiFmswI6n_lmlYnv7ggPYH0oASid6kRA/d19383c3-9b64-482d-811d-07f8997533ea.png?version=v.GmQEfbU1j.B.l4vI46thaJVPawniCF\",\r\n      \"frameSize\": {\r\n        \"x\": 100,\r\n        \"y\": 87\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"v.GmQEfbU1j.B.l4vI46thaJVPawniCF\"\r\n    },\r\n    \"62c23e14-37e1-4b40-9dc8-68553ff35ff9\": {\r\n      \"name\": \"cat\",\r\n      \"sourceUrl\": \"https://studio.code.org/v3/animations/fyCTcQ6s52URiFmswI6n_lmlYnv7ggPYH0oASid6kRA/62c23e14-37e1-4b40-9dc8-68553ff35ff9.png?version=t7yJ2eX2s4X..cVkKdwWebbWGC.YvO5k\",\r\n      \"frameSize\": {\r\n        \"x\": 64,\r\n        \"y\": 100\r\n      },\r\n      \"frameCount\": 1,\r\n      \"looping\": true,\r\n      \"frameDelay\": 12,\r\n      \"version\": \"t7yJ2eX2s4X..cVkKdwWebbWGC.YvO5k\"\r\n    }\r\n  }\r\n}",
+    "contained_level_names": null,
+    "encrypted_examples": [
+
+    ]
   },
   "published": true,
   "notes": "",
-  "audit_log": "[{\"changed_at\":\"2018-01-29 14:49:19 -0800\",\"changed\":[\"notes\",\"show_d_pad\",\"show_debug_watch\",\"contained_level_names\"],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-01-31 17:42:17 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-01-31 17:43:38 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-01-31 18:09:38 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-01-31 18:10:19 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-01-31 18:23:17 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 09:22:19 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 09:23:47 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 09:24:53 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 09:25:08 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 09:25:47 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 09:31:50 -0800\",\"changed\":[],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 12:58:13 -0800\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 14:45:08 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 15:04:06 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 15:14:03 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-02 18:15:57 -0800\",\"changed\":[\"toolbox_blocks\",\"contained_level_names\"],\"changed_by_id\":9,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 00:39:49 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 01:14:42 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 01:14:46 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 12:06:39 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 12:07:12 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 12:11:41 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"},{\"changed_at\":\"2018-02-15 16:22:13 -0800\",\"changed\":[\"toolbox_blocks\"],\"changed_by_id\":2,\"changed_by_email\":\"ram+teacher@code.org\"}]",
+  "audit_log": "",
   "level_concept_difficulty": {
   }
 }]]></config>
@@ -290,4 +300,4 @@
       </xml>
     </toolbox_blocks>
   </blocks>
-</GamelabJr>
+</GamelabJr>
diff --git a/dashboard/db/migrate/20180219200100_add_properties_to_regional_partner.rb b/dashboard/db/migrate/20180219200100_add_properties_to_regional_partner.rb
@@ -0,0 +1,5 @@
+class AddPropertiesToRegionalPartner < ActiveRecord::Migration[5.0]
+  def change
+    add_column :regional_partners, :properties, :text
+  end
+end
diff --git a/dashboard/db/schema.rb b/dashboard/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180216220752) do
+ActiveRecord::Schema.define(version: 20180219200100) do
 
   create_table "activities", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci" do |t|
     t.integer  "user_id"
@@ -914,6 +914,7 @@
     t.datetime "created_at",                       null: false
     t.datetime "updated_at",                       null: false
     t.datetime "deleted_at"
+    t.text     "properties",         limit: 65535
     t.index ["name", "contact_id"], name: "index_regional_partners_on_name_and_contact_id", unique: true, using: :btree
   end
 

diff --git a/dashboard/db/schema_cache.dump b/dashboard/db/schema_cache.dump