Skip to content

Commit

Permalink
feat: indicate time for notification channel (monicahq/chandler#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
@djaiss
djaiss authored Feb 24, 2022
1 parent ee1c7f1 commit 02e2078
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 4 deletions.
3 changes: 3 additions & 0 deletions app/Http/Controllers/Settings/Notifications/NotificationsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@ public function index()

public function store(Request $request)
{
$time = $request->input('hours').':'.$request->input('minutes');

$data = [
'account_id' => Auth::user()->account_id,
'author_id' => Auth::user()->id,
'label' => $request->input('label'),
'type' => UserNotificationChannel::TYPE_EMAIL,
'content' => $request->input('content'),
'verify_email' => true,
'preferred_time' => $time,
];

$channel = (new CreateUserNotificationChannel)->execute($data);
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/Settings/Notifications/ViewHelpers/NotificationsIndexViewHelper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public static function dtoEmail(UserNotificationChannel $channel, User $user): a
'content' => $channel->content,
'active' => $channel->active,
'verified_at' => $channel->verified_at ? $channel->verified_at->format('Y-m-d H:i:s') : null,
'preferred_time' => $channel->preferred_time->format('H:i'),
'url' => [
'store' => route('settings.notifications.store'),
'send_test' => route('settings.notifications.test.store', [
Expand Down
1 change: 1 addition & 0 deletions app/Jobs/SetupAccount.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ private function addNotificationChannel(): void
'type' => UserNotificationChannel::TYPE_EMAIL,
'content' => $this->user->email,
'verify_email' => false,
'preferred_time' => '09:00',
]);

$channel->verified_at = Carbon::now();
Expand Down
1 change: 1 addition & 0 deletions app/Models/UserNotificationChannel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class UserNotificationChannel extends Model
*/
protected $dates = [
'verified_at',
'preferred_time',
];

/**
Expand Down
5 changes: 4 additions & 1 deletion app/Services/User/NotificationChannels/CreateUserNotificationChannel.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public function rules(): array
'type' => 'required|string|max:255',
'content' => 'required|string|max:65535',
'verify_email' => 'nullable|boolean',
'preferred_time' => 'nullable|date_format:H:i',
];
}

Expand Down Expand Up @@ -81,8 +82,10 @@ private function create(): void
'label' => $this->data['label'],
'type' => $this->data['type'],
'content' => $this->data['content'],
'preferred_time' => $this->data['preferred_time'],
]);

// add a verification link if the channel is email
if ($this->data['verify_email']) {
$uuid = Str::uuid();

Expand All @@ -98,7 +101,7 @@ private function verifyChannel(): void
{
if ($this->data['type'] === UserNotificationChannel::TYPE_EMAIL && $this->data['verify_email']) {
// we need to verify the email address by sending a verification email
SendVerificationEmailChannel::dispatch($this->userNotificationChannel);
SendVerificationEmailChannel::dispatch($this->userNotificationChannel)->onQueue('high');
}
}

Expand Down
1 change: 1 addition & 0 deletions database/factories/UserNotificationChannelFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public function definition()
'content' => 'admin@admin.com',
'active' => true,
'verified_at' => null,
'preferred_time' => '09:00:00',
];
}
}
120 changes: 119 additions & 1 deletion resources/js/Pages/Settings/Notifications/Partials/Emails.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
border-bottom-right-radius: 8px;
}
}
select {
padding-left: 8px;
padding-right: 20px;
background-position: right 3px center;
}
</style>

<template>
Expand All @@ -32,6 +38,7 @@
<div class="border-b border-gray-200 p-5">
<errors :errors="form.errors" />

<!-- content -->
<text-input
:ref="'content'"
v-model="form.content"
Expand All @@ -45,16 +52,123 @@
:maxlength="255"
@esc-key-pressed="addEmailModalShown = false" />

<!-- label -->
<text-input
v-model="form.label"
:label="'Give this email address a name'"
:type="'text'"
:autofocus="true"
:input-class="'block w-full'"
:div-outer-class="'mb-4'"
:required="true"
:autocomplete="false"
:maxlength="255"
@esc-key-pressed="addEmailModalShown = false" />

<!-- preferred time -->
<p class="mb-2 block text-sm">At which time should we send the notification, when the reminder occurs?</p>
<div class="flex items-center text-sm font-medium text-gray-700">
<span class="mr-2">At</span>

<select
v-model="form.hours"
class="mr-1 rounded-md border-gray-300 bg-white py-2 px-3 shadow-sm focus:border-indigo-300 focus:outline-none focus:ring focus:ring-indigo-200 focus:ring-opacity-50 sm:text-sm"
:required="required">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
<option value="03">03</option>
<option value="04">04</option>
<option value="05">05</option>
<option value="06">06</option>
<option value="07">07</option>
<option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="23">23</option>
</select>

<span class="mr-2">h:</span>

<select
v-model="form.minutes"
class="mr-1 rounded-md border-gray-300 bg-white py-2 px-3 shadow-sm focus:border-indigo-300 focus:outline-none focus:ring focus:ring-indigo-200 focus:ring-opacity-50 sm:text-sm"
:required="required">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
<option value="03">03</option>
<option value="04">04</option>
<option value="05">05</option>
<option value="06">06</option>
<option value="07">07</option>
<option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
<option value="32">32</option>
<option value="33">33</option>
<option value="34">34</option>
<option value="35">35</option>
<option value="36">36</option>
<option value="37">37</option>
<option value="38">38</option>
<option value="39">39</option>
<option value="40">40</option>
<option value="41">41</option>
<option value="42">42</option>
<option value="43">43</option>
<option value="44">44</option>
<option value="45">45</option>
<option value="46">46</option>
<option value="47">47</option>
<option value="48">48</option>
<option value="49">49</option>
<option value="50">50</option>
<option value="51">51</option>
<option value="52">52</option>
<option value="53">53</option>
<option value="54">54</option>
<option value="55">55</option>
<option value="56">56</option>
<option value="57">57</option>
<option value="57">58</option>
<option value="57">59</option>
</select>

<span>m</span>
</div>
</div>

<div class="border-b border-gray-200 p-5">
Expand Down Expand Up @@ -97,7 +211,7 @@
<span class="mb-0 block">{{ email.content }}</span>
<ul class="bulleted-list mr-2 text-sm text-gray-500">
<li v-if="email.label" class="mr-1 inline">{{ email.label }}</li>
<li class="inline">Sent at 9:00pm</li>
<li class="inline">Sent at {{ email.preferred_time }}</li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -186,13 +300,17 @@ export default {
form: {
content: '',
label: '',
minutes: '',
hours: '',
errors: [],
},
};
},
mounted() {
this.localEmails = this.data.emails;
this.form.hours = '09';
this.form.minutes = '00';
},
methods: {
Expand Down
3 changes: 1 addition & 2 deletions resources/js/Shared/Modules/Reminders.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ select {
v-model="form.month"
:data="data.months"
:required="true"
:div-outer-class="'mb-5 mr-2'"
:div-outer-class="'mr-2'"
:placeholder="'Choose a value'"
:dropdown-class="'block w-full'"
:label="'Month'" />
Expand All @@ -331,7 +331,6 @@ select {
v-model="form.day"
:data="data.days"
:required="true"
:div-outer-class="'mb-5'"
:placeholder="'Choose a value'"
:dropdown-class="'block w-full'"
:label="'Day'" />
Expand Down
2 changes: 2 additions & 0 deletions .../Unit/Controllers/Settings/Notifications/ViewHelpers/NotificationsIndexViewHelperTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public function it_gets_the_data_needed_for_email_notification_channel(): void
'type' => UserNotificationChannel::TYPE_EMAIL,
'label' => 'super',
'verified_at' => '2020-01-01 00:00:00',
'preferred_time' => '09:00:00',
]);

$array = NotificationsIndexViewHelper::dtoEmail($channel, $user);
Expand All @@ -61,6 +62,7 @@ public function it_gets_the_data_needed_for_email_notification_channel(): void
'content' => 'admin@admin.com',
'active' => $channel->active,
'verified_at' => '2020-01-01 00:00:00',
'preferred_time' => '09:00',
'url' => [
'store' => env('APP_URL').'/settings/notifications',
'send_test' => env('APP_URL').'/settings/notifications/'.$channel->id.'/test',
Expand Down
1 change: 1 addition & 0 deletions tests/Unit/Services/User/NotificationChannels/CreateUserNotificationChannelTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ private function executeService(User $author, Account $account, string $channelT
'type' => $channelType,
'content' => 'admin@admin.com',
'verify_email' => true,
'preferred_time' => '09:00',
];

$channel = (new CreateUserNotificationChannel)->execute($request);
Expand Down

0 comments on commit 02e2078

Please sign in to comment.