Replace frontend Google Maps key with server-side proxy

.fly/scripts/startup.sh

@@ -61,6 +61,11 @@ if [ -n "$AWS_BUCKET" ]; then
     mv /etc/nginx/nginx.conf.tmp /etc/nginx/nginx.conf
 fi
 
+# Ensure queue watchdog is in crontab (image crontab may predate this entry)
+if ! crontab -l 2>/dev/null | grep -q 'queue-watchdog'; then
+    ( crontab -l 2>/dev/null; echo "* * * * * /usr/local/bin/queue-watchdog.sh" ) | crontab -
+fi
+
 # Run DB setup in a subshell so failures never prevent supervisord from starting
 (
     # Wait for MySQL to be reachable
@@ -83,7 +88,8 @@ fi
         echo "WARNING: Database not reachable after 60s, skipping migrations"
     fi
 
-    # Cache config/routes/views for performance (non-fatal)
+    # Clear stale compiled assets from previous deploy, then rebuild
+    php /var/www/artisan view:clear 2>/dev/null || true
     php /var/www/artisan config:cache 2>/dev/null || true
     php /var/www/artisan route:cache 2>/dev/null || true
     php /var/www/artisan view:cache 2>/dev/null || true

.gitignore

@@ -1,4 +1,5 @@
 /node_modules
+/.worktrees
 /public/storage
 /public/uploads
 /public/devices.csv

Dockerfile.fly

@@ -71,16 +71,23 @@
     cron \
     gettext-base \
     redis-server \
+    procps \
     libpng-dev libjpeg62-turbo-dev libfreetype6-dev libzip-dev libicu-dev libxml2-dev \
     && docker-php-ext-configure gd --with-freetype --with-jpeg \
-    && docker-php-ext-install pdo_mysql bcmath zip intl gd exif \
+    && docker-php-ext-install pdo_mysql bcmath zip intl gd exif pcntl \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install xmlrpc
 RUN pecl install channel://pecl.php.net/xmlrpc-1.0.0RC3 && docker-php-ext-enable xmlrpc
 
-# Configure PHP-FPM to use unix socket
-RUN sed -i 's|listen = 127.0.0.1:9000|listen = /var/run/php-fpm.sock|' /usr/local/etc/php-fpm.d/www.conf && \
+# Configure PHP-FPM to use unix socket.
+# The base image ships docker.conf (formerly zz-docker.conf) with:
+#   listen = 9000      — overrides www.conf (last-file-wins in glob)
+#   clear_env = no     — lets Fly.io env vars reach PHP workers (must keep)
+# We patch docker.conf: keep clear_env=no, switch listen to unix socket.
+# www.conf has no bare `listen =` line, so we append one there as belt-and-braces.
+RUN sed -i 's|^listen = .*|listen = /var/run/php-fpm.sock|' /usr/local/etc/php-fpm.d/docker.conf && \
+    rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \
     sed -i 's|;listen.owner = www-data|listen.owner = www-data|' /usr/local/etc/php-fpm.d/www.conf && \
     sed -i 's|;listen.group = www-data|listen.group = www-data|' /usr/local/etc/php-fpm.d/www.conf && \
     sed -i 's|;listen.mode = 0660|listen.mode = 0660|' /usr/local/etc/php-fpm.d/www.conf && \
@@ -92,8 +99,7 @@
     sed -i 's|pm.min_spare_servers = [0-9]*|pm.min_spare_servers = 10|' /usr/local/etc/php-fpm.d/www.conf && \
     sed -i 's|pm.max_spare_servers = [0-9]*|pm.max_spare_servers = 50|' /usr/local/etc/php-fpm.d/www.conf && \
     sed -i 's|;pm.status_path = .*|pm.status_path = /fpm-status|' /usr/local/etc/php-fpm.d/www.conf && \
-    sed -i 's|;pm.status_listen = .*|pm.status_listen = 127.0.0.1:9001|' /usr/local/etc/php-fpm.d/www.conf && \
-    rm -f /usr/local/etc/php-fpm.d/zz-docker.conf
+    sed -i 's|;pm.status_listen = .*|pm.status_listen = 127.0.0.1:9001|' /usr/local/etc/php-fpm.d/www.conf
 
 # Install sysstat (sar), vim, procps (vmstat) and iputils-ping for diagnostics
 RUN apt-get update && apt-get install -y --no-install-recommends sysstat vim-tiny procps iputils-ping && \
@@ -104,7 +110,8 @@
 RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/conf.d/php.ini && \
     echo "upload_max_filesize = 100M" >> /usr/local/etc/php/conf.d/php.ini && \
     echo "post_max_size = 100M" >> /usr/local/etc/php/conf.d/php.ini && \
-    echo "memory_limit = 1024M" >> /usr/local/etc/php/conf.d/php.ini
+    echo "memory_limit = 1024M" >> /usr/local/etc/php/conf.d/php.ini && \
+    echo "max_execution_time = 120" >> /usr/local/etc/php/conf.d/php.ini
 
 # Copy nginx config
 COPY docker/nginx-fly.conf /etc/nginx/nginx.conf
@@ -115,8 +122,12 @@
 # Copy logrotate config
 COPY docker/logrotate-fly.conf /etc/logrotate.d/restarters
 
-# Set up cron for Laravel scheduler (every minute)
-RUN echo "* * * * * cd /var/www && php artisan schedule:run >> /dev/null 2>&1" | crontab -
+# Copy queue watchdog
+COPY docker/queue-watchdog.sh /usr/local/bin/queue-watchdog.sh
+RUN chmod +x /usr/local/bin/queue-watchdog.sh
+
+# Set up cron: Laravel scheduler + queue watchdog (kills hung jobs, supervisord restarts worker)
+RUN printf '* * * * * cd /var/www && php artisan schedule:run >> /dev/null 2>&1\n* * * * * /usr/local/bin/queue-watchdog.sh\n' | crontab -
 
 # Set working directory
 WORKDIR /var/www

app/Device.php

@@ -418,62 +418,32 @@ public function getImages()
 
     public function fixedPoweredCount()
     {
-        // We want fixed devices with an powered category.
-        $count = self::where('repair_status', '=', env('DEVICE_FIXED'))->withCount(['deviceCategory' => function ($query) {
-            $query->where('powered', 1);
-        }])->get();
-
-        $total = 0;
-        foreach ($count as $c) {
-            $total += $c->device_category_count;
-        }
-
-        return $total;
+        return self::join('categories', 'devices.category', '=', 'categories.idcategories')
+            ->where('repair_status', env('DEVICE_FIXED'))
+            ->where('powered', 1)
+            ->count();
     }
 
     public function fixedUnpoweredCount()
     {
-        // We want fixed devices with an unpowered category.
-        $count = self::where('repair_status', '=', env('DEVICE_FIXED'))->withCount(['deviceCategory' => function ($query) {
-            $query->where('powered', 0);
-        }])->get();
-
-        $total = 0;
-        foreach ($count as $c) {
-            $total += $c->device_category_count;
-        }
-
-        return $total;
+        return self::join('categories', 'devices.category', '=', 'categories.idcategories')
+            ->where('repair_status', env('DEVICE_FIXED'))
+            ->where('powered', 0)
+            ->count();
     }
 
     public function unpoweredCount()
     {
-        // We want devices with an unpowered category.
-        $count = self::withCount(['deviceCategory' => function ($query) {
-            $query->where('powered', 0);
-        }])->get();
-
-        $total = 0;
-        foreach ($count as $c) {
-            $total += $c->device_category_count;
-        }
-
-        return $total;
+        return self::join('categories', 'devices.category', '=', 'categories.idcategories')
+            ->where('powered', 0)
+            ->count();
     }
 
     public function poweredCount()
     {
-        // We want devices with an powered category.
-        $count = self::withCount(['deviceCategory' => function ($query) {
-            $query->where('powered', 1);
-        }])->get();
-
-        $total = 0;
-        foreach ($count as $c) {
-            $total += $c->device_category_count;
-        }
-
-        return $total;
+        return self::join('categories', 'devices.category', '=', 'categories.idcategories')
+            ->where('powered', 1)
+            ->count();
     }
 
     public static function getItemTypes()

app/Exceptions/Handler.php

@@ -2,6 +2,7 @@
 
 namespace App\Exceptions;
 
+use Illuminate\Validation\ValidationException;
 use Throwable;
 use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
@@ -28,6 +29,12 @@ class Handler extends ExceptionHandler
     public function render($request, Throwable $exception)
     {
         if ($request->wantsJson()) {
+            if ($exception instanceof ValidationException) {
+                return response()->json(
+                    ['message' => $exception->getMessage(), 'errors' => $exception->errors()],
+                    422);
+            }
+
             return response()->json(
                 ['message' => $exception->getMessage()],
                 method_exists($exception, 'getStatusCode') ? $exception->getStatusCode() : 500);

app/Http/Controllers/API/UserController.php

@@ -96,7 +96,7 @@ protected static function mapUserAndAuditToUserChange($user, $audit)
     public function notifications(Request $request, int $id): JsonResponse
     {
         $user = User::findOrFail($id);
-        $restartersNotifications = $user->unReadNotifications->count();
+        $restartersNotifications = $user->unreadNotifications()->count();
         $discourseNotifications = 0;
 
         if (config('restarters.features.discourse_integration')) {

app/Http/Controllers/ApiController.php

@@ -51,48 +51,62 @@ public static function homepage_data(): JsonResponse
     {
         $result = [];
 
+        $lock = \Cache::lock('homepage_data_lock', 60);
+
         if (\Cache::has('homepage_data')) {
             $result = \Cache::get('homepage_data');
-        } else {
-            $Device = new Device;
-
-            $allparties = Party::past()->get();
-
-            $participants = 0;
-            $hours_volunteered = 0;
-
-            foreach ($allparties as $party) {
-                $participants += $party->pax;
-
-                $hours_volunteered += $party->hoursVolunteered();
+        } elseif ($lock->get()) {
+            try {
+                $Device = new Device;
+
+                // Aggregate participants and hours in SQL — avoids loading 18k+ event rows into PHP.
+                // hoursVolunteered() formula: cancelled→3, volunteers>0→9+volunteers*ceil(minutes/60), else→21
+                $eventStats = DB::table('events')
+                    ->whereNull('deleted_at')
+                    ->where('event_end_utc', '<', now())
+                    ->selectRaw("
+                        SUM(pax) as participants,
+                        SUM(CASE
+                            WHEN cancelled = 1 THEN 3
+                            WHEN volunteers > 0 THEN 9 + volunteers * CEIL(TIMESTAMPDIFF(MINUTE, event_start_utc, event_end_utc) / 60)
+                            ELSE 21
+                        END) as hours_volunteered
+                    ")
+                    ->first();
+
+                $result['participants'] = (int) ($eventStats->participants ?? 0);
+                $result['hours_volunteered'] = (int) ($eventStats->hours_volunteered ?? 0);
+
+                $fixed = $Device->statusCount();
+                $result['items_fixed'] = count($fixed) ? $fixed[0]->counter : 0;
+
+                $stats = \App\Helpers\LcaStats::getWasteStats();
+                $result['waste_powered'] = round($stats[0]->powered_waste);
+                $result['waste_unpowered'] = round($stats[0]->unpowered_waste);
+                $result['waste_total'] = round($stats[0]->powered_waste + $stats[0]->unpowered_waste);
+                $result['co2_powered'] = round($stats[0]->powered_footprint);
+                $result['co2_unpowered'] = round($stats[0]->unpowered_footprint);
+                $result['co2_total'] = round($stats[0]->powered_footprint + $stats[0]->unpowered_footprint);
+
+                $devices = new Device;
+                $result['fixed_powered'] = $devices->fixedPoweredCount();
+                $result['fixed_unpowered'] = $devices->fixedUnpoweredCount();
+                $result['total_powered'] = $devices->poweredCount();
+                $result['total_unpowered'] = $devices->unpoweredCount();
+
+                // for backward compatibility (don't break therestartproject.org)
+                $result['weights'] = round($result['waste_total']);
+                $result['ewaste'] = round($result['waste_powered']);
+                $result['unpowered_waste'] = round($result['waste_unpowered']);
+                $result['emissions'] = round($result['co2_total']);
+
+                \Cache::put('homepage_data', $result, 43200);
+            } finally {
+                $lock->release();
             }
-
-            $result['participants'] = $participants;
-            $result['hours_volunteered'] = $hours_volunteered;
-            $fixed = $Device->statusCount();
-            $result['items_fixed'] = count($fixed) ? $fixed[0]->counter : 0;
-
-            $stats = \App\Helpers\LcaStats::getWasteStats();
-            $result['waste_powered'] = round($stats[0]->powered_waste);
-            $result['waste_unpowered'] = round($stats[0]->unpowered_waste);
-            $result['waste_total'] = round($stats[0]->powered_waste + $stats[0]->unpowered_waste);
-            $result['co2_powered'] = round($stats[0]->powered_footprint);
-            $result['co2_unpowered'] = round($stats[0]->unpowered_footprint);
-            $result['co2_total'] = round($stats[0]->powered_footprint + $stats[0]->unpowered_footprint);
-
-            $devices = new Device;
-            $result['fixed_powered'] = $devices->fixedPoweredCount();
-            $result['fixed_unpowered'] = $devices->fixedUnpoweredCount();
-            $result['total_powered'] = $devices->poweredCount();
-            $result['total_unpowered'] = $devices->unpoweredCount();
-
-            // for backward compatibility (don't break therestartproject.org)
-            $result['weights'] = round($result['waste_total']);
-            $result['ewaste'] = round($result['waste_powered']);
-            $result['unpowered_waste'] = round($result['waste_unpowered']);
-            $result['emissions'] = round($result['co2_total']);
-
-            \Cache::put('homepage_data', $result, 43200);
+        } else {
+            // Another worker is rebuilding — return stale or empty rather than pile on
+            $result = \Cache::get('homepage_data', []);
         }
 
         return response()

app/Http/Controllers/MapsProxyController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Http;
+
+class MapsProxyController extends Controller
+{
+    private function apiKey(): string
+    {
+        return config('GOOGLE_API_CONSOLE_KEY') ?? env('GOOGLE_API_CONSOLE_KEY', '');
+    }
+
+    public function autocomplete(Request $request): JsonResponse
+    {
+        $request->validate(['input' => 'required|string']);
+
+        $response = Http::get('https://maps.googleapis.com/maps/api/place/autocomplete/json', [
+            'input' => $request->input('input'),
+            'types' => $request->input('types', 'geocode'),
+            'key' => $this->apiKey(),
+        ]);
+
+        return response()->json($response->json());
+    }
+
+    public function placeDetails(Request $request): JsonResponse
+    {
+        $request->validate(['place_id' => 'required|string']);
+
+        $response = Http::get('https://maps.googleapis.com/maps/api/place/details/json', [
+            'place_id' => $request->input('place_id'),
+            'fields' => 'geometry,formatted_address,address_components',
+            'key' => $this->apiKey(),
+        ]);
+
+        return response()->json($response->json());
+    }
+}

app/Http/Controllers/NetworkController.php

@@ -11,6 +11,7 @@
 use Auth;
 use FixometerFile;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
 use Lang;
 
 class NetworkController extends Controller
@@ -130,13 +131,23 @@ public function update(Request $request, Network $network): RedirectResponse
         $this->authorize('update', $network);
 
         if ($request->hasFile('network_logo')) {
+            // Determine the correct disk to use (s3 on Fly, public_uploads in dev)
+            $disk = config('filesystems.default') === 's3' ? 's3' : 'public_uploads';
+
             // Save the file.
             $path = $request->file('network_logo')->store('network_logos', [
-                'disk' => 'public_uploads',
+                'disk' => $disk,
             ]);
 
             // Store it in the network object.
             if ($path) {
+                // Generate the _x100 sized version by copying the file
+                $sizedPath = preg_replace('/\.([^.\s]{3,4})$/', '-_x100.$1', $path);
+                $storage = Storage::disk($disk);
+
+                // Copy the uploaded file to the _x100 filename
+                $storage->copy($path, $sizedPath);
+
                 $network->logo = $path;
                 $network->save();
             } else {

app/Http/Kernel.php

@@ -45,6 +45,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyTranslationAccess::class,
         ],
         'api' => [
+            \App\Http\Middleware\AddCorsHeaders::class,
             \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],