Bug fixes (#112)

* Fixed Undefined variable error

* Fixed sass error

* Updated package.json

Gruntfile.js

@@ -1,4 +1,5 @@
 module.exports = function (grunt) {
+    const sass = require('node-sass');
 
     // load plugins as needed instead of up front
     require('jit-grunt')(grunt);
@@ -8,6 +9,9 @@ module.exports = function (grunt) {
         pkg: grunt.file.readJSON('package.json'),
 
         sass: {
+            options: {
+                implementation: sass
+            },
             dist: {
                 files: {
                     'static/dist/css/app.built.css': 'static/sass/main.scss',

lib/Monocle.php

@@ -469,6 +469,7 @@ public function get_weather($updated = null)
         }
         $query = str_replace(":conditions", join(" AND ", $conds), $query);
         $weathers = $db->query($query, $params)->fetchAll(\PDO::FETCH_ASSOC);
+        $data = array();
         foreach ($weathers as $weather) {
             $data["weather_" . $weather['s2_cell_id']] = $weather;
         }

lib/RocketMap.php

@@ -682,6 +682,7 @@ public function get_weather($updated = null)
         global $db;
         $query = "SELECT s2_cell_id, gameplay_weather FROM weather";
         $weathers = $db->query($query)->fetchAll(\PDO::FETCH_ASSOC);
+        $data = array();
         foreach ($weathers as $weather) {
             $data["weather_" . $weather['s2_cell_id']] = $weather;
             $data["weather_" . $weather['s2_cell_id']]['condition'] = $data["weather_" . $weather['s2_cell_id']]['gameplay_weather'];

lib/RocketMap_Sloppy.php

@@ -26,6 +26,7 @@ public function get_weather($updated = null)
         global $db;
         $query = "SELECT s2_cell_id, gameplay_weather FROM weather";
         $weathers = $db->query($query)->fetchAll(\PDO::FETCH_ASSOC);
+        $data = array();
         foreach ($weathers as $weather) {
             $weather['s2_cell_id'] = sprintf("%u", $weather['s2_cell_id']);
             $data["weather_" . $weather['s2_cell_id']] = $weather;

package.json

@@ -26,35 +26,36 @@
   },
   "homepage": "https://github.com/Glennmen/PMSF#readme",
   "dependencies": {
-    "babel-core": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
+    "babel-core": "^6.26.3",
+    "babel-preset-env": "^1.7.0",
     "clean": "^4.0.2",
-    "eslint": "^4.8.0",
+    "eslint": "^4.19.1",
     "eslint-config-standard": "^10.2.1",
-    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-import": "^2.13.0",
     "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "grunt": "^1.0.1",
+    "eslint-plugin-promise": "^3.8.0",
+    "eslint-plugin-standard": "^3.1.0",
+    "grunt": "^1.0.3",
     "grunt-babel": "^7.0.0",
-    "grunt-cache-bust": "^1.6.0",
+    "grunt-cache-bust": "^1.7.0",
     "grunt-cli": "^1.2.0",
     "grunt-contrib-clean": "latest",
     "grunt-contrib-concat": "latest",
     "grunt-contrib-connect": "latest",
     "grunt-contrib-copy": "latest",
     "grunt-contrib-cssmin": "latest",
     "grunt-contrib-htmlmin": "2.4.0",
-    "grunt-contrib-uglify": "latest",
-    "grunt-contrib-watch": "latest",
-    "grunt-eslint": "^20.1.0",
+    "grunt-contrib-uglify": "^3.3.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-eslint": "^20.2.0",
     "grunt-minjson": "latest",
     "grunt-newer": "^1.2.0",
-    "grunt-sass": "latest",
+    "grunt-sass": "^3.0.0",
     "grunt-unused": "latest",
     "grunt-usemin": "latest",
     "jit-grunt": "^0.10.0",
     "long": "^3.2.0",
+    "node-sass": "^4.9.2",
     "phplint": "^1.7.4",
     "push.js": "^1.0.4"
   }