Skip to content

Commit

Permalink
updated build
Browse files Browse the repository at this point in the history
  • Loading branch information
jonniespratley committed Jan 11, 2015
1 parent e9da725 commit 7f2c07c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 11 deletions.
10 changes: 5 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ module.exports = function (grunt) {
options: {
port: SERVER_PORT,
// Change this to '0.0.0.0' to access the server from outside.
hostname: '127.0.0.1',
hostname: config.host,
livereload: LIVERELOAD_PORT,
base: ['.tmp', '<%= yeoman.app %>'],
onCreateServer: function(server, connect, options) {
Expand Down Expand Up @@ -659,9 +659,7 @@ module.exports = function (grunt) {
return grunt.task.run(['karma:unit', 'coveralls']);
}
});

grunt.registerTask('ptor', ['coffee:test', 'protractor_webdriver', 'protractor']);
grunt.registerTask('build-docs', ['useminPrepare', 'autoprefixer', 'concat', 'ngmin']);

grunt.registerTask('build', [
'clean:dist',
'useminPrepare',
Expand All @@ -671,13 +669,15 @@ module.exports = function (grunt) {
'ngtemplates',
'ngmin',
'copy:dist',
'cdnify',
//'cdnify',
'cssmin',
'uglify',
'rev',
'usemin'
]);

grunt.registerTask('ptor', ['coffee:test', 'protractor_webdriver', 'protractor']);
grunt.registerTask('build-docs', ['useminPrepare', 'autoprefixer', 'concat', 'ngmin']);
grunt.registerTask('docs', ['coffee', 'ngdocs', 'connect:docs', 'watch:scripts']);
grunt.registerTask('default', ['newer:jshint', 'test', 'build']);

Expand Down
5 changes: 4 additions & 1 deletion app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<link rel="icon" type="image/png" href="images/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16">
<link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32">



<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="images/mstile-144x144.png">
<meta name="msapplication-square70x70logo" content="images/mstile-70x70.png">
Expand Down Expand Up @@ -89,7 +92,7 @@
</script>

<!--script src="/socket.io/socket.io.js"></script--!>
<!-- build:js({.tmp,app}) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/jquery.js"></script>
<script src="bower_components/jquery-ui/ui/jquery-ui.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"sitecopy":"2014 ",
"version":"0.1",
"email":"[email protected]",
"host":"http://localhost",
"host":"localhost",
"port":8181,
"apiBase":"/api/v2",
"version":"v2",
Expand Down
10 changes: 6 additions & 4 deletions routes/cms-passport.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,12 @@ var cmsPassport = function(config, app) {
* TODO: Handle configuring passport
*
*/
app.use(express.static(path.resolve(__dirname + path.sep + 'views')));
app.set('views', path.resolve(__dirname + path.sep + 'views'));
app.set('view engine', 'ejs');
app.engine('ejs', require('ejs-locals'));
app.use(express.static(path.resolve(config.staticDir)));
app.use(express.static(path.resolve(config.publicDir)));
//app.set('views', path.resolve(__dirname + path.sep + 'views'));
app.set('views', path.resolve(config.publicDir));
//app.set('view engine', 'ejs');
//app.engine('ejs', require('ejs-locals'));

app.use(cookieParser());
app.use(bodyParser.urlencoded({
Expand Down

0 comments on commit 7f2c07c

Please sign in to comment.