Merge branch 'main' into agaete/fix-key-collision

Author: agaetep

CLAUDE.md

@@ -143,3 +143,4 @@ Before starting any work or commits:
 
 - Always use sequential thinking mcp for planning before doing any changes
 - Always run yarn build to validate that your changes are building too for validation
+- Always remember that our JIRA sprint field is customfield_10020. When we create tickets, we need to assign them to the current user and set it to the current sprint.

apps/lfx-one/public/images/lfx-logo.svg

@@ -2,9 +2,4 @@
 <!-- SPDX-License-Identifier: MIT -->
 <p-toast />
 
-<!-- Header Component -->
-<lfx-header></lfx-header>
-
-<div class="top-20">
-  <router-outlet />
-</div>
+<router-outlet />

apps/lfx-one/public/images/lfx-one-logo.svg

@@ -7,13 +7,12 @@ import { RouterOutlet } from '@angular/router';
 import { AuthContext } from '@lfx-one/shared/interfaces';
 import { ToastModule } from 'primeng/toast';
 
-import { HeaderComponent } from './shared/components/header/header.component';
 import { SegmentService } from './shared/services/segment.service';
 import { UserService } from './shared/services/user.service';
 
 @Component({
   selector: 'lfx-root',
-  imports: [RouterOutlet, HeaderComponent, CommonModule, ToastModule],
+  imports: [RouterOutlet, CommonModule, ToastModule],
   templateUrl: './app.component.html',
   styleUrl: './app.component.scss',
 })

apps/lfx-one/src/app/app.component.html

@@ -1,16 +1,16 @@
 <!-- Copyright The Linux Foundation and each contributor to LFX. -->
 <!-- SPDX-License-Identifier: MIT -->
 
-<div class="flex min-h-screen pt-4">
+<div class="flex min-h-screen">
   <!-- Sidebar - Desktop -->
-  <div class="hidden lg:block w-72 flex-shrink-0 fixed top-[6rem] left-0">
+  <div class="hidden lg:block w-64 flex-shrink-0 fixed top-0 left-0">
     <lfx-sidebar [items]="sidebarItems" [footerItems]="sidebarFooterItems" [showProjectSelector]="true"></lfx-sidebar>
   </div>
 
   <!-- Sidebar - Mobile Overlay -->
   @if (showMobileSidebar()) {
     <div class="lg:hidden fixed inset-0 z-40 bg-black bg-opacity-50" data-testid="mobile-sidebar-overlay" (click)="closeMobileSidebar()">
-      <div class="absolute top-0 left-0 bottom-0 w-72 bg-white shadow-xl" (click)="$event.stopPropagation()" data-testid="mobile-sidebar">
+      <div class="absolute top-0 left-0 bottom-0 w-64 bg-white shadow-xl" (click)="$event.stopPropagation()" data-testid="mobile-sidebar">
         <div class="flex items-center justify-between p-4 border-b border-gray-200">
           <h2 class="text-lg font-semibold text-gray-900">Menu</h2>
           <button
@@ -30,7 +30,7 @@ <h2 class="text-lg font-semibold text-gray-900">Menu</h2>
   }
 
   <!-- Main Content Area -->
-  <main class="flex-1 min-w-0 transition-all duration-300 lg:ml-72" data-testid="main-content">
+  <main class="flex-1 min-w-0 transition-all duration-300 lg:ml-64 px-[21px] md:px-[32px] py-[24px]" data-testid="main-content">
     <router-outlet />
     <!-- Footer Component -->
     <lfx-footer class="py-8"></lfx-footer>

apps/lfx-one/src/app/app.component.ts

@@ -25,39 +25,27 @@ export class MainLayoutComponent {
   // Expose mobile sidebar state from service
   protected readonly showMobileSidebar = this.appService.showMobileSidebar;
 
-  // Sidebar navigation items
+  // Sidebar navigation items - matching React NavigationSidebar design
   protected readonly sidebarItems: SidebarMenuItem[] = [
     {
-      label: 'Home',
-      icon: 'fa-light fa-house',
+      label: 'Overview',
+      icon: 'fa-light fa-grid-2',
       routerLink: '/',
     },
     {
       label: 'Meetings',
-      icon: 'fa-light fa-video',
+      icon: 'fa-light fa-calendar',
       routerLink: '/meetings',
     },
+    {
+      label: 'Projects',
+      icon: 'fa-light fa-folder-open',
+      routerLink: '/projects',
+    },
   ];
 
-  // Sidebar footer items
+  // Sidebar footer items - matching React NavigationSidebar design
   protected readonly sidebarFooterItems: SidebarMenuItem[] = [
-    {
-      label: 'Documentation',
-      icon: 'fa-light fa-file-lines',
-      url: 'https://docs.lfx.linuxfoundation.org',
-      disabled: true,
-    },
-    {
-      label: 'Submit a Ticket',
-      icon: 'fa-light fa-circle-question',
-      url: 'https://jira.linuxfoundation.org/plugins/servlet/theme/portal/4',
-    },
-    {
-      label: 'Changelog',
-      icon: 'fa-light fa-rectangle-history',
-      routerLink: '/changelog',
-      disabled: true,
-    },
     {
       label: 'Settings',
       icon: 'fa-light fa-gear',

apps/lfx-one/src/app/layouts/main-layout/main-layout.component.html

@@ -1,6 +1,9 @@
 <!-- Copyright The Linux Foundation and each contributor to LFX. -->
 <!-- SPDX-License-Identifier: MIT -->
 
+<!-- Header Component -->
+<lfx-header></lfx-header>
+
 <div class="bg-white border-b border-gray-100 py-6 shadow-sm">
   <div class="container mx-auto px-8">
     <!-- Breadcrumb Navigation -->

apps/lfx-one/src/app/layouts/main-layout/main-layout.component.ts

@@ -9,6 +9,7 @@ import { CombinedProfile } from '@lfx-one/shared/interfaces';
 import { UserService } from '@services/user.service';
 import { AvatarComponent } from '@shared/components/avatar/avatar.component';
 import { BreadcrumbComponent } from '@shared/components/breadcrumb/breadcrumb.component';
+import { HeaderComponent } from '@shared/components/header/header.component';
 import { MenuItem } from 'primeng/api';
 import { ChipModule } from 'primeng/chip';
 import { finalize } from 'rxjs';
@@ -18,7 +19,7 @@ import { ProfileStatsComponent } from './components/profile-stats/profile-stats.
 @Component({
   selector: 'lfx-profile-layout',
   standalone: true,
-  imports: [CommonModule, RouterModule, AvatarComponent, BreadcrumbComponent, ChipModule, ProfileStatsComponent],
+  imports: [CommonModule, RouterModule, HeaderComponent, AvatarComponent, BreadcrumbComponent, ChipModule, ProfileStatsComponent],
   templateUrl: './profile-layout.component.html',
   styleUrl: './profile-layout.component.scss',
 })

apps/lfx-one/src/app/layouts/profile-layout/profile-layout.component.html

@@ -1,6 +1,9 @@
 <!-- Copyright The Linux Foundation and each contributor to LFX. -->
 <!-- SPDX-License-Identifier: MIT -->
 
+<!-- Header Component -->
+<lfx-header></lfx-header>
+
 <div class="bg-white border-b border-gray-100 py-6 shadow-sm min-h-60">
   <div class="container mx-auto px-8">
     <!-- Breadcrumb Navigation -->