Skip to content

Commit fd2d41f

Browse files
shubhi1092shubhi1092
committed
Refactoring and linting changes
- Refactored OzariaUnitMap to ozaria folder - Updated route for Ozaria unit map - Re-arranged methods in ozariaUtils alphabetically - Vue linting in ozaria unit map and intro level pages
1 parent 149b5bc commit fd2d41f

File tree

9 files changed

+551
-542
lines changed

9 files changed

+551
-542
lines changed

‎app/core/Router.coffee‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,13 @@ module.exports = class CocoRouter extends Backbone.Router
177177
'minigames/conditionals': go('minigames/ConditionalMinigameView')
178178
'ozaria/play/intro/:introLevelOriginalId': go('core/SingletonAppVueComponentView')
179179
'ozaria/play/level/:levelID': go('views/ozaria/site/play/level/PlayLevelView')
180+
# TODO move to vue router after support for empty template is added there
181+
'ozaria/play/:campaign(?course-instance=:courseInstanceId)': (campaign, courseInstanceId) ->
182+
props = {
183+
campaign: campaign,
184+
courseInstanceId: courseInstanceId
185+
}
186+
@routeDirectly('ozaria/site/play/PageUnitMap', [], {vueRoute: true, baseTemplate: 'base-empty', propsData: props})
180187
'parents': go('ParentsView')
181188

182189
'paypal/subscribe-callback': go('play/CampaignView')
@@ -196,12 +203,6 @@ module.exports = class CocoRouter extends Backbone.Router
196203
@navigate("play/web-dev-level/#{sessionID}?#{queryString}", { trigger: true, replace: true })
197204
'play/spectate/:levelID': go('play/SpectateView')
198205
'play/:map': go('play/CampaignView')
199-
'play-ozaria/:unit(?course-instance=:courseInstanceId)': (unit, courseInstanceId) ->
200-
props = {
201-
campaign: unit,
202-
courseInstanceId: courseInstanceId
203-
}
204-
@routeDirectly('play/OzariaUnitMap', [], {vueRoute: true, baseTemplate: 'base-empty', propsData: props})
205206

206207
# Adding this route to test interactives until we have the intro levels implemented
207208
# TODO: remove this route when intro level is ready to test the interactives.

‎app/lib/dynamicRequire.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/views/play/OzariaUnitMap.vue‎

Lines changed: 0 additions & 233 deletions
This file was deleted.

‎app/views/play/OzariaUnitMapLevelDot.vue‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)