Various group-related improvements

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

js/src/components/Discussion/DiscussionListItem.vue

@@ -98,10 +98,9 @@ export default class DiscussionListItem extends Vue {
 
       .discussion-minimalist-title {
         color: #3c376e;
-        font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica,
-          Arial, serif;
-        font-size: 1.25rem;
-        font-weight: 700;
+        font-family: Roboto, Helvetica, Arial, serif;
+        font-size: 16px;
+        font-weight: 500;
         flex: 1;
       }
     }

js/src/components/Post/PostListItem.vue

@@ -43,10 +43,9 @@ export default class PostListItem extends Vue {
 
     .post-minimalist-title {
       color: #3c376e;
-      font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
-        serif;
-      font-size: 1rem;
-      font-weight: 700;
+      font-family: Roboto, Helvetica, Arial, serif;
+      font-size: 16px;
+      font-weight: 500;
       overflow: hidden;
       display: -webkit-box;
       -webkit-box-orient: vertical;

js/src/i18n/en_US.json

@@ -1046,6 +1046,6 @@
   "Move resource to the root folder": "Move resource to the root folder",
   "Share this group": "Share this group",
   "This group is accessible only through it's link. Be careful where you post this link.": "This group is accessible only through it's link. Be careful where you post this link.",
-  "{count} members": "{count} members",
+  "{count} members": "No members|One member|{count} members",
   "Share": "Share"
 }

js/src/i18n/fr_FR.json

@@ -1137,6 +1137,6 @@
   "Move resource to the root folder": "Déplacer la resource dans le dossier racine",
   "Share this group": "Partager ce groupe",
   "This group is accessible only through it's link. Be careful where you post this link.": "Ce groupe est accessible uniquement à travers son lien. Faites attention où vous le diffusez.",
-  "{count} members": "{count} membres",
+  "{count} members": "Aucun membre|Un⋅e membre|{count} membres",
   "Share": "Partager"
 }

js/src/mixins/group.ts

@@ -5,13 +5,7 @@ import {
 } from "@/graphql/actor";
 import { FETCH_GROUP } from "@/graphql/group";
 import RouteName from "@/router/name";
-import {
-  Group,
-  IActor,
-  IGroup,
-  IPerson,
-  usernameWithDomain,
-} from "@/types/actor";
+import { IActor, IGroup, IPerson, usernameWithDomain } from "@/types/actor";
 import { MemberRole } from "@/types/enums";
 import { Component, Vue } from "vue-property-decorator";
 
@@ -50,14 +44,14 @@ const now = new Date();
         variables() {
           return {
             actorId: this.currentActor.id,
-            group: this.group.preferredUsername,
+            group: this.group?.preferredUsername,
           };
         },
         skip() {
           return (
             !this.currentActor ||
             !this.currentActor.id ||
-            !this.group.preferredUsername
+            !this.group?.preferredUsername
           );
         },
       },
@@ -65,7 +59,7 @@ const now = new Date();
         return (
           !this.currentActor ||
           !this.currentActor.id ||
-          !this.group.preferredUsername
+          !this.group?.preferredUsername
         );
       },
     },
@@ -73,7 +67,7 @@ const now = new Date();
   },
 })
 export default class GroupMixin extends Vue {
-  group: IGroup = new Group();
+  group!: IGroup;
 
   currentActor!: IActor;
 

js/src/types/actor/actor.model.ts

@@ -57,7 +57,8 @@ export class Actor implements IActor {
 }
 
 export function usernameWithDomain(actor: IActor, force = false): string {
-  if (actor.domain) {
+  if (!actor) return "";
+  if (actor?.domain) {
     return `${actor.preferredUsername}@${actor.domain}`;
   }
   if (force) {

js/src/views/Group/Group.vue

@@ -10,7 +10,7 @@
           </li>
           <li class="is-active">
             <router-link
-              v-if="group.preferredUsername"
+              v-if="group && group.preferredUsername"
               :to="{
                 name: RouteName.GROUP,
                 params: { preferredUsername: usernameWithDomain(group) },
@@ -44,9 +44,9 @@
           )
         }}
       </b-message>
-      <header class="block-container presentation">
+      <header class="block-container presentation" v-if="group">
         <div class="banner-container">
-          <lazy-image-wrapper :picture="group.picture" />
+          <lazy-image-wrapper :picture="group.banner" />
         </div>
         <div class="header">
           <div class="avatar-container">
@@ -65,7 +65,10 @@
             <br />
           </div>
           <div class="group-metadata">
-            <div class="block-column members" v-if="isCurrentActorAGroupMember">
+            <div
+              class="block-column members"
+              v-if="isCurrentActorAGroupMember && !previewPublic"
+            >
               <div>
                 <figure
                   class="image is-32x32"
@@ -88,7 +91,11 @@
                 </figure>
               </div>
               <p>
-                {{ $t("{count} members", { count: group.members.total }) }}
+                {{
+                  $tc("{count} members", group.members.total, {
+                    count: group.members.total,
+                  })
+                }}
                 <router-link
                   v-if="isCurrentActorAGroupAdmin"
                   :to="{
@@ -188,7 +195,7 @@
               <b-button
                 outlined
                 icon-left="timeline-text"
-                v-if="isCurrentActorAGroupMember"
+                v-if="isCurrentActorAGroupMember && !previewPublic"
                 tag="router-link"
                 :to="{
                   name: RouteName.TIMELINE,
@@ -199,7 +206,7 @@
               <b-button
                 outlined
                 icon-left="cog"
-                v-if="isCurrentActorAGroupAdmin"
+                v-if="isCurrentActorAGroupAdmin && !previewPublic"
                 tag="router-link"
                 :to="{
                   name: RouteName.GROUP_PUBLIC_SETTINGS,
@@ -207,17 +214,50 @@
                 }"
                 >{{ $t("Group settings") }}</b-button
               >
+              <b-tooltip
+                v-if="
+                  (!isCurrentActorAGroupMember || previewPublic) &&
+                  group.openness !== Openness.OPEN
+                "
+                :label="$t('This group is invite-only')"
+                position="is-bottom"
+              >
+                <b-button disabled type="is-primary">{{
+                  $t("Join group")
+                }}</b-button></b-tooltip
+              >
+              <b-button
+                v-else-if="
+                  (!isCurrentActorAGroupMember || previewPublic) &&
+                  currentActor.id
+                "
+                @click="joinGroup"
+                type="is-primary"
+                :disabled="previewPublic"
+                >{{ $t("Join group") }}</b-button
+              >
+              <b-button
+                tag="router-link"
+                :to="{
+                  name: RouteName.GROUP_JOIN,
+                  params: { preferredUsername: usernameWithDomain(group) },
+                }"
+                v-else-if="!isCurrentActorAGroupMember || previewPublic"
+                :disabled="previewPublic"
+                type="is-primary"
+                >{{ $t("Join group") }}</b-button
+              >
               <b-button
                 outlined
                 icon-left="share"
                 @click="triggerShare()"
-                v-if="!isCurrentActorAGroupMember"
+                v-if="!isCurrentActorAGroupMember || previewPublic"
               >
                 {{ $t("Share") }}
               </b-button>
               <b-dropdown
                 class="menu-dropdown"
-                v-if="isCurrentActorAGroupMember"
+                v-if="isCurrentActorAGroupMember || previewPublic"
                 position="is-bottom-left"
                 aria-role="menu"
               >
@@ -228,13 +268,25 @@
                   icon-left="dots-horizontal"
                   aria-label="Other actions"
                 />
-                <b-dropdown-item aria-role="menuitem" @click="triggerShare()">
+                <b-dropdown-item aria-role="menuitem">
+                  <b-switch v-model="previewPublic">{{
+                    $t("Public preview")
+                  }}</b-switch>
+                </b-dropdown-item>
+                <b-dropdown-item
+                  v-if="!previewPublic"
+                  aria-role="menuitem"
+                  @click="triggerShare()"
+                >
                   <span>
                     <b-icon icon="share" />
                     {{ $t("Share") }}
                   </span>
                 </b-dropdown-item>
-                <hr class="dropdown-divider" />
+                <hr
+                  class="dropdown-divider"
+                  v-if="isCurrentActorAGroupMember"
+                />
                 <b-dropdown-item has-link aria-role="menuitem">
                   <a
                     :href="`@${preferredUsername}/feed/atom`"
@@ -255,8 +307,8 @@
                 </b-dropdown-item>
                 <hr class="dropdown-divider" />
                 <b-dropdown-item
-                  aria-role="menuitem"
                   v-if="ableToReport"
+                  aria-role="menuitem"
                   @click="isReportModalActive = true"
                 >
                   <span>
@@ -266,7 +318,7 @@
                 </b-dropdown-item>
                 <b-dropdown-item
                   aria-role="menuitem"
-                  v-if="isCurrentActorAGroupMember"
+                  v-if="isCurrentActorAGroupMember && !previewPublic"
                   @click="leaveGroup"
                 >
                   <span>
@@ -280,7 +332,10 @@
         </div>
       </header>
     </div>
-    <div v-if="isCurrentActorAGroupMember" class="block-container">
+    <div
+      v-if="isCurrentActorAGroupMember && !previewPublic"
+      class="block-container"
+    >
       <!-- Private things -->
       <div class="block-column">
         <!-- Group discussions -->
@@ -300,9 +355,9 @@
                 :discussion="discussion"
               />
             </div>
-            <div v-else class="content has-text-grey-dark has-text-centered">
-              <p>{{ $t("No discussions yet") }}</p>
-            </div>
+            <empty-content v-else icon="chat" :inline="true">
+              {{ $t("No discussions yet") }}
+            </empty-content>
           </template>
           <template v-slot:create>
             <router-link
@@ -343,12 +398,9 @@
                 />
               </div>
             </div>
-            <div
-              v-else-if="group"
-              class="content has-text-grey-dark has-text-centered"
-            >
-              <p>{{ $t("No resources yet") }}</p>
-            </div>
+            <empty-content v-else icon="link" :inline="true">
+              {{ $t("No resources yet") }}
+            </empty-content>
           </template>
           <template v-slot:create>
             <router-link
@@ -386,12 +438,9 @@
                 class="organized-event"
               />
             </div>
-            <div
-              v-else-if="group"
-              class="content has-text-grey-dark has-text-centered"
-            >
-              <p>{{ $t("No public upcoming events") }}</p>
-            </div>
+            <empty-content v-else-if="group" icon="calendar" :inline="true">
+              {{ $t("No public upcoming events") }}
+            </empty-content>
             <b-skeleton animated v-else></b-skeleton>
           </template>
           <template v-slot:create>
@@ -424,12 +473,9 @@
                 :post="post"
               />
             </div>
-            <div
-              v-else-if="group"
-              class="content has-text-grey-dark has-text-centered"
-            >
-              <p>{{ $t("No posts yet") }}</p>
-            </div>
+            <empty-content v-else-if="group" icon="bullhorn" :inline="true">
+              {{ $t("No posts yet") }}
+            </empty-content>
           </template>
           <template v-slot:create>
             <router-link
@@ -448,10 +494,18 @@
     <b-message v-else-if="!group && $apollo.loading === false" type="is-danger">
       {{ $t("No group found") }}
     </b-message>
-    <div v-else class="public-container">
+    <div v-else-if="group" class="public-container">
       <aside class="group-metadata">
         <div class="sticky">
+          <event-metadata-block :title="$t('Members')" icon="account-group">
+            {{
+              $tc("{count} members", group.members.total, {
+                count: group.members.total,
+              })
+            }}
+          </event-metadata-block>
           <event-metadata-block
+            v-if="physicalAddress"
             :title="$t('Location')"
             :icon="
               physicalAddress ? physicalAddress.poiInfos.poiIcon.icon : 'earth'
@@ -493,12 +547,9 @@
             v-html="group.summary"
             v-if="group.summary && group.summary !== '<p></p>'"
           />
-          <div
-            v-else-if="group"
-            class="content has-text-grey-dark has-text-centered"
-          >
-            <p>{{ $t("This group doesn't have a description yet.") }}</p>
-          </div>
+          <empty-content v-else-if="group" icon="image-text" :inline="true">
+            {{ $t("This group doesn't have a description yet.") }}
+          </empty-content>
         </section>
         <section>
           <subtitle>{{ $t("Upcoming events") }}</subtitle>
@@ -513,18 +564,9 @@
               class="organized-event"
             />
           </div>
-          <div
-            v-else-if="group && group.organizedEvents.elements.length == 0"
-            class="content has-text-grey-dark has-text-centered"
-          >
-            <p>{{ $t("No public upcoming events") }}</p>
-          </div>
-          <div
-            v-else-if="group"
-            class="content has-text-grey-dark has-text-centered"
-          >
-            <p>{{ $t("No public upcoming events") }}</p>
-          </div>
+          <empty-content v-else-if="group" icon="calendar" :inline="true">
+            {{ $t("No public upcoming events") }}
+          </empty-content>
           <b-skeleton animated v-else-if="$apollo.loading"></b-skeleton>
           <router-link
             v-if="group.organizedEvents.total > 0"
@@ -545,12 +587,9 @@
               :post="post"
             />
           </div>
-          <div
-            v-else-if="group"
-            class="content has-text-grey-dark has-text-centered"
-          >
-            <p>{{ $t("No posts yet") }}</p>
-          </div>
+          <empty-content v-else-if="group" icon="bullhorn" :inline="true">
+            {{ $t("No posts yet") }}
+          </empty-content>
           <b-skeleton animated v-else-if="$apollo.loading"></b-skeleton>
           <router-link
             v-if="group.posts.total > 0"
@@ -581,6 +620,7 @@
       :active.sync="isReportModalActive"
       has-modal-card
       ref="reportModal"
+      v-if="group"
     >
       <report-modal
         :on-confirm="reportGroup"
@@ -589,7 +629,12 @@
         @close="$refs.reportModal.close()"
       />
     </b-modal>
-    <b-modal :active.sync="isShareModalActive" has-modal-card ref="shareModal">
+    <b-modal
+      v-if="group"
+      :active.sync="isShareModalActive"
+      has-modal-card
+      ref="shareModal"
+    >
       <share-group-modal :group="group" />
     </b-modal>
   </div>
@@ -625,6 +670,7 @@ import { PERSON_MEMBERSHIP_GROUP } from "@/graphql/actor";
 import { LEAVE_GROUP } from "@/graphql/group";
 import LazyImageWrapper from "../../components/Image/LazyImageWrapper.vue";
 import EventMetadataBlock from "../../components/Event/EventMetadataBlock.vue";
+import EmptyContent from "../../components/Utils/EmptyContent.vue";
 
 @Component({
   apollo: {
@@ -644,6 +690,7 @@ import EventMetadataBlock from "../../components/Event/EventMetadataBlock.vue";
     ReportModal,
     LazyImageWrapper,
     EventMetadataBlock,
+    EmptyContent,
     "map-leaflet": () =>
       import(/* webpackChunkName: "map" */ "../../components/Map.vue"),
     ShareGroupModal: () =>
@@ -683,6 +730,8 @@ export default class Group extends mixins(GroupMixin) {
 
   isShareModalActive = false;
 
+  previewPublic = false;
+
   @Watch("currentActor")
   watchCurrentActor(currentActor: IActor, oldActor: IActor): void {
     if (currentActor.id && oldActor && currentActor.id !== oldActor.id) {
@@ -815,13 +864,11 @@ export default class Group extends mixins(GroupMixin) {
   }
 
   get groupTitle(): undefined | string {
-    if (!this.group) return undefined;
-    return this.group.name || this.group.preferredUsername;
+    return this.group?.name || this.group?.preferredUsername;
   }
 
   get groupSummary(): undefined | string {
-    if (!this.group) return undefined;
-    return this.group.summary;
+    return this.group?.summary;
   }
 
   get groupMember(): IMember | undefined {
@@ -918,6 +965,7 @@ export default class Group extends mixins(GroupMixin) {
 }
 </script>
 <style lang="scss" scoped>
+@import "~bulma/sass/utilities/mixins.sass";
 div.container {
   margin-bottom: 3rem;
 
@@ -937,13 +985,6 @@ div.container {
     margin-left: 0.5rem;
   }
 
-  .public-container {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row-reverse;
-    padding: 0;
-  }
-
   .block-container {
     display: flex;
     flex-wrap: wrap;
@@ -1025,14 +1066,18 @@ div.container {
 
     .block-column {
       flex: 1;
-      margin: 0 0.5rem;
+      margin: 0;
       max-width: 576px;
 
-      &:first-child {
-        margin-left: 0;
-      }
-      &:last-child {
-        margin-right: 0;
+      @include desktop {
+        margin: 0 0.5rem;
+
+        &:first-child {
+          margin-left: 0;
+        }
+        &:last-child {
+          margin-right: 0;
+        }
       }
 
       section {
@@ -1092,6 +1137,17 @@ div.container {
         margin-top: 16px;
         align-items: flex-end;
 
+        ::v-deep .icon {
+          border-radius: 290486px;
+          border: 1px solid #cdcaea;
+          background: white;
+          height: 5rem;
+          width: 5rem;
+          i::before {
+            font-size: 60px;
+          }
+        }
+
         figure {
           position: relative;
 
@@ -1122,6 +1178,10 @@ div.container {
 
         & > .buttons {
           justify-content: center;
+
+          ::v-deep .b-tooltip {
+            padding-right: 0.5em;
+          }
         }
 
         .members {
@@ -1143,11 +1203,19 @@ div.container {
   }
 
   .public-container {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row-reverse;
+    padding: 0;
+    margin-top: 1rem;
+
     .group-metadata {
       min-width: 20rem;
       flex: 1;
       padding-left: 1rem;
-      margin: 2rem auto;
+      @include mobile {
+        padding-left: 0;
+      }
 
       .sticky {
         position: sticky;
@@ -1158,14 +1226,28 @@ div.container {
     }
     .main-content {
       min-width: 20rem;
-      padding: 1rem;
       flex: 2;
       background: white;
-      margin: 2rem auto;
+
+      @include desktop {
+        padding: 10px;
+      }
+
+      @include mobile {
+        margin-top: 1rem;
+      }
+
+      h2 {
+        margin: 0 auto 10px;
+      }
     }
 
     section {
-      margin-top: 2rem;
+      margin-top: 0;
+
+      .posts-wrapper {
+        margin-bottom: 1rem;
+      }
     }
   }
 

js/src/views/Group/GroupSettings.vue

@@ -4,11 +4,12 @@
       <ul>
         <li>
           <router-link
+            v-if="group"
             :to="{
               name: RouteName.GROUP,
               params: { preferredUsername: usernameWithDomain(group) },
             }"
-            >{{ group.name }}</router-link
+            >{{ group.name || usernameWithDomain(group) }}</router-link
           >
         </li>
         <li>
@@ -78,7 +79,7 @@
           <b-radio
             v-model="editableGroup.visibility"
             name="groupVisibility"
-            :native-value="GroupVisibility.PRIVATE"
+            :native-value="GroupVisibility.UNLISTED"
             >{{ $t("Only accessible through link") }}<br />
             <small>{{
               $t(
@@ -186,6 +187,7 @@ import { IConfig } from "@/types/config.model";
 import { ServerParseError } from "@apollo/client/link/http";
 import { ErrorResponse } from "@apollo/client/link/error";
 import RouteName from "@/router/name";
+import { buildFileFromIMedia } from "@/utils/image";
 
 @Component({
   components: {
@@ -274,7 +276,19 @@ export default class GroupSettings extends mixins(GroupMixin) {
   }
 
   @Watch("group")
-  async watchUpdateGroup(): Promise<void> {
+  async watchUpdateGroup(oldGroup: IGroup, newGroup: IGroup): Promise<void> {
+    if (
+      oldGroup?.avatar !== undefined &&
+      oldGroup?.avatar !== newGroup?.avatar
+    ) {
+      this.avatarFile = await buildFileFromIMedia(this.group.avatar);
+    }
+    if (
+      oldGroup?.banner !== undefined &&
+      oldGroup?.banner !== newGroup?.banner
+    ) {
+      this.bannerFile = await buildFileFromIMedia(this.group.banner);
+    }
     this.editableGroup = { ...this.group };
   }
 

js/src/views/Posts/List.vue

@@ -86,7 +86,7 @@ import { IMember } from "@/types/actor/member.model";
 import { FETCH_GROUP_POSTS } from "../../graphql/post";
 import { Paginate } from "../../types/paginate";
 import { IPost } from "../../types/post.model";
-import { IGroup, IPerson, usernameWithDomain } from "../../types/actor";
+import { usernameWithDomain } from "../../types/actor";
 import RouteName from "../../router/name";
 import PostElementItem from "../../components/Post/PostElementItem.vue";
 
@@ -138,14 +138,10 @@ const POSTS_PAGE_LIMIT = 10;
 export default class PostList extends mixins(GroupMixin) {
   @Prop({ required: true, type: String }) preferredUsername!: string;
 
-  group!: IGroup;
-
   posts!: Paginate<IPost>;
 
   memberships!: IMember[];
 
-  currentActor!: IPerson;
-
   postsPage = 1;
 
   RouteName = RouteName;