From a4b8069cf5ed57d7cba066993f683941a6e60bc3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 6 Oct 2016 22:47:35 +0200
Subject: Styling loading indicator, removing unused routes, adding "getting
 started" explanation Also, only update relative time every minute instead of
 6 seconds. My bad

---
 .../javascripts/components/containers/mastodon.jsx | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'app/assets/javascripts/components/containers')

diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index 220ddc54d..6c65c303b 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -1,20 +1,24 @@
-import { Provider }                   from 'react-redux';
-import configureStore                 from '../store/configureStore';
+import { Provider }       from 'react-redux';
+import configureStore     from '../store/configureStore';
 import {
   refreshTimelineSuccess,
   updateTimeline,
   deleteFromTimelines,
   refreshTimeline
-}                                     from '../actions/timelines';
-import { setAccessToken }             from '../actions/meta';
-import { setAccountSelf }             from '../actions/accounts';
-import PureRenderMixin                from 'react-addons-pure-render-mixin';
-import { Router, Route, hashHistory } from 'react-router';
-import Account                        from '../features/account';
-import Settings                       from '../features/settings';
-import Status                         from '../features/status';
-import Subscriptions                  from '../features/subscriptions';
-import UI                             from '../features/ui';
+}                         from '../actions/timelines';
+import { setAccessToken } from '../actions/meta';
+import { setAccountSelf } from '../actions/accounts';
+import PureRenderMixin    from 'react-addons-pure-render-mixin';
+import {
+  Router,
+  Route,
+  hashHistory,
+  IndexRoute
+}                         from 'react-router';
+import Account            from '../features/account';
+import Status             from '../features/status';
+import GettingStarted     from '../features/getting_started';
+import UI                 from '../features/ui';
 
 const store = configureStore();
 
@@ -70,8 +74,7 @@ const Mastodon = React.createClass({
       <Provider store={store}>
         <Router history={hashHistory}>
           <Route path='/' component={UI}>
-            <Route path='/settings' component={Settings} />
-            <Route path='/subscriptions' component={Subscriptions} />
+            <IndexRoute component={GettingStarted} />
             <Route path='/statuses/:statusId' component={Status} />
             <Route path='/accounts/:accountId' component={Account} />
           </Route>
-- 
cgit