craftingguide/website
1
0
Fork 0
Code Pull Requests Actions Activity

Move model files to crafting-guide-common

Browse Source
This commit is contained in:
Andrew Miner
2017-05-02 18:34:53 -07:00
parent 69ca6b06b9
commit bd96bc6575
85 changed files with 134 additions and 5686 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/site/browse_page/browse_page_controller.coffee
+1 -1
View File
@@ -5,10 +5,10 @@
# All rights reserved.
#
{CraftingGuideClient} = require('crafting-guide-common').api
ModBallotController = require './mod_ballot/mod_ballot_controller'
ModTileController = require './mod_tile/mod_tile_controller'
PageController = require '../page_controller'
{CraftingGuideClient} = require 'crafting-guide-common'
########################################################################################################################
src/client/site/common/adsense/adsense_controller.coffee
+1 -1
View File
@@ -140,7 +140,7 @@ module.exports = class AdsenseController
adCount = @_computeAdCount @_computeAdType()
if adCount is 0
logger.verbose "Adsense is waiting for room to insert ads"
logger.trace "Adsense is waiting for room to insert ads"
@_waiting = true
_.delay (=> @_waiting = false; @_waitForPageReadiness()), c.adsense.readinessCheckInterval
else
src/client/site/common/item_selector/item_selector_controller.coffee
+1
View File
@@ -8,6 +8,7 @@
BaseController = require '../../base_controller'
ItemSelector = require '../../../models/site/item_selector'
ElementController = require './element/element_controller'
w = require "when"
########################################################################################################################
src/client/site/common/recipe/recipe_controller.coffee
+1 -1
View File
@@ -8,7 +8,7 @@
BaseController = require '../../base_controller'
CraftingGridController = require '../crafting_grid/crafting_grid_controller'
SlotController = require '../slot/slot_controller'
{StringBuilder} = require 'crafting-guide-common'
{StringBuilder} = require('crafting-guide-common').util
########################################################################################################################
src/client/site/craft_page/craft_page_controller.coffee
+3 -2
View File
@@ -7,11 +7,11 @@
BaseController = require '../base_controller'
CraftPage = require '../../models/site/craft_page'
Craftsman = require '../../models/crafting/craftsman'
{Craftsman} = require('crafting-guide-common').deprecated.crafting
CraftsmanWorkingController = require './craftsman_working/craftsman_working_controller'
InventoryController = require '../common/inventory/inventory_controller'
PageController = require '../page_controller'
SimpleInventory = require '../../models/crafting/simple_inventory'
{SimpleInventory} = require('crafting-guide-common').deprecated.crafting
StepController = require './step/step_controller'
########################################################################################################################
@@ -64,6 +64,7 @@ module.exports = class CraftPageController extends PageController
sampleInventory.parse inventoryText
@model.craftsman.want.addInventory sampleInventory
@_scrollTo @$workingSection
@onWantInventoryChanged()
return false
src/client/site/craft_page/craftsman_working/craftsman_working_controller.coffee
+1 -1
View File
@@ -6,7 +6,7 @@
#
BaseController = require '../../base_controller'
Craftsman = require '../../../models/crafting/craftsman'
{Craftsman} = require('crafting-guide-common').deprecated.crafting
########################################################################################################################
src/client/site/craft_page/step/step_controller.coffee
+1 -1
View File
@@ -8,7 +8,7 @@
BaseController = require '../../base_controller'
InventoryController = require '../../common/inventory/inventory_controller'
RecipeController = require '../../common/recipe/recipe_controller'
SimpleInventory = require '../../../models/crafting/simple_inventory'
{SimpleInventory} = require('crafting-guide-common').deprecated.crafting
########################################################################################################################
src/client/site/feedback/feedback_controller.coffee
+1
View File
@@ -7,6 +7,7 @@
BaseController = require '../base_controller'
EmailClient = require '../../models/site/email_client'
w = require "when"
########################################################################################################################
src/client/site/item_page/item_page_controller.coffee
+3 -2
View File
@@ -6,15 +6,16 @@
#
EditableFile = require '../../models/site/editable_file'
Item = require '../../models/game/item'
{Item} = require('crafting-guide-common').deprecated.game
ItemGroupController = require '../common/item_group/item_group_controller'
ItemPage = require '../../models/site/item_page'
ItemSlug = require '../../models/game/item_slug'
{ItemSlug} = require('crafting-guide-common').deprecated.game
MarkdownSectionController = require '../common/markdown_section/markdown_section_controller'
MultiblockViewerController = require './multiblock_viewer/multiblock_viewer_controller'
PageController = require '../page_controller'
RecipeDetailController = require './recipe_detail/recipe_detail_controller'
VideoController = require '../common/video/video_controller'
w = require "when"
########################################################################################################################
src/client/site/item_page/recipe_detail/recipe_detail_controller.coffee
+2 -2
View File
@@ -7,9 +7,9 @@
BaseController = require '../../base_controller'
CraftingGridController = require '../../common/crafting_grid/crafting_grid_controller'
Inventory = require '../../../models/game/inventory'
{Inventory} = require('crafting-guide-common').deprecated.game
InventoryController = require '../../common/inventory/inventory_controller'
{StringBuilder} = require 'crafting-guide-common'
{StringBuilder} = require('crafting-guide-common').util
########################################################################################################################
src/client/site/login_page/login_page_controller.coffee
+1 -1
View File
@@ -7,7 +7,7 @@
PageController = require '../page_controller'
GitHubUser = require '../../models/site/github_user'
{CraftingGuideClient} = require 'crafting-guide-common'
{CraftingGuideClient} = require('crafting-guide-common').api
########################################################################################################################
src/client/site/mod_page/mod_page_controller.coffee
+3 -3
View File
@@ -5,10 +5,10 @@
# All rights reserved.
#
PageController = require '../page_controller'
Item = require '../../models/game/item'
{Item} = require('crafting-guide-common').deprecated.game
ItemGroupController = require '../common/item_group/item_group_controller'
Mod = require '../../models/game/mod'
{Mod} = require('crafting-guide-common').deprecated.game
PageController = require '../page_controller'
TutorialController = require './tutorial/tutorial_controller'
########################################################################################################################
src/client/site/router.coffee
+9 -9
View File
@@ -5,15 +5,15 @@
# All rights reserved.
#
BrowsePageController = require './browse_page/browse_page_controller'
CraftPageController = require './craft_page/craft_page_controller'
ItemPageController = require './item_page/item_page_controller'
ItemSlug = require '../models/game/item_slug'
LoginPageController = require './login_page/login_page_controller'
ModPageController = require './mod_page/mod_page_controller'
NewsPageController = require './news_page/news_page_controller'
TutorialPageController = require './tutorial_page/tutorial_page_controller'
UrlParams = require './url_params'
BrowsePageController = require './browse_page/browse_page_controller'
CraftPageController = require './craft_page/craft_page_controller'
ItemPageController = require './item_page/item_page_controller'
{ItemSlug} = require('crafting-guide-common').deprecated.game
LoginPageController = require './login_page/login_page_controller'
ModPageController = require './mod_page/mod_page_controller'
NewsPageController = require './news_page/news_page_controller'
TutorialPageController = require './tutorial_page/tutorial_page_controller'
UrlParams = require './url_params'
########################################################################################################################
src/client/site/site_controller.coffee
+20 -3
View File
@@ -13,9 +13,8 @@ FooterController = require './footer/footer_controller'
GitHubUser = require '../models/site/github_user'
HeaderController = require './header/header_controller'
ImageLoader = require './image_loader'
Mod = require '../models/game/mod'
ModPack = require '../models/game/mod_pack'
ModPackStore = require '../models/store/mod_pack_store'
{Mod} = require('crafting-guide-common').deprecated.game
{ModPack} = require('crafting-guide-common').deprecated.game
Router = require './router'
########################################################################################################################
@@ -31,6 +30,7 @@ module.exports = class SiteController extends BaseController
@client = options.client
@fileCache = new FileCache c.url.modpackArchive()
@imageLoader = new ImageLoader defaultUrl:'/images/unknown.png'
@modPack = new ModPack {}, fileCache:@fileCache
@router = new Router this
@storage = options.storage
@@ -41,6 +41,23 @@ module.exports = class SiteController extends BaseController
# Public Methods ###############################################################################
loadDefaultModPack: ->
makeResponder = (m)-> return ->
m.activeModVersion.fetch() if m.activeModVersion?
for modSlug, modData of c.defaultMods
mod = new Mod {slug:modSlug}, {fileCache:@fileCache}
mod.on c.event.change + ':activeModVersion', makeResponder mod
@storage.register "mod:#{mod.slug}", mod, 'activeVersion', modData.defaultVersion
mod.fetch()
@modPack.addMod mod
if global.env isnt 'prerender'
@modPack.once c.event.sync, =>
@$pageContent.removeClass 'hidden'
@$pageContentLoading.addClass 'hidden'
loadCurrentUser: ->
@client.getCurrentUser()
.then (response)=>