Merge pull request #256 from Sterbenfr/fix/CalendarAndLogin

fix:Calendar route names fix and bad password login
Sterbenfr · Jul 30, 2024 · 44bb6d2 · 44bb6d2
2 parents 9163522 + 12836c6
commit 44bb6d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/app/api/events/route.ts b/app/api/events/route.ts
@@ -33,7 +33,7 @@ export async function GET(request: Request) {
 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const [interactionsrelance]: any[] = await connection.query(
-            'SELECT i.code_Entite_Prospectee, i.code_interaction AS id, i.date_relance AS date, CONCAT("Relance d\'interaction du don : ", i.code_interaction) AS title, e.code_societe_appartenance, e.nom_commercial FROM `Interactions` i LEFT JOIN `Entite` e ON e.code_entite = i.code_Entite_Prospectee',
+            'SELECT i.code_Entite_Prospectee, i.code_interaction AS id, i.date_relance AS date, CONCAT("Relance d\'interaction du don : ", e.nom_commercial) AS title, e.code_societe_appartenance, e.nom_commercial FROM `Interactions` i LEFT JOIN `Entite` e ON e.code_entite = i.code_Entite_Prospectee',
         )
 
         // Ajouter un préfixe aux identifiants pour éviter les conflits

diff --git a/app/login/page.tsx b/app/login/page.tsx
@@ -25,6 +25,10 @@ const LoginPage = () => {
             window.location.href = '/'
         } else if (result) {
             console.error(result.error)
+            const paragraph = document.querySelector('h3')
+            if (paragraph) {
+                paragraph.textContent = 'Mauvais mot de passe.'
+            }
         }
     }
 
@@ -164,6 +168,7 @@ const LoginPage = () => {
                     <button className={style.submit} type='submit'>
                         Se connecter
                     </button>
+                    <h3></h3>
                 </form>
             )}
         </div>