Merge remote-tracking branch 'origin/master'

etl12003 · Mar 25, 2017 · 6648c07 · 6648c07
2 parents 2c3600e + 623d215
commit 6648c07
Show file tree

Hide file tree

Showing 13 changed files with 580 additions and 1,035 deletions.
diff --git a/Wello/platforms/browser/cordova/build b/Wello/platforms/browser/cordova/build
diff --git a/Wello/platforms/browser/cordova/clean b/Wello/platforms/browser/cordova/clean
diff --git a/...node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js b/...node_modules/cordova-serve/node_modules/express/node_modules/content-disposition/index.js
diff --git a/...wser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js b/...wser/cordova/node_modules/cordova-serve/node_modules/express/node_modules/cookie/index.js
diff --git a/Wello/platforms/browser/cordova/run b/Wello/platforms/browser/cordova/run
diff --git a/Wello/platforms/browser/cordova/version b/Wello/platforms/browser/cordova/version
diff --git a/html-ONLY-site/form.html b/html-ONLY-site/form.html
@@ -117,7 +117,10 @@ <h2>Well location</h2>
             </li>
 
             <li id="get-gps-local">
-                <label for="gps-coordinates">GPS coordinates <button onclick="getLocation()"><img alt="get location" src="img/gps.svg"></button></label>
+                <label for="gps-coordinates">GPS coordinates 
+                        <img onclick="getLocation()" alt="get location" src="img/gps.svg">
+                </label>
+                <p id="demo"></p>
                 <label for="gps-coordinates">Latitude</label>
                 <input type="text" id="gps-coordinates-latitude">
                 <label for="gps-coordinates">Longitude</label>

diff --git a/html-ONLY-site/index.html b/html-ONLY-site/index.html
@@ -15,33 +15,22 @@
     <script src="js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 
-
-
-
-
-
 <body>
     <!--[if lt IE 8]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
     <!-- Add your site or application content here -->
 
-
-
-
-
-
+
     <main class="intro">
 
         <h1>Connecticut<br>Well Report App</h1>
         <p>Use this app to pull up data on any well in Connecticut on site and see it's details. Also, fill out and submit well report forms within the app.</p>
         <a href="map.html">Continue</a>
+
     </main>
 
-
-
-
-
+
     <script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
     <script>
         window.jQuery || document.write('<script src="js/vendor/jquery-1.12.0.min.js"><\/script>')

diff --git a/html-ONLY-site/js/main.js b/html-ONLY-site/js/main.js
@@ -20,3 +20,20 @@ $('select').change(function() {
     };
 
 });
+
+var x = document.getElementById("demo");
+
+function getLocation() {
+    if (navigator.geolocation) {
+        navigator.geolocation.getCurrentPosition(showPosition);
+    } else { 
+        x.innerHTML = "Geolocation is not supported by this browser.";
+    }
+}
+
+function showPosition(position) {
+    $("#gps-coordinates-latitude").val(position.coords.latitude);
+    $("#gps-coordinates-longitude").val(position.coords.longitude);
+    //x.innerHTML = "Latitude: " + position.coords.latitude + 
+    //"<br>Longitude: " + position.coords.longitude;
+}
diff --git a/html-ONLY-site/map.html → html-ONLY-site/map.php b/html-ONLY-site/map.html → html-ONLY-site/map.php
@@ -1,3 +1,20 @@
+<?php
+
+$servername = "wellreportapp.uconn.edu";
+$username = "db10e41481317066";
+$password = "jXLUjNG/cQxm4VJ1SionhDKdcT4BT1Dos7sZMddIapa/8LYDpDNz+3hwGCz8Shon";
+
+// Create connection
+$conn = new mysqli($servername, $username, $password);
+
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
+} 
+echo "Connected successfully";
+
+?>
+
 <!doctype html>
 <html class="no-js" lang="">
 
@@ -111,4 +128,11 @@ <h2>Well Name</h2>
     </script>
 </body>
 
+
 </html>
+// notes :
+
+
+
+// we will need a file where we import the well name, address, longiture and latitude within the range we chose
+// we need a food loop for it