From 9383d774062651ab528058bb0c1e6db8a34a9d6f Mon Sep 17 00:00:00 2001
From: Renan Costa <renan.costa@runrun.it>
Date: Mon, 19 Nov 2018 18:08:32 -0200
Subject: [PATCH] Add compatibility with multiple assignees

---
 app/background/index.js                 | 25 ++++---------------------
 app/components/App.js                   |  5 -----
 app/components/AuthInterceptor/index.js |  2 ++
 app/components/ClosedTasksPage/index.js |  2 +-
 app/components/OpenedTasksPage/index.js | 12 +++---------
 app/components/PopupHeader/index.js     |  6 +-----
 app/components/PopupNav/index.js        |  1 +
 app/meta/manifest.json                  |  2 +-
 app/options.js                          |  3 +--
 app/popup.js                            |  3 +--
 10 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/app/background/index.js b/app/background/index.js
index 282bf19..4c1c5ff 100644
--- a/app/background/index.js
+++ b/app/background/index.js
@@ -1,5 +1,6 @@
-import axios from 'axios'
+/* global localStorage, chrome */
 import moment from 'moment'
+import request from '../components/AuthInterceptor'
 
 JSON.isAJSONString = (object) => {
   try {
@@ -12,8 +13,6 @@ JSON.isAJSONString = (object) => {
 
 class RunrunTasks {
   constructor () {
-    this._tasks
-
     if (!localStorage.getItem('reminderEnabled')) { localStorage.setItem('reminderEnabled', true) }
 
     if (!localStorage.getItem('reminderTimeInMinutes')) { localStorage.setItem('reminderTimeInMinutes', 30) }
@@ -26,29 +25,16 @@ class RunrunTasks {
 
     this._is_working_on = (localStorage.getItem('is_working_on') && JSON.isAJSONString(localStorage.getItem('is_working_on'))) ? JSON.parse(localStorage.getItem('is_working_on')) : false
     this._reminder = (localStorage.getItem('reminder')) ? moment(localStorage.getItem('reminder')) : moment()
-    parent = this
 
     this.updateTasks = this.updateTasks.bind(this)
   }
 
-  getHttpClient () {
-    const client = axios.create()
-    client.interceptors.request.use((config) => {
-      config.headers['App-Key'] = localStorage.getItem('appkey')
-      config.headers['User-Token'] = localStorage.getItem('usertoken')
-
-      return config
-    })
-    return client
-  }
-
   getUser () {
     return new Promise((resolve, reject) => {
       try {
         const user = (localStorage.getItem('user')) ? JSON.parse(localStorage.getItem('user')) : {}
         resolve(user)
       } catch (error) {
-        const request = this.getHttpClient()
         request.get(`https://secure.runrun.it/api/v1.0/users/me`)
           .then(response => {
             localStorage.setItem('user', JSON.stringify(response.data))
@@ -62,7 +48,6 @@ class RunrunTasks {
   }
 
   updateTasks () {
-    const request = this.getHttpClient()
     this.getUser()
       .then(user => {
         return request.get('https://secure.runrun.it/api/v1.0/tasks', {
@@ -82,7 +67,7 @@ class RunrunTasks {
         const trackedTask = localStorage.getItem('trackedTask')
         if (trackedTask) {
           const trackedTaskOnTaskList = this._tasks.find((task) => {
-            return task.id == trackedTask
+            return task.id === trackedTask
           })
           if (trackedTaskOnTaskList === undefined || (workingTask !== undefined && workingTask.id !== trackedTaskOnTaskList.id)) { localStorage.setItem('trackedTask', '') }
         }
@@ -119,7 +104,7 @@ class RunrunTasks {
           chrome.browserAction.setIcon({path: 'images/icon_128.png'})
         }
 
-        const reminderEnabled = !!((localStorage.getItem('reminderEnabled') && localStorage.getItem('reminderEnabled') == 'true'))
+        const reminderEnabled = !!((localStorage.getItem('reminderEnabled') && localStorage.getItem('reminderEnabled') === 'true'))
         const reminderTime = (localStorage.getItem('reminderTimeInMinutes')) ? parseInt(localStorage.getItem('reminderTimeInMinutes')) : 30
         if (reminderEnabled && this._reminder.isSameOrBefore(moment().subtract(reminderTime, 'm'))) {
           this._reminder = moment()
@@ -164,7 +149,6 @@ class RunrunTasks {
   }
 
   pauseTask (id) {
-    const request = this.getHttpClient()
     request.post(`https://secure.runrun.it/api/v1.0/tasks/${id}/pause`)
       .then(response => {
         this.updateTasks()
@@ -172,7 +156,6 @@ class RunrunTasks {
   }
 
   resumeTask (id) {
-    const request = this.getHttpClient()
     request.post(`https://secure.runrun.it/api/v1.0/tasks/${id}/play`)
       .then(response => {
         this.updateTasks()
diff --git a/app/components/App.js b/app/components/App.js
index ab0e647..9ea27cf 100644
--- a/app/components/App.js
+++ b/app/components/App.js
@@ -1,12 +1,7 @@
 import React from 'react'
-
 import style from './App.css'
 
 class App extends React.Component {
-  constructor (props) {
-    super(props)
-  }
-
   render () {
     return (
       <div className='app'>
diff --git a/app/components/AuthInterceptor/index.js b/app/components/AuthInterceptor/index.js
index 75868a8..4b3a796 100644
--- a/app/components/AuthInterceptor/index.js
+++ b/app/components/AuthInterceptor/index.js
@@ -1,9 +1,11 @@
+/* global localStorage */
 import axios from 'axios'
 
 const AuthInterceptor = axios.create()
 AuthInterceptor.interceptors.request.use((config) => {
   config.headers['App-Key'] = localStorage.getItem('appkey')
   config.headers['User-Token'] = localStorage.getItem('usertoken')
+  config.headers['X-Platform'] = 'ChromeExtension'
 
   return config
 })
diff --git a/app/components/ClosedTasksPage/index.js b/app/components/ClosedTasksPage/index.js
index de54e62..e85220d 100644
--- a/app/components/ClosedTasksPage/index.js
+++ b/app/components/ClosedTasksPage/index.js
@@ -1,5 +1,5 @@
+/* global localStorage */
 import React from 'react'
-import { Link } from 'react-router'
 import moment from 'moment'
 import 'moment-duration-format'
 
diff --git a/app/components/OpenedTasksPage/index.js b/app/components/OpenedTasksPage/index.js
index 744f62e..da95612 100644
--- a/app/components/OpenedTasksPage/index.js
+++ b/app/components/OpenedTasksPage/index.js
@@ -1,5 +1,5 @@
+/* global localStorage, chrome, parent */
 import React from 'react'
-import { Link } from 'react-router'
 import moment from 'moment'
 import 'moment-duration-format'
 
@@ -89,7 +89,7 @@ class OpenedTasksPage extends React.Component {
 
   handleTaskTracking (id) {
     return () => {
-      if (localStorage.getItem('trackedTask') && localStorage.getItem('trackedTask') == id) { localStorage.setItem('trackedTask', '') } else { localStorage.setItem('trackedTask', id) }
+      if (localStorage.getItem('trackedTask') && localStorage.getItem('trackedTask') === id) { localStorage.setItem('trackedTask', '') } else { localStorage.setItem('trackedTask', id) }
       this.setState({
         trackedTask: localStorage.getItem('trackedTask')
       })
@@ -134,7 +134,7 @@ class OpenedTasksPage extends React.Component {
                     {(this.state.autoPauseResume && task.is_working_on) ? (
                       <span title='When this option is active the extension will manage the task for you, pausing/resuming if you lock/unlock the machine.' onClick={this.handleTaskTracking(task.id)}>
                         {
-                          (this.state.trackedTask == task.id)
+                          (this.state.trackedTask === task.id)
                             ? (<img src='/images/auto_pause_red.svg' />)
                             : (<img src='/images/auto_pause_gray.svg' />)
                         }
@@ -192,12 +192,6 @@ class OpenedTasksPage extends React.Component {
           <PopupHeader title='Tasks (Open)' />
           <PopupNav routeName='opened' />
         </div>
-        {/* <ul className={`list-group ${style.OpenedTasksPage}`}>
-          {tasks}
-        </ul> */}
-        {/* <div className={style.TasksDiv}>
-          {tasks}
-        </div> */}
         <div className={(localStorage.getItem('appkey')) ? `${style.TasksDiv}` : `${style.CoverDiv}`}>
           {tasks}
         </div>
diff --git a/app/components/PopupHeader/index.js b/app/components/PopupHeader/index.js
index d086f75..5cafebf 100644
--- a/app/components/PopupHeader/index.js
+++ b/app/components/PopupHeader/index.js
@@ -1,13 +1,9 @@
+/* global localStorage */
 import React from 'react'
 import style from './style.css'
-import { Link } from 'react-router'
 import PropTypes from 'prop-types'
 
 class PopupHeader extends React.Component {
-  constructor (props) {
-    super(props)
-  }
-
   render () {
     if (!localStorage.getItem('appkey')) {
       return (
diff --git a/app/components/PopupNav/index.js b/app/components/PopupNav/index.js
index 024ba60..4ff468c 100644
--- a/app/components/PopupNav/index.js
+++ b/app/components/PopupNav/index.js
@@ -1,3 +1,4 @@
+/* global localStorage */
 import React from 'react'
 import { Link } from 'react-router'
 import PropTypes from 'prop-types'
diff --git a/app/meta/manifest.json b/app/meta/manifest.json
index 5839c82..c80254e 100644
--- a/app/meta/manifest.json
+++ b/app/meta/manifest.json
@@ -4,7 +4,7 @@
   "short_name": "Runrun.it",
   "description": "__MSG_extDescription__",
   "default_locale": "en",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "browser_action": {
     "default_icon": "images/icon_16_active.png",
     "default_title": "Runrun.it",
diff --git a/app/options.js b/app/options.js
index b233988..0281fca 100644
--- a/app/options.js
+++ b/app/options.js
@@ -1,9 +1,8 @@
 import React from 'react'
 import { render } from 'react-dom'
 import OptionsPage from './components/OptionsPage'
+import routes from './routes'
 
 const appContainer = document.getElementById('runrunTMApp')
 
-import routes from './routes'
-
 render(<OptionsPage />, appContainer)
diff --git a/app/popup.js b/app/popup.js
index 0a3281c..ee6a149 100644
--- a/app/popup.js
+++ b/app/popup.js
@@ -1,12 +1,11 @@
 import React from 'react'
 import { render } from 'react-dom'
 import { Router, hashHistory } from 'react-router'
+import routes from './routes'
 
 const appContainer = document.getElementById('runrunTMApp')
 const path = appContainer.getAttribute('path') || ''
 
-import routes from './routes'
-
 render(
   <Router history={hashHistory} routes={routes(path)} />,
   appContainer