Merge branch 'main' into clive-fix-1

Signed-off-by: Jordan Clive <[email protected]>

Author: jordancclive

apps/lfx-one/src/app/modules/meetings/meeting-join/meeting-join.component.html

@@ -9,7 +9,7 @@
         <!-- Project Logo -->
         @if (project()?.logo_url) {
           <div class="flex items-center justify-center mb-6">
-            <img [src]="project()?.logo_url" [alt]="project()?.name" class="w-auto h-20" />
+            <img [src]="project()?.logo_url" [alt]="project()?.name" class="w-auto h-10 md:h-20" />
           </div>
         }
 
@@ -68,7 +68,7 @@
           </div>
 
           <!-- Content Row: Title/Details + Join Button (if immediate) -->
-          <div class="flex justify-between items-start gap-6 mb-4">
+          <div class="flex flex-col md:flex-row justify-between items-start gap-6 mb-4">
             <!-- Left Column: Title + Details -->
             <div class="flex-1 flex flex-col gap-4 justify-between h-full">
               <div class="flex flex-col gap-4 h-full">
@@ -147,7 +147,7 @@ <h1 class="font-medium text-base text-neutral-950 leading-tight" [attr.data-test
             <!-- Right Column: Join Button (immediate meetings) or RSVP (future meetings) -->
             @if (canJoinMeeting()) {
               <!-- Join Button - Immediate Meeting -->
-              <div class="w-[296px]">
+              <div class="w-full md:w-[296px]">
                 <lfx-button
                   label="Join Meeting"
                   icon="fa-light fa-video"
@@ -163,7 +163,7 @@ <h1 class="font-medium text-base text-neutral-950 leading-tight" [attr.data-test
               </div>
             } @else if (authenticated() && meeting().organizer) {
               <!-- RSVP Details - Future Meeting (Authenticated Organizers) -->
-              <div class="w-[296px] flex flex-col gap-3">
+              <div class="w-full md:w-[296px] flex flex-col gap-3">
                 <lfx-meeting-rsvp-details
                   [meeting]="meeting()"
                   [project]="project()"
@@ -190,7 +190,7 @@ <h1 class="font-medium text-base text-neutral-950 leading-tight" [attr.data-test
               </div>
             } @else if (authenticated()) {
               <!-- RSVP Container - Future Meeting (Authenticated Non-Organizers) -->
-              <div class="w-[296px]">
+              <div class="w-full md:w-[296px]">
                 <lfx-rsvp-button-group [meeting]="meeting()" [occurrenceId]="currentOccurrence()?.occurrence_id"> </lfx-rsvp-button-group>
               </div>
             }
@@ -237,15 +237,19 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
                   <div class="flex flex-col gap-2">
                     @for (attachment of attachments(); track attachment.uid; let i = $index) {
                       <a
-                        [href]="'/api/meetings/' + meeting().uid + '/attachments/' + attachment.uid"
+                        [href]="attachment.type === 'link' ? attachment.link : '/api/meetings/' + meeting().uid + '/attachments/' + attachment.uid"
                         target="_blank"
                         rel="noopener noreferrer"
                         class="bg-gray-200 hover:bg-gray-300 rounded px-3 py-2 flex items-center gap-3 min-w-[180px] transition-colors cursor-pointer"
                         [attr.data-testid]="'meeting-attachment-' + i">
-                        <!-- File Icon -->
-                        <i [class]="(attachment.mime_type || '' | fileTypeIcon) + ' text-3xl text-black'"></i>
-
-                        <!-- File Name -->
+                        <!-- Icon - File or Link -->
+                        @if (attachment.type === 'link') {
+                          <i class="fa-light fa-arrow-up-right-from-square text-3xl text-black w-8 flex-shrink-0"></i>
+                        } @else {
+                          <i [class]="(attachment.mime_type || '' | fileTypeIcon) + ' text-3xl text-black w-8 flex-shrink-0'"></i>
+                        }
+
+                        <!-- Attachment Name -->
                         <span class="text-sm text-neutral-950 overflow-ellipsis overflow-hidden whitespace-nowrap flex-1 font-sans">{{ attachment.name }}</span>
                       </a>
                     }
@@ -270,9 +274,9 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
             <div class="flex flex-col gap-3">
               <p class="text-sm text-neutral-950">You are signed in as:</p>
 
-              <div class="bg-[#f8fbff] border-[0.5px] border-[#009aff] border-solid rounded-[4px] p-[12px] flex items-center gap-3">
+              <div class="bg-blue-50 border border-blue-500/50 rounded px-3 py-2 flex flex-wrap items-center gap-3">
                 <!-- Avatar -->
-                <div class="w-12 h-12 bg-blue-600 rounded-full flex items-center justify-center">
+                <div class="hidden md:flex w-12 h-12 bg-blue-600 rounded-full items-center justify-center">
                   <span class="text-white text-2xl font-medium">{{ (user.name || 'User').substring(0, 2).toUpperCase() }}</span>
                 </div>
 
@@ -287,7 +291,7 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
             <!-- Signed Out State -->
             <div class="flex flex-col gap-6">
               <!-- Sign In CTA -->
-              <div class="bg-blue-50 border border-blue-500/50 rounded px-3 py-2 flex items-center justify-between gap-3">
+              <div class="bg-blue-50 border border-blue-500/50 rounded px-3 py-2 flex flex-wrap items-center justify-between gap-3">
                 <div class="flex items-center gap-3">
                   <i class="fa-light fa-arrow-right-to-bracket text-blue-600 text-2xl"></i>
                   <div>
@@ -296,7 +300,14 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
                   </div>
                 </div>
 
-                <lfx-button size="small" label="Sign In" icon="fa-light fa-arrow-right-to-bracket" severity="info" [href]="'/login?returnTo=' + returnTo()">
+                <lfx-button
+                  class="w-full md:w-auto"
+                  styleClass="w-full md:w-auto"
+                  size="small"
+                  label="Sign In"
+                  icon="fa-light fa-arrow-right-to-bracket"
+                  severity="info"
+                  [href]="'/login?returnTo=' + returnTo()">
                 </lfx-button>
               </div>
 
@@ -311,7 +322,7 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
 
                 <form [formGroup]="joinForm" class="flex flex-col gap-4">
                   <!-- Name + Email Row -->
-                  <div class="flex gap-4">
+                  <div class="flex flex-col md:flex-row gap-4">
                     <div class="flex-1">
                       <label class="flex items-center gap-1 text-xs text-blue-900 mb-2">
                         <i class="fa-light fa-user text-gray-600"></i>
@@ -363,8 +374,10 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
                   </div>
 
                   <!-- Submit Button -->
-                  <div class="flex justify-end">
+                  <div class="flex justify-end md:justify-center">
                     <lfx-button
+                      class="w-full md:w-auto"
+                      styleClass="w-full md:w-auto"
                       size="small"
                       label="Join Meeting"
                       icon="fa-light fa-arrow-right-to-bracket"

apps/lfx-one/src/app/modules/meetings/meeting-join/meeting-join.component.ts

@@ -18,16 +18,7 @@ import { MeetingRegistrantsComponent } from '@components/meeting-registrants/mee
 import { MeetingRsvpDetailsComponent } from '@components/meeting-rsvp-details/meeting-rsvp-details.component';
 import { RsvpButtonGroupComponent } from '@components/rsvp-button-group/rsvp-button-group.component';
 import { environment } from '@environments/environment';
-import {
-  canJoinMeeting,
-  extractUrlsWithDomains,
-  getCurrentOrNextOccurrence,
-  Meeting,
-  MeetingAttachment,
-  MeetingOccurrence,
-  Project,
-  User,
-} from '@lfx-one/shared';
+import { canJoinMeeting, getCurrentOrNextOccurrence, Meeting, MeetingAttachment, MeetingOccurrence, Project, User } from '@lfx-one/shared';
 import { FileTypeIconPipe } from '@pipes/file-type-icon.pipe';
 import { MeetingTimePipe } from '@pipes/meeting-time.pipe';
 import { MeetingService } from '@services/meeting.service';
@@ -78,7 +69,6 @@ export class MeetingJoinComponent {
   public meeting: Signal<Meeting & { project: Project }>;
   public currentOccurrence: Signal<MeetingOccurrence | null>;
   public meetingTypeBadge: Signal<{ badgeClass: string; icon?: string; text: string } | null>;
-  public importantLinks: Signal<{ url: string; domain: string }[]>;
   public returnTo: Signal<string | undefined>;
   public password: WritableSignal<string | null> = signal<string | null>(null);
   public canJoinMeeting: Signal<boolean>;
@@ -103,7 +93,6 @@ export class MeetingJoinComponent {
     this.joinForm = this.initializeJoinForm();
     this.formValues = this.initializeFormValues();
     this.meetingTypeBadge = this.initializeMeetingTypeBadge();
-    this.importantLinks = this.initializeImportantLinks();
     this.returnTo = this.initializeReturnTo();
     this.canJoinMeeting = this.initializeCanJoinMeeting();
     this.fetchedJoinUrl = this.initializeFetchedJoinUrl();
@@ -268,20 +257,6 @@ export class MeetingJoinComponent {
     });
   }
 
-  private initializeImportantLinks(): Signal<{ url: string; domain: string }[]> {
-    return computed(() => {
-      const meeting = this.meeting();
-      const currentOccurrence = this.currentOccurrence();
-
-      // Use current occurrence description if available, otherwise fallback to meeting description
-      const description = currentOccurrence?.description || meeting?.description;
-      if (!description) {
-        return [];
-      }
-      return extractUrlsWithDomains(description);
-    });
-  }
-
   private initializeReturnTo(): Signal<string | undefined> {
     return computed(() => {
       return `${environment.urls.home}/meetings/${this.meeting().uid}?password=${this.password()}`;

apps/lfx-one/src/app/modules/project/committees/components/upcoming-committee-meeting/upcoming-committee-meeting.component.html

@@ -7,7 +7,7 @@
       <a
         [routerLink]="['/project', project()?.slug, 'meetings', upcomingMeeting()!.uid]"
         class="text-sm font-medium text-primary hover:text-primary-600 hover:underline line-clamp-2"
-        [title]="upcomingMeeting()!.title || 'Meeting'">
+        [pTooltip]="upcomingMeeting()!.title || 'Meeting'">
         {{ upcomingMeeting()!.title || 'Meeting' }}
       </a>
     </div>

apps/lfx-one/src/app/modules/project/dashboard/project-dashboard/project.component.html

@@ -183,7 +183,7 @@ <h3 class="text-sm font-display text-gray-500">Upcoming Meetings</h3>
                       <ng-template #body let-row>
                         <tr>
                           <td class="w-1/2 max-w-0">
-                            <a class="block truncate text-sm" [title]="row.title" [routerLink]="[row.url]" [relativeTo]="activatedRoute">{{ row.title }}</a>
+                            <a class="block truncate text-sm" [pTooltip]="row.title" [routerLink]="[row.url]" [relativeTo]="activatedRoute">{{ row.title }}</a>
                           </td>
                           <td class="w-1/2">
                             <div class="flex justify-end whitespace-nowrap">
@@ -242,7 +242,7 @@ <h3 class="text-sm font-display text-gray-500">Recently Updated Committees</h3>
                       <ng-template #body let-row>
                         <tr>
                           <td class="w-1/2 max-w-0">
-                            <a class="block truncate text-sm" [title]="row.title" [routerLink]="row.url">{{ row.title }}</a>
+                            <a class="block truncate text-sm" [pTooltip]="row.title" [routerLink]="row.url">{{ row.title }}</a>
                           </td>
                           <td class="w-1/2">
                             <div class="flex justify-end whitespace-nowrap">

apps/lfx-one/src/app/modules/project/meetings/components/meeting-manage/meeting-manage.component.html

@@ -55,8 +55,11 @@ <h1 class="text-xl font-semibold text-slate-900" data-testid="meeting-manage-tit
                   [existingAttachments]="attachments()"
                   [isEditMode]="isEditMode()"
                   [deletingAttachmentId]="deletingAttachmentId()"
+                  [pendingAttachmentDeletions]="pendingAttachmentDeletions()"
                   (goToStep)="goToStep($event)"
-                  (deleteAttachment)="deleteAttachment($event)">
+                  (deleteAttachment)="deleteAttachment($event)"
+                  (undoDeleteAttachment)="undoDeleteAttachment($event)"
+                  (deleteLinkAttachment)="deleteLinkAttachment($event)">
                 </lfx-meeting-resources-summary>
               </ng-template>
             </p-step-panel>
@@ -114,8 +117,10 @@ <h2 class="text-lg font-semibold text-slate-900 mb-4">Resources & Summary</h2>
                     [existingAttachments]="attachments()"
                     [isEditMode]="isEditMode()"
                     [deletingAttachmentId]="deletingAttachmentId()"
+                    [pendingAttachmentDeletions]="pendingAttachmentDeletions()"
                     (goToStep)="goToStep($event)"
-                    (deleteAttachment)="deleteAttachment($event)">
+                    (deleteAttachment)="deleteAttachment($event)"
+                    (undoDeleteAttachment)="undoDeleteAttachment($event)">
                   </lfx-meeting-resources-summary>
                 </div>
               </div>