app/Mail/Digest.php

@@ -24,24 +24,17 @@ class Digest extends Mailable
     /**
      * The current trip locations as a JSON object.
      *
-     * @var obj
+     * @var string
      */
     public $locations;
 
     /**
      * The current trip checkins as a JSON object.
      *
-     * @var obj
+     * @var string
      */
     public $checkinsList;
 
-    /**
-     * The current trip object.
-     *
-     * @var obj
-     */
-    public $trip;
-
     /**
      * Create a new message instance.
      *
@@ -52,7 +45,7 @@ class Digest extends Mailable
     public function __construct(string $digest_type, string $trip_id)
     {
         $this->digest_type = $digest_type;
-        $this->trip = (new TrackerController)->get_trip_data($trip_id);
+        $trip = (new TrackerController)->get_trip_data($trip_id);
 
         $cutoffDateTime = new DateTime();
         switch ($this->digest_type) {
@@ -72,7 +65,7 @@ class Digest extends Mailable
         }
 
         $this->checkinsList = array_filter(
-            $this->trip->checkins,
+            $trip->checkins,
             function ($elem) use ($cutoffDateTime) {
                 $elemDateTime = new DateTime($elem->created_at);
                 return $elemDateTime > $cutoffDateTime;
@@ -87,11 +80,7 @@ class Digest extends Mailable
      */
     public function build()
     {
-        return $this->view(
+        return $this->view('emails.digest')
-            'emails.digest', 
+            ->subject("track.bengoldsworthy.net ".ucwords($this->digest_type)." Digest");
-            [
-                'trip' => $this->trip
-            ]
-        )->subject("track.bengoldsworthy.net ".ucwords($this->digest_type)." Digest");
     }
 }

package.json

@@ -7,7 +7,7 @@
         "deploy:public": "rsync --delete -rP public ovhvps:~/track",
         "deploy:dependencies": "rsync --delete -rP vendor ovhvps:~/track",
         "deploy:full": "npm run deploy && npm run deploy:public && npm run deploy:dependencies && npm run deploy:finish",
-        "deploy:finish": "ssh ovhvps 'cd track && docker compose down && docker system prune -a -f && docker compose up -d --build'",
+        "deploy:finish": "ssh ovhvps 'cd track && docker compose down && docker system prune -f && docker compose up -d --build'",
         "lint": "npm run lint:php; npm run lint:css",
         "lint:fix": "npm run lint:php:fix; npm run lint:css:fix",
         "lint:php": "./vendor/bin/phpcs",

resources/views/partials/checkins-list.blade.php

@@ -11,11 +11,11 @@
                   $path = "/" . $trip_slug . "/" .$hasEmbed . "/" . $filepath[1];
 
                   $embed = '<video class="popup__video" controls>';
-                  $embed .= '<source src="' . secure_url( $path ) . '" type="video/webm">';
+                  $embed .= '<source src="' . url( $path ) . '" type="video/webm">';
-                  $embed .= '<p>Your client doesn\'t support HTML video. Here is a <a href="' . secure_url( $path ) . '">link to the video</a> instead.</p>';
+                  $embed .= '<p>Your client doesn\'t support HTML video. Here is a <a href="' . url( $path ) . '">link to the video</a> instead.</p>';
                   $embed .= '</video>'; 
                   if (isset($email)) {
-                    $embed .= '<p><i>If your email client doesn\'t support video embeds, here is a <a href="' . secure_url( $path ) . '">link to the file</a> instead.</i></p>';
+                    $embed .= '<p><i>If your email client doesn\'t support video embeds, here is a <a href="' . url( $path ) . '">link to the file</a> instead.</i></p>';
                   }
               } else {
                   $embed = '<p>[The video \'' . $filepath[1] . '\' has not yet been uploaded, try again later.]</p>';
@@ -28,11 +28,11 @@
                   $path = "/" . $trip_slug . "/" .$hasEmbed . "/" . $filepath[1];
 
                   $embed = '<audio class="popup__audio" controls>';
-                  $embed .= '<source src="' . secure_url( $path ) . '" type="audio/ogg">';
+                  $embed .= '<source src="' . url( $path ) . '" type="audio/ogg">';
-                  $embed .= '<p>Download <a href="' . secure_url( $path ) . '">OGG</a> audio.</p>';
+                  $embed .= '<p>Download <a href="' . url( $path ) . '">OGG</a> audio.</p>';
                   $embed .= '</audio>'; 
                   if (isset($email)) {
-                    $embed .= '<p><i>If your email client doesn\' support audio embeds, here is a <a href="' . secure_url( $path ) . '">link to the file</a> instead.</i></p>';
+                    $embed .= '<p><i>If your email client doesn\' support audio embeds, here is a <a href="' . url( $path ) . '">link to the file</a> instead.</i></p>';
                   }
               } else {
                   $embed = '<p>[The recording \'' . $filepath[1] . '\' has not yet been uploaded, try again later.]</p>';