Permalink
Browse files

server builds and css optimization working

  • Loading branch information...
1 parent d287ec3 commit afeb5284c19b3704f06d07f5315698cc7ef07054 @rmurphey rmurphey committed Apr 9, 2012
Showing with 22 additions and 10 deletions.
  1. +17 −7 README.md
  2. +0 −1 app/index.html
  3. +3 −1 assets/css/srchr.css
  4. +1 −1 bin/server
  5. +1 −0 srchr.build.js
View
24 README.md
@@ -1,3 +1,5 @@
+# Srchr
+
This app searches Flickr and Youtube for content based an a search term entered
by a user. It uses a variety of technologies, including:
@@ -6,30 +8,38 @@ by a user. It uses a variety of technologies, including:
- [Backbone](http://documentcloud.github.com/backbone/) for the client
- [Mocha](http://visionmedia.github.com/mocha/) and [expect.js](https://github.com/LearnBoost/expect.js/blob/master/README.md) for tests
-# Running the app
+## Running the app
1. Install node. [Homebrew](http://mxcl.github.com/homebrew/) is your best bet: `brew install node`.
2. Install [npm](http://npmjs.org/).
3. Run `npm install` from the root directory of this project to load the dependencies.
4. Copy `server/config.js.example` to `server/config.js` and update with your
API key(s) if you'd like. Currently, only the Youtube search will work without a key.
-5. Run the server using `node bin/server` and [visit the app in your browser](http://localhost:4444).
+5. To run the development server: `node bin/dev`
+6. [Visit the app in your browser](http://localhost:4444).
-# Running the tests
+## Running the tests
-When the server is running, you can view the tests [on the server](http://localhost:4444/_test).
+When the development server is running, you can [run the tests here](http://localhost:4444/_test).
-# Building the app
+## Building the app
You will need to have RequireJS installed:
npm install -g requirejs
-Then, from the root of the project, run the following command:
+Then, from the root of the project, run the following commands:
r.js -o srchr.build.js
+ r.js -o cssIn=assets/css/srchr.css out=build/assets/css/srchr.css
+
+You can run the built version of the app by running:
+
+ node bin/server
-# TODOs
+## TODOs
- Make it possible to favorite items
+- Make it possible to tag favorites
- Incorporate other content sources
+- Use [grunt](https://github.com/cowboy/grunt)
View
1 app/index.html
@@ -8,7 +8,6 @@
<title>Srchr</title>
<!-- Application styles -->
- <link rel="stylesheet" href="/assets/bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="/assets/css/srchr.css">
</head>
View
4 assets/css/srchr.css
@@ -1,4 +1,6 @@
+@import '../bootstrap/css/bootstrap.css';
+
body {
padding-top: 60px;
padding-bottom: 40px;
-}
+}
View
2 bin/server
@@ -1,3 +1,3 @@
server = require('server/server.js');
-server(4444);
+server({ port : 8080, baseDir : './build/' });
View
1 srchr.build.js
@@ -1,5 +1,6 @@
({
baseUrl : 'app',
+ dir : 'build',
paths : {
lib : '../lib',
plugins : '../lib/plugins',

0 comments on commit afeb528

Please sign in to comment.