diff --git a/app/Mail/Digest.php b/app/Mail/Digest.php index 4379ee4..9d04259 100644 --- a/app/Mail/Digest.php +++ b/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( - 'emails.digest', - [ - 'trip' => $this->trip - ] - )->subject("track.bengoldsworthy.net ".ucwords($this->digest_type)." Digest"); + return $this->view('emails.digest') + ->subject("track.bengoldsworthy.net ".ucwords($this->digest_type)." Digest"); } } diff --git a/package.json b/package.json index 5184eda..9fcaf26 100644 --- a/package.json +++ b/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", diff --git a/resources/views/partials/checkins-list.blade.php b/resources/views/partials/checkins-list.blade.php index eb9d24f..8d30cf6 100644 --- a/resources/views/partials/checkins-list.blade.php +++ b/resources/views/partials/checkins-list.blade.php @@ -11,11 +11,11 @@ $path = "/" . $trip_slug . "/" .$hasEmbed . "/" . $filepath[1]; $embed = ''; if (isset($email)) { - $embed .= '
If your email client doesn\'t support video embeds, here is a link to the file instead.
'; + $embed .= 'If your email client doesn\'t support video embeds, here is a link to the file instead.
'; } } else { $embed = '[The video \'' . $filepath[1] . '\' has not yet been uploaded, try again later.]
'; @@ -28,11 +28,11 @@ $path = "/" . $trip_slug . "/" .$hasEmbed . "/" . $filepath[1]; $embed = ''; if (isset($email)) { - $embed .= 'If your email client doesn\' support audio embeds, here is a link to the file instead.
'; + $embed .= 'If your email client doesn\' support audio embeds, here is a link to the file instead.
'; } } else { $embed = '[The recording \'' . $filepath[1] . '\' has not yet been uploaded, try again later.]
';