Merge pull request #773 from RickCarlino/staging

Version 6.3.0

CONTRIBUTING.md

@@ -1 +1 @@
-To get started, <a href="https://www.clahub.com/agreements/FarmBot/farmbot-web-frontend">sign the Contributor License Agreement</a>.
+To get started, <a href="https://www.clahub.com/agreements/FarmBot/Farmbot-Web-App">sign the Contributor License Agreement</a>.

Gemfile

@@ -15,20 +15,18 @@ gem "rack-attack"
 gem "paperclip"
 gem "figaro"
 gem "fog-google", git: "https://github.com/fog/fog-google"
-gem "pg", "0.21.0" # TODO: Why can't I upgrade to 1.0.0?
+gem "pg"
 gem "polymorphic_constraints"
 gem "tzinfo" # For validation of user selected timezone names
 gem "foreman"
 gem "webpack-rails"
-# Error reporting tools.
-# Active on the "official" FarmBot server, set the appropriate ENV
-# vars if you wish to use them on your own servers.
 gem "rollbar"
 gem "skylight"
 gem "bunny"
 gem "request_store"
 gem "secure_headers"
 gem "valid_url"
+gem "font-awesome-rails"
 
 group :development, :test do
   gem "hashdiff"
@@ -40,9 +38,6 @@ group :development, :test do
   gem "faker"
   gem "smarf_doc", git: "https://github.com/RickCarlino/smarf_doc.git"
   gem "rails-erd"
-  # TODO: Upgrade versions when they fix this stuff:
-  # https://stackoverflow.com/questions/43983466
-  #   /controller-test-emits-debug-failure-messages-after-rails-5-1-upgrade
   gem "rspec"
   gem "rspec-rails"
   gem "simplecov"

Gemfile.lock

@@ -6,9 +6,9 @@ GIT
 
 GIT
   remote: https://github.com/fog/fog-google
-  revision: 069b89ffb6d0a7430e6e49eb24266c8d555ad135
+  revision: ee58e2a4d9502f2a4dc102ca6a4b664656551e3f
   specs:
-    fog-google (1.2.2)
+    fog-google (1.3.3)
       fog-core
       fog-json
       fog-xml
@@ -65,7 +65,7 @@ GEM
     arel (8.0.0)
     bcrypt (3.1.11)
     builder (3.2.3)
-    bunny (2.9.1)
+    bunny (2.9.2)
       amq-protocol (~> 2.3.0)
     capybara (2.18.0)
       addressable
@@ -76,12 +76,10 @@ GEM
       xpath (>= 2.0, < 4.0)
     case_transform (0.2)
       activesupport
-    childprocess (0.8.0)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     choice (0.2.0)
     climate_control (0.2.0)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     codecov (0.1.10)
       json
       simplecov
@@ -98,17 +96,17 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    devise (4.4.1)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
-    docile (1.1.5)
-    erubi (1.7.0)
+    docile (1.3.0)
+    erubi (1.7.1)
     eventmachine (1.2.5)
-    excon (0.60.0)
+    excon (0.61.0)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.8.2)
@@ -121,7 +119,7 @@ GEM
     ffi (1.9.23)
     figaro (1.1.1)
       thor (~> 0.14)
-    fog-core (2.0.0)
+    fog-core (2.1.0)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
@@ -132,6 +130,8 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
+    font-awesome-rails (4.7.0.3)
+      railties (>= 3.2, < 5.2)
     foreman (0.84.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
@@ -167,7 +167,7 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    loofah (2.2.0)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -185,18 +185,18 @@ GEM
     multipart-post (2.0.0)
     mutations (0.8.1)
       activesupport
-    nio4r (2.2.0)
+    nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     os (0.9.6)
-    paperclip (5.2.1)
+    paperclip (6.0.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    pg (0.21.0)
+      terrapin (~> 0.6.0)
+    pg (1.0.0)
     polymorphic_constraints (1.0.0)
       rails
     pry (0.11.3)
@@ -206,10 +206,10 @@ GEM
       pry (>= 0.10.4)
     public_suffix (3.0.2)
     rack (2.0.4)
-    rack-attack (5.0.1)
+    rack-attack (5.1.0)
       rack
     rack-cors (1.0.2)
-    rack-test (0.8.2)
+    rack-test (0.8.3)
       rack (>= 1.0, < 3)
     rails (5.1.5)
       actioncable (= 5.1.5)
@@ -244,12 +244,12 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
+    rake (12.3.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    request_store (1.4.0)
+    request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
@@ -282,20 +282,20 @@ GEM
     rubyzip (1.2.1)
     secure_headers (5.0.5)
       useragent (>= 0.15.0)
-    selenium-webdriver (3.9.0)
+    selenium-webdriver (3.11.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
     signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.15.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    skylight (1.5.1)
+    skylight (1.6.0)
       activesupport (>= 3.0.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -304,6 +304,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -344,13 +346,14 @@ DEPENDENCIES
   faker
   figaro
   fog-google!
+  font-awesome-rails
   foreman
   hashdiff
   jwt
   letter_opener
   mutations
   paperclip
-  pg (= 0.21.0)
+  pg
   polymorphic_constraints
   pry
   pry-rails

README.md

@@ -1,11 +1,7 @@
-[![codebeat badge](https://codebeat.co/badges/7b023dc5-6509-42af-ad6e-ec0b8262ef13)](https://codebeat.co/projects/github-com-rickcarlino-farmbot-web-app-master)
-
-
-[![Coverage Status](https://coveralls.io/repos/github/FarmBot/Farmbot-Web-App/badge.svg)](https://coveralls.io/github/FarmBot/Farmbot-Web-App)(Frontend)
-
-
-[![codecov](https://codecov.io/gh/FarmBot/Farmbot-Web-App/branch/master/graph/badge.svg)](https://codecov.io/gh/FarmBot/Farmbot-Web-App)(API)
-
+# FarmBot Web App
+[![codebeat badge](https://codebeat.co/badges/7f81859b-67fe-4bdb-b56f-050bfed35e9c)](https://codebeat.co/projects/github-com-farmbot-farmbot-web-app-staging)
+[![codecov](https://codecov.io/gh/FarmBot/Farmbot-Web-App/branch/master/graph/badge.svg)](https://codecov.io/gh/FarmBot/Farmbot-Web-App)
+[![Coverage Status](https://coveralls.io/repos/github/FarmBot/Farmbot-Web-App/badge.svg)](https://coveralls.io/github/FarmBot/Farmbot-Web-App)
 [![Maintainability](https://api.codeclimate.com/v1/badges/74091163d8a02bb8988f/maintainability)](https://codeclimate.com/github/FarmBot/Farmbot-Web-App/maintainability)
 
 

app/assets/stylesheets/application.css

@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require bootstrap
+ *= require font-awesome
+*/