Final sprint close for boba & vata

.circleci/config.yml

@@ -4,6 +4,7 @@ jobs:
     working_directory: ~/origin-spacebox
     docker:
       - image: circleci/node:8.11.0
+      - image: mongo:4.0.3
     steps:
       - checkout
       - run:
@@ -16,10 +17,12 @@ jobs:
       - run:
           name: Mocha Test Suite
           command: 'npm run test'
+
   deploy-job:
     working_directory: ~/origin-spacebox
     docker:
       - image: circleci/node:8.11.0
+      - image: mongo:4.0.3
     steps:
       - checkout
       - run:

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.eslintignore

@@ -1,3 +1,4 @@
+/client/
 /node_modules
 /build
 .vscode

.eslintrc

@@ -0,0 +1,3 @@
+{
+  "extends": "loopback"
+}

.gitignore

@@ -9,4 +9,7 @@ package-lock.json
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-.env
+.env
+Mockup.sketch
+dist
+

.yo-rc.json

@@ -0,0 +1,3 @@
+{
+  "generator-loopback": {}
+}

client/README.md

@@ -0,0 +1,3 @@
+## Client
+
+This is the place for your application front-end files.

common/models/queue.js

@@ -0,0 +1,137 @@
+'use strict';
+const { getPlaylist, updatePlaylist } = require('../../server/utils/playlist');
+const { addToDefaultSongs } = require('../../server/utils/adminQueue');
+const { playCurrentSong, pauseCurrentSong } = require('../../server/utils/player');
+
+module.exports = function (Queue) {
+  Queue.getPlaylist = function (id, cb) {
+    getPlaylist(id)
+      .then((tracks) => cb(null, tracks))
+      .catch(err => cb(err));
+  }
+
+  Queue.remoteMethod('getPlaylist', {
+    description: 'Gets current playlist from Spotify',
+    accepts: {
+      arg: 'id',
+      type: 'string'
+    },
+    http: {
+      path: '/getPlaylist',
+      verb: 'get'
+    },
+    returns: {
+      arg: 'data',
+      type: 'array',
+      root: true
+    },
+  });
+
+  Queue.updatePlaylist = function (id, songID, cb) {
+    updatePlaylist(id, songID)
+      .then((queue) => {
+        Queue.replaceOrCreate(queue, cb);
+      })
+      .catch(err => cb(err));
+  }
+
+  Queue.remoteMethod('updatePlaylist', {
+    description: 'Adds new song to playlist and removes current playing song from playlist. Adds default songs if needed.',
+    accepts: [{
+      arg: 'id',
+      type: 'string'
+    },
+    {
+      arg: 'songID',
+      type: 'string',
+      required: false
+    }],
+    http: {
+      path: '/updatePlaylist',
+      verb: 'put'
+    },
+    returns: {
+      arg: 'data',
+      type: 'array',
+      root: true
+    },
+  });
+
+  Queue.addToDefaultSongs = function (id, uri, cb) {
+    addToDefaultSongs(id, uri)
+      .then((queue) => {
+        Queue.replaceOrCreate(queue, cb);
+      })
+      .catch(err => cb(err));
+  };
+
+  Queue.remoteMethod('addToDefaultSongs', {
+    description: 'Adds new song to default song array',
+    accepts: [
+      {
+        arg: 'id',
+        type: 'string'
+      },
+      {
+        arg: 'uri',
+        type: 'string'
+      }],
+    http: {
+      path: '/addToDefaultSongs',
+      verb: 'post'
+    },
+    returns: {
+      arg: 'data',
+      type: 'array',
+      root: true
+    },
+  });
+
+  Queue.pauseCurrentSong = function (id, cb) {
+    pauseCurrentSong(id)
+      .then(response => cb(null, response))
+      .catch(err => cb(err));
+  };
+
+  Queue.remoteMethod('pauseCurrentSong', {
+    description: 'Pauses currently playing song',
+    accepts: {
+      arg: 'id',
+      type: 'string'
+    },
+    http: {
+      path: '/pauseCurrentSong',
+      verb: 'get'
+    },
+    returns: {
+      arg: 'data',
+      type: 'array',
+      root: true
+    },
+  });
+
+  Queue.playCurrentSong = function (id, cb) {
+    playCurrentSong(id)
+      .then(response => cb(null, response))
+      .catch(err => cb(err));
+  };
+
+  Queue.remoteMethod('playCurrentSong', {
+    description: 'Starts/resumes currently playing song',
+    accepts: {
+      arg: 'id',
+      type: 'string'
+    },
+    http: {
+      path: '/playCurrentSong',
+      verb: 'get'
+    },
+    returns: {
+      arg: 'data',
+      type: 'array',
+      root: true
+    },
+  });
+
+};
+

common/models/queue.json

@@ -0,0 +1,42 @@
+{
+  "name": "Queue",
+  "base": "PersistedModel",
+  "idInjection": true,
+  "options": {
+    "validateUpsert": true
+  },
+  "properties": {
+    "defaultSongs": {
+      "type": [
+        "object"
+      ],
+      "required": true
+    }
+  },
+  "validations": [],
+  "relations": {
+    "default": {
+      "type": "referencesMany",
+      "model": "Song",
+      "foreignKey": "defaultSongs",
+      "options": {
+        "nestRemoting": true
+      }
+    },
+    "songs": {
+      "type": "referencesMany",
+      "model": "Song",
+      "foreignKey": "",
+      "options": {
+        "nestRemoting": true
+      }
+    },
+    "user": {
+      "type": "belongsTo",
+      "model": "user",
+      "foreignKey": ""
+    }
+  },
+  "acls": [],
+  "methods": {}
+}

common/models/song.js

@@ -0,0 +1,29 @@
+'use strict';
+const { getSong } = require('../../server/utils/song');
+const { getMoreMusicFromSpotify} = require('../../server/utils/getMoreFromSpotify');
+
+module.exports = function(Song) {
+  Song.getTrackData = function(songUri, userID, cb) {
+    getSong(songUri, userID)
+    .then(song => cb(null, song))
+    .catch(err => cb(err));
+  }
+
+  Song.remoteMethod('getTrackData', {
+        accepts: [{arg: 'songUri', type: 'string'},{arg: 'userID', type:'string'}],
+        returns: {arg: 'song', type: 'object'}
+  });
+
+  Song.getMoreFromSpotify = function(userId, query, types, cb) {
+    getMoreMusicFromSpotify(userId, query, types)
+      .then((songs) => cb(null, songs))
+      .catch(err => cb(err));
+  };
+
+  Song.remoteMethod('getMoreFromSpotify', {
+    description: 'Searchs for spotify songs',
+    accepts: [{arg: 'userId', type: 'string'}, {arg: 'query', type: 'string'}, {arg: 'types', type: 'array'}],
+    http: {path: '/getMoreFromSpotify', verb: 'get'},
+    returns: {arg: 'data', type: 'array', root: true},
+  });
+};

common/models/song.json

@@ -0,0 +1,38 @@
+{
+  "name": "Song",
+  "base": "PersistedModel",
+  "idInjection": true,
+  "options": {
+    "validateUpsert": true
+  },
+  "properties": {
+    "name": {
+      "type": "string",
+      "required": true
+    },
+    "duration": {
+      "type": "number",
+      "required": true
+    },
+    "artist": {
+      "type": "string",
+      "required": true
+    },
+    "uri": {
+      "type": "string",
+      "required": true
+    },
+    "albumCover": {
+      "type": "string",
+      "required": true
+    },
+    "spotifyId": {
+      "type": "string",
+      "required": true
+    }
+  },
+  "validations": [],
+  "relations": {},
+  "acls": [],
+  "methods": {}
+}

common/models/user.js

@@ -0,0 +1,4 @@
+'use strict';
+
+module.exports = function(User) {
+};

common/models/user.json

@@ -0,0 +1,63 @@
+{
+  "name": "user",
+  "plural": "users",
+  "base": "User",
+  "idInjection": true,
+  "options": {
+    "validateUpsert": true
+  },
+  "properties": {
+    "firstName": {
+      "type": "string"
+    },
+    "lastName": {
+      "type": "string"
+    },
+    "email": {
+      "type": "string",
+      "required": true
+    },
+    "username": {
+      "type": "string",
+      "required": true
+    },
+    "password": {
+      "type": "string",
+      "required": true
+    },
+    "accessToken": {
+      "type": "string",
+      "required": false
+    },
+    "spotifyID": {
+      "type": "string",
+      "required": false
+    },
+    "playlistID": {
+      "type": "string",
+      "required": false
+    },
+    "spotifyRefreshToken": {
+      "type": "string",
+      "required": false
+    },
+    "spotifyAccessToken": {
+      "type": "string",
+      "required": false
+    },
+    "spotifyAccessToken": {
+      "type": "string",
+      "required": false
+    }
+  },
+  "validations": [],
+  "relations": {
+    "queue": {
+      "type": "hasOne",
+      "model": "Queue",
+      "foreignKey": ""
+    }
+  },
+  "acls": [],
+  "methods": {}
+}