diff --git a/README.md b/README.md index 509ab08..44e41c9 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ $ ./node_modules/.bin/gulp serve To build the editor, run: ```bash -$ gulp build +$ gulp dist ``` -This will compile all scripts and styles and inline them into a single html file in the `dist/` folder. It will also create a `dist/assets/` folder, which separately contains the instructions and page screenshot so that they can easily be changed between different rounds of the competition. +This will compile all scripts and styles and inline them into a single html file in the `dist/` folder. It will also create a `dist/assets/` folder, which separately contains the instructions and page screenshot so that they can easily be changed between different rounds of the competition. ## Contributing -Contributions to the editor welcome. If you've fixed a bug or implemented a cool new feature that you would like to share, please feel free to open a pull request here. +Contributions to the editor welcome. If you've fixed a bug or implemented a cool new feature that you would like to share, please feel free to open a pull request here. diff --git a/app/assets/beach.jpg b/app/assets/beach.jpg new file mode 100644 index 0000000..067fd9d Binary files /dev/null and b/app/assets/beach.jpg differ diff --git a/app/assets/instructions.html b/app/assets/instructions.html index 6b74e88..47f99a7 100644 --- a/app/assets/instructions.html +++ b/app/assets/instructions.html @@ -17,16 +17,18 @@ 2) Stay in this editor at all times 3) No measurement tools 4) Stop coding when the time's up -5) Use the "Download file" button and save the file as design.html in the same folder as the editor. +5) After the round is over, press "Finish" and follow the prompt instructions to see your results Good luck and most important of all; have fun! --- Assets --- -* INCLUDE PATHS TO ANY ASSETS THE PAGE MIGHT NEED -* MAKE SURE TO PROVIDE DIMENSIONS FOR THE ASSETS AS WELL +NOTE TO ORGANIZERS (REMOVE ME): + * INCLUDE PATHS TO ANY ASSETS THE PAGE MIGHT NEED HERE + * MAKE SURE TO PROVIDE DIMENSIONS FOR THE ASSETS AS WELL + * THE BASE PATH WHEN VIEWING RESULTS IS /assets, SO YOU DON'T NEED TO INCLUDE THAT IN THE PATHS BELOW -assets/ASSET_NAME300x300px.png +./beach.jpg (1223x815) - \ No newline at end of file + diff --git a/app/assets/result.html b/app/assets/result.html new file mode 100644 index 0000000..a39b0ed --- /dev/null +++ b/app/assets/result.html @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/app/index.html b/app/index.html index 246e5c4..f89f2cc 100644 --- a/app/index.html +++ b/app/index.html @@ -20,14 +20,23 @@
+
+ Unnamed +
+

POWER MODE!

-
- + +
+ + +
+ + + + +
+ + +
+ + - - - - \ No newline at end of file diff --git a/gulpfile.coffee b/gulpfile.coffee index f9a8e63..904b745 100644 --- a/gulpfile.coffee +++ b/gulpfile.coffee @@ -2,6 +2,7 @@ _ = require "underscore" $ = require("gulp-load-plugins")() gulp = require "gulp" path = require "path" +rename = require "gulp-rename" merge = require "merge-stream" deepExtend = require "deep-extend" runSequence = require "run-sequence" @@ -100,7 +101,7 @@ gulp .task "copy-page-files", -> gulp - .src path.join(config.paths.assets, "{instructions.html,page.png}") + .src path.join(config.paths.assets, "{instructions.html,page.png,result.html,beach.jpg}") .pipe gulp.dest(path.join config.paths.dist, "assets") .task "webpack-dev-server", (done) -> @@ -129,10 +130,10 @@ gulp gulp .src "#{config.paths.tmp}/index.html" .pipe $.inlineSource() + .pipe rename(basename: "editor") .pipe gulp.dest("#{config.paths.dist}") .task "dist", -> runSequence "copy-assets", "build", "inline", "copy-page-files" .task "default", ["serve"] - diff --git a/package.json b/package.json index bdb11ff..65701cb 100644 --- a/package.json +++ b/package.json @@ -15,13 +15,14 @@ "gulp": "^3.8.11", "gulp-inline-source": "^1.2.0", "gulp-load-plugins": "^0.8.0", + "gulp-rename": "^1.2.2", "gulp-util": "^3.0.4", "jquery": "^2.1.3", "merge-stream": "^1.0.0", - "node-sass": "^3.4.2", + "node-sass": "^3.8.0", "postcss-loader": "^0.3.0", "run-sequence": "^1.0.2", - "sass-loader": "^3.1.2", + "sass-loader": "^4.0.1", "style-loader": "^0.8.3", "underscore": "^1.8.2", "url-loader": "^0.5.5",