diff --git a/app/Conductors/UserConductor.php b/app/Conductors/UserConductor.php index 5324261..1dce2af 100644 --- a/app/Conductors/UserConductor.php +++ b/app/Conductors/UserConductor.php @@ -43,6 +43,8 @@ class UserConductor extends Conductor if ($user === null || ($user->hasPermission('admin/users') === false && strcasecmp($user->id, $model->id) !== 0)) { $fields = ['id', 'username', 'display_name']; $data = arrayLimitKeys($data, $fields); + } else { + $data['permissions'] = $user->permissions; } return $data; diff --git a/database/migrations/2023_04_19_122711_drop_subscriptions_table.php b/database/migrations/2023_04_19_122711_drop_subscriptions_table.php new file mode 100644 index 0000000..61b90a2 --- /dev/null +++ b/database/migrations/2023_04_19_122711_drop_subscriptions_table.php @@ -0,0 +1,33 @@ +uuid('id')->primary(); + $table->string('email'); + $table->timestamp('confirmed_at')->nullable(); + $table->timestamps(); + }); + } +}; diff --git a/public/img/community-discord.png b/public/img/community-discord.png new file mode 100644 index 0000000..a303534 Binary files /dev/null and b/public/img/community-discord.png differ diff --git a/resources/js/components/SMAttachments.vue b/resources/js/components/SMAttachments.vue index b47094f..51c83e1 100644 --- a/resources/js/components/SMAttachments.vue +++ b/resources/js/components/SMAttachments.vue @@ -1,56 +1,51 @@ diff --git a/resources/js/views/EmailVerify.vue b/resources/js/views/EmailVerify.vue index be32f88..b3cfd51 100644 --- a/resources/js/views/EmailVerify.vue +++ b/resources/js/views/EmailVerify.vue @@ -47,7 +47,7 @@ import SMButton from "../components/SMButton.vue"; import SMFormCard from "../components/SMFormCard.vue"; import SMForm from "../components/SMForm.vue"; import SMFormFooter from "../components/SMFormFooter.vue"; -import SMInput from "../depreciated/SMInput-old.vue"; +import SMInput from "../components/SMInput.vue"; import { api } from "../helpers/api"; import { Form, FormControl } from "../helpers/form"; import { And, Max, Min, Required } from "../helpers/validate"; diff --git a/resources/js/views/ForgotPassword.vue b/resources/js/views/ForgotPassword.vue index 6b698ea..102a47c 100644 --- a/resources/js/views/ForgotPassword.vue +++ b/resources/js/views/ForgotPassword.vue @@ -53,7 +53,7 @@ import SMButton from "../components/SMButton.vue"; import SMFormCard from "../components/SMFormCard.vue"; import SMForm from "../components/SMForm.vue"; import SMFormFooter from "../components/SMFormFooter.vue"; -import SMInput from "../depreciated/SMInput-old.vue"; +import SMInput from "../components/SMInput.vue"; import { api } from "../helpers/api"; import { Form, FormControl } from "../helpers/form"; import { And, Min, Required } from "../helpers/validate"; diff --git a/resources/js/views/ForgotUsername.vue b/resources/js/views/ForgotUsername.vue index e4d9781..72583aa 100644 --- a/resources/js/views/ForgotUsername.vue +++ b/resources/js/views/ForgotUsername.vue @@ -52,7 +52,7 @@ import SMButton from "../components/SMButton.vue"; import SMFormCard from "../components/SMFormCard.vue"; import SMForm from "../components/SMForm.vue"; import SMFormFooter from "../components/SMFormFooter.vue"; -import SMInput from "../depreciated/SMInput-old.vue"; +import SMInput from "../components/SMInput.vue"; import { api } from "../helpers/api"; import { Form, FormControl } from "../helpers/form"; import { And, Email, Required } from "../helpers/validate"; diff --git a/resources/js/views/Home.vue b/resources/js/views/Home.vue index b3cc6c9..d62436d 100644 --- a/resources/js/views/Home.vue +++ b/resources/js/views/Home.vue @@ -1,7 +1,7 @@