From 1c7a688cb8346898addae4f07578e07e73d2d698 Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Thu, 26 Dec 2019 00:28:33 +0100
Subject: [PATCH] Moved fetch call for getting charts to api.js

---
 src/api.js                      | 20 ++++++++++++++++++++
 src/components/ActivityPage.vue | 15 +++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/api.js b/src/api.js
index b71ec40..e3b0593 100644
--- a/src/api.js
+++ b/src/api.js
@@ -335,6 +335,25 @@ const unlinkPlexAccount = (username, password) => {
 }
 
 
+// - - - User graphs - - -
+
+const fetchChart = (urlPath, days, chartType) => {
+  const url = new URL('v1/user' + urlPath, SEASONED_URL)
+  url.searchParams.append('days', days)
+  url.searchParams.append('y_axis', chartType)
+
+  const authorization_token = localStorage.getItem('token')
+  const headers = authorization_token ? {
+    'Authorization': authorization_token,
+    'Content-Type': 'application/json'
+  } : {}
+
+  return fetch(url.href, { headers })
+    .then(resp => resp.json())
+    .catch(error => { console.log('api error fetching chart'); throw error })
+}
+
+
 // - - - Random emoji - - -
 
 const getEmoji = () => {
@@ -412,6 +431,7 @@ export {
   login,
   getSettings,
   updateSettings,
+  fetchChart,
   getEmoji,
   elasticSearchMoviesAndShows
 }
diff --git a/src/components/ActivityPage.vue b/src/components/ActivityPage.vue
index 79bd19b..6c6f805 100644
--- a/src/components/ActivityPage.vue
+++ b/src/components/ActivityPage.vue
@@ -41,6 +41,7 @@
 <script>
 import store from '@/store'
 import ToggleButton from '@/components/ui/ToggleButton';
+import { fetchChart } from '@/api'
 
 var Chart = require('chart.js');
 Chart.defaults.global.elements.point.radius = 0
@@ -58,13 +59,13 @@ export default {
         name: 'Watch activity',
         ref: 'activityCanvas',
         data: null,
-        urlPath: 'api/v1/user/plays_by_day',
+        urlPath: '/plays_by_day',
         graphType: 'line'
       }, {
         name: 'Plays by day of week',
         ref: 'playsByDayOfWeekCanvas',
         data: null,
-        urlPath: 'api/v1/user/plays_by_dayofweek',
+        urlPath: '/plays_by_dayofweek',
         graphType: 'bar'
       }],
       chartData: [{
@@ -116,16 +117,10 @@ export default {
       }
 
       for (let chart of charts) {
-        const url = new URL(chart.urlPath, 'http://10.0.0.10:31459')
-        url.searchParams.append('days', this.days)
-        url.searchParams.append('y_axis', this.selectedChartType.type)
 
-        const headers = {
-          authorization: localStorage.getItem('token')
-        }
 
-        fetch(url.href, { headers })
-          .then(resp => resp.json())
+
+        fetchChart(chart.urlPath, this.days, this.selectedChartType.type)
           .then(data => {
             this.series = data.data.series.filter(group => group.name === 'TV')[0].data;      // plays pr date in groups (movie/tv/music)
             this.categories = data.data.categories;  // dates