OLM v5: Tagging v2, Achievements, Vue3, Tailwind & more

.env.example

@@ -22,12 +22,15 @@ LOCATE_API_KEY=
 MIX_GOOGLE_RECAPTCHA_KEY=6LcvHsIZAAAAAOG0q9-1vY3uWqu0iFvUC3tCNhID
 MIX_GOOGLE_RECAPTCHA_SECRET=
 
-BROADCAST_DRIVER=pusher
+BROADCAST_DRIVER=reverb
 CACHE_DRIVER=file
-SESSION_DRIVER=file
 QUEUE_DRIVER=redis
 QUEUE_CONNECTION=redis
 
+SESSION_DRIVER=cookie
+SESSION_DOMAIN=olm.test
+SANCTUM_STATEFUL_DOMAINS=olm.test
+
 MAIL_MAILER=smtp
 MAIL_HOST=localhost
 MAIL_PORT=1025
@@ -56,11 +59,6 @@ x500_AWS_REGION=us-east-1
 x500_AWS_BUCKET=olm-public-bbox
 x500_AWS_ENDPOINT=http://192.168.56.4:9600
 
-PUSHER_APP_ID=local
-PUSHER_APP_KEY=local
-PUSHER_APP_SECRET=local
-PUSHER_APP_CLUSTER=eu
-
 WEBSOCKET_BROADCAST_HOST=192.168.10.10
 
 LOCATION_API_KEY=
@@ -70,6 +68,13 @@ BACKUP_ARCHIVE_PASSWORD=
 DROPBOX_TOKEN=
 SLACK_WEBHOOK_URL=
 
+REVERB_APP_ID=1
+REVERB_APP_KEY=2
+REVERB_APP_SECRET=3
+REVERB_HOST=olm.test
+REVERB_PORT=8080
+REVERB_SCHEME=https
+
 OPTIMIZE="true"
 NETWORK=preprod
 NETWORK_PARAMS_FILE="preprod.json"

.env.testing

@@ -1,6 +1,6 @@
 APP_NAME=OpenLitterMap
 APP_ENV=testing
-APP_KEY=base64:wtfMWBVJMehE9KRxZqwTmY+G0vPoCoPOwtloNZmueLM=
+APP_KEY=base64:WCUtPA8Ky7rrK2cckMwmSo5E58UuQk8wKUud7SqjAgk=
 APP_DEBUG=true
 APP_URL=http://olm.test
 APP_ROOT_DIR=/home/vagrant/Code/olm
@@ -10,8 +10,8 @@ LOG_CHANNEL=stack
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306
-DB_DATABASE=olm
-DB_USERNAME=homestead
+DB_DATABASE=olm_test
+DB_USERNAME=root
 DB_PASSWORD=secret
 
 # For Testing
@@ -20,14 +20,16 @@ DB_FOREIGN_KEYS=false
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
+REDIS_DB=1
+REDIS_CLIENT=phpredis
 
 LOCATE_API_KEY=
 
 MIX_GOOGLE_RECAPTCHA_KEY=
 MIX_GOOGLE_RECAPTCHA_SECRET=
 
-BROADCAST_DRIVER=pusher
-CACHE_DRIVER=file
+BROADCAST_DRIVER=reverb
+CACHE_DRIVER=redis
 SESSION_DRIVER=file
 QUEUE_DRIVER=redis
 QUEUE_CONNECTION=redis
@@ -54,19 +56,14 @@ AWS_KEY=homestead
 AWS_SECRET=secretkey
 AWS_BUCKET=olm-public
 AWS_REGION=us-east-1
-AWS_ENDPOINT=http://192.168.56.4:9600
+AWS_ENDPOINT=http://127.0.0.1:9000
+MINIO_PATH_STYLE_ENDPOINT=true
 
 x500_AWS_KEY=homestead
 x500_AWS_SECRET=secretkey
 x500_AWS_REGION=us-east-1
 x500_AWS_BUCKET=olm-public-bbox
-x500_AWS_ENDPOINT=http://192.168.56.4:9600
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=eu
-LARAVEL_WEBSOCKETS_PORT=6002
+x500_AWS_ENDPOINT=http://127.0.0.1:9000
 
 WEBSOCKET_BROADCAST_HOST=192.168.56.4
 

.github/workflows/laravel.yml

@@ -1,103 +1,122 @@
-name: Laravel
+name: Laravel CI
 
 on:
   push:
-    branches: [ master, staging ]
+    branches:
+      - master
+      - staging
+      - upgrade/tagging-2025
   pull_request:
-    branches: [ master, staging ]
+    branches:
+      - master
+      - staging
+      - upgrade/tagging-2025
 
 jobs:
-  laravel-tests:
-
+  tests:
     runs-on: ubuntu-latest
 
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: secret
+          MYSQL_DATABASE: olm_test
+        ports: [3306:3306]
+        options: >-
+          --health-cmd="mysqladmin ping -h 127.0.0.1 -psecret"
+          --health-interval=10s --health-timeout=5s --health-retries=3
+
+      redis:
+        image: redis:7
+        ports: [6379:6379]
+
     env:
       APP_ENV: testing
+
+      # database
+      DB_CONNECTION: mysql
+      DB_HOST: 127.0.0.1
+      DB_PORT: 3306
       DB_DATABASE: olm_test
       DB_USERNAME: root
-      DB_PASSWORD: password
+      DB_PASSWORD: secret
+
+      # misc drivers
       BROADCAST_DRIVER: log
       CACHE_DRIVER: array
       QUEUE_CONNECTION: sync
       SESSION_DRIVER: array
-      AWS_KEY: minioadmin
-      AWS_SECRET: minioadmin
-      AWS_REGION: us-east-1
+
+      # fake S3/MinIO (used only by tests)
+      AWS_ACCESS_KEY_ID: minioadmin
+      AWS_SECRET_ACCESS_KEY: minioadmin
+      AWS_DEFAULT_REGION: us-east-1
+      AWS_EC2_METADATA_DISABLED: true
       AWS_BUCKET: olm-public
       AWS_ENDPOINT: http://127.0.0.1:9000
-      x500_AWS_KEY: minioadmin
-      x500_AWS_SECRET: minioadmin
+      x500_AWS_ACCESS_KEY_ID: minioadmin
+      x500_AWS_SECRET_ACCESS_KEY: minioadmin
       x500_AWS_REGION: us-east-1
       x500_AWS_BUCKET: olm-public-bbox
       x500_AWS_ENDPOINT: http://127.0.0.1:9000
-    services:
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: false
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: olm_test
-        ports:
-          - 3306/tcp
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-      redis:
-        image: redis
-        ports:
-          - 6379/tcp
-        options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-    - uses: shivammathur/setup-php@v2
-      with:
-        php-version: '8.2'
-        extensions: mbstring, dom, fileinfo, mysql
-        # coverage: xdebug #optional
-    - uses: actions/checkout@v3
-      with:
-        node-version: 18.20.3
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 18.20.3
-    - name: Start mysql service
-      run: sudo service mysql start
-    - name: Setup minio
-      run: |
-          docker run -d -p 9000:9000 --name minio \
-                     -e "MINIO_ACCESS_KEY=minioadmin" \
-                     -e "MINIO_SECRET_KEY=minioadmin" \
-                     -v /tmp/data:/data \
-                     -v /tmp/config:/root/.minio \
-                     minio/minio server /data
-
-          export AWS_ACCESS_KEY_ID=minioadmin
-          export AWS_SECRET_ACCESS_KEY=minioadmin
-          export AWS_EC2_METADATA_DISABLED=true
-
-          aws --endpoint-url http://127.0.0.1:9000/ s3 mb s3://olm-public
-          aws --endpoint-url http://127.0.0.1:9000/ s3 mb s3://olm-public-bbox
-    - name: Copy .env
-      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
-    - name: Install Dependencies
-      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
-    - name: Generate key
-      run: php artisan key:generate
-    - name: Install Passport
-      run: php artisan passport:keys
-    - name: Clear Config
-      run: php artisan config:clear
-    - name: Run Migration
-      run: php artisan migrate -v
-      env:
-          DB_PORT: ${{ job.services.mysql.ports['3306'] }}
-          REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
-    - name: Directory Permissions
-      run: chmod -R 777 storage bootstrap/cache
-    - name: Install NPM assets
-      run: npm install --silent --force
-    - name: Compile NPM assets
-      run: npm run build --silent
-    - name: Execute tests (Unit and Feature tests) via PHPUnit
-      run: vendor/bin/phpunit
-      env:
-          DB_PORT: ${{ job.services.mysql.ports['3306'] }}
-          REDIS_PORT: ${{ job.services.redis.ports['6379'] }}
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Copy test fixture image
+        run: |
+          mkdir -p storage/framework/testing
+          cp tests/Unit/img_with_exif.JPG storage/framework/testing/img_with_exif.JPG
+
+      - name: Remove old config cache
+        run: rm -f bootstrap/cache/config.php
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          extensions: mbstring, dom, fileinfo, mysql, pdo_mysql
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Prepare .env
+        run: cp .env.testing .env
+
+      - name: Wait for MySQL
+        run: |
+          for i in {1..30}; do
+            nc -z 127.0.0.1 3306 && exit 0
+            echo "Waiting for MySQL…"
+            sleep 2
+          done
+          exit 1
+
+      - name: Install Composer dependencies
+        run: composer install --no-interaction --prefer-dist --optimize-autoloader --no-scripts
+
+      - name: Discover packages
+        run: php artisan package:discover --ansi
+
+      - name: Generate Passport encryption keys
+        run: php artisan passport:keys --force
+
+      - name: Install Passport (keys + clients)
+        run: php artisan passport:install --no-interaction
+
+      - name: Run migrations
+        run: php artisan migrate --force --no-interaction -vvv
+
+      - name: npm ci & build (optional)
+        run: |
+          npm ci --silent --force
+          npm run build --if-present
+
+      - name: PHPUnit
+        run: vendor/bin/phpunit --colors=always
+        env:
+          REDIS_PORT: ${{ job.services.redis.ports[6379] }}

.gitignore

@@ -17,3 +17,4 @@ yarn-error.log
 .vscode
 .idea
 .eslintignore
+/storage/seeders/brands.txt

.prettierrc

@@ -0,0 +1,17 @@
+{
+    "semi": true,
+    "singleQuote": true,
+    "printWidth": 120,
+    "tabWidth": 4,
+    "trailingComma": "es5",
+    "bracketSpacing": true,
+    "vueIndentScriptAndStyle": false,
+    "overrides": [
+        {
+            "files": "*.vue",
+            "options": {
+                "vueIndentScriptAndStyle": false
+            }
+        }
+    ]
+}

.styleci.yml

@@ -9,5 +9,5 @@ php:
 js:
   finder:
     not-name:
-      - webpack.mix.js
+      - webpack.mix.old_js
 css: true