config constructor changes

VernonGrant · Oct 27, 2016 · aa8e7fd · aa8e7fd
1 parent 372bf49
commit aa8e7fd
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 130 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Command Palette ➔ Settings View: Install Packages ➔ Break
 
 - [x] Customizable micro and macro break schedule. Micro are shorter breaks that occur more often. Macro are longer breaks that occur less.
 - [x] Full screen break message that prevents you from further coding.
-- [x] Optional notifications 30s before each break starts.
+- [x] Optional notifications 1 minute before each break starts.
 - [x] Displays the current micro break count and remaining break time in the status bar. ![Status Bar Screenshot](https://github.com/Frozenfire92/break/raw/master/screenshot1.png)
 
 ## Package Settings
@@ -34,14 +34,14 @@ Command Palette ➔ Settings View: Install Packages ➔ Break
   Enable the micro break functionality
 - **Macro Break Configuration**
   - *Enable Notifications* - boolean :
-  Get a notification 30 seconds before each macro break
+  Get a notification 1 minute before each macro break
   - *Duration* - integer :
   Duration in minites of each macro break
   - *Interval* - integer :
   Time in minites between each macro break
 - **Micro Break Configuration**
   - *Enable Notifications* - boolean :
-  Get a notification 30 seconds before each micro break
+  Get a notification 1 minute before each micro break
   - *Duration* - integer :
   Duration in minites of each micro break
   - *Interval* - integer :

diff --git a/lib/main.js b/lib/main.js
@@ -100,10 +100,7 @@ export default breakPackage;
 socket.on('connect', function(){
 
     // constructor event
-    socket.emit('client-connected', {});
-
-    // config event
-    socket.emit('set-config-data', {
+    socket.emit('client-connected', {
         config: atom.config.get('break')
     });
 

diff --git a/lib/server/main.js b/lib/server/main.js
@@ -70,15 +70,20 @@ setInterval(function () {
  */
 io.on('connection', function (socket) {
 
-    // had first client
-    socketClientHandler.firstClient();
-
     /**
      * Called on client connection
      *
      * @param {Object} data
      */
-    socket.on('client-connected', function (data) {
+    socket.on('client-connected', function (dataObject) {
+
+        // set config
+        if (!socketClientHandler.hadFirstClient) {
+            stateController.setConfig(dataObject.config);
+        }
+
+        // had client
+        socketClientHandler.firstClient();
 
         // state constructors
         switch (stateController.currentState.constructor.name) {
@@ -127,18 +132,4 @@ io.on('connection', function (socket) {
         io.emit('set-status-bar-tile', { type: 'Null' });
         io.emit('set-break-panel', { type: 'Null' });
     });
-
-    /**
-     * Sets the config information and state only once.
-     *
-     * @param {Object} dataObject break's config object
-     */
-    socket.on('set-config-data', function (dataObject) {
-
-        // @TODO test this function
-        // first client only
-        if (socketClientHandler.clientCount == 0) {
-            stateController.setConfig(dataObject.config);
-        }
-    });
 });
diff --git a/lib/server/states/macroState.js b/lib/server/states/macroState.js
@@ -48,33 +48,15 @@ var MacroState = function () {
                 });
 
                 if (stateController.config.macroBreak.enableNotifications) {
-                    if (this.interval - this.secondCounter == 30) {
+                    if (this.interval - this.secondCounter === 60) {
                         _nodeNotifier2.default.notify({
                             title: 'Break;',
-                            message: 'Macro break will start in 30s'
+                            message: 'Macro break will start in 1 minute'
                         });
-                        this.socketEvent.emit('debug', 'macro break');
                     }
                 }
             }
         }
-
-        /**
-         * Sends a notification out 30s before break time
-         *
-         * @param {string} message a message to display
-         */
-
-    }, {
-        key: '_notify',
-        value: function _notify(message) {
-            if (this.interval - this.secondCounter == 30) {
-                _nodeNotifier2.default.notify({
-                    'title': 'Break;',
-                    'message': message
-                });
-            }
-        }
     }]);
 
     return MacroState;

diff --git a/lib/server/states/microState.js b/lib/server/states/microState.js
@@ -60,22 +60,20 @@ var MicroState = function () {
             });
 
             if (stateController.config.microBreak.enableNotifications && !this._onlastMicroBreak()) {
-                if (this.interval - this.secondCounter == 30) {
+                if (this.interval - this.secondCounter === 60) {
                     _nodeNotifier2.default.notify({
                         title: 'Break;',
-                        message: 'Micro break will start in 30s'
+                        message: 'Micro break will start in 1 minute'
                     });
-                    this.socketEvent.emit('debug', 'micro break');
                 }
             }
 
             if (stateController.config.macroBreak.enableNotifications && this._onlastMicroBreak()) {
-                if (this.interval - this.secondCounter == 30) {
+                if (this.interval - this.secondCounter === 60) {
                     _nodeNotifier2.default.notify({
                         title: 'Break;',
-                        message: 'Macro break will start in 30s'
+                        message: 'Macro break will start in 1 minute'
                     });
-                    this.socketEvent.emit('debug', 'macro break');
                 }
             }
         }
@@ -96,31 +94,14 @@ var MicroState = function () {
             }
         }
 
-        /**
-         * Sends a notification out 30s before break time
-         *
-         * @param {string} message a message to display
-         */
-
-    }, {
-        key: '_notify',
-        value: function _notify(message) {
-            if (this.interval - this.secondCounter == 30) {
-                _nodeNotifier2.default.notify({
-                    'title': 'Break;',
-                    'message': message
-                });
-            }
-        }
-
         /**
          * Returns true if on the last micro break
          */
 
     }, {
         key: '_onlastMicroBreak',
         value: function _onlastMicroBreak() {
-            if (this.amount == this.currentAmount + 1) {
+            if (this.amount === this.currentAmount + 1) {
                 return true;
             }
             return false;

diff --git a/lib/settings.js b/lib/settings.js
@@ -20,7 +20,7 @@ export default {
             properties: {
                 enableNotifications: {
                     title: 'Enable Notifications',
-                    description: 'Get a notification 30 seconds before each macro break',
+                    description: 'Get a notification 1 minute before each macro break',
                     type: 'boolean',
                     default: true,
                     order: 1
@@ -39,7 +39,7 @@ export default {
                     description: 'Time in minites between each macro break',
                     type: 'integer',
                     default: 60,
-                    minimum: 1,
+                    minimum: 2,
                     order: 3
                 }
             }
@@ -53,7 +53,7 @@ export default {
             properties: {
                 enableNotifications: {
                     title: 'Enable Notifications',
-                    description: 'Get a notification 30s before each micro break',
+                    description: 'Get a notification 1 minute before each micro break',
                     type: 'boolean',
                     default: true,
                     order: 1
@@ -72,7 +72,7 @@ export default {
                     description: 'Time in minites between each mico break',
                     type: 'integer',
                     default: 30,
-                    minimum: 1,
+                    minimum: 2,
                     maximum: 1439,
                     order: 3
                 },

diff --git a/lib/src/server/main.js b/lib/src/server/main.js
@@ -58,15 +58,20 @@ setInterval(function() {
  */
 io.on('connection', function (socket) {
 
-    // had first client
-    socketClientHandler.firstClient();
-
     /**
      * Called on client connection
      *
      * @param {Object} data
      */
-    socket.on('client-connected', function(data){
+    socket.on('client-connected', function(dataObject){
+
+        // set config
+        if(!socketClientHandler.hadFirstClient){
+            stateController.setConfig(dataObject.config);
+        }
+
+        // had client
+        socketClientHandler.firstClient();
 
         // state constructors
         switch(stateController.currentState.constructor.name){
@@ -117,19 +122,4 @@ io.on('connection', function (socket) {
         io.emit('set-break-panel', {type: 'Null'});
     });
 
-    /**
-     * Sets the config information and state only once.
-     *
-     * @param {Object} dataObject break's config object
-     */
-    socket.on('set-config-data', function(dataObject){
-
-        // @TODO test this function
-        // first client only
-        if(socketClientHandler.clientCount == 0){
-            stateController.setConfig(dataObject.config);
-        }
-
-    });
-
 });
diff --git a/lib/src/server/states/macroState.js b/lib/src/server/states/macroState.js
@@ -29,30 +29,15 @@ export default class MacroState{
             });
 
             if(stateController.config.macroBreak.enableNotifications){
-                if((this.interval - this.secondCounter) == 30){
+                if((this.interval - this.secondCounter) === 60){
                     notifier.notify({
                         title: 'Break;',
-                        message: 'Macro break will start in 30s'
+                        message: 'Macro break will start in 1 minute'
                     });
-                    this.socketEvent.emit('debug', 'macro break');
                 }
             }
 
         }
     }
 
-    /**
-     * Sends a notification out 30s before break time
-     *
-     * @param {string} message a message to display
-     */
-    _notify(message){
-        if((this.interval - this.secondCounter) == 30){
-            notifier.notify({
-                'title': 'Break;',
-                'message': message
-            });
-        }
-    }
-
 }
diff --git a/lib/src/server/states/microState.js b/lib/src/server/states/microState.js
@@ -43,22 +43,20 @@ export default class MicroState{
 
 
         if(stateController.config.microBreak.enableNotifications && !this._onlastMicroBreak()){
-            if((this.interval - this.secondCounter) == 30){
+            if((this.interval - this.secondCounter) === 60){
                 notifier.notify({
                     title: 'Break;',
-                    message: 'Micro break will start in 30s'
+                    message: 'Micro break will start in 1 minute'
                 });
-                this.socketEvent.emit('debug', 'micro break');
             }
         }
 
         if(stateController.config.macroBreak.enableNotifications && this._onlastMicroBreak()){
-            if((this.interval - this.secondCounter) == 30){
+            if((this.interval - this.secondCounter) === 60){
                 notifier.notify({
                     title: 'Break;',
-                    message: 'Macro break will start in 30s'
+                    message: 'Macro break will start in 1 minute'
                 });
-                this.socketEvent.emit('debug', 'macro break');
             }
         }
 
@@ -77,25 +75,11 @@ export default class MicroState{
         }
     }
 
-    /**
-     * Sends a notification out 30s before break time
-     *
-     * @param {string} message a message to display
-     */
-    _notify(message){
-        if((this.interval - this.secondCounter) == 30){
-            notifier.notify({
-                'title': 'Break;',
-                'message': message
-            });
-        }
-    }
-
     /**
      * Returns true if on the last micro break
      */
     _onlastMicroBreak(){
-        if(this.amount == this.currentAmount + 1){
+        if(this.amount === this.currentAmount + 1){
             return true;
         }
         return false;