Skip to content

Comments

Fusion finale de dev dans main#5

Merged
sabek13 merged 5 commits intomainfrom
dev
May 28, 2025
Merged

Fusion finale de dev dans main#5
sabek13 merged 5 commits intomainfrom
dev

Conversation

@sabek13
Copy link
Collaborator

@sabek13 sabek13 commented May 28, 2025 •
edited by qodo-code-review bot
Loading

PR Type

Enhancement

Description

  • Major overhaul and modernization of the homepage (index.html), contact page (contact.html), and presentation page (presentation.html) with improved structure, expanded content, and consistent layout.

  • Complete rewrite and enhancement of the 404 page CSS (css/style-404.css) for better styling, responsiveness, and unified design.

  • Reformatted and reindented HTML files for improved readability and maintainability.

  • Unified navigation bars across pages using a modern Bootstrap structure, including dropdowns and updated menu items.

  • Expanded Instagram and footer sections with additional images and refined layouts for visual consistency.

  • Added new activity overlays, news cards, and improved button/link classes for a cohesive user experience.

Changes walkthrough 📝

Relevant files
Enhancement
index.html
Major homepage structure overhaul, new sections, and content expansion

index.html

  • Reformatted and reindented the HTML for improved readability and
    consistency.
  • Added duplicate or nested navigation menus and carousel sections,
    possibly as a result of a merge conflict.
  • Introduced additional activity and news cards, and expanded Instagram
    and footer sections with more images and content.
  • Added new classes and structure for activity overlays and news cards,
    and updated button/link classes for visual consistency.
    		• +653/-589
    presentation.html
    Presentation page layout and structure improvements           

    presentation.html

  • Reformatted and reindented the HTML for improved readability and
    consistency.
  • Simplified and cleaned up the navigation bar and section structures.
  • Updated the layout of the training section, carousel, and activity
    descriptions for clarity.
  • Improved footer and Instagram sections for consistency with the
    homepage.
    		• +342/-483
    style-404.css
    Complete rewrite and enhancement of 404 page CSS                 

    css/style-404.css

  • Rewrote and expanded the CSS for the 404 page, including new classes
    for overlays, responsive images, and message styling.
  • Added detailed styles for the 404 message, button, and responsive
    behavior.
  • Resolved merge conflict markers and unified the style definitions.
    		• +84/-17 
    contact.html
    Major refactor and modernization of contact page layout and navigation

    contact.html

  • Reformatted and cleaned up the HTML structure for improved readability
    and consistency.
  • Rewrote the navigation bar to use a unified, more modern Bootstrap
    structure, adding dropdowns and updating menu items.
  • Refactored the contact form section for better layout and field
    grouping, aligning with the new navigation structure.
  • Enhanced the Instagram and footer sections with more detailed markup,
    additional images, and improved layout.
    		• +307/-242
    Need help?
  • Type /help how to ... in the comments thread for any questions about Qodo Merge usage.
  • Check out the documentation for more information.
    •

    @qodo-code-review
    Copy link

    qodo-code-review bot commented May 28, 2025

    PR Reviewer Guide 🔍

    Here are some key observations to aid the review process:

    ⏱️ Estimated effort to review: 4 🔵🔵🔵🔵⚪
    🧪 No relevant tests
    🔒 No security concerns identified
    ⚡ Recommended focus areas for review

    Duplicate Navigation

    There are two identical navigation sections in the navbar that create redundant code. This duplication appears between lines 111-179 and 182-201, causing potential maintenance issues.

     
    <div class="collapse navbar-collapse justify-content-center" id="navbarNavDropdown">
  <ul class="navbar-nav color-menu font-oswald text-17px">
    <li class="nav-item hover-menu">
      <a class="nav-link active" aria-current="page" href="./404.html">L'EQUIPE</a>
    </li>

    <li class="nav-item dropdown">
      <a class="nav-link dropdown-toggle hover-menu" href="#" role="button" data-bs-toggle="dropdown"
        aria-expanded="false">
        LES ACTIVITÉS
      </a>
      <ul class="dropdown-menu bg-black z-3 ps-3">
        <li>
          <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./404.html">
            LE CYCLING
          </a>
        </li>
        <li>
          <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./presentation.html">
            LE TRAINING FONCTIONNEL
          </a>
        </li>
        <li>
          <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./404.html">
            LE CROSSFIT
          </a>
        </li>
        <li>
          <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./404.html">
            PERSONAL TRAINING - COACH PERSONNEL
          </a>
        </li>
      </ul>
    </li>


    <li class="nav-item hover-menu">
      <a class="nav-link" href="./404.html">NOS OFFRES</a>
    </li>
    <li class="nav-item hover-menu">
      <a class="nav-link" href="./404.html">PLANNING</a>
    </li>
    <li class="nav-item hover-menu">
      <a class="nav-link" href="./404.html">BLOG</a>
    </li>
    <li class="nav-item hover-menu">
      <a class="nav-link" href="./contact.html">CONTACT</a>
    </li>

    <li class="nav-item d-flex align-items-center mx-lg-1">
      <a class="nav-link d-flex align-items-center justify-content-center gap-2 me-2" href="#">
        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor"
          class="bi bi-phone" viewBox="0 0 16 16">
          <path
            d="M11 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM5 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z" />
          <path d="M8 14a1 1 0 1 0 0-2 1 1 0 0 0 0 2" />
        </svg>
        05.59.47.84.18
      </a>
    </li>
    <li class="nav-item d-flex justify-content-center p-0 align-items-center gap-1">
      <a href="https://www.facebook.com" class="icon fhover" aria-label="Facebook" target="_blank"></a>
      <a href="https://www.instagram.com" class="icon ihover" aria-label="Instagram" target="_blank"></a>
      <a href="https://www.tripadvisor.fr" class="icon thover" aria-label="Tripadvisor" target="_blank"></a>
    </li>
    <li class="language-badge d-none d-lg-block mx-3">
      <a href="#" class="language-text" aria-label="Changer la langue en anglais">EN</a>
    </li>
  </ul>
    Duplicate Activity Sections

    The activities section contains duplicated content with identical activity cards appearing twice in the code. This redundancy occurs between lines 332-402 and 403-446.

     
      <div class="col-lg-3 col-md-6 col-sm-6 col-12 position-relative">
    <img src="./assets/img/activites/bg_activite_2.jpg" alt="cycling" class="img-fluid w-100" />
    <div class="overlay d-flex flex-column align-items-center justify-content-center">
      <img src="./assets/img/activites/icon_velo.png" alt="Icon Cycling" />
      <h5 class="text-white mb-2">CYCLING</h5>
      <p class="fw-light text-center">
        Le service 100% individualisé adapté à vos disponibilités, votre
        condition physique et vos objectifs.
      </p>
      <a href="./404.html" target="_blank" class="mt-3 text-white read-more underline-center">
        EN SAVOIR PLUS
      </a>
    </div>
  </div>
  <div class="col-lg-3 col-md-6 col-sm-6 col-12 position-relative">
    <img src="./assets/img/activites/bg_activite_3.jpg" alt="Training Fonctionnel" class="img-fluid w-100" />
    <div class="overlay d-flex flex-column align-items-center justify-content-center">
      <img src="./assets/img/activites/icon_corde.png" alt="Icon Training Fonctionnel" />
      <h5 class="text-white mb-2">TRAINING FONCTIONNEL</h5>
      <p class="fw-light text-center">
        Le service 100% individualisé adapté à vos disponibilités, votre
        condition physique et vos objectifs.
      </p>
      <a href="./404.html" target="_blank" class="mt-3 text-white read-more underline-center">
        EN SAVOIR PLUS
      </a>
    </div>
  </div>
  <div class="col-lg-3 col-md-6 col-sm-6 col-12 position-relative">
    <img src="./assets/img/activites/bg_activite_4.jpg" alt="CrossFit" class="img-fluid w-100" />
    <div class="overlay d-flex flex-column align-items-center justify-content-center">
      <img src="./assets/img/activites/icon_alter.png" alt="Icon CrossFit" />
      <h5 class="text-white mb-2">CROSSFIT</h5>
      <p class="fw-light text-center">
        Le service 100% individualisé adapté à vos disponibilités, votre
        condition physique et vos objectifs.
      </p>
      <a href="./404.html" target="_blank" class="mt-3 text-white fw-normal read-more underline-center">
        EN SAVOIR PLUS
      </a>

    </div>
  </div>
</div>
    Merge Conflicts

    There are unresolved merge conflicts in the file with conflict markers (<<<<<<< HEAD, =======, >>>>>>> sabrina) that need to be resolved before deployment.

     
    <<<<<<< HEAD
          <div
            class="collapse navbar-collapse justify-content-center"
            id="navbarNavDropdown"
          >
            <ul class="navbar-nav color-menu font-oswald">
              <li class="nav-item hover-menu">
                <a class="nav-link" aria-current="page" href="./404.html"
                  >L'EQUIPE</a
                >
              </li>

              <li class="nav-item dropdown">
                <a
                  class="nav-link dropdown-toggle hover-menu"
                  href="#"
                  role="button"
                  data-bs-toggle="dropdown"
                  aria-expanded="false"
                >
                  LES ACTIVITÉS
                </a>
                <ul class="dropdown-menu bg-black z-3 px-2">
                  <li>
                    <a
                      class="dropdown-item text-white hover-dropdown ps-3-responsive"
                      href="./404.html"
                    >
                      LE CYCLING
                    </a>
                  </li>
                  <li>
                    <a
                      class="dropdown-item text-white hover-dropdown ps-3-responsive"
                      href="./presentation.html"
                    >
                      LE TRAINING FONCTIONNEL
                    </a>
                  </li>
                  <li>
                    <a
                      class="dropdown-item text-white hover-dropdown ps-3-responsive"
                      href="./404.html"
                    >
                      LE CROSSFIT
                    </a>
                  </li>
                  <li>
                    <a
                      class="dropdown-item text-white hover-dropdown ps-3-responsive"
                      href="./404.html"
                    >
                      PERSONAL TRAINING - COACH PERSONNEL
                    </a>
                  </li>
                </ul>
              </li>

              <li class="nav-item hover-menu">
                <a class="nav-link" href="./404.html">NOS OFFRES</a>
              </li>
              <li class="nav-item hover-menu">
                <a class="nav-link" href="./404.html">PLANNING</a>
              </li>
              <li class="nav-item hover-menu">
                <a class="nav-link" href="./404.html">BLOG</a>
              </li>
              <li class="nav-item hover-menu">
                <a class="nav-link active contact-link" href="./contact.html">CONTACT</a>
              </li>
=======
        <div class="collapse navbar-collapse justify-content-center" id="navbarNavDropdown">
          <ul class="navbar-nav color-menu font-oswald text-17px">
            <li class="nav-item hover-menu">
              <a class="nav-link active" aria-current="page" href="./404.html">L'EQUIPE</a>
            </li>

            <li class="nav-item dropdown">
              <a class="nav-link dropdown-toggle hover-menu" href="#" role="button" data-bs-toggle="dropdown"
                aria-expanded="false">
                LES ACTIVITÉS
              </a>
              <ul class="dropdown-menu bg-black z-3 ps-3">
                <li>
                  <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./404.html">
                    LE CYCLING
                  </a>
                </li>
                <li>
                  <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./presentation.html">
                    LE TRAINING FONCTIONNEL
                  </a>
                </li>
                <li>
                  <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./404.html">
                    LE CROSSFIT
                  </a>
                </li>
                <li>
                  <a class="dropdown-item text-white hover-dropdown ps-3-responsive" href="./404.html">
                    PERSONAL TRAINING - COACH PERSONNEL
                  </a>
                </li>
              </ul>
            </li>

            <li class="nav-item hover-menu">
              <a class="nav-link" href="./404.html">NOS OFFRES</a>
            </li>
            <li class="nav-item hover-menu">
              <a class="nav-link" href="./404.html">PLANNING</a>
            </li>
            <li class="nav-item hover-menu">
              <a class="nav-link" href="./404.html">BLOG</a>
            </li>
            <li class="nav-item hover-menu">
              <a class="nav-link" href="./contact.html">CONTACT</a>
            </li>
>>>>>>> sabrina

    @sabek13 sabek13 merged commit 9db3af7 into main May 28, 2025
    3 checks passed
    @qodo-code-review
    Copy link

    qodo-code-review bot commented May 28, 2025

    PR Code Suggestions ✨

    Explore these optional code suggestions:

    CategorySuggestion                                                                                                                                    Impact
    Possible issue
    Fix merge conflict in carousel

    Fix the broken carousel structure by removing the merge conflict marker
    (=======) and the duplicate carousel-inner div that follows it. This will
    prevent the carousel from breaking.

    index.html [242-252]

     <div class="carousel-item">
   <img src="./assets/img/slider/slide_3.jpg" class="d-block w-100" alt="Slide 3" />
   <div class="carousel-caption d-block text-white text-center">
     <h2 class="mb-4">
       2 INSCRIPTIONS SIMULTANÉES + UN 3ÈME ABONNEMENT DE 6 MOIS OFFERT
       !
     </h2>
     <a href="./404.html" class="btn btn-outline-light btn-slider-info">PLUS D'INFOS</a>
   </div>
-  =======
-  <div class="carousel-inner">
+</div>
    • Apply / Chat
    Suggestion importance[1-10]: 10

    __

    Why: This identifies a critical merge conflict marker (=======) left in the code that completely breaks the HTML structure and prevents the carousel from functioning properly.

    		High
    Resolve merge conflict

    There's a merge conflict in the navigation section that needs to be resolved.
    The conflict markers (<<<<<<< HEAD, =======, >>>>>>> sabrina) are present in the
    HTML, which will cause rendering issues and break the page functionality.

    contact.html [145-149]

     <div class="collapse navbar-collapse justify-content-center" id="navbarNavDropdown">
-  <ul class="navbar-nav color-menu font-oswald text-17px">
+  <ul class="navbar-nav color-menu font-oswald">
     <li class="nav-item hover-menu">
-      <a class="nav-link active" aria-current="page" href="./404.html">L'EQUIPE</a>
+      <a class="nav-link" aria-current="page" href="./404.html">L'EQUIPE</a>
     </li>
    • Apply / Chat
    Suggestion importance[1-10]: 10

    __

    Why: Merge conflict markers in HTML will completely break the page rendering and functionality. This is a critical issue that must be resolved.

    		High
    Fix CSS merge conflicts

    The CSS file contains unresolved merge conflict markers that will prevent the
    styles from being properly applied. Remove all conflict markers (<<<<<<< HEAD,
    =======, >>>>>>> sabrina) and keep only one version of each conflicting section.

    css/style-404.css [22-25]

     /* ==========================================================================
   2. Section 404
   ========================================================================== */
-<<<<<<< HEAD
-   .image-section {
-     position: relative;
-     height: 100vh;
-     overflow: hidden;
-...
-=======
 .image-section {
   position: relative;
   height: 100vh;
   overflow: hidden;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}

    [To ensure code accuracy, apply this suggestion manually]

    Suggestion importance[1-10]: 10

    __

    Why: Merge conflict markers in CSS will prevent styles from being applied correctly, breaking the visual layout. This is a critical issue.

    		High
    Remove duplicate navigation menu

    Remove the duplicate navigation menu that appears nested inside the first menu.
    This duplicate menu creates redundant elements and will cause layout and
    functionality issues.

    index.html [111-115]

     <div class="collapse navbar-collapse justify-content-center" id="navbarNavDropdown">
-  <ul class="navbar-nav color-menu font-oswald text-17px">
+  <ul class="navbar-nav color-menu font-oswald">
     <li class="nav-item hover-menu">
-      <a class="nav-link active" aria-current="page" href="./404.html">L'EQUIPE</a>
+      <a class="nav-link" aria-current="page" href="./404.html">L'EQUIPE</a>
     </li>
    • Apply / Chat
    Suggestion importance[1-10]: 8

    __

    Why: This identifies a critical duplication issue where there are two complete navigation menus nested within each other. This creates invalid HTML structure and will cause functionality problems.

    		Medium
    Fix nested column structure

    Fix the nested column structure in the news cards section by properly closing
    the parent divs before starting new columns. The current structure creates
    invalid HTML nesting.

    index.html [519-537]

     <div class="col-md-4">
   <div class="card border-0 h-100">
     <img src="./assets/img/news3.jpg" alt="HIIT" class="news-image" />
     <div class="d-flex flex-column">
       <p class="my-2">18 OCTOBRE 2018</p>
       <h5 class="fw-bold">
         TITRE DE L'ACTUALITÉ SUR UNE OU DEUX LIGNES EN MAJUSCULES
       </h5>
       <p>
         Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed
         do eiusmod tempor incididunt ut labore et dolore magna aliqua
         veniam...
       </p>
       <a href="./404.html" class="btn-border-b-responsive anim-none-responsive mt-auto style-link">
         LIRE LA SUITE
       </a>
     </div>
+  </div>
+</div>
 
-    <div class="col-md-4">
-

    [To ensure code accuracy, apply this suggestion manually]

    Suggestion importance[1-10]: 8

    __

    Why: This correctly identifies improper HTML nesting where column divs are not properly closed, creating invalid Bootstrap grid structure that will cause layout issues.

    		Medium
    • More

    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

    Reviewers

    No reviews

    Assignees

    No one assigned

    Labels

    Review effort 4/5

    Projects

    None yet

    Milestone

    No milestone

    Development

    Successfully merging this pull request may close these issues.

    1 participant

    @sabek13