✨ Added data loading text to each pages

app/manifest.ts

@@ -11,7 +11,7 @@ const manifest = (): MetadataRoute.Manifest => ({
 	theme_color: '#d94253',
 	icons: [
 		{
-			src: '/logo.png',
+			src: '/logo-transparent.png',
 			sizes: '1024x1024',
 			type: 'image/png',
 		},

app/my-loves/hooks/useActions.ts

@@ -1,4 +1,5 @@
 export const useActions = ({
+	setIsLoading,
 	loveToDelete,
 	setLoveToDelete,
 	setDeleteMessage,
@@ -19,6 +20,7 @@ export const useActions = ({
 	};
 
 	const deleteLove = async () => {
+		setIsLoading(true);
 		const token = localStorage.getItem('token');
 
 		try {
@@ -43,6 +45,7 @@ export const useActions = ({
 		}
 
 		setDeleteMessage("Une erreur s'est produite. Veuillez réessayer");
+		setIsLoading(false);
 	};
 
 	return {

app/my-loves/hooks/useData.ts

@@ -11,12 +11,17 @@ import { getDataset } from '@/app/request';
 // ---------------------------------------------------------------------------------------------------------------------
 
 export const useData = () => {
+	const [isLoading, setIsLoading] = useState(true);
 	const [dataset, setDataset] = useState([]);
 	const [loveToDelete, setLoveToDelete] = useState<string | null>(null);
 	const [deleteMessage, setDeleteMessage] = useState<string | null>(null);
 
 	useEffect(() => {
-		refreshDataset();
+		(async () => {
+			setIsLoading(true);
+			await refreshDataset();
+			setIsLoading(false);
+		})();
 	}, []);
 
 	const refreshDataset = async () => {
@@ -35,6 +40,8 @@ export const useData = () => {
 	};
 
 	return {
+		isLoading,
+		setIsLoading,
 		dataset,
 		loveToDelete,
 		setLoveToDelete,

app/my-loves/page.tsx

@@ -17,10 +17,13 @@ import { useActions } from './hooks/useActions';
 // ------------------------------------------------- Assets & Styles ---------------------------------------------------
 import PenIcon from '@/assets/PenIcon';
 import './styles.scss';
+import Loader from '@/assets/Loader';
 // ---------------------------------------------------------------------------------------------------------------------
 
 const MyLoves = () => {
 	const {
+		isLoading,
+		setIsLoading,
 		dataset,
 		loveToDelete,
 		setLoveToDelete,
@@ -30,6 +33,7 @@ const MyLoves = () => {
 	} = useData();
 
 	const { handleEdit, openPopup, closePopup, deleteLove } = useActions({
+		setIsLoading,
 		loveToDelete,
 		setLoveToDelete,
 		setDeleteMessage,
@@ -42,37 +46,41 @@ const MyLoves = () => {
 				<p className='title'>Mes loves</p>
 			</div>
 
-			<div className='myLovesList'>
+			{isLoading ? (
-				{dataset.map((love) => (
+				<p className='loader'>Chargement...</p>
-					<div
+			) : (
-						key={love.id}
+				<div className='myLovesList'>
-						className='loveItem'
+					{dataset.map((love) => (
-					>
+						<div
-						<div className='infos'>
+							key={love.id}
-							<p className='location'>{love.location}</p>
+							className='loveItem'
-							<p className='comment'>{love.comment || '-'}</p>
+						>
-							<p className='date'>Le: {love.createdat}</p>
+							<div className='infos'>
-						</div>
+								<p className='location'>{love.location}</p>
+								<p className='comment'>{love.comment || '-'}</p>
+								<p className='date'>Le: {love.createdat}</p>
+							</div>
 
-						<div className='actionButtons'>
+							<div className='actionButtons'>
-							<button
+								<button
-								type='button'
+									type='button'
-								className='actionButton'
+									className='actionButton'
-								onClick={() => handleEdit(love.id)}
+									onClick={() => handleEdit(love.id)}
-							>
+								>
-								<PenIcon />
+									<PenIcon />
-							</button>
+								</button>
-							<button
+								<button
-								type='button'
+									type='button'
-								className='actionButton'
+									className='actionButton'
-								onClick={() => openPopup(love.id)}
+									onClick={() => openPopup(love.id)}
-							>
+								>
-								<TrashIcon />
+									<TrashIcon />
-							</button>
+								</button>
+							</div>
 						</div>
-					</div>
+					))}
-				))}
+				</div>
-			</div>
+			)}
 
 			{loveToDelete && (
 				<ConfirmPopup

app/my-loves/styles.scss

@@ -24,6 +24,11 @@
 		color: #ffffff;
 	}
 
+	& > .loader {
+		margin: auto;
+		color: #d94253;
+	}
+
 	& > .myLovesList {
 		display: flex;
 		flex-direction: column;

app/settings/hooks/useData.ts

@@ -1,4 +1,10 @@
+// ---------------------------------------------------------------------------------------------------------------------
+//!                                                      Imports
+// ---------------------------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------- React & Next -----------------------------------------------------
 import { useEffect, useState } from 'react';
+// ---------------------------------------------------------------------------------------------------------------------
 
 export const useData = () => {
 	const [userData, setUserData] = useState(null);

app/settings/page.tsx

@@ -45,10 +45,6 @@ const Settings = () => {
 		setPasswordMessage,
 	});
 
-	if (!userData) {
-		return;
-	}
-
 	return (
 		<div className='settings'>
 			<div className='header'>
@@ -65,93 +61,97 @@ const Settings = () => {
 				<p className='title'>Éditer le profil</p>
 			</div>
 
-			<div className='settingsContainer'>
+			{!userData ? (
-				{usernameMessage && (
+				<p className='loading'>Chargement...</p>
-					<p className='message'>{usernameMessage}</p>
+			) : (
-				)}
+				<div className='settingsContainer'>
-
+					{usernameMessage && (
-				<form
+						<p className='message'>{usernameMessage}</p>
-					className='card'
-					onSubmit={updateUsername}
-				>
-					<p className='cardTitle'>Nom d&apos;utilisateur</p>
-
-					<Input
-						type='text'
-						name='username'
-						placeholder="Nom d'utilisateur"
-						defaultValue={userData.username}
-						autoComplete='username'
-						required
-					/>
-
-					<button
-						type='submit'
-						className='submitButton'
-					>
-						Appliquer
-					</button>
-				</form>
-
-				<form
-					className='card'
-					onSubmit={updatePassword}
-				>
-					<p className='cardTitle'>Modifier le mot de passe</p>
-
-					{passwordMessage && (
-						<p className='message'>{passwordMessage}</p>
 					)}
 
-					<div className='inputsContainer'>
+					<form
+						className='card'
+						onSubmit={updateUsername}
+					>
+						<p className='cardTitle'>Nom d&apos;utilisateur</p>
+
 						<Input
-							type='password'
+							type='text'
-							name='currentPassword'
+							name='username'
-							placeholder='Mot de passe actuel'
+							placeholder="Nom d'utilisateur"
-							autoComplete='password'
+							defaultValue={userData.username}
+							autoComplete='username'
 							required
 						/>
-						<Input
+
-							type='password'
+						<button
-							name='newPassword'
+							type='submit'
-							placeholder='Nouveau mot de passe'
+							className='submitButton'
-							autoComplete='off'
+						>
-							required
+							Appliquer
-						/>
+						</button>
-						<Input
+					</form>
-							type='password'
+
-							name='confirmNewPassword'
+					<form
-							placeholder='Confirmer le nouveau mot de passe'
+						className='card'
-							autoComplete='off'
+						onSubmit={updatePassword}
-							required
+					>
-						/>
+						<p className='cardTitle'>Modifier le mot de passe</p>
-					</div>
+
+						{passwordMessage && (
+							<p className='message'>{passwordMessage}</p>
+						)}
+
+						<div className='inputsContainer'>
+							<Input
+								type='password'
+								name='currentPassword'
+								placeholder='Mot de passe actuel'
+								autoComplete='password'
+								required
+							/>
+							<Input
+								type='password'
+								name='newPassword'
+								placeholder='Nouveau mot de passe'
+								autoComplete='off'
+								required
+							/>
+							<Input
+								type='password'
+								name='confirmNewPassword'
+								placeholder='Confirmer le nouveau mot de passe'
+								autoComplete='off'
+								required
+							/>
+						</div>
+
+						<button
+							type='submit'
+							className='submitButton'
+						>
+							Appliquer
+						</button>
+					</form>
 
 					<button
-						type='submit'
+						className='deleteButton'
-						className='submitButton'
+						onClick={handleDeleteUser}
 					>
-						Appliquer
+						<TrashIcon />
+						Supprimer mon compte
 					</button>
-				</form>
 
-				<button
+					{isPopupDisplayed && (
-					className='deleteButton'
+						<ConfirmPopup
-					onClick={handleDeleteUser}
+							title='Supprimer le compte ?'
-				>
+							content='Es-tu sûr de vouloir supprimer ton compte ? Cette action est irréversible.'
-					<TrashIcon />
+							onClose={handleClosePopup}
-					Supprimer mon compte
+							onAccept={deleteUser}
-				</button>
+						/>
-
+					)}
-				{isPopupDisplayed && (
+				</div>
-					<ConfirmPopup
+			)}
-						title='Supprimer le compte ?'
-						content='Es-tu sûr de vouloir supprimer ton compte ? Cette action est irréversible.'
-						onClose={handleClosePopup}
-						onAccept={deleteUser}
-					/>
-				)}
-			</div>
 		</div>
 	);
 };

app/settings/styles.scss

@@ -26,6 +26,11 @@
 		}
 	}
 
+	& > .loading {
+		margin: auto;
+		color: #d94253;
+	}
+
 	& > .settingsContainer {
 		display: flex;
 		flex-direction: column;

app/statistics/hooks/useData.ts

@@ -1,7 +1,12 @@
+// ---------------------------------------------------------------------------------------------------------------------
+//!                                                      Imports
+// ---------------------------------------------------------------------------------------------------------------------
+
+// -------------------------------------------------- React & Next -----------------------------------------------------
 import { useEffect, useState } from 'react';
+// ---------------------------------------------------------------------------------------------------------------------
 
 export const useData = () => {
-	const [isLoading, setIsLoading] = useState(true);
 	const [userData, setUserData] = useState(null);
 
 	useEffect(() => {
@@ -24,13 +29,11 @@ export const useData = () => {
 				),
 			};
 
-			setIsLoading(false);
 			setUserData(formattedResponse);
 		})();
 	}, []);
 
 	return {
-		isLoading,
 		userData,
 	};
 };

app/statistics/page.tsx

@@ -22,92 +22,92 @@ import './styles.scss';
 
 const Statistics = () => {
 	const router = useRouter();
-	const { isLoading, userData } = useData();
+	const { userData } = useData();
-
-	if (!userData) {
-		return;
-	}
 
 	const logout = () => {
 		localStorage.clear();
 		router.push('/auth/login');
 	};
 
-	if (isLoading) {
-		return <></>;
-	}
-
 	return (
 		<div className='accountContainer'>
-			<div className='header'>
+			{!userData ? (
-				<div className='infosContainer'>
+				<p className='loading'>Chargement...</p>
-					<p className='username'>{userData.username}</p>
+			) : (
-					<p className='sinceDate'>Créé le: {userData.createdat}</p>
+				<>
-				</div>
+					<div className='header'>
+						<div className='infosContainer'>
+							<p className='username'>{userData.username}</p>
+							<p className='sinceDate'>
+								Créé le: {userData.createdat}
+							</p>
+						</div>
 
-				<div className='buttonsContainer'>
+						<div className='buttonsContainer'>
-					<button
+							<button
-						type='button'
+								type='button'
-						className='button'
+								className='button'
-						onClick={logout}
+								onClick={logout}
-					>
+							>
-						<Logout />
+								<Logout />
-					</button>
+							</button>
-					<Link
+							<Link
-						href={'/settings'}
+								href={'/settings'}
-						className='button'
+								className='button'
-					>
+							>
-						<SettingsIcon />
+								<SettingsIcon />
-					</Link>
+							</Link>
-				</div>
+						</div>
-			</div>
+					</div>
 
-			<div className='statistics'>
+					<div className='statistics'>
-				<div className='statistic'>
+						<div className='statistic'>
-					<SlotCounter
+							<SlotCounter
-						value={'00'}
+								value={'00'}
-						startValue={'00'}
+								startValue={'00'}
-						startValueOnce
+								startValueOnce
-						dummyCharacterCount={10}
+								dummyCharacterCount={10}
-						direction='top-down'
+								direction='top-down'
-						containerClassName='slotCounter'
+								containerClassName='slotCounter'
-					/>
+							/>
-					<p className='statName'>Loves par semaine</p>
+							<p className='statName'>Loves par semaine</p>
-				</div>
+						</div>
-				<div className='statistic'>
+						<div className='statistic'>
-					<SlotCounter
+							<SlotCounter
-						value={'00'}
+								value={'00'}
-						startValue={'00'}
+								startValue={'00'}
-						startValueOnce
+								startValueOnce
-						dummyCharacterCount={10}
+								dummyCharacterCount={10}
-						direction='top-down'
+								direction='top-down'
-						containerClassName='slotCounter'
+								containerClassName='slotCounter'
-					/>
+							/>
-					<p className='statName'>Loves par mois</p>
+							<p className='statName'>Loves par mois</p>
-				</div>
+						</div>
-				<div className='statistic'>
+						<div className='statistic'>
-					<SlotCounter
+							<SlotCounter
-						value={'00'}
+								value={'00'}
-						startValue={'00'}
+								startValue={'00'}
-						startValueOnce
+								startValueOnce
-						dummyCharacterCount={10}
+								dummyCharacterCount={10}
-						direction='top-down'
+								direction='top-down'
-						containerClassName='slotCounter'
+								containerClassName='slotCounter'
-					/>
+							/>
-					<p className='statName'>Loves par an</p>
+							<p className='statName'>Loves par an</p>
-				</div>
+						</div>
-				<div className='statistic'>
+						<div className='statistic'>
-					<SlotCounter
+							<SlotCounter
-						value={'00'}
+								value={'00'}
-						startValue={'00'}
+								startValue={'00'}
-						startValueOnce
+								startValueOnce
-						dummyCharacterCount={10}
+								dummyCharacterCount={10}
-						direction='top-down'
+								direction='top-down'
-						containerClassName='slotCounter'
+								containerClassName='slotCounter'
-					/>
+							/>
-					<p className='statName'>Loves total</p>
+							<p className='statName'>Loves total</p>
-				</div>
+						</div>
-			</div>
+					</div>
+				</>
+			)}
 		</div>
 	);
 };

app/statistics/styles.scss

@@ -5,6 +5,11 @@
 	flex-direction: column;
 	align-items: center;
 
+	& > .loading {
+		margin: auto;
+		color: #d94253;
+	}
+
 	& > .header {
 		display: flex;
 		flex-wrap: nowrap;