From 8e6679c156d440ec654f11db4f1b4af959896041 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Fri, 5 May 2017 04:14:16 +1200
Subject: [PATCH] Moving App; Modal analytics

---
 src/js/{views => }/App.js        | 26 +++++++++++++-------------
 src/js/index.js                  |  2 +-
 src/js/services/ui/middleware.js |  2 ++
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename src/js/{views => }/App.js (86%)

diff --git a/src/js/views/App.js b/src/js/App.js
similarity index 86%
rename from src/js/views/App.js
rename to src/js/App.js
index 909d2082..5c3845c2 100755
--- a/src/js/views/App.js
+++ b/src/js/App.js
@@ -5,20 +5,20 @@ import { createStore, bindActionCreators } from 'redux'
 import { hashHistory, Link } from 'react-router'
 import { connect } from 'react-redux'
 
-import Sidebar from '../components/Sidebar'
-import MiniPlayer from '../components/MiniPlayer'
-import SidebarToggleButton from '../components/SidebarToggleButton'
-import ContextMenu from '../components/ContextMenu'
-import Dragger from '../components/Dragger'
-import Modal from '../components/Modal/Modal'
-import Notifications from '../components/Notifications'
-import DebugInfo from '../components/DebugInfo'
+import Sidebar from './components/Sidebar'
+import MiniPlayer from './components/MiniPlayer'
+import SidebarToggleButton from './components/SidebarToggleButton'
+import ContextMenu from './components/ContextMenu'
+import Dragger from './components/Dragger'
+import Modal from './components/Modal/Modal'
+import Notifications from './components/Notifications'
+import DebugInfo from './components/DebugInfo'
 
-import * as helpers from '../helpers'
-import * as uiActions from '../services/ui/actions'
-import * as pusherActions from '../services/pusher/actions'
-import * as mopidyActions from '../services/mopidy/actions'
-import * as spotifyActions from '../services/spotify/actions'
+import * as helpers from './helpers'
+import * as uiActions from './services/ui/actions'
+import * as pusherActions from './services/pusher/actions'
+import * as mopidyActions from './services/mopidy/actions'
+import * as spotifyActions from './services/spotify/actions'
 
 
 /**
diff --git a/src/js/index.js b/src/js/index.js
index 010cf572..e580ad5c 100755
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -12,7 +12,7 @@ import ReactGA from 'react-ga'
 import store from './bootstrap.js'
 require('../scss/app.scss');
 
-import App from './views/App'
+import App from './App'
 import Album from './views/Album'
 import Artist from './views/Artist'
 import Playlist from './views/Playlist'
diff --git a/src/js/services/ui/middleware.js b/src/js/services/ui/middleware.js
index a6bfeaaa..bdd6b41e 100755
--- a/src/js/services/ui/middleware.js
+++ b/src/js/services/ui/middleware.js
@@ -244,11 +244,13 @@ const UIMiddleware = (function(){
                 break
 
             case 'OPEN_MODAL':
+                ReactGA.event({ category: 'Modal', action: 'Opened', label: action.modal.name })
                 $('body').addClass('modal-open')
                 next(action)
                 break
 
             case 'CLOSE_MODAL':
+                ReactGA.event({ category: 'Modal', action: 'Closed', label: action.modal.name })
                 $('body').removeClass('modal-open')
                 next(action)
                 break