Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Oct 16, 2025

Merge Conflicts Resolved βœ…

I have successfully resolved the merge conflicts that occurred when rebasing the Timeline component branch onto the latest main branch.

πŸ”§ Conflicts Resolved

  1. config/services.yaml:

    • βœ… Kept the correct Widget component registration from main: Enabel\Ux\Component\Widget\Widget with proper template path @EnabelUx/widget/widget.html.twig
    • βœ… Added Timeline component registration: Enabel\Ux\Component\Timeline\Timeline with template @EnabelUx/timeline/timeline.html.twig
    • βœ… Removed duplicate/incorrect Widget registration I had previously added
  2. docs/index.md:

    • βœ… Added Timeline component to the documentation index
    • βœ… Kept correct Widget documentation path: widget/widget.md
    • βœ… Maintained proper alphabetical ordering

πŸ“Š Current Status

  • All 158 tests pass (including 15 Timeline component tests)
  • Branch successfully rebased onto latest main (commit ccc1465)
  • No merge conflict markers remain
  • Timeline component properly integrated alongside existing Widget component

πŸ”„ Changes Made

  • Rebased branch from 7dcb57c to ccc1465 (latest main)
  • Resolved service registration conflicts between Timeline and Widget components
  • Maintained clean git history while preserving all Timeline component functionality

The Timeline component is now fully compatible with the latest main branch and ready for merge! πŸŽ‰

Original prompt

This section details on the original issue you should resolve

<issue_title>Add a Timeline component</issue_title>
<issue_description>Description:
Implement a reusable Twig component, visually and structurally, aligned with the Enabel Bootstrap Theme Timeline.
The component must use Symfony UX Icons for any iconography.

References:

Tasks:

  • Analyze the Timeline.astro structure and extract relevant HTML patterns.
  • Create a new Twig component in the bundle.
  • Ensure full compatibility with Enabel Bootstrap Theme.
  • Integrate Symfony UX Icons for all visual indicators (timeline dots, steps, etc.).
  • Allow dynamic rendering through parameters (title, items, orientation, etc.).
  • Provide a usage example in a demo template or documentation page.
  • Validate responsiveness and accessibility.

Acceptance Criteria:

  • The Twig component reproduces the Enabel Theme timeline design.
  • All icons are rendered using Symfony UX Icons
  • Supports both vertical and horizontal layouts if applicable.
  • No inline CSS or JavaScript; all styles rely on Enabel Bootstrap Theme classes.
  • The component is configurable through variables passed from the controller or parent template:
    {{ component('Enabel:Ux:Timeline', {
        title: 'Project milestones',
        items: [
            { date: '2024-01-10', label: 'Kick-off', icon: 'lucide:flag' },
            { date: '2024-03-20', label: 'First delivery', icon: 'lucide:package' },
        ]
    }) }}
    ```</issue_description>
    

Comments on the Issue (you are @copilot in this section)

Fixes #7


✨ Let Copilot coding agent set things up for you β€” coding agent works faster and does higher quality work when set up for your repo.

Copilot AI and others added 2 commits October 16, 2025 10:07
…d demo

Co-authored-by: damienlagae <2233003+damienlagae@users.noreply.github.com>
…n and icon safety check

Co-authored-by: damienlagae <2233003+damienlagae@users.noreply.github.com>
Copilot AI changed the title [WIP] Add reusable Timeline component with Symfony UX Icons Add Timeline component with Enabel Bootstrap Theme integration and Symfony UX Icons Oct 16, 2025
Copilot AI requested a review from damienlagae October 16, 2025 10:17
@damienlagae
Copy link
Member

@copilot resolve conflict

Copy link
Contributor Author

Copilot AI commented Oct 16, 2025

@copilot resolve conflict

Conflict resolved! βœ…

I've successfully rebased the branch onto the latest main branch and resolved the merge conflicts in:

  • config/services.yaml: Kept the proper Widget component registration from main and added Timeline component
  • docs/index.md: Added Timeline component while maintaining correct Widget documentation path

The branch is now up-to-date with main (commit ccc1465) and all 158 tests pass. The Timeline component is ready for merge without any conflicts.

@damienlagae damienlagae marked this pull request as ready for review October 16, 2025 12:07
@damienlagae damienlagae merged commit 673a1bd into main Oct 16, 2025
7 checks passed
@damienlagae damienlagae deleted the copilot/add-timeline-component branch October 16, 2025 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add a Timeline component

2 participants