diff --git a/src/components/MembersList.vue b/src/components/MembersList.vue index d556418f..e26613bf 100644 --- a/src/components/MembersList.vue +++ b/src/components/MembersList.vue @@ -11,7 +11,7 @@
-
+
{{ decryptionErrorMessage() }}
@@ -23,97 +23,94 @@ to set it.
-
- +
  • - - • Click - - - - / - - - - to add/remove them to/from the meeting. + Click + + - -
  • -
    - - • Click + / + + + + to add/remove them to/from the meeting. + +
  • + Click - + to add them to your contacts. - -
  • + + -
    +
    -
    -
    -
    -

    - {{ member.name || unnamedMember }} -

    -
    - + + + +
    - -
    -
    +
    -
    -

    - {{ member.did }} -

    -
    -
    +

    + {{ member.did }} +

    + + + +
    +
    @@ -156,6 +160,15 @@

    + + + @@ -522,29 +718,23 @@ export default class MembersList extends Vue { .btn-add-contact { /* stylelint-disable-next-line at-rule-no-unknown */ - @apply ml-2 w-8 h-8 flex items-center justify-center rounded-full + @apply w-6 h-6 flex items-center justify-center rounded-full bg-green-100 text-green-600 hover:bg-green-200 hover:text-green-800 transition-colors; } -.btn-info-contact { +.btn-info-contact, +.btn-info-admission { /* stylelint-disable-next-line at-rule-no-unknown */ - @apply ml-2 mb-2 w-6 h-6 flex items-center justify-center rounded-full - bg-slate-100 text-slate-500 hover:bg-slate-200 hover:text-slate-800 + @apply w-6 h-6 flex items-center justify-center rounded-full + bg-slate-100 text-slate-400 hover:text-slate-600 transition-colors; } .btn-admission { /* stylelint-disable-next-line at-rule-no-unknown */ - @apply mr-2 w-6 h-6 flex items-center justify-center rounded-full + @apply w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800 transition-colors; } - -.btn-info-admission { - /* stylelint-disable-next-line at-rule-no-unknown */ - @apply mr-2 mb-2 w-6 h-6 flex items-center justify-center rounded-full - bg-slate-100 text-slate-500 hover:bg-slate-200 hover:text-slate-800 - transition-colors; -} diff --git a/src/components/SetBulkVisibilityDialog.vue b/src/components/SetBulkVisibilityDialog.vue new file mode 100644 index 00000000..ee55022a --- /dev/null +++ b/src/components/SetBulkVisibilityDialog.vue @@ -0,0 +1,333 @@ + + + diff --git a/src/constants/app.ts b/src/constants/app.ts index aa64ea32..8a393b34 100644 --- a/src/constants/app.ts +++ b/src/constants/app.ts @@ -59,7 +59,7 @@ export const PASSKEYS_ENABLED = export interface NotificationIface { group: string; // "alert" | "modal" type: string; // "toast" | "info" | "success" | "warning" | "danger" - title: string; + title?: string; text?: string; callback?: (success: boolean) => Promise; // if this triggered an action noText?: string; @@ -68,4 +68,11 @@ export interface NotificationIface { onYes?: () => Promise; promptToStopAsking?: boolean; yesText?: string; + membersData?: Array<{ + member: { admitted: boolean; content: string; memberId: number }; + name: string; + did: string; + isContact: boolean; + contact?: { did: string; name?: string; seesMe?: boolean }; + }>; // For passing member data to visibility dialog } diff --git a/src/views/NotFoundView.vue b/src/views/NotFoundView.vue index 30eff651..28ec949c 100644 --- a/src/views/NotFoundView.vue +++ b/src/views/NotFoundView.vue @@ -60,7 +60,9 @@ stroke-linecap="round" stroke-linejoin="round" stroke-width="2" - d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" + d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 + 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 + 1 0 011 1v4a1 1 0 001 1m-6 0h6" > Go Home diff --git a/src/views/OnboardMeetingMembersView.vue b/src/views/OnboardMeetingMembersView.vue index 9b3c83ce..9dfba3d9 100644 --- a/src/views/OnboardMeetingMembersView.vue +++ b/src/views/OnboardMeetingMembersView.vue @@ -77,6 +77,7 @@ import { } from "../libs/endorserServer"; import { generateSaveAndActivateIdentity } from "../libs/util"; import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin"; +import { NotificationIface } from "../constants/app"; @Component({ components: { @@ -97,6 +98,7 @@ export default class OnboardMeetingMembersView extends Vue { projectLink = ""; $route!: RouteLocationNormalizedLoaded; $router!: Router; + $notify!: (notification: NotificationIface, timeout?: number) => void; userNameDialog!: InstanceType; diff --git a/src/views/OnboardMeetingSetupView.vue b/src/views/OnboardMeetingSetupView.vue index 45b2d580..e70148f5 100644 --- a/src/views/OnboardMeetingSetupView.vue +++ b/src/views/OnboardMeetingSetupView.vue @@ -230,26 +230,28 @@ class="mt-8 p-4 border rounded-lg bg-white shadow" >
    -

    Meeting Members

    -
    -
    - • Page for Members - - - - - - +

    Meeting Members

    +
      +
    • + Page for Members: + + + + + + +
    • +