Fixing javascript

ctrlaltdylan · Dec 14, 2016 · 80d2c67 · 80d2c67
1 parent 6f82535
commit 80d2c67
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -16,8 +16,8 @@
 
     return view('mirror', [
    		'greetings' => config('mirror.greetings'),
-   		'city' => env('city'),
-   		'state' => env('state'),
+   		'city' => env('CITY'),
+   		'state' => env('STATE'),
    		'woeid' => env('WOEID'),
     ]);
 });

diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/js/.DS_Store b/public/js/.DS_Store
diff --git a/public/js/vendor/jquery.simpleWeather.min.js b/public/js/vendor/jquery.simpleWeather.min.js
diff --git a/public/js/weather.js b/public/js/weather.js
@@ -3,7 +3,7 @@
           $.simpleWeather({
             location: '',
             'woeid': woeid,
-            unit: 'c',
+            unit: 'f',
             success: function(weather) {
                 var skycons = new Skycons({"color": "white"});
 
@@ -183,5 +183,5 @@
         };
         $(document).ready(function() {
             updateWeather();
-            setInterval(updateWeather, 300000);
+            setInterval(updateWeather, 30000);
         });
diff --git a/resources/views/mirror.blade.php b/resources/views/mirror.blade.php
@@ -36,27 +36,27 @@
         </p>
         <script type="text/javascript">
             var greetings = {!! json_encode($greetings) !!};
-            var city = {!! $city !!};
-            var state = {!! $state !!}
+            var city = "{!! $city !!}";
+            var state = "{!! $state !!}"
             var woeid = {!! $woeid !!};
         </script>
         <script type="text/javascript" src="/js/clock.js"></script>
         <script type="text/javascript" src="/js/weather.js"></script>
         <script type="text/javascript">
 
             function updateCompliment() {
-                var greeting = greetings[Math.floor(Math.random()*items.length)];
+                var greeting = greetings[Math.floor(Math.random()*greetings.length)];
 
                 $('#greeting').text(greeting);
             }
 
             setTimeout(function() {
                 updateCompliment();
-            }, 3000);
+            }, 30000);
 
         </script>
-        <script type="text/javascript">
-            var gitHash = {{ trim(`git rev-parse HEAD`) }};
+<!--         <script type="text/javascript">
+            var gitHash = "{{ trim(`git rev-parse HEAD`) }}";
                (function checkVersion()
                 {
                     $.getJSON('/version', {}, function(json, textStatus) {
@@ -71,6 +71,6 @@ function updateCompliment() {
                         checkVersion();
                     }, 3000);
                 })(); 
-        </script>
+        </script> -->
     </body>
 </html>