diff --git a/.gitignore b/.gitignore index 92a5a13..e956b58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ /assets/*.js /assets/*.js.map /bower_components/ +/node_modules/ /tools/Location History.json /vendor/ config.inc.php diff --git a/README.md b/README.md index b3e8e50..74b2910 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/bower.json b/bower.json deleted file mode 100644 index f623d09..0000000 --- a/bower.json +++ /dev/null @@ -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 ", - "Markus Birth " - ], - "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" - } -} diff --git a/composer.json b/composer.json index c2cbed7..b12303b 100644 --- a/composer.json +++ b/composer.json @@ -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" ] } } diff --git a/composer.lock b/composer.lock old mode 100755 new mode 100644 diff --git a/package.json b/package.json new file mode 100644 index 0000000..746adb5 --- /dev/null +++ b/package.json @@ -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 ", + "contributors": [ + "tomyvi " + ], + "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" + } +} diff --git a/templates/partials/index_assets.mustache b/templates/partials/index_assets.mustache index 8dd441c..6e9d66f 100644 --- a/templates/partials/index_assets.mustache +++ b/templates/partials/index_assets.mustache @@ -1,21 +1,21 @@ - + - - - + + + - + - - - - - - - + + + + + + + - + diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..9a93842 --- /dev/null +++ b/yarn.lock @@ -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==