From 8eac7fda01d14ad8234ae91b439902da63133a57 Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Thu, 25 Jan 2024 08:48:31 +0530 Subject: [PATCH 1/8] Your commit message here --- src/App.jsx | 34 ++++++++--- src/Components/Loader.jsx | 14 ----- src/Components/Loader/Loader.jsx | 28 +++++++++ src/Loader.css | 78 ++++++++++++++++++++++++++ src/assets/logo.svg | 5 ++ src/components/ContactUs/ContactUs.jsx | 2 +- src/components/Execom/Execom.jsx | 6 +- 7 files changed, 140 insertions(+), 27 deletions(-) delete mode 100644 src/Components/Loader.jsx create mode 100644 src/Components/Loader/Loader.jsx create mode 100644 src/Loader.css create mode 100644 src/assets/logo.svg diff --git a/src/App.jsx b/src/App.jsx index ee442cd..47d3d8f 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,4 +1,6 @@ import './App.css' +import { useState, useEffect } from "react"; +import Loader from './components/Loader/Loader' import Events from './Pages/LandingPages/Events' import Featuring from './Pages/LandingPages/Featuring' import HeroSection from './Pages/LandingPage/HeroSection/HeroSection' @@ -16,18 +18,32 @@ AOS.init({ }); function App() { - + const [loading, setLoading] = useState(false); + useEffect(() => { + setLoading(true); + setTimeout(() => { + setLoading(false); + }, 5000); + }, []); return (
- - - - - -
- - + { + loading? + : + +
+ + + + + +
+ + + +
+}
) } diff --git a/src/Components/Loader.jsx b/src/Components/Loader.jsx deleted file mode 100644 index 832f7a2..0000000 --- a/src/Components/Loader.jsx +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import { Html } from '@react-three/drei' - -const Loader = () => { - return ( - -
-
-
- - ) -} - -export default Loader diff --git a/src/Components/Loader/Loader.jsx b/src/Components/Loader/Loader.jsx new file mode 100644 index 0000000..d98d1a5 --- /dev/null +++ b/src/Components/Loader/Loader.jsx @@ -0,0 +1,28 @@ +import React from 'react'; +import '../../Loader.css'; +import logo from '../../assets/logo.svg'; + +const Loader = () => { + return ( +
+ + +
+
+
+
+
+
+
+
+ +
+
+ We're here +
+
+
+ ); +}; + +export default Loader; diff --git a/src/Loader.css b/src/Loader.css new file mode 100644 index 0000000..2852820 --- /dev/null +++ b/src/Loader.css @@ -0,0 +1,78 @@ +/** + * Coffee + * + * @author jh3y - jheytompkins.com +*/ +@-webkit-keyframes coffee { + 100% { + opacity: 0; + -webkit-transform: translateY(-200%); + transform: translateY(-200%); } } + @keyframes coffee { + 100% { + opacity: 0; + -webkit-transform: translateY(-200%); + transform: translateY(-200%); } } + + .coffee { + background: #fff; + display: grid; + border-radius: 4px; + grid-template-columns: repeat(5, 1fr); + grid-template-rows: 1fr; + height: 60px; + position: relative; + width: 60px; + padding: 2px; + justify-items: center; } + .coffee:before { + -webkit-box-sizing: border-box; + box-sizing: border-box; + content: ''; + height: 20px; + width: 20px; + border: 4px solid #fff; + position: absolute; + top: 50%; + margin-top: -13px; + margin-left: -10px; + left: 100%; + border-radius: 4px; } + .coffee div { + height:30px; + width: 10px; + background: #fff; + opacity: 0.6; + -webkit-animation: coffee 2s infinite; + animation: coffee 2s infinite; + + } + .coffee div:nth-child(1) { + -webkit-animation-delay: 0.4s; + animation-delay: 0.4s; + } + + .coffee div:nth-child(2) { + -webkit-animation-delay: 0.6s; + animation-delay: 0.8s; + } + + .coffee div:nth-child(3) { + -webkit-animation-delay: 1.2s; + animation-delay: 1.2s; + } + + .coffee div:nth-child(4) { + -webkit-animation-delay: 1.6s; + animation-delay: 1.6s; + } + + .coffee div:nth-child(5) { + -webkit-animation-delay: 2s; + animation-delay: 2s; + } + + .coffee div:nth-child(6) { + -webkit-animation-delay: 2.4s; + animation-delay: 2.4s; + } \ No newline at end of file diff --git a/src/assets/logo.svg b/src/assets/logo.svg new file mode 100644 index 0000000..3748a44 --- /dev/null +++ b/src/assets/logo.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/ContactUs/ContactUs.jsx b/src/components/ContactUs/ContactUs.jsx index 2ceadad..4598bba 100644 --- a/src/components/ContactUs/ContactUs.jsx +++ b/src/components/ContactUs/ContactUs.jsx @@ -55,7 +55,7 @@ function ContactUs() { }; return ( -
+
diff --git a/src/components/Execom/Execom.jsx b/src/components/Execom/Execom.jsx index 265217d..3ea6cc3 100644 --- a/src/components/Execom/Execom.jsx +++ b/src/components/Execom/Execom.jsx @@ -98,9 +98,9 @@ function Execom() {
-
-
-
{d.name}
+
+
+
{d.name}
{d.review}
From 9cb80efb9b77549506745f801184d23e025bceff Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Thu, 25 Jan 2024 10:02:09 +0530 Subject: [PATCH 2/8] new commit --- src/App.jsx | 55 +++++++++++++++++++------------- src/Components/Loader/Loader.jsx | 2 +- src/Loader.css | 18 ++++++++--- 3 files changed, 47 insertions(+), 28 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 47d3d8f..2fff091 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -18,34 +18,45 @@ AOS.init({ }); function App() { - const [loading, setLoading] = useState(false); + const [loading, setLoading] = useState(true); + const [loaderOpacity, setLoaderOpacity] = useState(1); + useEffect(() => { - setLoading(true); - setTimeout(() => { - setLoading(false); - }, 5000); + const loaderTimeout = setTimeout(() => { + setLoaderOpacity(0.5); // Change the opacity of the loader after 6000 milliseconds + }, 6000); + + const contentTimeout = setTimeout(() => { + setLoading(false); // Hide the loader after 7000 milliseconds + },9000); + + // Clean up timeouts + return () => { + clearTimeout(loaderTimeout); + clearTimeout(contentTimeout); + }; }, []); - return ( - -
- { - loading? - : - + +return ( +
+
+ + {loading ? : (
- - - -
- - - + + + +
+ +
-} -
- ) + )} +
+
+); + } export default App; \ No newline at end of file diff --git a/src/Components/Loader/Loader.jsx b/src/Components/Loader/Loader.jsx index d98d1a5..1b21432 100644 --- a/src/Components/Loader/Loader.jsx +++ b/src/Components/Loader/Loader.jsx @@ -14,7 +14,7 @@ const Loader = () => {
-
+
diff --git a/src/Loader.css b/src/Loader.css index 2852820..1c606bb 100644 --- a/src/Loader.css +++ b/src/Loader.css @@ -40,7 +40,7 @@ border-radius: 4px; } .coffee div { height:30px; - width: 10px; + width: 8px; background: #fff; opacity: 0.6; -webkit-animation: coffee 2s infinite; @@ -72,7 +72,15 @@ animation-delay: 2s; } - .coffee div:nth-child(6) { - -webkit-animation-delay: 2.4s; - animation-delay: 2.4s; - } \ No newline at end of file + .transition-opacity { + transition: opacity 1s ease-in-out; + } + + .opacity-0 { + opacity: 0; + } + + .opacity-100 { + opacity: 1; + } + \ No newline at end of file From 7f642d633d79c6b83ab3ca7fafd6326d7f5143b9 Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Thu, 25 Jan 2024 10:19:00 +0530 Subject: [PATCH 3/8] new commit --- src/App.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 2fff091..1090f72 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -23,14 +23,14 @@ function App() { useEffect(() => { const loaderTimeout = setTimeout(() => { - setLoaderOpacity(0.5); // Change the opacity of the loader after 6000 milliseconds + setLoaderOpacity(0.5); }, 6000); const contentTimeout = setTimeout(() => { - setLoading(false); // Hide the loader after 7000 milliseconds + setLoading(false); },9000); - // Clean up timeouts + return () => { clearTimeout(loaderTimeout); clearTimeout(contentTimeout); From 609cf9a3a5e269a73f746f591f946cfe9b451496 Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Sat, 27 Jan 2024 00:47:40 +0530 Subject: [PATCH 4/8] new commit in loader --- src/Components/Loader/Loader.jsx | 2 -- src/components/Execom/Execom.jsx | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Components/Loader/Loader.jsx b/src/Components/Loader/Loader.jsx index 1b21432..ef86e4b 100644 --- a/src/Components/Loader/Loader.jsx +++ b/src/Components/Loader/Loader.jsx @@ -14,8 +14,6 @@ const Loader = () => {
- -
We're here diff --git a/src/components/Execom/Execom.jsx b/src/components/Execom/Execom.jsx index 3ea6cc3..64c52d8 100644 --- a/src/components/Execom/Execom.jsx +++ b/src/components/Execom/Execom.jsx @@ -101,7 +101,7 @@ function Execom() {
{d.name}
-
{d.review}
+
{d.review}
From f6016891c4b24a591905aa120930ad3ea450ba8f Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Sat, 27 Jan 2024 10:50:36 +0530 Subject: [PATCH 5/8] new commit in loader --- src/App.jsx | 4 ++-- src/Components/Loader/Loader.jsx | 15 +++++++++++---- src/components/Execom/Execom.jsx | 6 +++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index 1090f72..63e20d2 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -24,11 +24,11 @@ function App() { useEffect(() => { const loaderTimeout = setTimeout(() => { setLoaderOpacity(0.5); - }, 6000); + }, 4000); const contentTimeout = setTimeout(() => { setLoading(false); - },9000); + },5000); return () => { diff --git a/src/Components/Loader/Loader.jsx b/src/Components/Loader/Loader.jsx index ef86e4b..5c3a7d0 100644 --- a/src/Components/Loader/Loader.jsx +++ b/src/Components/Loader/Loader.jsx @@ -4,11 +4,11 @@ import logo from '../../assets/logo.svg'; const Loader = () => { return ( -
+
- -
-
+ +
+
@@ -19,7 +19,14 @@ const Loader = () => { We're here
+ + + + 1st Rule Of Programming: If it Works, Don't Touch It. +
+ + ); }; diff --git a/src/components/Execom/Execom.jsx b/src/components/Execom/Execom.jsx index 64c52d8..7cecb7c 100644 --- a/src/components/Execom/Execom.jsx +++ b/src/components/Execom/Execom.jsx @@ -98,11 +98,11 @@ function Execom() {
-
-
+
+
{d.name}
{d.review}
-
+
))} From 12de8328523fef1ef0aaa42d0b24c24938ec1964 Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Sat, 27 Jan 2024 22:42:11 +0530 Subject: [PATCH 6/8] new commit --- src/components/Execom/Execom.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Execom/Execom.jsx b/src/components/Execom/Execom.jsx index 7cecb7c..955c110 100644 --- a/src/components/Execom/Execom.jsx +++ b/src/components/Execom/Execom.jsx @@ -98,10 +98,10 @@ function Execom() {
-
+
{d.name}
-
{d.review}
+
{d.review}
@@ -120,11 +120,11 @@ function Execom() {
-
-
+
+
{d1.name1}
{d1.review1}
-
+
))} From c7f53d214b493ad28bb471ffbffd86b136a34d40 Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Sat, 27 Jan 2024 23:16:46 +0530 Subject: [PATCH 7/8] new commit in app --- src/App.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/App.jsx b/src/App.jsx index 663c005..c111c27 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -5,6 +5,7 @@ import Events from './Pages/LandingPages/Events' import Featuring from './Pages/LandingPages/Featuring' import HeroSection from './Pages/LandingPage/HeroSection/HeroSection' import Footer from './Pages/LandingPage/Footer/Footer' +import ContactUs from './components/ContactUs/ContactUs'; import AboutUs from './Components/AboutUs/AboutUs'; import Execom from './components/Execom/Execom'; import Navbar from './Pages/LandingPage/Navbar/Navbar' From 1bd298d7ba54f5325107f607bfb21795ca7eeb13 Mon Sep 17 00:00:00 2001 From: Megha Daniel Date: Sat, 27 Jan 2024 23:28:01 +0530 Subject: [PATCH 8/8] new commit in app --- src/App.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/App.jsx b/src/App.jsx index c111c27..9049cf2 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -45,6 +45,7 @@ return ( {loading ? : (
+