diff options
| author | Jules Laplace <jules@okfoc.us> | 2015-09-25 12:36:32 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2015-09-25 12:36:32 -0400 |
| commit | f5e8e323597cf4655b5967a2c372d10e9f05782b (patch) | |
| tree | ca1489ada38b3df8dbb9c93c1b77b643ab51de6c | |
| parent | 6e96cf96eed6704c26e28c01dd3ece0eee54b1fd (diff) | |
grunt
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Gruntfile.js | 49 | ||||
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | public/dev.html | 69 | ||||
| -rw-r--r-- | public/index.html | 13 | ||||
| -rw-r--r-- | public/js/app.min.js | 0 |
6 files changed, 125 insertions, 11 deletions
@@ -9,4 +9,5 @@ node_modules/ dist *.sql .env +app.concat.js diff --git a/Gruntfile.js b/Gruntfile.js new file mode 100644 index 0000000..35ef388 --- /dev/null +++ b/Gruntfile.js @@ -0,0 +1,49 @@ +module.exports = function(grunt) { + + // Project configuration. + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + concat: { + js: { + options: { + separator: "\n;\n" + }, + src: [ + "public/js/vendor/lodash.min.js", + "public/js/vendor/util.js", + "public/js/vendor/view/view.js", + "public/js/vendor/view/uploadview.js", + "public/js/drag.js", + "public/js/nav.js", + "public/js/index.js", + ], + dest: 'public/js/app.concat.js' + }, + }, + + uglify: { + options: { + }, + index: { + src: 'public/js/app.concat.js', + dest: 'public/js/app.min.js' + }, + }, + + clean: { + release: [ + "dist/app.concat.js", + ], + }, + }); + + // Load tasks that we'll be using + grunt.loadNpmTasks('grunt-contrib-concat'); + grunt.loadNpmTasks('grunt-contrib-uglify'); + grunt.loadNpmTasks('grunt-contrib-clean'); + grunt.loadNpmTasks('grunt-dentist'); + + // Default task(s). + // grunt.registerTask('default', ['dentist', 'concat', 'uglify', 'copy', 'clean']); + grunt.registerTask('default', ['concat', 'uglify', 'clean']); +}; diff --git a/package.json b/package.json index 32bfa35..37b5a9c 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,10 @@ "ejs": "^2.3.4", "express": "^4.13.3", "express-json": "^1.0.0", + "grunt": "^0.4.5", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-concat": "^0.5.1", + "grunt-contrib-uglify": "^0.9.2", "knex": "^0.8.6", "knox": "^0.9.2", "lodash": "^3.10.1", diff --git a/public/dev.html b/public/dev.html new file mode 100644 index 0000000..20a7830 --- /dev/null +++ b/public/dev.html @@ -0,0 +1,69 @@ +<!DOCTYPE html> +<html> +<head> +<title>LuCkYPLoP™</title> +<meta property="og:title" content="LuCkYPLoP™"> +<meta property="og:type" content="website"> +<meta property="og:image" content=""> +<meta property="og:url" content=""> +<meta property="og:site_name" content="LuckyPlop - The Best Image Uploader Thing"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<meta name="description" content="LuckyPlop - Check this out.."> +<link rel="stylesheet" href="/assets/css/css.css"> +</head> +<body> + +<div id="luckyimage"></div> + +<div id="topnav"> + <span class="luckyback"> + <a id="prev">[<< previous 画像]</a> + <a id="next">[前のnewer >>]</a> + <a id="refresh">Rfsh</a> + <a id="random">RNDM</a> + </span> +</div> + +<a id="pip"><img></a> + +<div id="morelucky" class="popup_block"> + <div id="luckyinfo"> + <img src="http://okfocus.s3.amazonaws.com/luckyplop/lucky1.png" class="luckylogo"> + <ul> + <li>LuCkYPLoP™ is the world's best PIC UPLOADINGッTOOL!プド!</li> + <li>LuCkYPLoP™ lets you DRAG an image from your computer to anywhere in the page + to uploadド!. The picture is displayed until a NEW image is uploaded from anywhere in the + in the WORLD!!</li> + <li>LuCkYPLoP™ letsことができます you DISCOVER image過s from oth去er userの画s, you can像を view past imagesる!</li> + <li>On LuCkYPLoP™ you have a 1 in 100 chance ラッキー . to win amazing prizes!</li> + <li>Just upload things and LuCkYPLoP™ will do the lottery宝くじ! AND MAKE YOU WINメーカーに勝つ!!</li> + </ul> + <hr> + </div> +</div> + +<div id="bottombar"> + <marquee scrollamount="10" width="100%"> + Step 1.drag an image into luckyplop! - + Step 2.see if you won! - + 3.Share the image on friendster, grindr, twitter, myspace or facebook! + </marquee> +</div> + +<img src="http://okfocus.s3.amazonaws.com/luckyplop/luckypad.png" id="luckypad"> + +<div id="droparea"></div> + +</body> + +<script src="/assets/js/vendor/jquery-2.1.4.min.js"></script> +<script src="/assets/js/vendor/lodash.min.js"></script> +<script src="/assets/js/vendor/util.js"></script> +<script src="/assets/js/vendor/view/view.js"></script> +<script src="/assets/js/vendor/view/uploadview.js"></script> + +<script src="/assets/js/drag.js"></script> +<script src="/assets/js/nav.js"></script> +<script src="/assets/js/index.js"></script> + +</html> diff --git a/public/index.html b/public/index.html index 2e0bf79..25d82ed 100644 --- a/public/index.html +++ b/public/index.html @@ -56,16 +56,7 @@ </body> -<script src="/assets/js/vendor/jquery-2.1.4.min.js"></script> -<script src="/assets/js/vendor/lodash.min.js"></script> -<script src="/assets/js/vendor/util.js"></script> -<script src="/assets/js/vendor/view/view.js"></script> -<script src="/assets/js/vendor/view/formview.js"></script> -<script src="/assets/js/vendor/view/uploadview.js"></script> -<script src="/assets/js/vendor/view/router.js"></script> - -<script src="/assets/js/drag.js"></script> -<script src="/assets/js/nav.js"></script> -<script src="/assets/js/index.js"></script> +<script src='https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js'></script> +<script src='/js/app.min.js'></script> </html> diff --git a/public/js/app.min.js b/public/js/app.min.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/public/js/app.min.js |