Merge pull request #5 from wells/v1.1.1-dev

v1.1.1 dev
wells · Dec 27, 2016 · 1b595c9 · 1b595c9
2 parents f9cf60d + 3a4bb23
commit 1b595c9
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 139 deletions.
diff --git a/public/build/js/app-47eeed0b62.js b/public/build/js/app-47eeed0b62.js
diff --git a/public/build/js/app-ce2041b1a7.js b/public/build/js/app-ce2041b1a7.js
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
   "css/app.css": "css/app-c6da92f35b.css",
-  "js/app.js": "js/app-ce2041b1a7.js"
+  "js/app.js": "js/app-47eeed0b62.js"
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/assets/js/components/Movie.vue b/resources/assets/js/components/Movie.vue
@@ -165,11 +165,11 @@ export default {
     genres: function () {
       let state = this.$store.state
       let movie = state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
 
       return movie.relationships.genres.data.map(
-        ({ id }) => state.genres.all.find(g => g.id === id)
+        ({ id }) => state.genres.all.find(g => g.id == id)
       )
     },
 
@@ -180,10 +180,10 @@ export default {
     monthlyViews: function () {
       let state = this.$store.state
       let movie = state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
       let movieViews = movie.relationships.views.data.map(
-        ({ id }) => state.views.movies.find(m => m.id === id)
+        ({ id }) => state.views.movies.find(m => m.id == id)
       )
 
       // Create a moment.js range of the past 12 months
@@ -196,7 +196,7 @@ export default {
       range.by('months', function(month) {
         let label = month.format('MM/YY')
         let view = movieViews.find(
-          v => v.attributes.label === label
+          v => v.attributes.label == label
         )
 
         months.push({
@@ -212,7 +212,7 @@ export default {
       let state = this.$store.state
 
       return state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
     },
 

diff --git a/resources/assets/js/components/MovieEdit.vue b/resources/assets/js/components/MovieEdit.vue
@@ -161,11 +161,11 @@ export default {
     backdrops: function () {
       let state = this.$store.state
       let movie = state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
 
       return movie.relationships.backdrops.data.map(
-        ({ id }) => state.images.all.find(i => i.id === id)
+        ({ id }) => state.images.all.find(i => i.id == id)
       )
     },
 
@@ -181,29 +181,29 @@ export default {
       let state = this.$store.state
 
       return state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
     },
 
     posters: function () {
       let state = this.$store.state
       let movie = state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
 
       return movie.relationships.posters.data.map(
-        ({ id }) => state.images.all.find(i => i.id === id)
+        ({ id }) => state.images.all.find(i => i.id == id)
       )
     },
 
     results: function () {
       let state = this.$store.state
       let movie = state.movies.all.find(
-        m => m.id === state.movies.currentID
+        m => m.id == state.movies.currentID
       )
 
       return movie.relationships.results.data.map(
-        ({ id }) => state.search.movies.find(m => m.id === id)
+        ({ id }) => state.search.movies.find(m => m.id == id)
       )
     }
   }

diff --git a/resources/assets/js/components/Movies.vue b/resources/assets/js/components/Movies.vue
@@ -199,7 +199,7 @@ export default {
         })
         // Filter by genre
         .filter(function (item) { 
-          let record = item.relationships.genres.data.find(g => g.id === selectedGenre)
+          let record = item.relationships.genres.data.find(g => g.id == selectedGenre)
           return selectedGenre == '' || record != null
         })
         // Order by column and direction

diff --git a/resources/assets/js/components/Season.vue b/resources/assets/js/components/Season.vue
@@ -117,11 +117,11 @@ export default {
     episodes: function () {
       let state = this.$store.state
       let season = state.seasons.all.find(
-        s => s.id === state.seasons.currentID
+        s => s.id == state.seasons.currentID
       )
 
       return season.relationships.episodes.data.map(
-        ({ id }) => state.episodes.all.find(e => e.id === id)
+        ({ id }) => state.episodes.all.find(e => e.id == id)
       )
     },
 
@@ -132,10 +132,10 @@ export default {
     monthlyViews: function () {
       let state = this.$store.state
       let season = state.seasons.all.find(
-        s => s.id === state.seasons.currentID
+        s => s.id == state.seasons.currentID
       )
       let seasonViews = season.relationships.views.data.map(
-        ({ id }) => state.views.seasons.find(s => s.id === id)
+        ({ id }) => state.views.seasons.find(s => s.id == id)
       )
 
       // Create a moment.js range of the past 12 months
@@ -148,7 +148,7 @@ export default {
       range.by('months', function(month) {
         let label = month.format('MM/YY')
         let view = seasonViews.find(
-          s => s.attributes.label === label
+          s => s.attributes.label == label
         )
         months.push({
           id: label,
@@ -163,18 +163,18 @@ export default {
       let state = this.$store.state
 
       return state.seasons.all.find(
-        s => s.id === state.seasons.currentID
+        s => s.id == state.seasons.currentID
       )
     },
 
     show: function () {
       let state = this.$store.state
       let season = state.seasons.all.find(
-        s => s.id === state.seasons.currentID
+        s => s.id == state.seasons.currentID
       )
 
       return state.shows.all.find(
-        s => s.id === season.relationships.show.data.id
+        s => s.id == season.relationships.show.data.id
       )
     },
 

diff --git a/resources/assets/js/components/Show.vue b/resources/assets/js/components/Show.vue
@@ -185,11 +185,11 @@ export default {
     genres: function () {
       let state = this.$store.state
       let show = state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
 
       return show.relationships.genres.data.map(
-        ({ id }) => state.genres.all.find(g => g.id === id)
+        ({ id }) => state.genres.all.find(g => g.id == id)
       )
     },
 
@@ -200,10 +200,10 @@ export default {
     monthlyViews: function () {
       let state = this.$store.state
       let show = state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
       let showViews = show.relationships.views.data.map(
-        ({ id }) => state.views.shows.find(s => s.id === id)
+        ({ id }) => state.views.shows.find(s => s.id == id)
       )
 
       // Create a moment.js range of the past 12 months
@@ -216,7 +216,7 @@ export default {
       range.by('months', function(month) {
         let label = month.format('MM/YY')
         let view = showViews.find(
-          s => s.attributes.label === label
+          s => s.attributes.label == label
         )
         months.push({
           id: label,
@@ -230,14 +230,14 @@ export default {
     seasons: function () {
       let state = this.$store.state
       let show = state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
 
       return _.chain(
         // Map season objects to the TV show
         show.relationships.seasons.data.map(
           ({ id }) => state.seasons.all.find(
-            s => s.id === id
+            s => s.id == id
           )
         )
       )
@@ -250,7 +250,7 @@ export default {
       let state = this.$store.state
 
       return state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
     },
 

diff --git a/resources/assets/js/components/ShowEdit.vue b/resources/assets/js/components/ShowEdit.vue
@@ -158,11 +158,11 @@ export default {
     backdrops: function () {
       let state = this.$store.state
       let show = state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
 
       return show.relationships.backdrops.data.map(
-        ({ id }) => state.images.all.find(i => i.id === id)
+        ({ id }) => state.images.all.find(i => i.id == id)
       )
     },
 
@@ -177,30 +177,30 @@ export default {
     posters: function () {
       let state = this.$store.state
       let show = state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
 
       return show.relationships.posters.data.map(
-        ({ id }) => state.images.all.find(i => i.id === id)
+        ({ id }) => state.images.all.find(i => i.id == id)
       )
     },
 
     results: function () {
       let state = this.$store.state
       let show = state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
 
       return show.relationships.results.data.map(
-        ({ id }) => state.search.shows.find(s => s.id === id)
+        ({ id }) => state.search.shows.find(s => s.id == id)
       )
     },
 
     show: function () { 
       let state = this.$store.state
 
       return state.shows.all.find(
-        s => s.id === state.shows.currentID
+        s => s.id == state.shows.currentID
       )
     }
   }

diff --git a/resources/assets/js/components/Shows.vue b/resources/assets/js/components/Shows.vue
@@ -204,7 +204,7 @@ export default {
         })
         // Filter by genre
         .filter(function (item) { 
-          let record = item.relationships.genres.data.find(g => g.id === selectedGenre)
+          let record = item.relationships.genres.data.find(g => g.id == selectedGenre)
           return selectedGenre == '' || record != null
         })
         // Order by column and direction

diff --git a/resources/assets/js/vuex/helpers.js b/resources/assets/js/vuex/helpers.js
@@ -1,37 +1,27 @@
-export function addRecords (records, newRecords, type, callback) {
+export function addRecords (records, newRecords, type) {
   if (!newRecords) {
     return
   }
 
   newRecords.forEach(newRecord => {
-    addRecord(records, newRecord, type, callback)
+    addRecord(records, newRecord, type)
   })
 }
 
-export function addRecord (records, newRecord, type, callback) {
+export function addRecord (records, newRecord, type) {
   if(!newRecord || newRecord.type != type) {
     return
   }
 
-  var record = records.find(r => r.id === newRecord.id)
-
-  if (!record) {
-    records.push(newRecord)
-  } else if (callback) {
-    record.attributes = newRecord.attributes
-    record.links = newRecord.links
-
-    callback(record, newRecord)
-  } else {
-    record.attributes = newRecord.attributes
-    record.links = newRecord.links
+  // Find record index (if any)
+  let index = records.findIndex(r => r.id == newRecord.id)
 
-    if(!newRecord.relationships) {
-      record.relationships = {};
-      return;
-    }
-
-    record.relationships = newRecord.relationships ? 
-      newRecord.relationships : record.relationships
+  // Update record
+  if (index !== -1) {
+    records[index] = newRecord
+    return
   }
+
+  // Add record
+  records.push(newRecord)
 }
diff --git a/resources/assets/js/vuex/modules/filters.js b/resources/assets/js/vuex/modules/filters.js
@@ -99,7 +99,7 @@ export default {
 }
 
 function buildFilters (state) {
-  let order = state.orders.find(o => o.id === state.selectedOrder)
+  let order = state.orders.find(o => o.id == state.selectedOrder)
 
   state.attributes.movies = 'attributes.' + order.movies
   state.attributes.shows = 'attributes.' + order.shows

diff --git a/resources/assets/js/vuex/modules/movies.js b/resources/assets/js/vuex/modules/movies.js
@@ -25,10 +25,10 @@ export default {
       state.links = links
     },
     [types.ADD_MOVIE] (state, movie) {
-      addRecord(state.all, movie, 'movies', updateRelationships)
+      addRecord(state.all, movie, 'movies')
     },
     [types.ADD_MOVIES] (state, movies) {
-      addRecords(state.all, movies, 'movies', updateRelationships)
+      addRecords(state.all, movies, 'movies')
     }
   },
   actions: {
@@ -123,19 +123,3 @@ export default {
     }
   }
 }
-
-function updateRelationships (record, movie) {
-  if(!movie.relationships) {
-    return
-  }
-  record.relationships.backdrops = movie.relationships.backdrops ? 
-    movie.relationships.backdrops : record.relationships.backdrops
-  record.relationships.genres = movie.relationships.genres ? 
-    movie.relationships.genres : record.relationships.genres
-  record.relationships.posters = movie.relationships.posters ? 
-    movie.relationships.posters : record.relationships.posters
-  record.relationships.results = movie.relationships.results ? 
-    movie.relationships.results : record.relationships.results
-  record.relationships.views = movie.relationships.views ? 
-    movie.relationships.views : record.relationships.views
-}