added upload avatar grup

config/laratalk.php

@@ -138,7 +138,7 @@
      * 
      */
     'group' => [
-        'disabled' => env('LARATALK_GROUP_DISABLED', false),
+        'enabled' => env('LARATALK_GROUP_ENABLED', false),
         'participant' => env('LARATALK_GROUP_PARTICIPANT', 300)
     ]
 ];

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/app.js": "/js/app.js?id=593f8a09bccc842f5b17",
+    "/js/app.js": "/js/app.js?id=124cafeda7dbd8e664ea",
     "/css/app.css": "/css/app.css?id=5fab102d9b0d6f4397e5"
 }

resources/js/App.vue

@@ -259,6 +259,7 @@
                 class="border-b dark:border-dark-50 ml-10"
             >
                 <Avatar
+                    v-model="formGroup.avatar"
                     :isIconGroup="true"
                     :isUpload="true"
                     :size="48"
@@ -916,6 +917,7 @@ export default {
                 content: ''
             },
             formGroup: {
+                avatar: '',
                 name: '',
                 users: []
             },
@@ -1421,15 +1423,22 @@ export default {
 
         sendGroup()
         {
+
+            const data = new FormData()
+            data.append('image', this.formGroup.avatar)
+            data.append('name', this.formGroup.name)
+            
             this.users_add_Groups.filter(e => {
-                this.formGroup.users.push(e.id)
+                data.append('users[]', e.id)
             })
 
-            axios.post('group-create', this.formGroup)
+            axios
+                .post('group-create', data)
                 .then(() => {
                     this.isBoxNewGroup = false
                     this.isBoxGroup = false
                     this.formGroup = {
+                        avatar: '',
                         name: '',
                         users: []
                     }

resources/js/components/modules/Avatar.vue

@@ -25,7 +25,7 @@
         >
 
         <label
-            v-if="isUpload"
+            v-if="isUpload && (isIconGroup || !config.user_gravatar)"
             @mouseover="isHover=true"
             @mouseleave="isHover=false"
             class="absolute rounded-full"
@@ -74,6 +74,7 @@ export default {
             type: Boolean,
             default: false
         },
+        modelValue: [String, Object],
         size: {
             type: Number,
             default: 10
@@ -88,11 +89,11 @@ export default {
     computed: {
         ...mapGetters({
             auth_user: 'config/profile',
-            storage: 'config/storage',
+            config: 'config/config',
         }),
 
         acceptImage() {
-            return 'image/' + this.storage.image_format.join(',image/')
+            return 'image/' + this.config.storage_image_format.join(',image/')
         },
 
         whStyle() {
@@ -115,14 +116,18 @@ export default {
             const file = e.target.files[0]
             this.src = URL.createObjectURL(file)
 
-            const data = new FormData()
-            data.append('image', file)
+            this.$emit('update:modelValue', file)
+            
+            if (!this.isIconGroup) {
+                const data = new FormData()
+                data.append('image', file)
 
-            axios
-                .post('upload-avatar', data)
-                .then(({ data }) => {
-                    this.auth_user.avatar = data
-                })
+                axios
+                    .post('upload-avatar', data)
+                    .then(({ data }) => {
+                        this.auth_user.avatar = data
+                    })
+            }
         },
         
         styleObject(size)

resources/js/store/modules/config.js

@@ -1,18 +1,18 @@
 // state
 export const state = {
+    config: null,
     languages: null,
     models: null,
     profile: null,
-    storage: null,
     translations: null,
 }
 
 // getters
 export const getters = {
+    config: state => state.config,
     languages: state => state.languages,
     models: state => state.models,
     profile: state => state.profile,
-    storage: state => state.storage,
     translations: state => state.translations,
 }
 
@@ -27,10 +27,10 @@ export const actions = {
     {
         const config = window.laratalk
 
+        state.config = config.config
         state.languages = config.languages
         state.models = config.models
         state.profile = config.profile
-        state.storage = config.storage
         state.translations = config.translations
     },
 

routes/web.php

@@ -7,10 +7,10 @@
 use FebriHidayan\Laratalk\Http\Controllers\Messages\StatusController;
 use FebriHidayan\Laratalk\Http\Controllers\Messages\ShowController;
 use FebriHidayan\Laratalk\Http\Controllers\Messages\StoreController;
-use FebriHidayan\Laratalk\Http\Controllers\UploadAvatarController;
 use FebriHidayan\Laratalk\Http\Controllers\Users\ChangeDarkmodeController;
 use FebriHidayan\Laratalk\Http\Controllers\Users\ChangeLanguageController;
 use FebriHidayan\Laratalk\Http\Controllers\Users\NewChatController;
+use FebriHidayan\Laratalk\Http\Controllers\Users\UploadAvatarController;
 use FebriHidayan\Laratalk\Http\Controllers\Users\UserChatController;
 use Illuminate\Support\Facades\Route;
 

src/Http/Controllers/Groups/CreateController.php

@@ -10,18 +10,44 @@
 use FebriHidayan\Laratalk\Models\Message;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 
 class CreateController extends Controller
 {
     public function __invoke()
     {
-        Validator::validate(Request::all(), [
+        $validate = [
             'name' => 'required',
-            'users' => 'required:array'
-        ]);
+            'users' => 'required:array',
+            'users.*' => 'numeric'
+        ];
+
+        if (Request::file('image')) {
+
+            $format = implode(',', Config::storageImageFormat());
+            $size = Config::storageImageSize();
+
+            $validate['image'] = "required|mimes:$format|max:$size";
+        }
+
+        Validator::validate(Request::all(), $validate);
+
+        if (Request::file('image')) {
+            $path = Storage::putFile(
+                    Config::storagePath(),
+                    Request::file('image')
+                );
+
+            Request::merge([
+                'avatar' =>
+                    str_replace('public', '/storage', $path)
+            ]);
+
+        }
 
         Request::merge([
             'user_id' => Auth::id()
@@ -56,7 +82,6 @@ public function __invoke()
                 ]);
             }
 
-
             $messageCreate = new UserListResource(
                 $messageCreate->select([
                         '*',

src/Http/Controllers/LaratalkController.php

@@ -51,6 +51,12 @@ public function __invoke()
             ->withScripts([
                 'title' => Config::name(),
                 'path' => Config::path(),
+                'config' => [
+                    'user_gravatar' => Config::userGravatar(),
+                    'group_enabled' => Config::groupEnabled(),
+                    'storage_image_format' => Config::storageImageFormat(),
+                    'storage_file_format' => Config::storageFileFormat(),
+                ],
                 'profile' => [
                     'id' => $user->id,
                     'avatar' => Config::userGravatar()
@@ -94,11 +100,7 @@ public function __invoke()
                 'translations' => Laratalk::availableTranslations(
                     $user->{Config::userLocale()}
                 ),
-                'echo' => Config::pusher(),
-                'storage' => [
-                    'image_format' => Config::storageImageFormat(),
-                    'file_format' => Config::storageFileFormat(),
-                ]
+                'echo' => Config::pusher()
             ]);
     }
 }

src/Http/Controllers/UploadAvatarController.php → src/Http/Controllers/Users/UploadAvatarController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace FebriHidayan\Laratalk\Http\Controllers;
+namespace FebriHidayan\Laratalk\Http\Controllers\Users;
 
 use FebriHidayan\Laratalk\Config;
 use Illuminate\Routing\Controller;

src/Http/Resources/UserListResource.php

@@ -31,7 +31,7 @@ public function toArray($request)
             $userTo = Config::userModel()::find($this->to_id);
 
             $data += [
-                'avatar' => $this->group_avatar ?? Laratalk::gravatar(''),
+                'avatar' => $this->group_avatar ?? '',
                 'id' => $this->group_id,
                 'name' => $this->group_name,
                 'user_by_name' => $userBy->name,