reverse useAuth to its initial version

the-collab-lab · May 15, 2024 · 15eeccc · 15eeccc
1 parent 2c29951
commit 15eeccc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/api/useAuth.jsx b/src/api/useAuth.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { auth } from './config.js';
-import { GoogleAuthProvider, signInWithPopup } from 'firebase/auth';
+import { GoogleAuthProvider, signInWithRedirect } from 'firebase/auth';
 import { addUserToDatabase } from './firebase.js';
 
 /**
@@ -10,7 +10,7 @@ import { addUserToDatabase } from './firebase.js';
  */
 export const SignIn = () => {
 	try {
-		signInWithPopup(auth, new GoogleAuthProvider());
+		signInWithRedirect(auth, new GoogleAuthProvider());
 	} catch (error) {
 		console.log('error', error);
 	}

diff --git a/src/components/DeleteItem.jsx b/src/components/DeleteItem.jsx
@@ -34,12 +34,14 @@ const DeleteItem = ({ itemName, listPath, itemId }) => {
 		</Trans>
 	);
 
+	const deleteItemName = t('DeleteItemName', { itemName });
+
 	return (
 		<>
 			<button
 				onClick={openConfirm}
-				aria-label={`Delete ${itemName}`}
-				title={`Delete ${itemName}`}
+				aria-label={deleteItemName}
+				title={deleteItemName}
 				className="px-2 text-darkPurple rounded-md transition ease-in-out hover:text-alertRed focus:text-alertRed"
 			>
 				<i className="fa-solid fa-trash"></i>

diff --git a/src/components/DeleteList.jsx b/src/components/DeleteList.jsx
@@ -25,11 +25,7 @@ const DeleteList = ({ user, email, listPath, listName, setListPath }) => {
 
 	const listNameUppercase = listName.toUpperCase();
 
-	const buttonTranslated = (
-		<Trans i18nKey="ButtonDeleteList" listNameUppercase={listNameUppercase}>
-			Delete {{ listNameUppercase }}
-		</Trans>
-	);
+	const buttonTranslated = t('ButtonDeleteList', { listNameUppercase });
 
 	const titleTranslated = (
 		<Trans i18nKey="ModalDeleteListTitle" listNameUppercase={listNameUppercase}>

diff --git a/src/i18n.js b/src/i18n.js
@@ -78,6 +78,7 @@ const resources = {
 			ModalDeleteItemTitle: 'Delete {{itemNameUppercase}}',
 			ModalDeleteItemText:
 				'Do you really want to delete {{itemNameUppercase}} from this list?',
+			DeleteItemName: 'Delete {{itemName}}',
 
 			// confirm component
 			Confirm: 'Confirm',
@@ -166,6 +167,7 @@ const resources = {
 			ModalDeleteItemTitle: 'Supprimer {{itemNameUppercase}}',
 			ModalDeleteItemText:
 				'Souhaitez-vous définitivement supprimer {{itemNameUppercase}} de votre liste ?',
+			DeleteItemName: 'Supprimer {{itemName}}',
 
 			// confirm component
 			Confirm: 'Confirmer',