From f82d91687fdaeb46346e051fbd317c0fd670138c Mon Sep 17 00:00:00 2001 From: aunshx Date: Thu, 5 Sep 2024 16:08:08 -0700 Subject: [PATCH] Team UI Fixes and Particle loading fixed --- src/App.js | 39 ++++++++----------- src/Components/Pages/Team/index.js | 20 ++++++---- .../TransComps/Components/Overview.js | 2 +- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/App.js b/src/App.js index 877a3be..77bd83d 100644 --- a/src/App.js +++ b/src/App.js @@ -25,7 +25,7 @@ export const BorderToggleRef = () => { } const PreSynthApp = () => { - const [isLoading, setIsLoading] = useState(false); + const [isParticleLoading, setIsParticleLoading] = useState(false); const [init, setInit] = useState(false); const { toggleLightTheme, toggleDarkTheme } = useContext(ThemeContext); @@ -40,7 +40,7 @@ const PreSynthApp = () => { useEffect(() => { const initEngine = async () => { try { - setIsLoading(true); + setIsParticleLoading(true); await initParticlesEngine(async (engine) => { await loadSlim(engine); }); @@ -48,41 +48,34 @@ const PreSynthApp = () => { } catch (error) { console.error("Initialization failed:", error); } finally { - setIsLoading(false); + setIsParticleLoading(false); } }; initEngine(); }, []); - const particlesLoaded = (container) => { - }; + const particlesLoaded = (container) => {}; return ( <> - {isMobile ? ( + {false ? ( ) : ( - <> - {false ? ( - - ) : ( - - - } /> + + + } /> - } /> - } /> - } /> - - } /> - - - )} - - + } /> + } /> + } /> + + } /> + + )} + ); } diff --git a/src/Components/Pages/Team/index.js b/src/Components/Pages/Team/index.js index a559d36..cece27d 100644 --- a/src/Components/Pages/Team/index.js +++ b/src/Components/Pages/Team/index.js @@ -1,13 +1,14 @@ import React, { useContext } from 'react'; +import { BorderToggleRef } from '../../../App'; +import { NavbarToggleContext } from '../../../Context/navbarToggle'; import { teamIcon } from '../../../Resources/Icons'; +import Footer from '../../Shared/Footer'; +import Loader from '../../Shared/Loader'; +import Navbar from '../../Shared/Navbar'; import Title, { Subtitle } from '../../Shared/Title'; import Wrapper from '../../Shared/Wrapper'; import { CurrentTeamCard, PastMembersCard } from './Ancilliary/Components/Card'; import { currentTeam, pastMembers } from './Ancilliary/Data/data'; -import { NavbarToggleContext } from '../../../Context/navbarToggle'; -import Navbar from '../../Shared/Navbar'; -import { BorderToggleRef } from '../../../App'; -import Footer from '../../Shared/Footer'; const Team = () => { return ( @@ -42,13 +43,18 @@ const Team = () => { ); } -const Index = () => { +const Index = ({ loading }) => { const { borderToggle } = useContext(NavbarToggleContext); + return ( <> - + - + {loading ? ( + + ) : ( + + )}