Merge pull request #41 from nus-mtp/develop

Merging develop to master for sprint 1 release

Author: kphua

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "libs"
+}

.gitignore

@@ -11,73 +11,19 @@ pids
 *.pid
 *.seed
 
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directory
 # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
 node_modules
-
-
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
-
-*.iml
+libs/
 
 ## Directory-based project format:
 .idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
 
 # User-defined
-.tmp
+.tmp

.travis.yml

@@ -1,13 +1,8 @@
 language: node_js
+
 node_js:
-	- "0.11"
-	- "0.10"
-	- "4.2"
-env:
-	DASHBOARD_DIR=dashboard
-before_script:
-	- npm install
-script: cd dashboard && grunt test
+  - "0.10"
+
 branches:
-	only:
-		- development
+  only:
+    - develop

dashboard/Gruntfile.js Gruntfile.jsdashboard/Gruntfile.js renamed to Gruntfile.js

@@ -3,8 +3,58 @@ An open source Javascript-based zoomable video player and server, which utilizes
 
 
 ## Installation
-`to be updated`
 
+### Prerequisites
+
+[Node.js](http://nodejs.org)
+
+Install Node.js from https://nodejs.org/en/download/
+
+If you have Homebrew installed:
+```bash
+$ brew install node
+```
+
+[Grunt](http://gruntjs.com/)
+```bash
+$ npm install -g grunt-cli
+```
+
+[Bower](http://www.npmjs.com/package/bower)
+```bash
+$ npm install -g bower
+```
+
+[Sails.js](http://sailsjs.org/get-started)
+```bash
+$ npm install -g sails
+```
+
+
+### Setup
+
+Install the necessary packages.
+
+```bash
+$ npm install 
+$ bower install 
+```
+
+### Task Automation
+
+Generate frontend assets using Grunt.
+
+```bash
+$ grunt
+```
+
+### Start server
+
+Run on http://localhost:1337 .
+
+```bash
+$ sails lift
+```
 
 ## Usage
 `to be updated`
@@ -21,5 +71,5 @@ An open source Javascript-based zoomable video player and server, which utilizes
 ## License
 `to be updated`
 
-[travis-image]: https://travis-ci.org/nus-mtp/zoomable.js.svg?branch=master
+[travis-image]: https://travis-ci.org/nus-mtp/zoomable.js.svg?branch=develop
 [travis-url]: https://travis-ci.org/nus-mtp/zoomable.js

README.md

@@ -0,0 +1,77 @@
+/**
+ * UserController
+ *
+ * @description :: Server-side logic for managing users
+ * @help        :: See http://links.sailsjs.org/docs/controllers
+ *              :: https://github.com/irlnathan/activityoverlord20/blob/master/api/controllers/UserController.js
+ */
+
+var Passwords = require('machinepack-passwords');
+
+module.exports = {
+
+  /**
+   * `UserController.login()`
+   */
+  login: function (req, res) {
+    // Look for user using given username
+    User.findOne({
+      username: req.param('username')
+    }, function foundUser(err, user) {
+      if (err) return res.negotiate(err);
+      if (!user) return res.notFound();
+
+      Passwords.checkPassword({
+        passwordAttempt: req.param('password'),
+        encryptedPassword: user.encryptedPassword
+      }).exec({
+        // An unexpected error occurred.
+        error: function (err) {
+          return res.negotiate(err);
+        },
+
+        // If the password attempted is different from stored encrypted password
+        incorrect: function () {
+          return res.notFound();
+        },
+
+        success: function () {
+          // Store user id in the user session
+          req.session.me = user.id;
+
+          // All working, let the client know everything worked
+          return res.ok();
+        }
+      });
+    });
+  },
+
+
+  /**
+   * `UserController.signup()`
+   */
+  signup: function (req, res) {
+    return res.json({
+      todo: 'signup() is not implemented yet!'
+    });
+  },
+
+  /**
+   * `UserController.logout()`
+   */
+  logout: function (req, res) {
+    return res.json({
+      todo: 'logout() is not implemented yet!'
+    });
+  },
+
+  /**
+   * `UserController.updatePassword()`
+   */
+  updatePassword: function (req, res) {
+    return res.json({
+      todo: 'updatePassword() is not implemented yet!'
+    });
+  }
+};
+

dashboard/api/controllers/.gitkeep api/controllers/.gitkeepdashboard/api/controllers/.gitkeep renamed to api/controllers/.gitkeep

@@ -0,0 +1,98 @@
+/**
+ * VideoController
+ *
+ * @description :: Server-side logic for managing videos
+ * @help        :: See http://links.sailsjs.org/docs/controllers
+ */
+
+module.exports = {
+	
+  /**
+   * `VideoController.create()`
+   * Usage: POST /api/video
+   */
+  create: function (req, res) {
+    Video.create(req.body).exec(function (err, video) {
+      if (err) throw err;
+      res.json(video);
+    });
+  },
+
+  /**
+   * `VideoController.read()`
+   * Usage: GET /api/video/:id
+   */
+  read: function (req, res) {
+    Video.findOne({
+      id: req.param('id')
+    }).exec(function (err, video) {
+      if (err) throw err;
+      res.json(video);
+    });
+  },
+
+  /**
+   * `VideoController.readAll()`
+   * Usage: GET /api/video
+   */
+  readAll: function (req, res) {
+    Video.find().exec(function (err, videos) {
+      if (err) throw err;
+      res.json(videos);
+    });
+  },
+
+  /**
+   * `VideoController.destroy()`
+   * Usage: DELETE /api/video/:id
+   */
+  destroy: function (req, res) {
+    Video.destroy({
+      id: req.param('id')
+    }).exec(function (err, video) {
+      console.log(req.body.videoId);
+      if (err) throw err;
+      res.json(video);
+    });
+  },
+
+
+  /**
+   * `VideoController.update()`
+   * Usage: PUT /api/video/:id
+   */
+  update: function (req, res) {
+    Video.update({
+      id: req.param('id')
+    }, req.body).exec(function (err, updated) {
+      if (err) throw err;
+      res.json(updated);
+    });
+  },
+
+
+  /**
+   * `VideoController.tags()`
+   * Usage: 
+   */
+  tags: function (req, res) {
+    return res.json({
+      todo: 'tags() is not implemented yet!'
+    });
+  },
+
+  /**
+   * `VideoController.getVideo()`
+   * Usage: POST /api/video/getVideo
+   * Content: {id: ':id'}
+   */
+  getVideo: function (req, res) {
+    Video.findOne({
+      id: req.param('id')
+    }).exec(function (err, video) {
+      if (err) throw err;
+      res.json(video.videoDir);
+    });
+  }
+};
+

api/controllers/UserController.js

@@ -0,0 +1,17 @@
+// Tag.js
+// The set of tags registered in our app.
+
+module.exports = {
+	attributes: {
+		name: {
+			type: 'string',
+			required: true,
+			unique: true
+		},	
+
+		videoWithTags: {
+			collection:'video',
+			via: 'tags'
+		}
+	}
+}