Merge branch 'upgrade-deps' into 'main'

Upgrade dependencies

See merge request framasoft/mobilizon!1184

js/package.json

@@ -91,13 +91,13 @@
     "@types/sanitize-html": "^2.5.0",
     "@typescript-eslint/eslint-plugin": "^5.3.0",
     "@typescript-eslint/parser": "^5.3.0",
-    "@vue/cli-plugin-babel": "~5.0.0-rc.1",
-    "@vue/cli-plugin-eslint": "~5.0.0-rc.1",
-    "@vue/cli-plugin-pwa": "~5.0.0-rc.1",
-    "@vue/cli-plugin-router": "~5.0.0-rc.1",
-    "@vue/cli-plugin-typescript": "~5.0.0-rc.1",
-    "@vue/cli-plugin-unit-jest": "~5.0.0-rc.1",
-    "@vue/cli-service": "~5.0.0-rc.1",
+    "@vue/cli-plugin-babel": "~5.0.3",
+    "@vue/cli-plugin-eslint": "~5.0.3",
+    "@vue/cli-plugin-pwa": "~5.0.3",
+    "@vue/cli-plugin-router": "~5.0.3",
+    "@vue/cli-plugin-typescript": "~5.0.3",
+    "@vue/cli-plugin-unit-jest": "~5.0.3",
+    "@vue/cli-service": "~5.0.3",
     "@vue/eslint-config-typescript": "^10.0.0",
     "@vue/test-utils": "^1.1.0",
     "@vue/vue2-jest": "^27.0.0-alpha.3",
@@ -116,8 +116,8 @@
     "sass": "^1.34.1",
     "sass-loader": "^12.0.0",
     "ts-jest": "27",
-    "typescript": "~4.4.3",
-    "vue-cli-plugin-tailwind": "^3.0.0-beta.0",
+    "typescript": "~4.5.5",
+    "vue-cli-plugin-tailwind": "~3.0.0",
     "vue-i18n-extract": "^2.0.4",
     "vue-template-compiler": "^2.6.11",
     "webpack-cli": "^4.7.0"

js/src/components/Account/ActorCard.vue

@@ -1,33 +1,38 @@
 <template>
   <div
-    class="w-80 bg-white rounded-lg shadow-md p-4 sm:p-8 flex items-center space-x-4 flex-col items-center pb-10"
+    class="w-80 bg-white rounded-lg shadow-md flex space-x-4 items-center"
+    :class="{ 'flex-col p-4 sm:p-8 pb-10': !inline }"
   >
-    <figure class="w-12 h-12" v-if="actor.avatar">
-      <img
-        class="rounded-lg"
-        :src="actor.avatar.url"
-        alt=""
-        width="48"
-        height="48"
+    <div>
+      <figure class="w-12 h-12" v-if="actor.avatar">
+        <img
+          class="rounded-lg"
+          :src="actor.avatar.url"
+          alt=""
+          width="48"
+          height="48"
+        />
+      </figure>
+      <b-icon
+        v-else
+        :size="inline ? 'is-medium' : 'is-large'"
+        icon="account-circle"
+        class="ltr:-mr-0.5 rtl:-ml-0.5"
       />
-    </figure>
-    <b-icon
-      v-else
-      size="is-large"
-      icon="account-circle"
-      class="ltr:-mr-0.5 rtl:-ml-0.5"
-    />
-    <h5 class="text-xl font-medium violet-title tracking-tight text-gray-900">
-      {{ displayName(actor) }}
-    </h5>
-    <p class="text-gray-500 truncate" v-if="actor.name">
-      <span dir="ltr">@{{ usernameWithDomain(actor) }}</span>
-    </p>
-    <div
-      v-if="full"
-      :class="{ 'line-clamp-3': limit }"
-      v-html="actor.summary"
-    />
+    </div>
+    <div :class="{ 'text-center': !inline }">
+      <h5 class="text-xl font-medium violet-title tracking-tight text-gray-900">
+        {{ displayName(actor) }}
+      </h5>
+      <p class="text-gray-500 truncate" v-if="actor.name">
+        <span dir="ltr">@{{ usernameWithDomain(actor) }}</span>
+      </p>
+      <div
+        v-if="full"
+        :class="{ 'line-clamp-3': limit }"
+        v-html="actor.summary"
+      />
+    </div>
   </div>
   <!-- <div
     class="p-4 bg-white rounded-lg shadow-md sm:p-8 flex items-center space-x-4"
@@ -77,6 +82,8 @@ export default class ActorCard extends Vue {
 
   @Prop({ required: false, type: Boolean, default: false }) full!: boolean;
 
+  @Prop({ required: false, type: Boolean, default: false }) inline!: boolean;
+
   @Prop({ required: false, type: Boolean, default: false }) popover!: boolean;
 
   @Prop({ required: false, type: Boolean, default: true }) limit!: boolean;

js/src/components/Event/EventMetadataSidebar.vue

@@ -48,9 +48,10 @@
             !event.attributedTo || !event.options.hideOrganizerWhenGroupEvent
           "
           :actor="event.attributedTo"
+          :inline="true"
         />
-        <actor-card v-else :actor="event.organizerActor" />
       </router-link>
+      <actor-card v-else :actor="event.organizerActor" :inline="true" />
       <actor-card
         :actor="contact"
         v-for="contact in event.contacts"

js/src/graphql/event.ts

@@ -207,7 +207,7 @@ export const CREATE_EVENT = gql`
     $physicalAddress: AddressInput
     $options: EventOptionsInput
     $contacts: [Contact]
-    $metadata: EventMetadataInput
+    $metadata: [EventMetadataInput]
   ) {
     createEvent(
       organizerActorId: $organizerActorId
@@ -257,7 +257,7 @@ export const EDIT_EVENT = gql`
     $physicalAddress: AddressInput
     $options: EventOptionsInput
     $contacts: [Contact]
-    $metadata: EventMetadataInput
+    $metadata: [EventMetadataInput]
   ) {
     updateEvent(
       eventId: $id

js/src/utils/i18n.ts

@@ -49,6 +49,7 @@ export const i18n = new VueI18n({
   fallbackLocale: DEFAULT_LOCALE,
   formatFallbackMessages: true,
   pluralizationRules,
+  fallbackRootWithEmptyString: true,
 });
 
 console.debug("set VueI18n with default locale", DEFAULT_LOCALE);