Merge branch 'vue'

readme.md

@@ -1,6 +1,10 @@
 # Spot Project
 [Spot](https://www.findmespot.com) & GPX integration
+
 ## Dependencies
+
+* npm 18+
+* composer
 * php-mbstring
 * php-imagick
 * php-gd
@@ -9,24 +13,40 @@
 * ffprobe & ffmpeg
 * STARTTLS Email Server (use Gmail if none available)
 * Optional: Geo Caching Server (WMTS Caching Service)
+
 ## PHP Configuration
+
 * max_execution_time = 300
 * memory_limit = 500M
 * post_max_size = 4G
 * upload_max_filesize = 4G
 * max_file_uploads = 50
+
 ## Getting started
+
 1. Clone Git onto web server
+<<<<<<< HEAD
 2. Install dependencies & update php.ini parameters
 3. Copy timezone data: mariadb_tzinfo_to_sql /usr/share/zoneinfo | mariadb -u root mysql
 4. Copy settings-sample.php to settings.php and populate
 5. Go to #admin and create a new project, feed & maps
 6. Add a GPX file named <project_codename>.gpx to /geo/
 7. Run composer install
+=======
+2. composer install
+3. npm install webpack
+4. npm run dev
+5. Update php.ini parameters
+6. Copy timezone data: mariadb-tzinfo-to-sql /usr/share/zoneinfo | mariadb -u root mysql
+7. Copy settings-sample.php to settings.php and populate
+8. Go to #admin and create a new project, feed & maps
+9. Add a GPX file named <project_codename>.gpx to /geo/
+
+>>>>>>> vue
 ## To Do List
-* ECMA import/export
+
 * Add mail frequency slider
 * Use WMTS servers directly when not using Geo Caching Server
 * Allow HEIF picture format
-* Vector tiles support (https://www.arcgis.com/home/item.html?id=7dc6cea0b1764a1f9af2e679f642f0f5) + Use of GL library. Use Mapbox GL JS / Maplibre GL JS / ESRI-Leaflet-vector?
-* Fix .MOV playback on windows firefox
+* Fix .MOV playback on windows firefox
+* Garmin InReach Integration