All CSS into one, JSs optimized into 2 files: one for normal libs, on…

…e for modules
valegrajales · Jun 16, 2012 · 9f2d262 · 9f2d262
1 parent 1c6409e
commit 9f2d262
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,11 @@ I've chosen Mocha for all tests in this project. To run unit tests & function te
 If you're testing on Windows, install Mocha globally: 'npm install mocha@1.1.0 -g' and run 'mocha --ui bdd --recursive --reporter spec --timeout 10000 --slow 300' instead.
 For client side tests, open 'http://server:port/test'.
 
+## Build
+
+I've concatenated and minified the css into a single file and the JS into 2 files: one file that contains libraries (such as jQuery, underscore etc.. including RequireJS) and another file that includes all the RequireJS modules (minified and concatenated with r.js, the RequireJS optimizer).
+To see all the original files during development, use http://host:port/development.html.
+
 ## Small JS styleguide for the project
 
 - 2 spaces for indentation

diff --git a/public/build/app-modules.js b/public/build/app-modules.js
diff --git a/public/build/app.css b/public/build/app.css
diff --git a/public/build/app.js b/public/build/app.js
diff --git a/public/development.html b/public/development.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Client Manager</title>
+  <meta name="description" content="">
+  <meta name="author" content="">
+
+  <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+  <!--[if lt IE 9]>
+  <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+  <![endif]-->
+
+  <!-- Le styles -->
+  <link href="css/bootstrap.css" rel="stylesheet">
+  <link href="css/style.css" rel="stylesheet" />
+</head>
+<body>
+
+  <header>
+  </header>
+
+  <div class="container">
+
+    <section class="page-content"></section>
+
+    <hr />
+
+    <footer>
+      <p>&copy; Alexandru Vladutu 2012</p>
+    </footer>
+
+  </div> <!-- /container -->
+
+  <!-- Le javascript
+  ================================================== -->
+  <!-- Placed at the end of the document so the pages load faster -->
+
+  <!-- Load the script "js/main.js" as our entry point -->
+  <script data-main="js/main" src="js/lib/require.min.js"></script>
+
+</body>
+</html>
diff --git a/public/index.html b/public/index.html
@@ -12,8 +12,7 @@
   <![endif]-->
 
   <!-- Le styles -->
-  <link href="css/bootstrap.css" rel="stylesheet">
-  <link href="css/style.css" rel="stylesheet" />
+  <link rel="stylesheet" href="build/app.css" />
 </head>
 <body>
 
@@ -36,8 +35,8 @@
   ================================================== -->
   <!-- Placed at the end of the document so the pages load faster -->
 
-  <!-- Load the script "js/main.js" as our entry point -->
-  <script data-main="js/main" src="js/lib/require.min.js"></script>
+  <!-- jQuery, underscore, backbone, moment, bootstrap, requirejs and then Load the script "js/main-built.js" as our entry point -->
+  <script data-main="build/app-modules" src="build/app.js"></script>
 
 </body>
 </html>