1
0

Switched from Bower to Yarn.

This commit is contained in:
Markus Birth 2018-10-03 21:49:20 +02:00
parent 652dbe8202
commit 6b81b63771
Signed by: mbirth
GPG Key ID: A9928D7A098C3A9A
8 changed files with 93 additions and 64 deletions

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
/assets/*.js
/assets/*.js.map
/bower_components/
/node_modules/
/tools/Location History.json
/vendor/
config.inc.php

View File

@ -50,17 +50,8 @@ That's it !
$_config['geo_reverse_lookup_url'] // geodecoding api url, will be appended with lat= & lon= attributes
```
3. Create datatable using schema_mysql.sql or schema_sqlite.sql (in the 'sql' directory)
4. Make sure you have installed [bower](https://bower.io/) (via [npm](https://nodejs.org/)):
```
sudo -H npm install -g bower
```
If you don't have access to the root user, you can install it locally:
```
npm install -g --prefix=$HOME bower
export PATH=$HOME/bin:$PATH
```
5. Get [Composer](https://getcomposer.org/download/) and install dependencies (this will call `bower` automatically):
4. Make sure you have installed [Yarn](https://yarnpkg.com/en/docs/install)
5. Get [Composer](https://getcomposer.org/download/) and install dependencies (this will call `yarn` automatically):
```
./composer.phar install
```

View File

@ -1,38 +0,0 @@
{
"name": "php-owntracks-recorder",
"description": "A simple and responsive self-hosted solution to record and map Owntracks http payloads.",
"main": "index.php",
"authors": [
"tomyvi <tomyvi@protonmail.com>",
"Markus Birth <markus@birth-online.de>"
],
"license": "GPL-3.0-or-later",
"keywords": [
"owntracks",
"latitude",
"geolocation"
],
"homepage": "https://github.com/mbirth/php-owntracks-recorder",
"private": true,
"dependencies": {
"jQuery": "^3.3.1",
"coffeescript": "^2.3.1",
"bootstrap": "^4.1.1",
"font-awesome": "^5.0.13",
"js-cookie": "^2.2.0",
"leaflet": "^1.3.1",
"leaflet-hotline": "https://github.com/iosphere/Leaflet.hotline.git#v0.4.0",
"leaflet-awesome-markers": "^2.0.2",
"Leaflet.EasyButton": "^2.3.0"
},
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"resolutions": {
"leaflet": "^1.3.1"
}
}

View File

@ -15,11 +15,11 @@
},
"scripts": {
"post-install-cmd": [
"bower install",
"yarn install",
"@coffee"
],
"coffee": [
"bower_components/coffeescript/bin/coffee -m -c assets/*.coffee"
"node_modules/coffeescript/bin/coffee -m -c assets/*.coffee"
]
}
}

0
composer.lock generated Executable file → Normal file
View File

25
package.json Normal file
View File

@ -0,0 +1,25 @@
{
"name": "php-owntracks-recorder",
"version": "1.0.0",
"description": "A simple and responsive self-hosted solution to record and map Owntracks http payloads.",
"repository": "https://github.com/mbirth/php-owntracks-recorder.git",
"author": "Markus Birth <markus@birth-online.de>",
"contributors": [
"tomyvi <tomyvi@protonmail.com>"
],
"license": "GPL-3.0-or-later",
"homepage": "https://github.com/mbirth/php-owntracks-recorder",
"keywords": ["owntracks", "latitude", "geolocation"],
"private": true,
"dependencies": {
"bootstrap": "^4.1.3",
"coffeescript": "^2.3.2",
"font-awesome": "^4.7.0",
"jquery": "^3.3.1",
"js-cookie": "^2.2.0",
"leaflet": "^1.3.4",
"leaflet-easybutton": "^2.3.0",
"leaflet-hotline": "^0.4.0",
"leaflet.awesome-markers": "^2.0.4"
}
}

View File

@ -1,21 +1,21 @@
<!-- JQUERY !-->
<script type="text/javascript" src="bower_components/jQuery/dist/jquery.min.js"></script>
<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<!-- BOOTSTRAP !-->
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js" ></script>
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"/>
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap-grid.min.css"/>
<script type="text/javascript" src="node_modules/bootstrap/dist/js/bootstrap.min.js" ></script>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css"/>
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap-grid.min.css"/>
<!-- Font Awesome -->
<link rel="stylesheet" href="bower_components/font-awesome/web-fonts-with-css/css/fontawesome-all.min.css"/>
<link rel="stylesheet" href="node_modules/font-awesome/css/font-awesome.min.css"/>
<!-- LEAFLET.JS !-->
<script type="text/javascript" src="bower_components/leaflet/dist/leaflet.js"></script>
<link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css"/>
<script type="text/javascript" src="bower_components/leaflet-hotline/dist/leaflet.hotline.min.js"></script>
<script type="text/javascript" src="bower_components/leaflet-awesome-markers/dist/leaflet.awesome-markers.min.js"></script>
<link rel="stylesheet" href="bower_components/leaflet-awesome-markers/dist/leaflet.awesome-markers.css"/>
<script type="text/javascript" src="bower_components/Leaflet.EasyButton/src/easy-button.js"></script>
<link rel="stylesheet" href="bower_components/Leaflet.EasyButton/src/easy-button.css"/>
<script type="text/javascript" src="node_modules/leaflet/dist/leaflet.js"></script>
<link rel="stylesheet" href="node_modules/leaflet/dist/leaflet.css"/>
<script type="text/javascript" src="node_modules/leaflet-hotline/dist/leaflet.hotline.min.js"></script>
<script type="text/javascript" src="node_modules/leaflet.awesome-markers/dist/leaflet.awesome-markers.min.js"></script>
<link rel="stylesheet" href="node_modules/leaflet.awesome-markers/dist/leaflet.awesome-markers.css"/>
<script type="text/javascript" src="node_modules/leaflet-easybutton/src/easy-button.js"></script>
<link rel="stylesheet" href="node_modules/leaflet-easybutton/src/easy-button.css"/>
<script type="text/javascript" src="bower_components/js-cookie/src/js.cookie.js"></script>
<script type="text/javascript" src="node_modules/js-cookie/src/js.cookie.js"></script>

50
yarn.lock Normal file
View File

@ -0,0 +1,50 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
bootstrap@^4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
coffeescript@^2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-2.3.2.tgz#e854a7020dfe47b7cf4dd412042e32ef1e269810"
integrity sha512-YObiFDoukx7qPBi/K0kUKyntEZDfBQiqs/DbrR1xzASKOBjGT7auD85/DiPeRr9k++lRj7l3uA9TNMLfyfcD/Q==
font-awesome@^4.7.0:
version "4.7.0"
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
jquery@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
js-cookie@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.0.tgz#1b2c279a6eece380a12168b92485265b35b1effb"
integrity sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=
leaflet-easybutton@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/leaflet-easybutton/-/leaflet-easybutton-2.3.0.tgz#135a57c3ddba8814c24b9153919a5bf5b7acfdfc"
integrity sha512-uW45QWMMaI98n94NIm2mFm6153+i1de3N+5Gs3OwmW96lAq0F1WrVKZ2zhjinR8X5vYgBhwOLutDe4UPm2NUcQ==
dependencies:
leaflet "^1.0.1"
leaflet-hotline@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/leaflet-hotline/-/leaflet-hotline-0.4.0.tgz#e01069836a9d2e2c78b1fa1db2013bd03c8ff8d9"
integrity sha1-4BBpg2qdLix4sfodsgE70DyP+Nk=
leaflet.awesome-markers@^2.0.4:
version "2.0.4"
resolved "https://registry.yarnpkg.com/leaflet.awesome-markers/-/leaflet.awesome-markers-2.0.4.tgz#66fea2090c9c8a0ab6d1f3b6bdd02fb37cf4ba1a"
integrity sha1-Zv6iCQycigq20fO2vdAvs3z0uho=
leaflet@^1.0.1, leaflet@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.4.tgz#7f006ea5832603b53d7269ef5c595fd773060a40"
integrity sha512-FYL1LGFdj6v+2Ifpw+AcFIuIOqjNggfoLUwuwQv6+3sS21Za7Wvapq+LhbSE4NDXrEj6eYnW3y7LsaBICpyXtw==