Merge branch 'dev' of https://github.com/microweber/microweber into dev

microweber · Oct 30, 2023 · 7b4630a · 7b4630a
2 parents 6ef5280 + d76a984
commit 7b4630a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -76,7 +76,7 @@
         "microweber-deps/seo-helper": "dev-master",
         "microweber-deps/ziggy": "*",
         "microweber-dev/omnipay-przelewy24": "0.2",
-        "microweber-modules/standalone-updater": "^5.3.5",
+        "microweber-modules/standalone-updater": "5.3.6",
         "microweber-packages/composer-client": "2.0",
         "microweber-packages/microweber-class-alias": "dev-master",
         "microweber-templates/big-free": "7.7",

diff --git a/composer.lock b/composer.lock
diff --git a/src/MicroweberPackages/User/Http/Livewire/Admin/UpdateProfileInformationForm.php b/src/MicroweberPackages/User/Http/Livewire/Admin/UpdateProfileInformationForm.php
@@ -97,6 +97,9 @@ public function updateProfileInformation()
         if (isset($this->photo) && !empty($this->photo)) {
             if (method_exists($this->photo, 'guessExtension')) {
                 $photoExt = $this->photo->guessExtension();
+
+
+
                 $photoContent = $this->photo->get();
                 $photoFile = media_base_path() . 'users/' . $user->id . '-avatar.' . $photoExt;
                 if (!is_dir(dirname($photoFile))) {

diff --git a/src/MicroweberPackages/User/resources/views/admin/livewire/users/list.blade.php b/src/MicroweberPackages/User/resources/views/admin/livewire/users/list.blade.php
@@ -31,17 +31,16 @@
                            <input type="search" wire:model.debounce.500ms="keyword" class="form-control" aria-label="Search" placeholder="{{ _e("Search for users") }}">
 
                            <span class="input-icon-addon">
-                          <!-- Download SVG icon from http://tabler-icons.io/i/search -->
-                          <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M10 10m-7 0a7 7 0 1 0 14 0a7 7 0 1 0 -14 0"></path><path d="M21 21l-6 -6"></path></svg>
+                           <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><path d="M10 10m-7 0a7 7 0 1 0 14 0a7 7 0 1 0 -14 0"></path><path d="M21 21l-6 -6"></path></svg>
                         </span>
                        </div>
                    </div>
 
                     <div class="col-lg-8 col-12 text-lg-end">
 
                         @php
-                            $editUserLink = route('admin.users.edit', user_id());
-                        @endphp
+                            $editUserLink = route('admin.profile.show');
+                         @endphp
                         <a href="{{ $editUserLink }}"
                            class="btn btn-outline-secondary mx-1 btn-sm" id="add-edit-user-btn">
                             <?php _e("Edit profile"); ?>
@@ -153,7 +152,7 @@ class="btn btn-primary mx-1 btn-sm" id="add-new-user-btn">
                                         @php
                                             $editUserLink = route('admin.users.edit', $user->id);
                                             if (user_id() == $user->id) {
-                                                $editUserLink = admin_url('user/profile');
+                                               $editUserLink = route('admin.profile.show');
                                             }
                                         @endphp
                                         <a href="{{$editUserLink}}"><?php _e('Edit');?></a>

diff --git a/userfiles/modules/btn/index.php b/userfiles/modules/btn/index.php
@@ -40,7 +40,7 @@
 $hoverbackgroundColor = get_module_option('hoverbackgroundColor', $params['id']);
 $hovercolor = get_module_option('hovercolor', $params['id']);
 $hoverborderColor = get_module_option('hoverborderColor', $params['id']);
- 
+
 
 $style = $btn_options['button_style'];
 $size = $btn_options['button_size'];