bower to yarn (#162)

* bower to yarn

* yarn -> Javascript dependencies
composer -> PHP dependencies

* changelog

Changelog.md

@@ -3,13 +3,13 @@
 ## Podmins
 * Can no longer access db/pull.php to test their pod, they can however get to a debug screen from the edit pod area
 
-
 ## DB
 * Add development and release dates to masterversions table https://github.com/diasporg/Poduptime/issues/143
 
 ## Cleanup
 * Use the git API for release versions, check development releases on pods https://github.com/diasporg/Poduptime/issues/143
 * Forbid access to files that should be cli only https://github.com/diasporg/Poduptime/issues/152
+* Move from bower to yarn for packages
 
 ## End Users
 * Show version and update in full view cleaner https://github.com/diasporg/Poduptime/issues/143

README.md

@@ -4,15 +4,14 @@ Poduptime is software to get live stats and data on listed Diaspora Pods.
 
 Dependencies:
 ```
-php7.2 php7.2-curl php7.2-pgsql php-geoip php7.2-cli php7.2-common php7.2-json php7.2-readline php-cgi git curl postgresql postgresql-contrib wget dnsutils bind9 npm nodejs nodejs-legacy composer
+php7.2 php7.2-curl php7.2-pgsql php-geoip php7.2-cli php7.2-common php7.2-json php7.2-readline php-cgi git curl postgresql postgresql-contrib wget dnsutils bind9 npm nodejs nodejs-legacy composer yarn
 ```
 
 To Install:
 ```
 git clone https://github.com/diasporg/Poduptime.git
 cd Poduptime
-sudo npm install -g bower
-bower install
+yarn install
 composer install
 cp config.php.example config.php
 ```

bower.json

@@ -19,12 +19,6 @@
     "tests"
   ],
   "dependencies": {
-    "bootstrap": "v4.0.0-alpha.6",
-    "jquery-ui": "^1.12.1",
-    "tablesorter": "jquery.tablesorter#^2.28.3",
-    "leaflet": "^1.0.2",
-    "leaflet.markercluster": "^1.0.0",
     "facebox": "*",
-    "chart.js": "^2.4.0"
   }
 }

index.php

@@ -31,11 +31,10 @@ $simpleview   = !($detailedview || $mapview || $podmin || $podminedit || $statsv
   <title>Open Source Social Network Pod Uptime Status</title>
   <meta name="keywords" content="diaspora, federated pods, <?php echo $_SERVER['HTTP_HOST'] ?>, friendica, hubzilla, open source social, open source social network"/>
   <meta name="description" content="Diaspora Pod Live Status. Find a Diaspora pod to sign up for, rate pods, find one close to you!"/>
-  <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
+  <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
   <link rel="stylesheet" href="css/poduptime.css"/>
   <link rel="stylesheet" href="bower_components/facebox/src/facebox.css"/>
-  <link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.min.css"/>
-  <link rel="stylesheet" href="bower_components/tablesorter/dist/css/theme.bootstrap_4.min.css"/>
+  <link rel="stylesheet" href="node_modules/tablesorter/dist/css/theme.bootstrap_4.min.css"/>
   <meta property="og:url" content="https://<?php echo $_SERVER['HTTP_HOST'] ?>"/>
   <meta property="og:title" content="Social Network Pod Finder"/>
   <meta property="og:type" content="website"/>
@@ -139,14 +138,12 @@ $navs = [
     </div>
   </div>
 </div>
-<script src="bower_components/jquery/dist/jquery.min.js"></script>
-<script src="bower_components/tablesorter/dist/js/jquery.tablesorter.min.js"></script>
-<script src="bower_components/tether/dist/js/tether.min.js"></script>
-<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="node_modules/jquery/dist/jquery.min.js"></script>
+<script src="node_modules/tablesorter/dist/js/jquery.tablesorter.combined.min.js"></script>
+<script src="js/podup.js"></script>
+<script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="bower_components/facebox/src/facebox.js"></script>
-<script src="bower_components/jquery-ui/jquery-ui.min.js"></script>
-<script src="bower_components/chart.js/dist/Chart.min.js"></script>
+<script src="node_modules/chart.js/dist/Chart.min.js"></script>
 <?php $statsview && include_once __DIR__ . '/statsviewjs.php'; ?>
-<script src="js/podup.js"></script>
 </body>
 </html>

package.json

+{
+  "name": "poduptime",
+  "version": "1.0.0",
+  "description": "Poduptime is software to get live stats and data on listed Diaspora Pods.",
+  "main": "index.php",
+  "dependencies": {
+    "bootstrap": "^4.1.1",
+    "bower-resolve": "^2.2.1",
+    "chart.js": "^2.7.2",
+    "jquery": "^3.3.1",
+    "leaflet": "^1.3.1",
+    "leaflet.markercluster": "^1.3.0",
+    "tablesorter": "^2.30.6"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": "git+https://github.com/diasporg/Poduptime.git",
+  "author": "dmorley <david@usr.io>",
+  "license": "AGPL",
+  "bugs": {
+    "url": "https://github.com/diasporg/Poduptime/issues"
+  },
+  "homepage": "https://github.com/diasporg/Poduptime#readme"
+}

showmap.php

@@ -30,9 +30,9 @@ foreach ($csv as $cords) {
   }
 }
 ?>
-<link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css"/>
-<script src="bower_components/leaflet/dist/leaflet.js"></script>
-<script type="text/javascript" src="bower_components/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
+<link rel="stylesheet" href="node_modules/leaflet/dist/leaflet.css"/>
+<script src="node_modules/leaflet/dist/leaflet.js"></script>
+<script type="text/javascript" src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
 <div id="map"></div>
 <script type="text/javascript">
   var geoJsonData = {