Improve init settings store

Author: Emmanouil Konstantinidis

src/js/components/settings.js

@@ -12,9 +12,7 @@ var SettingsPage = React.createClass({
 
   getInitialState: function () {
     return {
-      settings: {
-        participating: false
-      }
+      settings: Actions.getSettings()
     };
   },
 
@@ -26,7 +24,7 @@ var SettingsPage = React.createClass({
     return (
       <div className="container-fluid main-container settings">
         <div className='row'>
-          <div className='col-xs-8'>Setting Title</div>
+          <div className='col-xs-8'>Show only participating</div>
           <div className='col-xs-4'>
             <Toggle
               defaultChecked={this.state.settings.participating}

src/js/stores/settings.js

@@ -5,13 +5,19 @@ var SettingsStore = Reflux.createStore({
   listenables: Actions,
 
   init: function () {
-    var settings = window.localStorage.getItem('settings') || {
-      participating: false
-    };
-    var participatingSetting = settings.participating;
-    this._settings = {
-      participating: participatingSetting
-    };
+    var settings = window.localStorage.getItem('settings');
+
+    if (!settings) {
+      settings = {
+        'participating': true
+      };
+    }
+
+    if (settings[0] === "{") {
+      settings = JSON.parse(settings);
+    }
+
+    this._settings = settings;
   },
 
   onGetSettings: function () {
@@ -20,8 +26,8 @@ var SettingsStore = Reflux.createStore({
 
   onSetSetting: function (setting, value) {
     console.log('Setting: ' + setting + ' to: ' + value);
-    window.localStorage.setItem('settings', this._settings);
-    this._settings.participating = value;
+    this._settings[setting] = value;
+    window.localStorage.setItem('settings', JSON.stringify(this._settings));
     this.trigger(this._settings);
   }