Skip to content

Commit 5aaef21

Browse files
Incorporate light/dark mode to Loading component
1 parent d72c30c commit 5aaef21

File tree

2 files changed

+3
-27
lines changed

2 files changed

+3
-27
lines changed

src/components/Loading.jsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
import logo from '../assets/logo.png';
2-
31
export function Loading() {
42
return (
5-
<div className="flex flex-col items-center justify-center min-h-screen p-4 bg-bgPrimary">
3+
<div className="flex flex-col items-center justify-center min-h-screen p-4 bg-bgPrimary dark:bg-bgPrimaryDark">
64
<div className="flex flex-col items-center animate-fadeIn">
7-
<img
8-
src={logo}
9-
alt="CollabShop Logo, a collaboration platform for grocery shopping."
10-
className="w-64 sm:w-72 md:w-80 lg:w-96 h-auto mb-6 max-w-full rounded-lg shadow-sm transform hover:scale-105 transition-all duration-300 ease-in-out"
11-
/>
12-
<h2 className="text-txtPrimary text-sm sm:text-base md:text-lg font-semibold mb-2">
5+
<h2 className="text-txtPrimary dark:text-txtPrimaryDark text-sm sm:text-base md:text-lg font-semibold mb-2">
136
Please hold on while we prepare your experience.
147
</h2>
15-
<div className="w-10 h-10 border-t-4 border-blue-300 rounded-full animate-spin"></div>
8+
<div className="w-10 h-10 border-t-4 border-blue-300 dark:border-blue-500 rounded-full animate-spin"></div>
169
</div>
1710
</div>
1811
);

src/views/Team.jsx

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import { FaGithub, FaLinkedin, FaGlobe } from 'react-icons/fa';
2-
import { Loading } from '../components/Loading';
32
import doribelAvatar from '../assets/avatars/doribelAvatar.jpg';
43
import nicholasAvatar from '../assets/avatars/nicholasAvatar.png';
54
import shuvekshaAvatar from '../assets/avatars/shuvekshaAvatar.jpg';
65
import stacyAvatar from '../assets/avatars/stacyAvatar.jpg';
76
import ejAvatar from '../assets/avatars/ejAvatar.png';
87
import jennyAvatar from '../assets/avatars/jennyAvatar.jpg';
98
import meganAvatar from '../assets/avatars/meganAvatar.jpg';
10-
import { useEffect, useState } from 'react';
119

1210
const developers = [
1311
{
@@ -64,21 +62,6 @@ const mentors = [
6462
];
6563

6664
export function Team() {
67-
/* This will be removed once the Logo ticket is finalized to ensure the UI is correct. */
68-
const [isLoading, setIsLoading] = useState(true);
69-
70-
useEffect(() => {
71-
const timer = setTimeout(() => {
72-
setIsLoading(false);
73-
}, 3000);
74-
75-
return () => clearTimeout(timer);
76-
}, []);
77-
78-
if (isLoading) {
79-
return <Loading />;
80-
}
81-
8265
return (
8366
<div className="bg-bgPrimary dark:bg-bgPrimaryDark p-10 text-center text-txtPrimary dark:text-txtPrimaryDark">
8467
<h1 className="mb-5 text-4xl font-bold">

0 commit comments

Comments
 (0)