From 47ce6c08355f7141b79c9da657beac16049e1fe0 Mon Sep 17 00:00:00 2001
From: bsidio <siddhartha51997@gmail.com>
Date: Mon, 2 Oct 2017 13:20:14 +0530
Subject: [PATCH 1/9] Updated layout

---
 app/views/layouts/application.html.erb | 36 +++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b55585e..1f9a6de 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,17 +1,47 @@
 <!DOCTYPE html>
 <html>
+
+<!-- Petrol, Diesel, Price -->
   <head>
-    <title>FuelPricesIndia</title>
+
+    <meta name="description" content="Get the Latest Petrol price in India " />
+    <meta name="keywords" content="Bangalore Petrol Rate, Pune Petrol Rate, Bangalore Petrol Rate,Delhi,Mumbai,</option>
+    Chennai,Hyderabad,Chandigarh Petrol Prics" />
+    <meta name="author" content="metatags generator">
+    <meta name="robots" content="index, follow">
+    <meta name="revisit-after" content="1 days">
+    <title>Latest Fuel Price India</title>
     <%= csrf_meta_tags %>
 
+    <%= stylesheet_link_tag "https://fonts.googleapis.com/icon?family=Material+Icons" %>
+      <%= stylesheet_link_tag "https://code.getmdl.io/1.3.0/material.indigo-pink.min.css" %>
+      <%= stylesheet_link_tag "http://fonts.googleapis.com/css?family=Roboto:300,400,500,700"  %>
+      <%= javascript_include_tag  "https://code.getmdl.io/1.3.0/material.min.js" %>
+
+      <%= stylesheet_link_tag "http://fonts.googleapis.com/css?family=Roboto:300,400,500,700"  %>
+
+
+
+
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
     <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"> 
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+        
   </head>
 
   <body>
     <%= yield %>
   </body>
+  <footer> <center>
+<span>
+    Made <i class="fa fa-heart pulse"></i> in RVCE<a href="https://bsid.io" target="_blank"> by B Siddhartha</a>
+</span>
+<br>
+<br>
+
+<img src="https://image.ibb.co/igBwa5/rvce.png"  style="width:100px;height:100px;"></center>
+</footer>
 </html>

From 4b71e63cbdd7fea787377af1a86cfb91f3aef5c4 Mon Sep 17 00:00:00 2001
From: bsidio <siddhartha51997@gmail.com>
Date: Mon, 2 Oct 2017 13:22:25 +0530
Subject: [PATCH 2/9] Updated indec

---
 app/views/layouts/application.html.erb |  1 -
 app/views/main/index.html.erb          | 22 +++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 1f9a6de..0e9e222 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -42,6 +42,5 @@
 <br>
 <br>
 
-<img src="https://image.ibb.co/igBwa5/rvce.png"  style="width:100px;height:100px;"></center>
 </footer>
 </html>
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index ac7b8c2..967aee8 100644
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -1,17 +1,17 @@
 <center>
-  <h4>Latest Fuel Price</h4>
-  <%= select_tag 'city_name', options_for_select(City.city_list) %>
-  <%= select_tag 'fuelType', options_for_select(["Petrol", "Diesel"]) %>
-  <br>
-  <br>
-  <br>
-  <button class="btn btn-default" id="submit" onclick="fetchVal()">Fetch Price</button>
-  <br>
+
+  <h4>Latest Fuel Price India</h4>
+<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+  <%= select_tag 'city_name', options_for_select(City.city_list), {:class => 'mdl-textfield__input'} %>
   <br>
+  <%= select_tag 'fuelType', options_for_select(["Petrol", "Diesel"]) , {:class => 'mdl-textfield__input'} %>
+</div>
+<h3 id="result">
+
   <br>
-  <h5><p id="result"></h5>
-</center>
+  <h1><button class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" id="submit" onclick="fetchVal()">Fetch Price</button></h2>
 
+</center>
 <script>
 function fetchVal() {
   $("#result").text("Fetching latest value for you...");
@@ -25,7 +25,7 @@ function fetchVal() {
     url: "main/" + city + "/" + fuelType + "/price",
     success: function(data){
       // alert(data['val']);
-      $("#result").text("Latest " + fuelType + " price for " + data['city'] + " is Rs. " + data['price']);
+      $("#result").text("Latest " + fuelType + " price for " + data['city'] + " is ₹ " + data['price']);
       // $('#result').val(objectStr);
     }
   });

From 28387c7ec47f95b377601c7147d059709a741605 Mon Sep 17 00:00:00 2001
From: bsidio <siddhartha51997@gmail.com>
Date: Mon, 2 Oct 2017 13:24:02 +0530
Subject: [PATCH 3/9] Footer

---
 app/views/layouts/application.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 0e9e222..afe3bc5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -37,7 +37,6 @@
   </body>
   <footer> <center>
 <span>
-    Made <i class="fa fa-heart pulse"></i> in RVCE<a href="https://bsid.io" target="_blank"> by B Siddhartha</a>
 </span>
 <br>
 <br>

From 1317e9a84cbb63b86ff1d79fd24315eaebf285f3 Mon Sep 17 00:00:00 2001
From: bsidio <siddhartha51997@gmail.com>
Date: Mon, 2 Oct 2017 13:28:49 +0530
Subject: [PATCH 4/9] Options Updated design

---
 app/views/layouts/application.html.erb | 103 +++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index afe3bc5..44a99f5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,6 +28,109 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <style type="text/css">
+	  .site-footer  {
+	font-size: 12px;
+	margin-left: 2px;
+	margin-right: 2px;
+}
+
+        button.mdl-button {
+      margin: 50px;
+      font-size: 20px;
+     width: 8em;
+      height: 3em;
+    }
+            /*SELECT ELEMENT WITH UNICODE SYMBOL: DOWN-ARROW (&#x25bc;)*/
+            select#city_name, select#fuelType
+            {
+               width                    : 185pt;
+               height                   : 40pt;
+               line-height              : 40pt;
+               padding-right            : 0pt;
+               text-indent              : 4pt;
+               text-align               : center;
+               vertical-align           : middle;
+               box-shadow               : inset 0 0 3px #606060;
+               border                   : 1px solid #acacac;
+               -moz-border-radius       : 6px;
+               -webkit-border-radius    : 6px;
+               border-radius            : 6px;
+               -webkit-appearance       : none;
+               -moz-appearance          : none;
+               appearance               : none;  /*IMPORTANT*/
+               font-family              : Arial,  Calibri, Tahoma, Verdana;
+               font-size                : 18pt;
+               font-weight              : 500;
+               color                    : #F44336;
+               cursor                   : pointer;
+               outline                  : none;
+            }
+            select#city_name::-ms-expand {display: none;} /*FOR IE*/
+            select#city_name option
+            {
+                padding             : 4px 10px 4px 10px;
+                font-size           : 11pt;
+                font-weight         : normal;
+            }
+            select#city_name option[selected]{ font-weight:bold}
+            select#city_name option:nth-child(even) { background-color:#f5f5f5; }
+            select#city_name:hover {font-weight: 700;}
+            select#city_name:focus {box-shadow: inset 0 0 5px #000099; font-weight: 600;}
+
+            /*LABEL FOR SELECT*/
+            label#lblSelect{ position: relative; display: inline-block;}
+            /*DOWNWARD ARROW (25bc)*/
+            label#lblSelect::after
+            {
+                content                 : "\25bc";
+                position                : absolute;
+                top                     : 0;
+                right                   : 0;
+                bottom                  : 0;
+                width                   : 20pt;
+                line-height             : 40pt;
+                vertical-align          : middle;
+                text-align              : center;
+                background              : #000099;
+                color                   : #fefefe;
+               -moz-border-radius       : 0 6px 6px 0;
+               -webkit-border-radius    : 0 6px 6px 0;
+                border-radius           : 0 6px 6px 0;
+                pointer-events          : none;
+            }
+
+            img
+  {
+    width:100px;
+  }
+
+span
+  {
+  color: #666
+  font-size: 12px
+  display: block
+  position: absolute
+  bottom: 10px
+  position: absolute
+  width: 90%
+  left: 50%
+  top: 45%
+  bottom: auto
+  right: auto
+  transform: translateX(-50%) translateY(-50%)
+  text-align: center
+  }
+
+  .fa
+    {
+    color: #E90606
+    margin: 0 3px
+    font-size: 10px
+    animation: pound .35s infinite alternate
+    -webkit-animation: pound .35s infinite
+  }
+        </style>
 
         
   </head>

From 4f327254cbf72594aeccf7a210001283aebe457d Mon Sep 17 00:00:00 2001
From: bsidio <siddhartha51997@gmail.com>
Date: Mon, 2 Oct 2017 13:31:28 +0530
Subject: [PATCH 5/9] Button changed

---
 app/views/layouts/application.html.erb | 34 +++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 44a99f5..b06d6ae 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -29,7 +29,39 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <style type="text/css">
-	  .site-footer  {
+		.by {
+    right: 0;
+    bottom: 0;
+    background-color: #ff4742;
+    background: -webkit-linear-gradient(right, #f85032, #ff4742);
+    background: linear-gradient(to left, #f85032, #ff4742);
+    color: #fff;
+    position: fixed;
+    font-weight: 500;
+    z-index: 970000;
+    border-top-left-radius: 0.2em;
+    padding: 0.5em;
+}
+.by:hover {
+    background-color: #fff !important;
+    color: #000 !important;
+}
+.by img {
+    border-radius: 0em !important;
+    width: 2.2em !important;
+    vertical-align: middle !important; 
+}
+.by p {
+    margin: 0 !important;
+    vertical-align: middle !important;
+    display: inline !important;
+    margin-left: 0.5em !important;
+    font-weight: 700 !important;
+}
+
+
+
+        .site-footer  {
 	font-size: 12px;
 	margin-left: 2px;
 	margin-right: 2px;

From d35e2f9fc00d4907b79bbedbe19f38a12fc4e88c Mon Sep 17 00:00:00 2001
From: bsidio <siddhartha51997@gmail.com>
Date: Mon, 2 Oct 2017 13:33:55 +0530
Subject: [PATCH 6/9] Button Size

---
 app/views/layouts/application.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b06d6ae..ad2726a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -70,7 +70,7 @@
         button.mdl-button {
       margin: 50px;
       font-size: 20px;
-     width: 8em;
+     width: 12em;
       height: 3em;
     }
             /*SELECT ELEMENT WITH UNICODE SYMBOL: DOWN-ARROW (&#x25bc;)*/

From c0142fb0a0f942d47ba917ee999a1203cfdc2276 Mon Sep 17 00:00:00 2001
From: B Siddhartha <siddhartha51997@gmail.com>
Date: Tue, 17 Jul 2018 23:44:11 +0530
Subject: [PATCH 7/9] Update fuel_price_scraper.rb

---
 app/models/fuel_price_scraper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/fuel_price_scraper.rb b/app/models/fuel_price_scraper.rb
index f21f306..24ebb6e 100644
--- a/app/models/fuel_price_scraper.rb
+++ b/app/models/fuel_price_scraper.rb
@@ -9,7 +9,7 @@ def self.get_fuel_price(city, city_id, fuel_type)
       if response_html.success?
         puts "Successfully fetched #{fuel_type} price for #{city}"
         parsed_page = Nokogiri::HTML(response_html)
-        return parsed_page.at_css('[class="price"]').children.to_s.strip.delete("^.0-9").to_f.round(2)
+        return parsed_page.at_css('[class="UCPrice"]').children.to_s.strip.delete("^.0-9").to_f.round(2)
       else
         raise HTTParty::Error("Received a non 200 response")
       end
@@ -19,4 +19,4 @@ def self.get_fuel_price(city, city_id, fuel_type)
     end
   end
 
-end
\ No newline at end of file
+end

From 8c22671204438a38e212488d4b905b756a4f7a7f Mon Sep 17 00:00:00 2001
From: B Siddhartha <siddhartha51997@gmail.com>
Date: Wed, 18 Jul 2018 00:09:10 +0530
Subject: [PATCH 8/9] Update index.html.erb

---
 app/views/main/index.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index 4b782f1..31f13db 100644
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -11,6 +11,7 @@
   <br>
   <h5><p id="result"></h5>
 </center>
+
 <script>
 function fetchVal() {
   $("#result").text("Fetching latest value for you...");
@@ -21,7 +22,8 @@ function fetchVal() {
     type: "GET",
     dataType: "JSON",
     data: jsonData,
-     success: function(data){
+    url: "price?city=" + city + "&fuel_type=" + fuelType,
+    success: function(data){
       if(data[fuelType] == null){
         $("#result").text("Data not available at this time.");
       } else {

From 7ae31cfadadc75ee9d89039276bd99831cfb519f Mon Sep 17 00:00:00 2001
From: B Siddhartha <siddhartha51997@gmail.com>
Date: Wed, 18 Jul 2018 00:23:33 +0530
Subject: [PATCH 9/9] Update index.html.erb

---
 app/views/main/index.html.erb | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index 31f13db..967aee8 100644
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -1,17 +1,17 @@
 <center>
-  <h4>Latest Fuel Price</h4>
-  <%= select_tag 'city_name', options_for_select(City.city_list) %>
-  <%= select_tag 'fuelType', options_for_select(Fuel::TYPE.values) %>
-  <br>
-  <br>
-  <br>
-  <button class="btn btn-default" id="submit" onclick="fetchVal()">Fetch Price</button>
-  <br>
+
+  <h4>Latest Fuel Price India</h4>
+<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+  <%= select_tag 'city_name', options_for_select(City.city_list), {:class => 'mdl-textfield__input'} %>
   <br>
+  <%= select_tag 'fuelType', options_for_select(["Petrol", "Diesel"]) , {:class => 'mdl-textfield__input'} %>
+</div>
+<h3 id="result">
+
   <br>
-  <h5><p id="result"></h5>
-</center>
+  <h1><button class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--accent" id="submit" onclick="fetchVal()">Fetch Price</button></h2>
 
+</center>
 <script>
 function fetchVal() {
   $("#result").text("Fetching latest value for you...");
@@ -22,17 +22,13 @@ function fetchVal() {
     type: "GET",
     dataType: "JSON",
     data: jsonData,
-    url: "price?city=" + city + "&fuel_type=" + fuelType,
+    url: "main/" + city + "/" + fuelType + "/price",
     success: function(data){
-      if(data[fuelType] == null){
-        $("#result").text("Data not available at this time.");
-      } else {
-        $("#result").text("Latest " + fuelType + " price for " + data['city'] + " is Rs. " + data[fuelType]);
-      }
-    },
-    error: function(data){
-      $("#result").text("Data not available at this time.");
+      // alert(data['val']);
+      $("#result").text("Latest " + fuelType + " price for " + data['city'] + " is ₹ " + data['price']);
+      // $('#result').val(objectStr);
     }
   });
 }
+
 </script>
