Rumperuu/Where-in-the-World-is-Ben
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Compare commits

base: Rumperuu:0d777d214ccb2c29727114fa39e53294fed3b4bc
Branches Tags
Rumperuu:main
..
compare: Rumperuu:3899b99af4565eb31b173def831534f576ee9615
Branches Tags
Rumperuu:main

No commits in common. "0d777d214ccb2c29727114fa39e53294fed3b4bc" and "3899b99af4565eb31b173def831534f576ee9615" have entirely different histories.
0d777d214c ... 3899b99af4

3 changed files with 13 additions and 24 deletions
Show stats Expand all files Collapse all files

23
app/Mail/Digest.php
View file

@ -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");
}
}

2
package.json
View file

@ -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",

12
resources/views/partials/checkins-list.blade.php
View file

@ -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 .= '<p>Your client doesn\'t support HTML video. Here is a <a href="' . secure_url( $path ) . '">link to the video</a> instead.</p>';
$embed .= '<source src="' . url( $path ) . '" type="video/webm">';
$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 .= '<p>Download <a href="' . secure_url( $path ) . '">OGG</a> audio.</p>';
$embed .= '<source src="' . url( $path ) . '" type="audio/ogg">';
$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>';