diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 8c56220..6b8a5a5 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -57,7 +57,8 @@ class UserController extends ApiController return $this->respondAsResource( $collection, ['isCollection' => true, - 'appendData' => ['total' => $total]] + 'appendData' => ['total' => $total] + ] ); } @@ -97,14 +98,14 @@ class UserController extends ApiController * Update the specified resource in storage. * * @param \App\Http\Requests\UserRequest $request The user update request. - * @param \App\Models\User $user The specified user. + * @param \App\Models\User $user The specified user. * @return \Illuminate\Http\Response */ public function update(UserRequest $request, User $user) { if (UserConductor::updatable($user) === true) { $input = []; - $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password']; + $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password', 'display_name']; if ($request->user()->hasPermission('admin/user') === true) { $updatable = array_merge($updatable, ['email_verified_at']); diff --git a/resources/js/components/SMButton.vue b/resources/js/components/SMButton.vue index 4b6bbf7..392363f 100644 --- a/resources/js/components/SMButton.vue +++ b/resources/js/components/SMButton.vue @@ -304,4 +304,12 @@ const handleClickItem = (item: string) => { color: var(--base-color); } } + +@media only screen and (max-width: 768px) { + .button { + display: block; + width: 100%; + text-align: center; + } +} diff --git a/resources/js/components/SMButtonRow.vue b/resources/js/components/SMButtonRow.vue new file mode 100644 index 0000000..bdf5564 --- /dev/null +++ b/resources/js/components/SMButtonRow.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/resources/js/components/SMColumn.vue b/resources/js/components/SMColumn.vue index f06c55f..7102028 100644 --- a/resources/js/components/SMColumn.vue +++ b/resources/js/components/SMColumn.vue @@ -45,7 +45,7 @@ if (props.width != "") { } @media screen and (max-width: 768px) { - .sm-column { + .column { flex-basis: auto !important; width: 100%; @@ -55,7 +55,7 @@ if (props.width != "") { } @media screen and (max-width: 640px) { - .sm-column { + .column { flex-direction: column; } } diff --git a/resources/js/components/SMContainer.vue b/resources/js/components/SMContainer.vue index b1fbef1..17a250f 100644 --- a/resources/js/components/SMContainer.vue +++ b/resources/js/components/SMContainer.vue @@ -50,8 +50,8 @@ const slots = useSlots(); max-width: 100%; .container-inner { - padding-left: 1rem; - padding-right: 1rem; + padding-left: 16px; + padding-right: 16px; width: 100%; max-width: 1200px; margin: 0 auto; diff --git a/resources/js/components/SMInput.vue b/resources/js/components/SMInput.vue index 9ffb8f3..f2ee6fa 100644 --- a/resources/js/components/SMInput.vue +++ b/resources/js/components/SMInput.vue @@ -11,7 +11,9 @@ }}