Skip to content

Commit

Permalink
Cleans up app infrastructure. Moves files such as gitignore, package.…
Browse files Browse the repository at this point in the history
…json, etc. to root folder

Removes unecessary gitignore folder

Renames mementos to client

Moves gitignore, bowerrc, bower.json, and package.json to root

Moves gulp file to root.  Small edits to file.

Adds blank files so folders can be committed to git
  • Loading branch information
kranrao committed Feb 17, 2015
1 parent fef508d commit 993946e
Show file tree
Hide file tree
Showing 84 changed files with 45 additions and 34,078 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "client/www/lib"
}
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Compiled Dirs (http://nodejs.org/api/addons.html)
client/platforms/
client/plugins/
client/www/lib/

#OS Specific Annoyances
.DS_Store

# Dependency directorys
# Deployed apps should consider commenting these lines out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-
node_modules/
bower_components/
2 changes: 0 additions & 2 deletions .gitignore/README.md

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions client/www/app/core/core.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
core.js
1 change: 1 addition & 0 deletions client/www/app/memento/memento.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
memento.html
1 change: 1 addition & 0 deletions client/www/app/mementos-list/mementos.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mementos.html
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions client/www/content/content.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
content.js
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions client/www/test/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test.js
28 changes: 9 additions & 19 deletions mementos/gulpfile.js → gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,44 +7,34 @@ var minifyCss = require('gulp-minify-css');
var rename = require('gulp-rename');
var sh = require('shelljs');

// the paths to our app files
var paths = {
sass: ['./scss/**/*.scss']
};

gulp.task('default', ['sass']);

// compile sass
gulp.task('sass', function(done) {
gulp.src('./scss/ionic.app.scss')
gulp.src('./client/scss/ionic.app.scss')
.pipe(sass())
.pipe(gulp.dest('./www/css/'))
.pipe(gulp.dest('./client/www/css/'))
.pipe(minifyCss({
keepSpecialComments: 0
}))
.pipe(rename({ extname: '.min.css' }))
.pipe(gulp.dest('./www/css/'))
.pipe(gulp.dest('./client/www/css/'))
.on('end', done);
});

gulp.task('watch', function() {
gulp.watch(paths.sass, ['sass']);
});

gulp.task('install', ['git-check'], function() {
// FIXME: what should be included in the install task. Is this even necessary if compiling to native ios
/*gulp.task('install', ['git-check'], function() {
return bower.commands.install()
.on('log', function(data) {
gutil.log('bower', gutil.colors.cyan(data.id), data.message);
});
});
});*/

gulp.task('git-check', function(done) {
if (!sh.which('git')) {
console.log(
' ' + gutil.colors.red('Git is not installed.'),
'\n Git, the version control system, is required to download Ionic.',
'\n Download git here:', gutil.colors.cyan('http://git-scm.com/downloads') + '.',
'\n Once git is installed, run \'' + gutil.colors.cyan('gulp install') + '\' again.'
);
process.exit(1);
}
done();
});
gulp.task('default', ['sass']);
3 changes: 0 additions & 3 deletions mementos/.bowerrc

This file was deleted.

6 changes: 0 additions & 6 deletions mementos/.gitignore

This file was deleted.

Loading

0 comments on commit 993946e

Please sign in to comment.