Skip to content

Commit

Permalink
<docs> add user model doc
Browse files Browse the repository at this point in the history
  • Loading branch information
rmi22186 committed Feb 2, 2015
1 parent 7fbf393 commit 2e1ce05
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 22 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ To get up and running on your local development machine:
5. Start your mySql server
6. Goto <http://localhost:3000>

Additionally, start a server by running `gulp serve` and then run `gulp` to continually compile files and refresh the browser.

## Contributing Guidelines

If you would like to make a contribution, please see the contribution guide for the git workflow.
Expand Down
7 changes: 7 additions & 0 deletions docs/User_model.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
User Model:

Currently, users do NOT have to sign up or sign in to use Language Exchange.

However, as of 2/2/2015, a user model has been created for future plans to implement future features that require persistent data. A future feature could be to save chats in a user's history so that users can go back to conversations they've had over instant message.

Facebook integration is currently implemented via [passport](http://passportjs.org/guide/facebook/), and saved to the user model via their facebookId.
22 changes: 0 additions & 22 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,10 @@ var miscCSS = gulp.src(['./bower_components/bootstrap/dist/css/bootstrap.min.css
.pipe(concat('bower.css'))
.pipe(gulp.dest('./build'));

// gulp.task('index', function () {
// var target = gulp.src('./index.html');
// // It's not necessary to read the files (will speed up things), we're only after their paths:
// var sources = gulp.src(['./build/**/*.js', './build/**/*.css'], {read: false});

// return target.pipe(inject(sources))
// .pipe(gulp.dest('./'));
// });
// concatenate and minify app sources
var appStream = gulp.src(paths.scripts)
.pipe(concat('app.js'))
// .pipe(rename({suffix: '.min'}))
// .pipe(uglify())
.pipe(gulp.dest('./build'));


// Concatenate vendor scripts
var vendor = gulp.src([
'./bower_components/angular/angular.js',
Expand All @@ -51,16 +39,7 @@ gulp.task('scripts', function() {

var paths = {
scripts: ['client/**/*.js']

};
gulp.task('scripts', function() {
return gulp.src(paths.scripts)
.pipe(jshint())
.pipe(concat('main.js'))
.pipe(rename({suffix: '.min'}))
.pipe(uglify())
.pipe(gulp.dest('build/js'));
});

gulp.task('browser-sync', function() {
browserSync({
Expand All @@ -72,7 +51,6 @@ gulp.task('serve', function () {
nodemon({ script: 'server.js', ignore: ['node_modules/**/*.js'] });
});


gulp.task('default', ['scripts', 'browser-sync'], function() {
gulp.watch(paths.scripts, ['scripts', browserSync.reload]);
});

0 comments on commit 2e1ce05

Please sign in to comment.