Merge branch 'staging'

Gemfile

@@ -24,8 +24,8 @@ gem "rest-client"
 gem "simple_form" , "5.1.0"
 gem "simple_form_tailwind_css"
 
-gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
-#gem "merged" , path: "../merged"
+#gem "merged" , git: "https://github.com/HubFeenixMakers/merged"
+gem "merged" , path: "../merged"
 
 gem "passenger" ,  require: "phusion_passenger/rack_handler"
 gem "bootsnap", require: false

Gemfile.lock

@@ -1,6 +1,14 @@
 GIT
-  remote: https://github.com/HubFeenixMakers/merged
-  revision: a8f5229935e22f5aa8092647ec8c610477bdaa98
+  remote: https://github.com/ruby2js/ruby2js/
+  revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
+  branch: haml_fix
+  specs:
+    ruby2js (5.0.1)
+      parser
+      regexp_parser (~> 2.1.1)
+
+PATH
+  remote: ../merged
   specs:
     merged (0.1.0)
       active_hash
@@ -11,15 +19,6 @@ GIT
       redcarpet
       ruby2js (~> 5.0, >= 5.0.1)
 
-GIT
-  remote: https://github.com/ruby2js/ruby2js/
-  revision: f204f4e8f14cde6e4d4c6aafc55251a8d488a78d
-  branch: haml_fix
-  specs:
-    ruby2js (5.0.1)
-      parser
-      regexp_parser (~> 2.1.1)
-
 GEM
   remote: https://rubygems.org/
   specs:

app/models/entity.rb

@@ -13,16 +13,22 @@ class Entity < ApplicationRecord
   def type
     ha_id.split(".").first.capitalize
   end
-  
+
   def self.ha_entities
     res = response()
     res.collect{|i| i["entity_id"]}.select{|i| i.include?("4a") || i.include?("2d")}
   end
 
   def self.response(path = "")
-    token = Rails.application.credentials[:ha_token]
-    all = RestClient.get( "10.30.39.238:8123/api/states#{path}" ,
-                    {"Authorization" => "Bearer #{token}" })
-    res = JSON.parse(all.body)
+    host = Rails.credentials.weather_dev
+    host = Rails.credentials.weather_pro if Rails.env.production?
+    token = Rails.application.credentials.weather_token
+    begin
+      all = RestClient.get( "#{host}:8123/api/states#{path}" ,
+                      {"Authorization" => "Bearer #{token}" })
+      res = JSON.parse(all.body)
+    rescue
+      []
+    end
   end
 end

config/credentials.yml.enc

@@ -1 +1 @@
-OaKTik0EStvonrwTuP2M/z94Dn97BOuyOeP0zCgiKOG0C3K9D7XLKwhboSBBprkWBxAadS3U+JXKr+uF3J72fE3DYO2O1Ruddx60CWi4XnIsUi2TUKDgHvvRJMMCp1hbclggixuqH3r5d+YVoFeEtp0XBE1JZscUSDEEG8m7+5WeBnuKa+cWu1OVFtgqn68AAD4Jr8wEp8agNIZlvZk/77nO5jmIpgzWlVsIgznDDdyZW7IK6jdVxKBrnu6HvfJqt8Np9nZnsQ+EtwioCQO5nvfYtM5lrHVOvVKxVnmaycKvC42Vh2MH8IUO2mQZAX5543FPBovmxRcQFqDgrHr6C4NQ2x7UHRxeD5RD6A9fZ4RaEAxKVRYWXL3YVkz+HUutJ+bKJMaMlPwnEBfYnshFJdI5ca57UpiUY+c09WikIDMjZjtCos4obwJbIX8Oy9/ClhSWEkoJBr1eZ3ieUZz66gKZvfiKgNhMnE/KBCj3CqUBmHLi5XfmKqdOlAf+EoZDm4XRbXd4BanmheJ4FWJeIQhFXM7lwIvv1q9PiuBP60Ss95dWQR4q7NZiu3LKkfAodZkgbPjPNzmUWlZsq0q4ze0Koz1XGki9vkx3hz7DbWnHehSuJw2cHKOTJuEfi2b2bXnsVi+vV/+naczyQn9mzU0SG9WHTJZVKUiT8fKnS2v5VO/c3cbYGGylJRNxS0EQ50FDSqgVQgbeI/08BivcBxnGq9beXyuaeqkGE4JFeI9i6gJrU2FfsjKdTjw6T8TwUV6qP0/MJOtSo2UaP4aIFAV7U90+3y0B+mUj2M5JtfpFWMKWcWMNsIHqowINz6H4bnV/XQ==--u9baZdFij677MR3P--ozXUG3v6hK2XQxftbhMiQQ==
+rSgLEjI+CL+J/pMIJnkQ3ERk5ezR/X83SUxDohF2kuz57PdocKAN5ZMpYDQa/B8Rw7o5eA0OBe+SvxZcSg1O5Iuh0BjS4eixoaVKIyqanek7OwjN6jp8UX8xxoCDDDIPIQkVggWLnOu6E1C3arYfl22XsvGAeKfybcaHSCkJ4Xh8OIAxQ6j/hJxmp1j29fZl+PNJRFT2hnOk2W/DbDtkV52+tD65A2rOhRk3pCY8al2K7HzugnmFkAz6ekOoO9slZ7J70lWabqrOoDg06ohMoJaHXSc71SvWkODtOv5/7MsMHUnJ/iqzdNmHezA51ns8HoO5TgcMqzper94dOsxrg+0wYqAzvIDI53JWLpdLYbh5AC0QXgzLFW0gf/WpXmiPpZhp2OotjET1/2GwBYzyXjlaGmddVy4h/aqljnTBZRi8AFbnXAByrhvUd4uF/DXZyfM+7/8chNoetem3i2g9dK/xGVjVAJXaxPgt+Q9Ez7OUrz1qgGHqnORcYKpoJTxVXl2TBT67V+hh5I+CabB5V6TQta4YzZfj0LgY2GaIxaCs78FDXRyMhP5k9Im0f2OUaFPoXCA+/bUwANxGxbSgmI9sv/dDTqotixMh2uQfxlW6gCKaXumthbzwVpZJSmOcdEZrW0V4di/ceCskoy/KqMT2INPEbFkFQ8qd7WMZtsbz+7rpQNpBRtYjeybO9HAzTspmPpHun7KCHrlPswEzoWs+YmamDUEQxwnooqXDptNbzEeMyNpbgtx+irkPwzFwe81C8ff6Fyc9ujkJ/sPAWXEZI6mPpxkZ4oNU+0Fmgr0Cjy5K+PM8t0/tIA0c6/IhjdOILsnOEC7lOQFQeRe8kooL0vJcyiwH5MoCPcVNww/PsMf6vw6cipD/5uMs0N1NoQFdyEubMnu1IA==--E/95HXUFhFAeaK3C--T9Mn8lvZAiN45MP3eBGRNw==