Merge conditional minigame prototype and rework the view/vue wiring

codecombat · Jun 11, 2018 · 5e38fe9 · 5e38fe9
1 parent 09b3989
commit 5e38fe9
Show file tree

Hide file tree

Showing 19 changed files with 408 additions and 1 deletion.
diff --git a/app/assets/images/pages/minigames/conditionals/bear.png b/app/assets/images/pages/minigames/conditionals/bear.png
diff --git a/app/assets/images/pages/minigames/conditionals/dog.png b/app/assets/images/pages/minigames/conditionals/dog.png
diff --git a/app/assets/images/pages/minigames/conditionals/fire_trap.png b/app/assets/images/pages/minigames/conditionals/fire_trap.png
diff --git a/app/assets/images/pages/minigames/conditionals/forked-path.jpg b/app/assets/images/pages/minigames/conditionals/forked-path.jpg
diff --git a/app/assets/images/pages/minigames/conditionals/fox.png b/app/assets/images/pages/minigames/conditionals/fox.png
diff --git a/app/assets/images/pages/minigames/conditionals/gem.png b/app/assets/images/pages/minigames/conditionals/gem.png
diff --git a/app/assets/images/pages/minigames/conditionals/ogre.png b/app/assets/images/pages/minigames/conditionals/ogre.png
diff --git a/app/assets/images/pages/minigames/conditionals/rat.jpg b/app/assets/images/pages/minigames/conditionals/rat.jpg
diff --git a/app/assets/images/pages/minigames/conditionals/raven.png b/app/assets/images/pages/minigames/conditionals/raven.png
diff --git a/app/assets/images/pages/minigames/conditionals/wolf.png b/app/assets/images/pages/minigames/conditionals/wolf.png
diff --git a/app/assets/sounds/pages/minigames/conditionals/firetrap_die.mp3 b/app/assets/sounds/pages/minigames/conditionals/firetrap_die.mp3
diff --git a/app/assets/sounds/pages/minigames/conditionals/gem_pickup.mp3 b/app/assets/sounds/pages/minigames/conditionals/gem_pickup.mp3
diff --git a/app/assets/sounds/pages/minigames/conditionals/ogre_munchkin_raah.mp3 b/app/assets/sounds/pages/minigames/conditionals/ogre_munchkin_raah.mp3
diff --git a/app/core/Router.coffee b/app/core/Router.coffee
@@ -158,6 +158,8 @@ module.exports = class CocoRouter extends Backbone.Router
 
     'logout': 'logout'
 
+    'minigames/conditionals': go('minigames/ConditionalMinigameView')
+
     'paypal/subscribe-callback': go('play/CampaignView')
     'paypal/cancel-callback': go('account/SubscriptionView')
 

diff --git a/app/lib/dynamicRequire.js b/app/lib/dynamicRequire.js
diff --git a/app/views/artisans/SandboxView.coffee b/app/views/artisans/SandboxView.coffee
@@ -2,7 +2,7 @@ RootComponent = require 'views/core/RootComponent'
 template = require 'templates/base-flat'
 SandboxViewComponent = require('./SandboxViewComponent.vue').default
 
-module.exports = class BulkLevelEditView extends RootComponent
+module.exports = class SandboxView extends RootComponent
   id: 'sandbox-view'
   template: template
   VueComponent: SandboxViewComponent

diff --git a/app/views/artisans/SandboxViewComponent.vue b/app/views/artisans/SandboxViewComponent.vue
@@ -1,6 +1,11 @@
 <template lang="pug">
   div.container
     h1 Artisan Sandbox
+    div
+      a(href='/minigames/conditionals')
+        |Conditionals Minigame Prototype
+
+
 </template>
 
 <script lang="coffee">