Merge pull request #63 from Mern-Coding-School/develop

Develop

Author: abhishek-nexgen-dev

src/App.jsx

@@ -1,4 +1,6 @@
-import React from 'react';
+import React, {
+  useEffect,
+} from 'react';
 import Body from './Body';
 import {
   BrowserRouter,
@@ -9,9 +11,16 @@ import ErrorPage from './components/ErrorPage';
 import About from './pages/About';
 import Landing from './pages/Home';
 import Student from './pages/Student';
-import Album_Image from './pages/Album_Image';
-import ContactUs from './components/ContactUs';
+import Album_Image from './components/Album_Image_Components/Album_Image';
+import ContactUs from './pages/ContactUs';
+import Loader from './components/Loader';
 const App = () => {
+  useEffect(() => {
+    window.onload = () => {
+      return <Loader />;
+    };
+  }, []);
+
   return (
     <>
       <BrowserRouter basename='/'>

src/components/Album_Image_Components/Album_Image.jsx

@@ -0,0 +1,32 @@
+import axios from 'axios';
+import React from 'react';
+import { useParams } from 'react-router-dom';
+import Swal from 'sweetalert2';
+
+const Album_Image = () => {
+  let parms = useParams();
+  let name = parms.name;
+
+  let Find_Image = async () => {
+    try {
+      // let res = await axios.get(`/api/image/${name}`)
+    } catch (error) {
+      console.log(error);
+      Swal.fire(() => {
+        icon: 'error';
+        title: 'Oops...';
+        text: error.message;
+      });
+    }
+  };
+
+  Find_Image();
+
+  return (
+    <div>
+      Album_Image <h1>{name}</h1>
+    </div>
+  );
+};
+
+export default Album_Image;

src/components/Loader.jsx

@@ -1,6 +1,7 @@
 import React, { useRef } from 'react';
 import gsap from 'gsap';
 import { useGSAP } from '@gsap/react';
+import { useSelector } from 'react-redux';
 
 const Loader = () => {
   let loader = useRef();

src/components/aboutComponents/AboutHero.jsx

@@ -5,6 +5,7 @@ import React, {
 import About_BG from '../../assets/images/aboutbg.svg';
 import Loader from '../Loader';
 import { useSelector } from 'react-redux';
+import useAbout from '../../hooks/useAbout';
 
 const AboutHero = () => {
   const [image, setimage] =
@@ -13,6 +14,8 @@ const AboutHero = () => {
   const [heading, setheading] =
     useState('');
 
+  useAbout();
+
   let about = useSelector(
     state => state.about.aboutPage,
   );
@@ -28,9 +31,7 @@ const AboutHero = () => {
       );
     }
   }, [about]);
-  return !about ? (
-    <Loader />
-  ) : (
+  return (
     <section className='bg-black w-full text-white'>
       <div className='about_hero relative w-full h-[90vh] bg-gradient-to-b from-white via-gray-700 to-black'>
         <img

src/components/aboutComponents/CampusFacilities.jsx

@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom';
 import bulletPoint from '../../assets/images/bulletPoint.svg';
 import { useSelector } from 'react-redux';
 import { use } from 'react';
+import useAbout from '../../hooks/useAbout';
 
 export let Facilites_Card = ({
   Title,
@@ -34,6 +35,8 @@ const CampusFacilities = () => {
   const [Description, setDescription] =
     useState({});
 
+  useAbout();
+
   let About_Page_Data = useSelector(
     state => state.about.aboutPage,
   );

src/components/aboutComponents/Teachers.jsx

@@ -1,4 +1,7 @@
-import React from 'react';
+import React, {
+  useEffect,
+  useState,
+} from 'react';
 import {
   Swiper,
   SwiperSlide,
@@ -14,6 +17,7 @@ import 'swiper/css/navigation';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
 import useTeacher from '../../hooks/useTeacher';
+import Loader from '../Loader';
 
 const TeacherCard = ({ teacher }) => (
   <div className='card w-[25%] max-[599px]:w-full h-full bg-white text-black flex items-start p-4 justify-between flex-col gap-2 rounded-xl  max-[1098px]:w-[40%]'>
@@ -128,11 +132,24 @@ const TeacherCard = ({ teacher }) => (
 );
 
 const Teachers = () => {
-  const teachers = useSelector(
+  let [teachers, SetTeacher] =
+    useState();
+
+  useTeacher();
+
+  const data = useSelector(
     state => state.about.teacher,
   );
 
-  useTeacher();
+  useEffect(() => {
+    if (data) {
+      SetTeacher([...data]);
+    }
+  }, [data]);
+
+  {
+    !data && <Loader />;
+  }
 
   return (
     <section className='w-full px-10 py-10 max-[599px]:py-6 flex items-center justify-between gap-4 flex-col bg-[#333] text-white overflow-hidden'>

src/components/Album.jsx src/components/homeComponents/Album.jsxsrc/components/Album.jsx renamed to src/components/homeComponents/Album.jsx

@@ -4,7 +4,7 @@ import {
   useState,
 } from 'react';
 import { Link } from 'react-router-dom';
-import useAlbum from '../hooks/useAlbum';
+import useAlbum from '../../hooks/useAlbum';
 import { useSelector } from 'react-redux';
 
 const Album = () => {

src/components/homeComponents/Hero.jsx

@@ -5,25 +5,23 @@ import React, {
   useState,
 } from 'react';
 import Loader from '../Loader';
+import useHomeUi from '../../hooks/useHomeUi';
 
 const Hero = () => {
   let [image, setImage] = useState();
+
   const [heading, setHeading] =
     useState();
   const [Paragraph, setParagraph] =
     useState();
 
+  useHomeUi();
+
   let hero = useSelector(
     state => state.home.landingPage,
   );
 
   useEffect(() => {
-    setImage('');
-    setHeading('');
-    setParagraph(
-      'Lorem ipsum dolor sit amet consectetur adipisicing elit. Quo, nemo.',
-    );
-
     if (hero) {
       let data = hero.HeroSection;
       setImage(
@@ -34,9 +32,7 @@ const Hero = () => {
     }
   }, [hero]);
 
-  return !hero ? (
-    <Loader />
-  ) : (
+  return (
     <section
       className='w-full min-h-screen flex flex-col lg:flex-row items-center justify-center text-white bg-cover bg-no-repeat px-10 relative overflow-clip'
       style={{

src/components/Testimonials.jsx …mponents/homeComponents/Testimonials.jsxsrc/components/Testimonials.jsx renamed to src/components/homeComponents/Testimonials.jsx src/components/Testimonials.jsx renamed to src/components/homeComponents/Testimonials.jsx

@@ -6,10 +6,12 @@ import Slider from 'react-slick';
 import 'slick-carousel/slick/slick.css';
 import 'slick-carousel/slick/slick-theme.css';
 
-import useTestimonial from '../hooks/useTestimoniyal';
+import useTestimonial from '../../hooks/useTestimoniyal';
 import { useSelector } from 'react-redux';
 
 const Testimonials = () => {
+  useTestimonial();
+
   let testimonial = useSelector(
     state => state.home.Testimonital,
   );
@@ -19,8 +21,6 @@ const Testimonials = () => {
     setTestimonials,
   ] = useState([]);
 
-  useTestimonial();
-
   useEffect(() => {
     if (testimonial) {
       setTestimonials([...testimonial]);

src/main.jsx

@@ -6,6 +6,7 @@ import { Provider } from 'react-redux';
 import App from './App';
 import { HelmetProvider } from 'react-helmet-async';
 import Lenis from 'lenis';
+import Loader from './components/Loader';
 
 // Initialize Lenis
 const lenis = new Lenis({