diff --git a/Gruntfile.coffee b/Gruntfile.coffee index b930d253f..eaa0f215c 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -151,27 +151,41 @@ module.exports = (grunt)-> # Compound Tasks ################################################################################################### - grunt.registerTask 'build', ['jade', 'build:copy', 'css', 'browserify:external', 'browserify:internal'] + grunt.registerTask 'build', 'build the project to be run from a local server', + ['jade', 'build:copy', 'css', 'browserify:external', 'browserify:internal'] - grunt.registerTask 'build:copy', ['copy:assets_build', 'copy:common_source', 'copy:server_source'] + grunt.registerTask 'build:copy', 'helper task for build', + ['copy:assets_build', 'copy:common_source', 'copy:server_source'] - grunt.registerTask 'css', ['sass_globbing', 'sass'] + grunt.registerTask 'build:css', 'helper task for build', + ['sass_globbing', 'sass'] - grunt.registerTask 'default', ['clean', 'start'] + grunt.registerTask 'default', 'rebuild the project from scratch and start a local HTTP server', + ['clean', 'start'] - grunt.registerTask 'deploy:prod', ['script:deploy:prod'] + grunt.registerTask 'deploy:prod', 'deploy the project to production via CircleCI', + ['script:deploy:prod'] - grunt.registerTask 'deploy:staging', ['script:deploy:staging'] + grunt.registerTask 'deploy:staging', 'deploy the project to staging via CircleCI', + ['script:deploy:staging'] - grunt.registerTask 'dist', ['build', 'uglify', 'copy:build_to_dist', 'compress'] + grunt.registerTask 'dist', 'build the project to be run from Amazon S3', + ['build', 'uglify', 'copy:build_to_dist', 'compress'] - grunt.registerTask 'prepublish', ['clean', 'coffee'] + grunt.registerTask 'prepublish', 'build the project to be published to NPM as shared code', + ['clean', 'coffee'] - grunt.registerTask 'start', ['build', 'script:start'] + grunt.registerTask 'start', 'build the project and start a local HTTP server', + ['build', 'script:start'] - grunt.registerTask 'test', ['mochaTest'] + grunt.registerTask 'test', 'run unit tests', + ['mochaTest'] - grunt.registerTask 'upload', ['dist', 'script:s3_upload'] + grunt.registerTask 'upload:prod', 'upload the project to the production Amazon S3 environment', + ['dist', 'script:s3_upload:prod'] + + grunt.registerTask 'upload:staging', 'upload the project the staging Amazon S3 environment', + ['dist', 'script:s3_upload:staging'] # Code Tasks ####################################################################################################### @@ -228,11 +242,15 @@ module.exports = (grunt)-> done = this.async() grunt.util.spawn cmd:'./scripts/publish', opts:{stdio:'inherit'}, -> done() - grunt.registerTask 'script:s3_upload', 'uploads all static content to S3', -> + grunt.registerTask 'script:s3_upload:prod', 'uploads all static content to S3', -> done = this.async() - grunt.util.spawn cmd:'./scripts/s3_upload', opts:{stdio:'inherit'}, -> done() + grunt.util.spawn cmd:'./scripts/s3_upload', args:['--prod'], opts:{stdio:'inherit'}, -> done() - grunt.registerTask 'script:start', "start the server at port 8080", -> + grunt.registerTask 'script:s3_upload:staging', 'uploads all static content to S3', -> + done = this.async() + grunt.util.spawn cmd:'./scripts/s3_upload', args:['--staging'], opts:{stdio:'inherit'}, -> done() + + grunt.registerTask 'script:start', "start a local HTTP server on port 8080", -> done = this.async() grunt.util.spawn cmd:'./scripts/start', opts:{stdio:'inherit'}, -> done() diff --git a/circle.yml b/circle.yml index 8efca9612..50e593418 100644 --- a/circle.yml +++ b/circle.yml @@ -6,8 +6,8 @@ deployment: staging: branch: staging commands: - - grunt deploy:staging + - grunt upload:staging production: branch: production commands: - - grunt deploy:prod + - grunt upload:prod diff --git a/src/client/site/templates.js b/src/client/site/templates.js deleted file mode 100644 index af05bcef6..000000000 --- a/src/client/site/templates.js +++ /dev/null @@ -1,260 +0,0 @@ -var jade = jade || require('jade/lib/runtime'); - -this["JST"] = this["JST"] || {}; - -this["JST"]["browse_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["browse_page/mod_tile"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

");;return buf.join(""); -}; - -this["JST"]["common/adsense"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["common/crafting_grid"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["common/inventory"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
nothing

add an item...

clear

");;return buf.join(""); -}; - -this["JST"]["common/item_group"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

");;return buf.join(""); -}; - -this["JST"]["common/item_group/item_tile"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

");;return buf.join(""); -}; - -this["JST"]["common/item_selector/element"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["common/item_selector"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["common/markdown_section/markdown_image_list/markdown_image"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

checking for image...

");;return buf.join(""); -}; - -this["JST"]["common/markdown_section/markdown_image_list"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Images Referenced

");;return buf.join(""); -}; - -this["JST"]["common/markdown_section"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Please help by adding a description!

Edit using GitHub\nFlavored Markdown. Use [[Item Name]] to link to another item and ![](image.png)\nto add an image.
Confused? Click here to ask a question!

edit

save

preview

cancel

return

Thanks for your help!

Your changes will appear on the site in a few minutes.

Sorry, but something went wrong.

Please try again after a few moments.

");;return buf.join(""); -}; - -this["JST"]["common/recipe"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["common/slot"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["common/stack"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

 

 

");;return buf.join(""); -}; - -this["JST"]["common/video"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

");;return buf.join(""); -}; - -this["JST"]["craft_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push(""); -var quarryHref = '/craft/quarry' -var quarry -var quantumSuitHref = '/craft/quantumsuit_bodyarmor:quantumsuit_boots:quantumsuit_helmet:quantumsuit_leggings' -var ic2Href = '/browse/industrial_craft_2' -var solarPanelHref = '/craft/solar_panel_vi' -var solarFluxHref = '/browse/solar_flux' -buf.push("

Instructions

Crafting Guide provides step-by-step instructions for thousands of items from Minecraft and many\npopular mods. Just click \"Add an item...\" down below.

Not sure what you'd like to make? Try one of these:

Items to Make

Already in Inventory

Need to Gather

Steps

");;return buf.join(""); -}; - -this["JST"]["craft_page/craftsman_working"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

");;return buf.join(""); -}; - -this["JST"]["craft_page/step"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

complete step

make this tool

");;return buf.join(""); -}; - -this["JST"]["feedback"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Sending failed. Please try again later.

send

Feedback

");;return buf.join(""); -}; - -this["JST"]["footer"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

About

Crafting Guide gives step-by-step instructions for making anything in Minecraft or its many mods. Just\nsay what you'd like to make, what you already have, it will do the rest, giving you a list of raw\nmaterials and instructions of which items to make in the proper order. You can even ask it to include\nthe materials and instructions for all the tools you'll need along the way!\n

Donate

Crafting Guide is free for all, but if you find it helpful, donations in any amount are gratefully\naccepted.

Get Involved

Crafting Guide is completely open-source, and you can help! Whether you want to write a recipe book\n(all simple JSON), or implement new features, just head over to GitHub to get started.

");;return buf.join(""); -}; - -this["JST"]["header"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Minecraft Crafting Guide

Craft

Browse

News

Search

Login

");;return buf.join(""); -}; - -this["JST"]["item_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

View Crafting Plan

Official Link:project page

Multiblock Construction

Recipes

Videos

");;return buf.join(""); -}; - -this["JST"]["item_page/multiblock_viewer/multiblock"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
");;return buf.join(""); -}; - -this["JST"]["item_page/multiblock_viewer"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Complete Materials

Current Layer

back

next

 

");;return buf.join(""); -}; - -this["JST"]["item_page/recipe_detail"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Ingredients

Produces

");;return buf.join(""); -}; - -this["JST"]["login_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

Login with GitHub

Use your GitHub credentials to login and make changes on Crafting Guide. No GitHub account? Don't\nworry, you can get one for free. read more...\n

All changes you make on the site get submitted directly to our GitHub repo, and then published\nthrough the same automated deployment process as changes made by anyone else. That way, anyone\ncan contribute easily: whether developer or end user.

To log in, we redirect you to GitHub's site, and once you're signed in, they'll send you back\nhere. We never see your credentials, and only get the minimum set of permissions necessary to\nsubmit changes to the Crafting Guide repo on your behalf.

GitHub offers free accounts, so even if you don't already have one, you've got nothing to lose!\n

Login with GitHub

Completing log in...

Hang on just a second while we finish logging you in...

Oops!

Sorry about that, but it looks like something went wrong with your GitHub login. Click the button below\nto try again, or use the Feedback button on the left to let us know, and we'll try to help.\n

Login with GitHub

All set!

You are logged in to CraftingGuide using the following GitHub account:

You will be redirected shortly.

Logout

Sorry!

Our interactive editing service is down right now, but you can always submit a pull request over at the\nCrafting Guide GitHub Repository. We'll\nhave the editing service back up soon!

");;return buf.join(""); -}; - -this["JST"]["mod_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
in my mod pack
PLEASE NOTE: By selecting \"no\", crafting plans, search, and other features will ignore items\nand recipes from this mod.

Official Links:

project pagedocumentationdownload

Tutorials

");;return buf.join(""); -}; - -this["JST"]["mod_page/tutorial"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

");;return buf.join(""); -}; - -this["JST"]["news_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("

2015-02-11

I've been using Modular PowerSuits myself lately, and I\nnoticed that the newest version (finally!) comes with default recipes. So, I've updated\nCrafting Guide to support both the newest vanilla recipes as well as those from Thermal\nExpansion. You can switch back and forth on the Configure page.\n

2015-02-09

Back before the winter holidays, the extremely patient \ntdallmann completed support for Hydraulicraft, and I'm\nafraid I'm only now getting it up on the site! It looks like a neat mod based all around the\nscience of hydraulics with a nicely stepped set of devices to be made at each level. Many thanks\nto tddallmann for adding it to Crafting Guide!

I also received a submission for adding OpenComputers from\nyut23. Should be a big help to those aspiring Minecraft\nprogrammers who want a bit more challege than is provided by \nComputerCraft! Thanks, yut23!\n

2015-11-25

With many thanks to Mike Caron, I'm pleased to announce\nsupport for Storage Drawers!\n

2015-12-13

I'm super excited to announce that I've added full multi-block support for Crafting Guide! For\nexample, check out a 5-Core Reactor\nfrom Big Reactors, or the 5x5x5 Steel Tank from\nRailcraft. I'm really pleased with how it turned out!\n

2015-11-17

And today, it's Extra Cells!\n

2015-11-16

It's a small one, but also highly requested... Here's ComputerCraft!\n

2015-11-14

One more small one over the weekend... Advanced Solar\nPanels has been added to crafting guide!\n

2015-11-14

For a long while now, Galacticraft has been the most\nrequested mod, and it's finally here! Enjoy!\n

2015-11-10

Remember me? They guy who runs the site. Yeah, I'm back, and with big news! The site now has\na completely new crafting algorithm. Instead of just taking the first crafting plan it comes up\nwith, it tries to compute every possible plan, rates them, and then picks the best one. This\nalso clears up a lot of bugs related to the old algorithm. The one drawback is that some items\ncan take a bit longer to compute than with the old way, but I think you'll find it's worth it!

On a personal note, I think it's clear that I don't have nearly as much time to dedicate to the\nsite as I used to. That's mostly because I started a new job which keeps me away from working\non the site so much. I hope to be able to get into a more regular pace now things my personal\nlife has settled down again.\n

2015-07-25

You may have noticed things have been very quiet with the site for the past month... well I'm\nafraid that's because I haven't been working on it. Instead, I've been hunting for a new job.\nNow that I've got that all squared away (I'll be starting at Looker in Santa Cruz on Monday),\nI'll have nights and weekends to continue working on the site. Thanks for being patient!\n

2015-06-12

Today I launched the second major part of the item description editor: image uploads! As you\nenter your description, use the markdown notation for an image ![](image.png) and a\nempty image preview will show up underneath the editor. Click the button to select an image from\nyour computer. Just be sure to keep the images to a reasonable size (< 750kB, and < 740px by\n600px).\n

2015-05-13

As of today, you can now add and edit item descriptions right on Crafting Guide. This feature is\nstarting small with just item descriptions, but eventually all the content on the site will be\neditable. All you need is a (free) GitHub account, and you're ready to go!

For those more comfortable with a regular text editor, all the content is still in GitHub under\nthe crafting-guide-data repo.\nJust follow the instructions, and you can submit content via pull request instead of using the\nwebsite's editor.\n

2015-04-30

I've been working on a big new feature for a while now, but I didn't want to leave everyone\nwithout anything new for so long... So, I've just finished adding MineFactory Reloaded! Enjoy!\n

2015-04-20

Okay... big changes on the crafting page! Instead of having four little boxes for the various\nparts of the crafting plan, the new page shows all the steps as one long list. In addition, you\nget a lot more control over the plan. Now, you can even mark individual steps as complete to get\na new crafting plan which doesn't include those items.

As an example, let's say you're thinking about upgrading your Reinforced Jetpack to a shiny new Resonant Jetpack, you can just mark off the\nstep for the Reinforced Jetpack, and get only the materials and steps for doing the upgrade.\nI'm really pleased with the new crafting page, and I think you're going to love it!\n

2015-04-11

I've just finished adding Simply Jetpacks by Tonius. It\nseems like a simple mod on the surface, but what with all the upgrades and technology tiers, it\ntakes an amazing 87 steps to make the highest-tier\njetpack!

I've also added Solar Flux by Nauktis. Again, another\ndeceptively simple mod, but the most powerful solar\npanel kicks out an impressive 4096 RF/t! I just hope your mine has been productive... among\nother things, you'll need 45 Diamonds, 110 Gold Ore, 1568 Copper Ore, and 6023 Iron Ore!

");;return buf.join(""); -}; - -this["JST"]["tutorial_page"] = function template(locals) { -var buf = []; -var jade_mixins = {}; -var jade_interp; - -buf.push("
a tutorial for
from

");;return buf.join(""); -}; - -if (typeof exports === 'object' && exports) {module.exports = this["JST"];} \ No newline at end of file