Merge branch 'release/2.9.x' into 'master'

2.9.3 into master

See merge request pleroma/pleroma-fe!2157

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.9.3
+### Fixed
+- Being unable to update profile
+
 ## 2.9.2
 ### Changed
 - BREAKING: due to some internal technical changes logging into AdminFE through PleromaFE is no longer possible

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.9.2",
+  "version": "2.9.3",
   "description": "Pleroma frontend, the default frontend of Pleroma social network server",
   "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/CONTRIBUTORS.md>",
   "private": false,

src/App.scss

@@ -749,13 +749,11 @@ option {
     max-height: 0.6em;
     min-width: 0.6em;
     max-width: 0.6em;
-    padding: 0;
+    left: calc(50% + 0.5em);
+    top: calc(50% - 1em);
     line-height: 0;
-    font-size: 0;
-    left: calc(50% - 0.6em);
-    top: calc(50% - 0.6em);
-    margin-left: 0.4em;
-    margin-top: -0.4em;
+    padding: 0;
+    margin: 0;
   }
 
   &.-counter {

src/components/account_actions/account_actions.js

@@ -38,6 +38,9 @@ const AccountActions = {
     hideConfirmRemoveUserFromFollowers () {
       this.showingConfirmRemoveFollower = false
     },
+    hideConfirmBlock () {
+      this.showingConfirmBlock = false
+    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -56,7 +59,7 @@ const AccountActions = {
       }
     },
     doBlockUser () {
-      this.$store.dispatch('blockUser', this.user.id)
+      this.$store.dispatch('blockUser', { id: this.user.id })
       this.hideConfirmBlock()
     },
     unblockUser () {

src/components/block_card/block_card.js

@@ -37,7 +37,7 @@ const BlockCard = {
       if (this.blockExpirationSupported) {
         this.$refs.timedBlockDialog.optionallyPrompt()
       } else {
-        this.$store.dispatch('blockUser', this.user.id)
+        this.$store.dispatch('blockUser', { id: this.user.id })
       }
     }
   }

src/components/button.style.js

@@ -129,6 +129,13 @@ export default {
         shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
       }
     },
+    {
+      state: ['toggled', 'hover', 'focused'],
+      directives: {
+        background: '--accent,-24.2',
+        shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel']
+      }
+    },
     {
       state: ['toggled', 'disabled'],
       directives: {

src/components/user_card/user_card.scss

@@ -270,8 +270,7 @@
     // big one
     z-index: 1;
     line-height: 2em;
-    filter: drop-shadow(0 0 5em var(--profileTint))
-            drop-shadow(0 0 0.5em var(--profileTint))
+    filter: drop-shadow(0 0 0.5em var(--profileTint))
             drop-shadow(0 0 0.2em var(--profileTint));
 
     .alert {

src/components/user_popover/user_popover.vue

@@ -32,6 +32,7 @@
   margin: 0;
 
   .user-info {
+    width: 100%;
     margin: 1.2em;
   }
 

src/services/api/api.service.js

@@ -226,7 +226,8 @@ const updateProfile = ({ credentials, params }) => {
       })
     } else {
       if (typeof params[name] === 'object') {
-        console.warning('Object detected in updateProfile API call. This will not work, use updateProfileJSON instead.')
+        console.warn('Object detected in updateProfile API call. This will not work, use updateProfileJSON instead.')
+        console.warn('Object:\n' + JSON.stringify(params[name], null, 2))
       }
       formData.append(name, params[name]);
     }

src/services/style_setter/style_setter.js

@@ -42,7 +42,6 @@ export const createStyleSheet = (id, priority = 1000) => {
 
 
 export const adoptStyleSheets = throttle(() => {
-  console.log('adopt')
   if (supportsAdoptedStyleSheets) {
     document.adoptedStyleSheets = Object
       .values(stylesheets)
@@ -138,8 +137,6 @@ export const tryLoadCache = async () => {
       eagerStyles.ready = true
       lazyStyles.ready = true
 
-      adoptStyleSheets()
-
       console.info(`Loaded theme from cache`)
       return true
     } else {