xonecas.io
1361
Xc

xonecas.com / commit e6df8b2

New directory tree to allow for seamless, requirejs usage between prod and dev, see server.js for instructions

Sean Caetano Martin2011-10-27 e6df8b270159594fa0084d35c34f17c7bd11b6e5 parent d0feda2

29 files changed

.gitignore+1−0
@@ -1,4 +1,5 @@
11 node_modules
2+build
23
34 # Mac stuff
45 .DS_Store
app.build.js+13−0
@@ -0,0 +1,13 @@
1+({
2+ appDir: './public',
3+ baseUrl: './',
4+ paths: {
5+ bootstrap: './bootstrap/js'
6+ },
7+ dir: 'build',
8+ modules: [
9+ {name: 'js/init'},
10+ {name: 'js/init-event'}
11+ ],
12+ dirExclusionRegExp: /^(node_modules|2d-particle-experiements|canvas-rings|creativejs-threejs-part1|fractal-tree|build)$/
13+})
public/bootstrap+1−0
@@ -0,0 +1 @@
1+../bootstrap/
public/event/index.html+17−0
@@ -0,0 +1,17 @@
1+<!doctype html>
2+<html lang="en">
3+<head charset="utf-8">
4+
5+ <title>xonecas.com</title>
6+ <meta name="author" content="@xonecas">
7+ <meta name="description" content="Notes and rants">
8+
9+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
10+
11+ <script src="/vendor/modernizr.js"></script>
12+ <!-- require magic! -->
13+ <script data-main="/js/router.js" src="/vendor/require.js"></script>
14+
15+
16+</body>
17+</html>
public/favicon.ico+0−0
public/imgs/ajax-loader.gif+0−0
public/imgs/ajax-loader1.gif+0−0
public/imgs/me.png+0−0
public/index.html+1−1
@@ -10,7 +10,7 @@
1010
1111 <script src="vendor/modernizr.js"></script>
1212 <!-- require magic! -->
13- <script data-main="js/init" src="vendor/require.js"></script>
13+ <script data-main="js/router.js" src="vendor/require.js"></script>
1414
1515 <link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
1616 <link rel="stylesheet" type="text/css" href="styles/style.css?v=1">
public/js/init-event.js+12−0
@@ -0,0 +1,12 @@
1+require.config({
2+ baseUrl: '/'
3+});
4+
5+require([
6+ 'vendor/underscore',
7+ 'vendor/jquery'
8+], function () {
9+ _.each([1,2,3,4,5,6], function (num) {
10+ $('body').append('<p>'+num+'</p>');
11+ });
12+});
public/js/init.js+1−0
@@ -26,3 +26,4 @@ require([
2626
2727 });
2828 });
29+
public/js/old_script.js+0−0
public/js/router.js+9−0
@@ -0,0 +1,9 @@
1+var loc = location.pathname.split('/')[1];
2+
3+require.config({
4+ baseUrl: '/'
5+});
6+
7+loc === "" && require(['js/init']);
8+
9+loc === "event" && require(['js/init-event']);
public/js/script.js+0−0
public/styles/base.less+1−1
@@ -1,5 +1,5 @@
11 @import "bootstrap/lib/bootstrap.less";
2-@import "styles/smoke.less";
2+@import "_root_/styles/smoke.less";
33
44 body {
55 margin-top: 100px;
public/styles/smoke.css+0−0
public/styles/smoke.less+0−0
public/styles/style.css+1−1
@@ -355,7 +355,7 @@ button.cancel{background-color:#999;color:#222222;}
355355 .dialog-prompt input{width:300px;text-align:center;background-color:#ccc;}
356356 body{margin-top:100px;}
357357 article{margin:0 0 140px 0;}
358-pre,code{font-family:'Inconsolata',monospace;}
358+pre,code{font-family:'Inconsolata',monospace;font-size:14px;}
359359 pre code{background-color:#f5f5f5;}
360360 code .keyword{font-weight:bold;}
361361 code .string,code .regexp{color:red;}
public/vendor/backbone.js+0−0
public/vendor/handlebars.js+0−0
public/vendor/hijs.js+0−0
public/vendor/jquery.js+0−0
public/vendor/json2.js+0−0
public/vendor/less.js+0−0
public/vendor/modernizr.js+0−0
public/vendor/require.js+0−0
public/vendor/smoke.js+0−0
public/vendor/underscore.js+0−0
server.js+15−5
@@ -1,5 +1,7 @@
11 var
2- _fs = require('fs'),
2+ prod = process.env.PRODUCTION,
3+ root = prod ? "./build" : "./public",
4+ _fs = require('fs'),
35 less = require('less'),
46 parser,
57 connect = require('connect'),
@@ -7,7 +9,7 @@ var
79 //connect.profiler(),
810 connect.logger('dev'),
911 connect.favicon("./favicon.ico"),
10- connect['static'](__dirname),
12+ connect['static'](root),
1113 connect.errorHandler({
1214 'stack': true,
1315 'message': true,
@@ -16,17 +18,19 @@ var
1618 );
1719
1820 parser = new (less.Parser)();
19-_fs.readFile('styles/base.less', 'utf8', function (itAway, out) {
21+_fs.readFile(root+'/styles/base.less', 'utf8', function (itAway, out) {
2022 if (itAway) {
2123 throw itAway;
2224 }
2325
26+ out = out.replace(/_root_/, root);
27+
2428 parser.parse(out, function (down, tree) {
2529 if (down) {
2630 throw down;//!!!!!
2731 }
2832
29- _fs.writeFile('styles/style.css', tree.toCSS({ compress: true }), 'utf8', function (yourArmsUp) {
33+ _fs.writeFile(root+ '/styles/style.css', tree.toCSS({ compress: true }), 'utf8', function (yourArmsUp) {
3034 if (yourArmsUp) {
3135 throw yourArmsUp; // \o/
3236 }
@@ -35,5 +39,11 @@ _fs.readFile('styles/base.less', 'utf8', function (itAway, out) {
3539 });
3640 });
3741
38-server.listen(80);
42+server.listen(prod ? 80 : 8080);
3943 console.log('OK');
44+prod && console.log('PRODUCTION');
45+
46+// for production run `node node_modules/requirejs/bn/r.js -o app.build.js`
47+// then run `sudo PRODUCTION=true node server`
48+//
49+// for dev just run `node server`