matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new-ui' of https://github.com/JhumanJ/OpnForm into new-ui

Browse Source
This commit is contained in:
Julien Nahum
2022-10-27 23:31:10 +02:00
parent 53272b033b 95da37dbaa
commit 6abf36702b
40 changed files with 1739 additions and 1735 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -9,6 +9,7 @@ use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
class RegisterController extends Controller
{
@@ -52,7 +53,10 @@ class RegisterController extends Controller
'name' => 'required|max:255',
'email' => 'required|email:filter|max:255|unique:users',
'password' => 'required|min:6|confirmed',
'hear_about_us' => 'required|string'
'hear_about_us' => 'required|string',
'agree_terms' => ['required',Rule::in([true])]
],[
'agree_terms' => 'Please agree with the terms and conditions.'
]);
}

3
app/Http/Resources/FormResource.php
View File

@@ -45,7 +45,8 @@ class FormResource extends JsonResource
'visibility' => $this->visibility,
'notification_emails' => $this->notification_emails,
'slack_webhook_url' => $this->slack_webhook_url,
'removed_properties' => $this->removed_properties
'removed_properties' => $this->removed_properties,
'last_edited_human' => $this->updated_at->diffForHumans()
] : [];
$baseData = $this->getFilteredFormData(parent::toArray($request), $this->userIsFormOwner());