Merge branch 'develop'

Author: glibersat

.github/workflows/django.yml

@@ -48,7 +48,7 @@ jobs:
         uses: pre-commit/action@v3.0.1
 
       - name: Run Pre-commit checks
-        uses: pre-commit-ci/lite-action@v1.0.2
+        uses: pre-commit-ci/lite-action@v1.1.0
         if: always()
 
       - uses: borales/actions-yarn@v3.0.0

.pre-commit-config.yaml

@@ -8,20 +8,20 @@ repos:
       exclude_types: [sql]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.6
+  rev: v0.11.0
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
     - id: ruff-format
 
 - repo: https://github.com/adamchainz/django-upgrade
-  rev: "1.22.1"
+  rev: "1.23.1"
   hooks:
     - id: django-upgrade
       args: [--target-version, "5.0"]
 
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.6.0
+  rev: 0.6.6
   hooks:
     - id: uv-lock
     - id: uv-export

frontend_tests/cypress/e2e/auth/signupWithUi.cy.js

@@ -4,7 +4,7 @@ describe('The Signup Page', () => {
     '[name=last_name]': 'Successful',
     '[name=organization]': 'Signup Corp',
     '[name=organization_position]': 'Tester',
-    '[name=email]': 'signup@success.test',
+    '[name=email]': 'signup3@success.test',
     '[name=phone_no]': '0102030405',
     '[name=password1]': 'derpderp',
     '[name=password2]': 'derpderp',
@@ -25,7 +25,7 @@ describe('The Signup Page', () => {
       var iframe = doc.getElementById('id_captcha').querySelector('iframe');
       var innerDoc = iframe.contentDocument || iframe.contentWindow.document;
       innerDoc.querySelector('.recaptcha-checkbox').click();
-      cy.wait(200);
+      cy.wait(400);
       cy.get('[type=submit]').click();
 
       cy.location().should((loc) => {

frontend_tests/cypress/e2e/tools/tutorial/externalResourceTutorial.cy.js

@@ -0,0 +1,11 @@
+describe('I can follow the external resource tutorial', () => {
+  it('displays the launcher tutorial on the external resource', () => {
+    cy.login('conseiller1');
+    cy.visit('/project/27/actions');
+    cy.get("[data-test-id='create-task-button']").click();
+    cy.get("[data-cy='radio-push-reco-external-resource']").check({
+      force: true,
+    });
+    cy.get('[data-test-id="tutorial-project-launcher"]').should.exist;
+  });
+});

frontend_tests/cypress/fixtures/settings/challengeDefinition.json

@@ -24,5 +24,18 @@
       "site_id": 1,
       "week_inactivity_repeat": 0
     }
+  },
+  {
+    "model": "training.challengedefinition",
+    "pk": 3,
+    "fields": {
+      "name": "external-resources-proper-functioning",
+      "description": "external-resources-proper-functioning",
+      "next_challenge": null,
+      "code": "external-resources-proper-functioning",
+      "icon_name": null,
+      "site_id": 1,
+      "week_inactivity_repeat": 0
+    }
   }
 ]

recoco/apps/home/static/home/css/home/home.scss

@@ -90,31 +90,6 @@ span.step {
   line-height: 1.7em;
 }
 
-.custom-banner {
-  background-color: white;
-  border: 1px solid var(--background-action-high-blue-france);
-  color: var(--background-action-high-blue-france);
-  padding: 10px 20px;
-  width: fit-content;
-  position:absolute;
-  top:25px;
-  display: flex;
-  align-items: center;
-  border-radius: 1px;
-}
-
-.custom-banner a {
-  text-decoration: underline;
-}
-
-.custom-banner.left-banner {
-  left: -10px;
-  right: inherit;
-}
-
-.custom-banner.left-banner::after {
-  left: 0;
-}
 
 // .custom-banner::after {
 //   content: '';
@@ -131,17 +106,6 @@ span.step {
 //   border-top: 10px solid #3558a2;
 // }
 
-@media (max-width: 48em) {
-  .custom-banner {
-    display: flex;
-    flex-direction: column;
-    align-items: start;
-  }
-
-  .custom-banner a {
-    margin-top: 15px;
-  }
-}
 
 .imiteH6 {
   font-size: 1rem;
@@ -165,7 +129,128 @@ span.step {
   text-decoration: underline;
 }
 
-.dark-section {
-  background: var(--dark-accent-green-archipel-125, #1F2C2E);
-  color: white;
+
+// design hero des portails
+
+.hero-div {
+  margin: .5rem;
+  padding: .5rem;
+  margin-top: 2rem;
+
+  &__sub-container {
+    position: relative;
+  }
+
+  &__text-part {
+    width: 50%;
+    padding-left: 6rem;
+    padding-right: 1rem;
+    margin-top: 6rem;
+  }
+
+  &__dark-section {
+    background: var(--light-background-alt-blue-france, #F5F5FE);
+    padding-left: 120px;
+    padding-right: 120px;
+    padding-top: 80px;
+    padding-bottom: 80px;
+    margin-top: 40px;
+  }
+
+  &__dark-section h2 {
+    margin-bottom: 64px;
+  }
+
+  &__custom-banner {
+    background-color: white;
+    border: 1px solid var(--background-action-high-blue-france);
+    color: var(--background-action-high-blue-france);
+    padding: 10px 20px;
+    max-width: fit-content;
+    position: absolute;
+    top: 25px;
+    display: flex;
+    align-items: center;
+    border-radius: 1px;
+    margin-left: 6rem;
+  }
+
+    &__custom-banner a {
+    text-decoration: underline;
+  }
+}
+
+@media (max-width: 48em) {
+
+  .hero-div {
+    &__custom-banner {
+      display: flex;
+      align-items: start;
+    }
+  }
+}
+
+@media (min-width: 1100px) and (max-width: 1200px) {
+
+  .hero-div {
+    &__img-div img {
+      height: 450px;
+      width: 450px;
+    }
+  }
+}
+
+@media (max-width: 1100px) {
+
+  .hero-div {
+    text-align: center;
+    padding: 40px 40px 60px 40px;
+    &__sub-container {
+      position: static;
+    }
+    &__img-div {
+      display: none;
+    }
+    &__text-part {
+      width: 100%;
+      padding: 0px;
+      margin-top: 0px;
+    }
+    &__custom-banner {
+      position: static;
+      margin: auto;
+      margin-bottom: 32px;
+    }
+    &__custom-banner p {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      font-size: 14px;
+    }
+    &__custom-banner a {
+      white-space: nowrap;
+      font-size: 14px;
+    }
+    &__dark-section {
+      margin-top: 0px;
+      padding-left: 80px;
+      padding-right: 80px;
+      padding-top: 60px;
+      padding-bottom: 60px;
+    }
+  }
+}
+
+@media (max-width: 900px) {
+
+  .hero-div {
+    &__dark-section {
+      padding-left: 40px;
+      padding-right: 40px;
+    }
+    &__dark-section h2 {
+      text-align: center;
+    }
+  }
+
 }

recoco/apps/invites/tests.py

@@ -193,7 +193,7 @@ def test_invite_does_not_match_existing_account(request, client):
 def test_invite_matches_existing_account_for_logged_in_user(request, client):
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
-    with login(client) as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(models.Invite, site=current_site, email=user.email).make()
         url = reverse("invites-invite-details", args=[invite.pk])
         response = client.get(url)
@@ -209,7 +209,7 @@ def test_invite_matches_existing_account_redirects_anonyous_user_to_login(
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
     invited = Recipe(
-        auth_models.User, username="invited", email="invited@example.com"
+        auth_models.User, username="invited@example.com", email="invited@example.com"
     ).make()
 
     invite = Recipe(models.Invite, site=current_site, email=invited.email).make()
@@ -239,7 +239,7 @@ def test_accept_invite_returns_to_details_if_get(request, client):
 def test_accept_invite_matches_existing_account(request, client, project):
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
-    with login(client) as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite, project=project, site=current_site, email=user.email
         ).make()
@@ -261,7 +261,7 @@ def test_accept_invite_as_switchtender_triggers_notification(request, client, pr
     )
     project.projectmember_set.add(membership)
 
-    with login(client) as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         user.profile.sites.add(current_site)
         invite = Recipe(
             models.Invite,
@@ -288,7 +288,7 @@ def test_accept_invite_as_team_member_triggers_notification(request, client, pro
 
     project.projectmember_set.add(membership)
 
-    with login(client) as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite,
             project=project,
@@ -336,7 +336,7 @@ def test_logged_in_user_accepts_invite_advisor_with_matching_existing_account(
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
 
-    with login(client, email="invited@here.tld") as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite,
             site=current_site,
@@ -365,7 +365,7 @@ def test_logged_in_user_accepts_invite_observer_with_matching_existing_account(
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
 
-    with login(client, email="invited@here.tld") as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite,
             site=current_site,
@@ -424,7 +424,7 @@ def test_logged_in_user_accepts_invite_collaborator_with_matching_existing_accou
 ):
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
-    with login(client, email="invited@here.tld") as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite,
             role="COLLABORATOR",
@@ -483,7 +483,7 @@ def test_anonymous_accepts_invite_with_existing_account_fails(
     baker.make(home_models.SiteConfiguration, site=current_site)
 
     invited = Recipe(
-        auth_models.User, username="invited", email="invited@example.com"
+        auth_models.User, username="invited@example.com", email="invited@example.com"
     ).make()
 
     invite = Recipe(
@@ -642,7 +642,7 @@ def test_accepting_invitation_updates_organization_with_current_site(
 def test_logged_in_user_accepts_invite_but_is_already_member(request, client, project):
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
-    with login(client, email="invited@here.tld") as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite,
             role="COLLABORATOR",
@@ -670,7 +670,7 @@ def test_logged_in_user_accepts_invite_but_is_already_advisor(
 ):
     current_site = get_current_site(request)
     baker.make(home_models.SiteConfiguration, site=current_site)
-    with login(client, email="invited@here.tld") as user:
+    with login(client, email="invited@here.tld", username="invited@here.tld") as user:
         invite = Recipe(
             models.Invite,
             role="OBSERVER",

recoco/apps/invites/views.py

@@ -27,7 +27,7 @@ def invite_accept(request, invite_id):
     # Check if this email already exists as an account
     existing_account = None
     try:
-        existing_account = auth_models.User.objects.get(email=invite.email)
+        existing_account = auth_models.User.objects.get(username=invite.email)
     except auth_models.User.DoesNotExist:
         pass
 
@@ -105,7 +105,7 @@ def invite_details(request, invite_id):
     # Check if this email already exists as an account
     existing_account = None
     try:
-        existing_account = auth_models.User.objects.get(email=invite.email)
+        existing_account = auth_models.User.objects.get(username=invite.email)
     except auth_models.User.DoesNotExist:
         pass
 

recoco/apps/projects/templates/projects/project/administration_panel.html

@@ -83,7 +83,7 @@ <h6 class="text-uppercase fw-bold d-block fr-mb-2w font-small">informations gén
                                                    for="input-project-description">
                                                 {{ project_form.description.label }}
                                             </label>
-                                            <textarea maxlength="500"
+                                            <textarea
                                                       class="placeholder-grey form-control {% if project_form.description.errors %}is-invalid{% endif %} textarea-size"
                                                       id="input-project-description"
                                                       name="{{ project_form.description.name }}"