Skip to content

Commit

Permalink
Updated client->static related code.
Browse files Browse the repository at this point in the history
  • Loading branch information
pilwon committed Oct 15, 2013
1 parent 28342ed commit fe90208
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 83 deletions.
10 changes: 5 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ module.exports = function (grunt) {
dest: '<%= project.path.dist %>',
src: [
'../<%= project.path.bower %>/**/*',
'fonts/**/*',
'*.{ico,txt}'
'fonts/**/*'
]
},
{
Expand Down Expand Up @@ -173,8 +172,8 @@ module.exports = function (grunt) {
files: [{
expand: true,
cwd: '<%= project.path.client %>/img',
src: '**/*.{png,jpg,gif}',
dest: '<%= project.path.dist %>/img'
dest: '<%= project.path.dist %>/img',
src: '**/*.{gif,jpg,png}'
}]
}
},
Expand Down Expand Up @@ -289,7 +288,8 @@ module.exports = function (grunt) {
},
files: [
'<%= project.path.client %>/fonts/{,*/}*',
'<%= project.path.client %>/img/**/*',
'<%= project.path.client %>/img/**/*.{gif,jpg,png}',
'<%= project.path.static %>/**/*',
'<%= project.path.temp %>/*.html',
'<%= project.path.temp %>/css/{,*/}*.css',
'<%= project.path.temp %>/js/{,*/}*.js'
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

#### [Demo hosted on Heroku](http://ultimate-seed.herokuapp.com/)

[![Screenshot](https://raw.github.com/pilwon/ultimate-seed/master/client/img/screenshot1.png)](http://ultimate-seed.herokuapp.com/)
[![Screenshot](https://raw.github.com/pilwon/ultimate-seed/master/client/img/screenshot2.png)](http://ultimate-seed.herokuapp.com/login)
[![Screenshot](https://raw.github.com/pilwon/ultimate-seed/master/static/img/screenshot1.png)](http://ultimate-seed.herokuapp.com/)
[![Screenshot](https://raw.github.com/pilwon/ultimate-seed/master/static/img/screenshot2.png)](http://ultimate-seed.herokuapp.com/login)

`ultimate-seed` is the ultimate full-stack AngularJS + Node.js/Express seed (batteries included!) that makes web developers insanely productive.

Expand Down Expand Up @@ -263,6 +263,7 @@ This project uses [ultimate](https://github.com/pilwon/node-ultimate) dependency
│   ├── routes.js
│   ├── socketio.js
│ └── winston.js
├── static/
├── .bowerrc
├── .editorconfig
├── .jshintrc
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ultimate-seed",
"description": "The ultimate full-stack AngularJS + Node.js/Express seed (batteries included!) that makes web developers insanely productive.",
"version": "0.3.2",
"version": "0.3.3",
"license": "MIT",
"author": "Pilwon Huh <[email protected]>",
"contributors": [
Expand Down Expand Up @@ -64,7 +64,7 @@
"express-winston": "~0.2.1",
"lodash": "~1.3.1",
"string": "~1.5.1",
"ultimate": "0.3.2",
"ultimate": "0.3.3",
"winston": "~0.7.2",
"winston-mongodb": "~0.4.2",
"wrench": "~1.5.1"
Expand Down
1 change: 1 addition & 0 deletions project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"dist": "client-built",
"log": "log",
"server": "server",
"static": "static",
"test": "test",
"temp": ".tmp"
},
Expand Down
9 changes: 4 additions & 5 deletions server/lib/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@ var path = require('path');

var app = require('../app');

var _clientDir = path.join(app.dir, '..', app.project.path[
process.env.NODE_ENV === 'development' ? 'client' : 'dist'
]);

function catchAll(req, res) {
res.render('empty', {
catchAll: true
});
}

function error404(req, res) {
res.status(404).sendfile(path.join(_clientDir, '404.html'));
res.status(404).sendfile(path.join(
path.join(app.dir, '..', app.project.path.static),
'404.html'
));
}

// Public API
Expand Down
69 changes: 0 additions & 69 deletions server/views/error.hbs

This file was deleted.

0 comments on commit fe90208

Please sign in to comment.