From 25bcf71a8c1e8100ff1b97755fbe0a3bc4f59134 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Fri, 16 Feb 2024 16:38:58 -0500 Subject: [PATCH 01/25] Setup: svgs and About Section --- src/assets/svg/billboard hawk.svg | 12 +++ src/assets/svg/billboard.svg | 173 ++++++++++++++++++++++++++++++ src/components/About.section.tsx | 11 ++ src/components/index.tsx | 13 ++- src/pages/Landing.tsx | 4 +- src/pages/index.tsx | 6 +- 6 files changed, 212 insertions(+), 7 deletions(-) create mode 100644 src/assets/svg/billboard hawk.svg create mode 100644 src/assets/svg/billboard.svg create mode 100644 src/components/About.section.tsx diff --git a/src/assets/svg/billboard hawk.svg b/src/assets/svg/billboard hawk.svg new file mode 100644 index 00000000..4328fc02 --- /dev/null +++ b/src/assets/svg/billboard hawk.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/svg/billboard.svg b/src/assets/svg/billboard.svg new file mode 100644 index 00000000..2cd35575 --- /dev/null +++ b/src/assets/svg/billboard.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/About.section.tsx b/src/components/About.section.tsx new file mode 100644 index 00000000..e6807045 --- /dev/null +++ b/src/components/About.section.tsx @@ -0,0 +1,11 @@ +import billboard from '../assets/svg/billboard.svg'; + +const About: React.FC = () => { + return ( +
+ Billboard +
+ ); +}; + +export { About }; diff --git a/src/components/index.tsx b/src/components/index.tsx index fa766c2c..d2aba600 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -1,11 +1,18 @@ /* * - * @component + * @component * */ /* * - * @section + * @section * - */ \ No newline at end of file + */ + +/* + * + * @section About + * + */ +export { About } from './About.section'; diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx index adf59fa1..c5bc1782 100644 --- a/src/pages/Landing.tsx +++ b/src/pages/Landing.tsx @@ -1,7 +1,9 @@ +import { About } from '@components'; + const Landing: React.FC = () => { return (
- +
); }; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index cac5ae0d..24d1497f 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,6 +1,6 @@ /* * - * @page Landing - * + * @page Landing + * */ -export { Landing } from './Landing'; \ No newline at end of file +export { Landing } from './Landing'; From ae148ca087dd2dc3380230f9852e42b041fefde1 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Fri, 16 Feb 2024 16:38:58 -0500 Subject: [PATCH 02/25] Setup: svgs and About Section --- src/assets/svg/billboard hawk.svg | 12 +++ src/assets/svg/billboard.svg | 173 ++++++++++++++++++++++++++++++ src/components/About.section.tsx | 11 ++ src/components/index.tsx | 13 ++- src/pages/Landing.tsx | 4 +- src/pages/index.tsx | 6 +- 6 files changed, 212 insertions(+), 7 deletions(-) create mode 100644 src/assets/svg/billboard hawk.svg create mode 100644 src/assets/svg/billboard.svg create mode 100644 src/components/About.section.tsx diff --git a/src/assets/svg/billboard hawk.svg b/src/assets/svg/billboard hawk.svg new file mode 100644 index 00000000..4328fc02 --- /dev/null +++ b/src/assets/svg/billboard hawk.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/svg/billboard.svg b/src/assets/svg/billboard.svg new file mode 100644 index 00000000..2cd35575 --- /dev/null +++ b/src/assets/svg/billboard.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/About.section.tsx b/src/components/About.section.tsx new file mode 100644 index 00000000..e6807045 --- /dev/null +++ b/src/components/About.section.tsx @@ -0,0 +1,11 @@ +import billboard from '../assets/svg/billboard.svg'; + +const About: React.FC = () => { + return ( +
+ Billboard +
+ ); +}; + +export { About }; diff --git a/src/components/index.tsx b/src/components/index.tsx index fa766c2c..d2aba600 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -1,11 +1,18 @@ /* * - * @component + * @component * */ /* * - * @section + * @section * - */ \ No newline at end of file + */ + +/* + * + * @section About + * + */ +export { About } from './About.section'; diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx index adf59fa1..c5bc1782 100644 --- a/src/pages/Landing.tsx +++ b/src/pages/Landing.tsx @@ -1,7 +1,9 @@ +import { About } from '@components'; + const Landing: React.FC = () => { return (
- +
); }; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index cac5ae0d..24d1497f 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,6 +1,6 @@ /* * - * @page Landing - * + * @page Landing + * */ -export { Landing } from './Landing'; \ No newline at end of file +export { Landing } from './Landing'; From fdabc607a7dba4e31041d834dcc3ff5ab0641f05 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 17 Feb 2024 12:13:02 -0500 Subject: [PATCH 03/25] Update: file structure --- src/assets/{svg => about}/billboard hawk.svg | 0 src/assets/{svg => about}/billboard.svg | 0 src/components/index.tsx | 7 +------ src/components/{ => sections}/About.section.tsx | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) rename src/assets/{svg => about}/billboard hawk.svg (100%) rename src/assets/{svg => about}/billboard.svg (100%) rename src/components/{ => sections}/About.section.tsx (74%) diff --git a/src/assets/svg/billboard hawk.svg b/src/assets/about/billboard hawk.svg similarity index 100% rename from src/assets/svg/billboard hawk.svg rename to src/assets/about/billboard hawk.svg diff --git a/src/assets/svg/billboard.svg b/src/assets/about/billboard.svg similarity index 100% rename from src/assets/svg/billboard.svg rename to src/assets/about/billboard.svg diff --git a/src/components/index.tsx b/src/components/index.tsx index d2aba600..42b298ad 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -10,9 +10,4 @@ * */ -/* - * - * @section About - * - */ -export { About } from './About.section'; +export { About } from './sections/About.section'; diff --git a/src/components/About.section.tsx b/src/components/sections/About.section.tsx similarity index 74% rename from src/components/About.section.tsx rename to src/components/sections/About.section.tsx index e6807045..34fea6a4 100644 --- a/src/components/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,4 +1,4 @@ -import billboard from '../assets/svg/billboard.svg'; +import billboard from '../../assets/about/billboard.svg'; const About: React.FC = () => { return ( From 7d096cfb7d0b8243e39ebf5975ac91a6243691f3 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 17 Feb 2024 12:13:02 -0500 Subject: [PATCH 04/25] Update: file structure --- src/assets/{svg => about}/billboard hawk.svg | 0 src/assets/{svg => about}/billboard.svg | 0 src/components/index.tsx | 7 +------ src/components/{ => sections}/About.section.tsx | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) rename src/assets/{svg => about}/billboard hawk.svg (100%) rename src/assets/{svg => about}/billboard.svg (100%) rename src/components/{ => sections}/About.section.tsx (74%) diff --git a/src/assets/svg/billboard hawk.svg b/src/assets/about/billboard hawk.svg similarity index 100% rename from src/assets/svg/billboard hawk.svg rename to src/assets/about/billboard hawk.svg diff --git a/src/assets/svg/billboard.svg b/src/assets/about/billboard.svg similarity index 100% rename from src/assets/svg/billboard.svg rename to src/assets/about/billboard.svg diff --git a/src/components/index.tsx b/src/components/index.tsx index d2aba600..42b298ad 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -10,9 +10,4 @@ * */ -/* - * - * @section About - * - */ -export { About } from './About.section'; +export { About } from './sections/About.section'; diff --git a/src/components/About.section.tsx b/src/components/sections/About.section.tsx similarity index 74% rename from src/components/About.section.tsx rename to src/components/sections/About.section.tsx index e6807045..34fea6a4 100644 --- a/src/components/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,4 +1,4 @@ -import billboard from '../assets/svg/billboard.svg'; +import billboard from '../../assets/about/billboard.svg'; const About: React.FC = () => { return ( From dc5930323df867c3eced8a7493227c7f047ef8cb Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Fri, 16 Feb 2024 16:38:58 -0500 Subject: [PATCH 05/25] Setup: svgs and About Section --- src/assets/about/billboard hawk.svg | 12 ++ src/assets/about/billboard.svg | 173 ++++++++++++++++++++++ src/components/index.tsx | 9 +- src/components/sections/About.section.tsx | 11 ++ src/pages/Landing.tsx | 3 +- src/pages/index.tsx | 6 +- 6 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 src/assets/about/billboard hawk.svg create mode 100644 src/assets/about/billboard.svg create mode 100644 src/components/sections/About.section.tsx diff --git a/src/assets/about/billboard hawk.svg b/src/assets/about/billboard hawk.svg new file mode 100644 index 00000000..4328fc02 --- /dev/null +++ b/src/assets/about/billboard hawk.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/about/billboard.svg b/src/assets/about/billboard.svg new file mode 100644 index 00000000..2cd35575 --- /dev/null +++ b/src/assets/about/billboard.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/index.tsx b/src/components/index.tsx index 731bf7da..91814346 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -6,10 +6,15 @@ export { NavItems } from './Navbar/NavItems'; export { Navbar } from './Navbar/Navbar'; export { Menu } from './Navbar/Menu'; - +/* + * + * @section About + * + */ +export { About } from './sections/About.section'; /* * * @section FooterSection * */ -export { FooterSection } from './sections/Footer.section'; \ No newline at end of file +export { FooterSection } from './sections/Footer.section'; diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx new file mode 100644 index 00000000..bbf78e36 --- /dev/null +++ b/src/components/sections/About.section.tsx @@ -0,0 +1,11 @@ +import billboard from '../../assets/svg/billboard.svg'; + +const About: React.FC = () => { + return ( +
+ Billboard +
+ ); +}; + +export { About }; diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx index f4c5f18e..f336069c 100644 --- a/src/pages/Landing.tsx +++ b/src/pages/Landing.tsx @@ -1,10 +1,11 @@ -import { FooterSection } from '@components'; +import { FooterSection, About } from '@components'; import { Navbar } from '@components'; const Landing: React.FC = () => { return (
+
); diff --git a/src/pages/index.tsx b/src/pages/index.tsx index cac5ae0d..24d1497f 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,6 +1,6 @@ /* * - * @page Landing - * + * @page Landing + * */ -export { Landing } from './Landing'; \ No newline at end of file +export { Landing } from './Landing'; From 79ce0e5680820eb84bc1998215423d66032d4adb Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 17 Feb 2024 12:13:02 -0500 Subject: [PATCH 06/25] Update: file structure --- src/components/sections/About.section.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index bbf78e36..6b905683 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,4 +1,5 @@ import billboard from '../../assets/svg/billboard.svg'; +// import billboard from '../../assets/about/billboard.svg'; const About: React.FC = () => { return ( From b5dc5f3a9b540d832eb47a479b3c75643aeafc99 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Fri, 16 Feb 2024 16:38:58 -0500 Subject: [PATCH 07/25] Setup: svgs and About Section --- src/assets/svg/billboard hawk.svg | 12 +++ src/assets/svg/billboard.svg | 173 ++++++++++++++++++++++++++++++ src/components/About.section.tsx | 11 ++ 3 files changed, 196 insertions(+) create mode 100644 src/assets/svg/billboard hawk.svg create mode 100644 src/assets/svg/billboard.svg create mode 100644 src/components/About.section.tsx diff --git a/src/assets/svg/billboard hawk.svg b/src/assets/svg/billboard hawk.svg new file mode 100644 index 00000000..4328fc02 --- /dev/null +++ b/src/assets/svg/billboard hawk.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/assets/svg/billboard.svg b/src/assets/svg/billboard.svg new file mode 100644 index 00000000..2cd35575 --- /dev/null +++ b/src/assets/svg/billboard.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/About.section.tsx b/src/components/About.section.tsx new file mode 100644 index 00000000..e6807045 --- /dev/null +++ b/src/components/About.section.tsx @@ -0,0 +1,11 @@ +import billboard from '../assets/svg/billboard.svg'; + +const About: React.FC = () => { + return ( +
+ Billboard +
+ ); +}; + +export { About }; From 780274d2b80f66a63025efe967866e48477ac54b Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 17 Feb 2024 12:13:02 -0500 Subject: [PATCH 08/25] Update: file structure --- src/assets/svg/billboard hawk.svg | 12 --- src/assets/svg/billboard.svg | 173 ------------------------------ src/components/About.section.tsx | 11 -- src/components/index.tsx | 11 ++ 4 files changed, 11 insertions(+), 196 deletions(-) delete mode 100644 src/assets/svg/billboard hawk.svg delete mode 100644 src/assets/svg/billboard.svg delete mode 100644 src/components/About.section.tsx diff --git a/src/assets/svg/billboard hawk.svg b/src/assets/svg/billboard hawk.svg deleted file mode 100644 index 4328fc02..00000000 --- a/src/assets/svg/billboard hawk.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/assets/svg/billboard.svg b/src/assets/svg/billboard.svg deleted file mode 100644 index 2cd35575..00000000 --- a/src/assets/svg/billboard.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/About.section.tsx b/src/components/About.section.tsx deleted file mode 100644 index e6807045..00000000 --- a/src/components/About.section.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import billboard from '../assets/svg/billboard.svg'; - -const About: React.FC = () => { - return ( -
- Billboard -
- ); -}; - -export { About }; diff --git a/src/components/index.tsx b/src/components/index.tsx index 91814346..ceb404ce 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -3,6 +3,7 @@ * @component * */ +<<<<<<< HEAD export { NavItems } from './Navbar/NavItems'; export { Navbar } from './Navbar/Navbar'; export { Menu } from './Navbar/Menu'; @@ -18,3 +19,13 @@ export { About } from './sections/About.section'; * */ export { FooterSection } from './sections/Footer.section'; +======= + +/* + * + * @section + * + */ + +export { About } from './sections/About.section'; +>>>>>>> fdabc60 (Update: file structure) From 473c45b920b064184fe4e30f6ec56506155242ce Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 21 Feb 2024 21:43:36 -0500 Subject: [PATCH 09/25] Update: semi-working images --- src/assets/about/AboutAirBalloon.svg | 67 ++ src/assets/about/AboutBillboard.svg | 183 +++ src/assets/about/AboutDetails.svg | 1039 +++++++++++++++++ src/assets/about/AboutSection.svg | 1229 +++++++++++++++++++++ src/assets/about/AboutWifi.svg | 14 + src/assets/about/billboard hawk.svg | 12 - src/assets/about/billboard.svg | 173 --- src/components/sections/About.section.tsx | 22 +- 8 files changed, 2550 insertions(+), 189 deletions(-) create mode 100644 src/assets/about/AboutAirBalloon.svg create mode 100644 src/assets/about/AboutBillboard.svg create mode 100644 src/assets/about/AboutDetails.svg create mode 100644 src/assets/about/AboutSection.svg create mode 100644 src/assets/about/AboutWifi.svg delete mode 100644 src/assets/about/billboard hawk.svg delete mode 100644 src/assets/about/billboard.svg diff --git a/src/assets/about/AboutAirBalloon.svg b/src/assets/about/AboutAirBalloon.svg new file mode 100644 index 00000000..21717167 --- /dev/null +++ b/src/assets/about/AboutAirBalloon.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/about/AboutBillboard.svg b/src/assets/about/AboutBillboard.svg new file mode 100644 index 00000000..b746aa08 --- /dev/null +++ b/src/assets/about/AboutBillboard.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/about/AboutDetails.svg b/src/assets/about/AboutDetails.svg new file mode 100644 index 00000000..c4e28313 --- /dev/null +++ b/src/assets/about/AboutDetails.svg @@ -0,0 +1,1039 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/about/AboutSection.svg b/src/assets/about/AboutSection.svg new file mode 100644 index 00000000..b53575f6 --- /dev/null +++ b/src/assets/about/AboutSection.svg @@ -0,0 +1,1229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/about/AboutWifi.svg b/src/assets/about/AboutWifi.svg new file mode 100644 index 00000000..1a65b5aa --- /dev/null +++ b/src/assets/about/AboutWifi.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/assets/about/billboard hawk.svg b/src/assets/about/billboard hawk.svg deleted file mode 100644 index 4328fc02..00000000 --- a/src/assets/about/billboard hawk.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/assets/about/billboard.svg b/src/assets/about/billboard.svg deleted file mode 100644 index 2cd35575..00000000 --- a/src/assets/about/billboard.svg +++ /dev/null @@ -1,173 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 6b905683..6bd718a0 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,10 +1,24 @@ -import billboard from '../../assets/svg/billboard.svg'; -// import billboard from '../../assets/about/billboard.svg'; +// import AboutBillboard from '../../assets/about/AboutBillboard.svg'; +// import AboutWifi from '../../assets/about/AboutWifi.svg'; +// import AboutDetails from '../../assets/about/AboutDetails.svg'; +import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; +import AboutSection from '../../assets/about/AboutSection.svg'; const About: React.FC = () => { return ( -
- Billboard +
+
+ Billboard +
+ Billboard
); }; From 9287a3021969673499787309b957e11b51eb131c Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 24 Feb 2024 11:35:50 -0500 Subject: [PATCH 10/25] Fix: image positioning --- src/components/sections/About.section.tsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 6bd718a0..6d3f235d 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -6,18 +6,14 @@ import AboutSection from '../../assets/about/AboutSection.svg'; const About: React.FC = () => { return ( -
-
- Billboard +
+
+ Billboard
Billboard
); From 08046cb470b45864026c6460a7e512b2831cec84 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 24 Feb 2024 12:43:54 -0500 Subject: [PATCH 11/25] Update: svg styling and add text --- src/assets/about/AboutMeSection.svg | 1500 +++++++++++++++++++++ src/components/sections/About.section.tsx | 31 +- 2 files changed, 1527 insertions(+), 4 deletions(-) create mode 100644 src/assets/about/AboutMeSection.svg diff --git a/src/assets/about/AboutMeSection.svg b/src/assets/about/AboutMeSection.svg new file mode 100644 index 00000000..28656db2 --- /dev/null +++ b/src/assets/about/AboutMeSection.svg @@ -0,0 +1,1500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 6d3f235d..a0c12435 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -2,19 +2,42 @@ // import AboutWifi from '../../assets/about/AboutWifi.svg'; // import AboutDetails from '../../assets/about/AboutDetails.svg'; import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; -import AboutSection from '../../assets/about/AboutSection.svg'; +import AboutSection from '../../assets/about/AboutMeSection.svg'; const About: React.FC = () => { return ( -
-
+
+
Billboard
Billboard +
+

+ About Hawkhacks +

+
+

+ HawkHacks came out of a desire to give everyone an equal + opportunity to get into tech, whether that be + programming, networking, researching, learning, or + teaching. +

+

+ Join hundreds of students across Canada (and across the + world) in a 36 hour period of exploration, creativity, + and learning! +

+

+ Remember, you don’t have to be a pro to participate - + show up with ten years or ten minutes of experience (oh + yeah, and a great attitute too!) +

+
+
); }; From ad292d34739860012ceda02b90e4d87dce175fb2 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sat, 24 Feb 2024 15:38:42 -0500 Subject: [PATCH 12/25] Add: air balloon moving on-scroll functionality --- src/components/sections/About.section.tsx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index a0c12435..45ea2067 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,10 +1,19 @@ -// import AboutBillboard from '../../assets/about/AboutBillboard.svg'; -// import AboutWifi from '../../assets/about/AboutWifi.svg'; -// import AboutDetails from '../../assets/about/AboutDetails.svg'; +import React, { useEffect, useState } from 'react'; import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; import AboutSection from '../../assets/about/AboutMeSection.svg'; const About: React.FC = () => { + const [offsetY, setOffsetY] = useState(0); + + const handleScroll = () => { + setOffsetY(window.scrollY * 0.45); // Handles the speed at which the balloon moves + }; + + useEffect(() => { + window.addEventListener('scroll', handleScroll); + + return () => window.removeEventListener('scroll', handleScroll); + }, []); return (
@@ -13,7 +22,8 @@ const About: React.FC = () => { Billboard

From e3394bd2de1e1ae65d9c00263cbc3185badb7504 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sun, 25 Feb 2024 12:55:38 -0500 Subject: [PATCH 13/25] Add: mobile responsiveness and comments --- src/components/Navbar/Navbar.tsx | 2 +- src/components/sections/About.section.tsx | 23 +++++++++++++---------- src/pages/Landing.tsx | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx index eea7e14e..c11fc1e1 100644 --- a/src/components/Navbar/Navbar.tsx +++ b/src/components/Navbar/Navbar.tsx @@ -13,7 +13,7 @@ const Navbar = () => { const hideMenu = () => setShowMenu(false); useEffect(() => { - if (showMenu) document.body.classList.add('overflow-y-hidden') + if (showMenu) document.body.classList.add('overflow-y-hidden'); else document.body.classList.remove('overflow-y-hidden'); }, [showMenu]); diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 45ea2067..108ce87f 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -15,18 +15,14 @@ const About: React.FC = () => { return () => window.removeEventListener('scroll', handleScroll); }, []); return ( -
-
+
+ {/* MAIN SVG (Background) */} +
Billboard
- Billboard -
-

+ {/* About HawkHacks Content */} +
+

About Hawkhacks

@@ -48,6 +44,13 @@ const About: React.FC = () => {

+ {/* Hawk Air Balloon */} + Billboard

); }; diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx index f336069c..d3b07968 100644 --- a/src/pages/Landing.tsx +++ b/src/pages/Landing.tsx @@ -3,7 +3,7 @@ import { Navbar } from '@components'; const Landing: React.FC = () => { return ( -
+
From 3ca207d7c794b815b2e77fbfe650c0b625fab661 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Mon, 26 Feb 2024 14:36:13 -0500 Subject: [PATCH 14/25] Resolve: components index sectioning --- src/components/index.tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/components/index.tsx b/src/components/index.tsx index 91814346..f69630fa 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -8,13 +8,8 @@ export { Navbar } from './Navbar/Navbar'; export { Menu } from './Navbar/Menu'; /* * - * @section About + * @section * */ export { About } from './sections/About.section'; -/* - * - * @section FooterSection - * - */ export { FooterSection } from './sections/Footer.section'; From 387df9d30bc772a5892689429c29cc6bab16c5f5 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Mon, 26 Feb 2024 14:37:40 -0500 Subject: [PATCH 15/25] Resolve: remove pointless tailwind --- src/pages/Landing.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx index d3b07968..f336069c 100644 --- a/src/pages/Landing.tsx +++ b/src/pages/Landing.tsx @@ -3,7 +3,7 @@ import { Navbar } from '@components'; const Landing: React.FC = () => { return ( -
+
From 1b17d4ed7c56273c57c88b2705ecca782fe49af8 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Mon, 26 Feb 2024 16:06:24 -0500 Subject: [PATCH 16/25] Resolve: svgs to fit screen naturally --- src/assets/about/AboutBillboard.svg | 183 -- src/assets/about/AboutDetails.svg | 1039 ----------- src/assets/about/AboutSection.svg | 1933 ++++++++++++--------- src/assets/about/AboutWifi.svg | 14 - src/components/sections/About.section.tsx | 4 +- 5 files changed, 1103 insertions(+), 2070 deletions(-) delete mode 100644 src/assets/about/AboutBillboard.svg delete mode 100644 src/assets/about/AboutDetails.svg delete mode 100644 src/assets/about/AboutWifi.svg diff --git a/src/assets/about/AboutBillboard.svg b/src/assets/about/AboutBillboard.svg deleted file mode 100644 index b746aa08..00000000 --- a/src/assets/about/AboutBillboard.svg +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/about/AboutDetails.svg b/src/assets/about/AboutDetails.svg deleted file mode 100644 index c4e28313..00000000 --- a/src/assets/about/AboutDetails.svg +++ /dev/null @@ -1,1039 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/about/AboutSection.svg b/src/assets/about/AboutSection.svg index b53575f6..7a23e372 100644 --- a/src/assets/about/AboutSection.svg +++ b/src/assets/about/AboutSection.svg @@ -1,901 +1,1086 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + - - - + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -903,7 +1088,7 @@ - + @@ -931,299 +1116,383 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/about/AboutWifi.svg b/src/assets/about/AboutWifi.svg deleted file mode 100644 index 1a65b5aa..00000000 --- a/src/assets/about/AboutWifi.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 108ce87f..5785a4e9 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; -import AboutSection from '../../assets/about/AboutMeSection.svg'; +import AboutSection from '../../assets/about/AboutSection.svg'; const About: React.FC = () => { const [offsetY, setOffsetY] = useState(0); @@ -17,7 +17,7 @@ const About: React.FC = () => { return (
{/* MAIN SVG (Background) */} -
+
Billboard
{/* About HawkHacks Content */} From ae95e71c74aebeb5d8598445c60a36f2a648a788 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Mon, 26 Feb 2024 18:42:12 -0500 Subject: [PATCH 17/25] Resolve: use translate for animation --- src/components/sections/About.section.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 5785a4e9..35580881 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -3,10 +3,12 @@ import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; import AboutSection from '../../assets/about/AboutSection.svg'; const About: React.FC = () => { - const [offsetY, setOffsetY] = useState(0); + const [translateY, setTranslateY] = useState(0); const handleScroll = () => { - setOffsetY(window.scrollY * 0.45); // Handles the speed at which the balloon moves + // Control the speed at which the Balloon travels + const newTranslateY = window.scrollY * 0.45; + setTranslateY(newTranslateY); }; useEffect(() => { @@ -18,7 +20,7 @@ const About: React.FC = () => {
{/* MAIN SVG (Background) */}
- Billboard +
{/* About HawkHacks Content */}
@@ -47,9 +49,9 @@ const About: React.FC = () => { {/* Hawk Air Balloon */} Billboard
); From d6850202ec66186455e839aa586469b57ca96b50 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Mon, 26 Feb 2024 22:03:04 -0500 Subject: [PATCH 18/25] Resolve: add alt to main statistics svg --- src/components/sections/About.section.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 35580881..740669c9 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -20,7 +20,11 @@ const About: React.FC = () => {
{/* MAIN SVG (Background) */}
- + about-statistics
{/* About HawkHacks Content */}
From 06bbf781db4362a270c26139e66df814fae8f6ca Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Tue, 27 Feb 2024 21:07:06 -0500 Subject: [PATCH 19/25] Resolve: Remove Hawk balloon on Mobile --- src/components/sections/About.section.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 740669c9..20152ce8 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -54,7 +54,7 @@ const About: React.FC = () => {
From e3f6b66e29290800318f71b4bdae5fb170e73527 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Wed, 28 Feb 2024 20:00:38 -0500 Subject: [PATCH 20/25] [Feature] Update SVG for Mobile view --- src/assets/about/AboutMeSection.svg | 1500 --------------------- src/assets/about/AboutMobileSection.svg | 1359 +++++++++++++++++++ src/components/sections/About.section.tsx | 10 +- 3 files changed, 1367 insertions(+), 1502 deletions(-) delete mode 100644 src/assets/about/AboutMeSection.svg create mode 100644 src/assets/about/AboutMobileSection.svg diff --git a/src/assets/about/AboutMeSection.svg b/src/assets/about/AboutMeSection.svg deleted file mode 100644 index 28656db2..00000000 --- a/src/assets/about/AboutMeSection.svg +++ /dev/null @@ -1,1500 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/about/AboutMobileSection.svg b/src/assets/about/AboutMobileSection.svg new file mode 100644 index 00000000..65148fd3 --- /dev/null +++ b/src/assets/about/AboutMobileSection.svg @@ -0,0 +1,1359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 20152ce8..28fd5cc8 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,6 +1,7 @@ import React, { useEffect, useState } from 'react'; import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; import AboutSection from '../../assets/about/AboutSection.svg'; +import AboutMobileSection from '../../assets/about/AboutMobileSection.svg'; const About: React.FC = () => { const [translateY, setTranslateY] = useState(0); @@ -19,11 +20,16 @@ const About: React.FC = () => { return (
{/* MAIN SVG (Background) */} -
+
about-statistics + about-statistics
{/* About HawkHacks Content */} From 7e231d2bb93e692fd9d8b4a25b3768ad0340119c Mon Sep 17 00:00:00 2001 From: Gabriel Diniz <55710093+GabeDiniz@users.noreply.github.com> Date: Sat, 2 Mar 2024 06:51:57 -0500 Subject: [PATCH 21/25] [Resolve] AboutSection rename Co-authored-by: Chee Kian Teoh <98545971+teoh4770@users.noreply.github.com> --- src/components/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/index.tsx b/src/components/index.tsx index f69630fa..ee1d11a7 100644 --- a/src/components/index.tsx +++ b/src/components/index.tsx @@ -11,5 +11,5 @@ export { Menu } from './Navbar/Menu'; * @section * */ -export { About } from './sections/About.section'; +export { AboutSection } from './sections/About.section'; export { FooterSection } from './sections/Footer.section'; From 1e38ee9a551dc1d2b2f2d838cb0b03770cdd58c6 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sun, 3 Mar 2024 15:44:06 -0500 Subject: [PATCH 22/25] [Resolve] AboutSection import naming convention --- src/components/sections/About.section.tsx | 12 ++++++------ src/pages/Landing.tsx | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 28fd5cc8..45180ff5 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState } from 'react'; import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; -import AboutSection from '../../assets/about/AboutSection.svg'; -import AboutMobileSection from '../../assets/about/AboutMobileSection.svg'; +import AboutSectionDesktop from '../../assets/about/AboutSection.svg'; +import AboutSectionMobile from '../../assets/about/AboutMobileSection.svg'; -const About: React.FC = () => { +const AboutSection: React.FC = () => { const [translateY, setTranslateY] = useState(0); const handleScroll = () => { @@ -22,12 +22,12 @@ const About: React.FC = () => { {/* MAIN SVG (Background) */}
about-statistics about-statistics @@ -67,4 +67,4 @@ const About: React.FC = () => { ); }; -export { About }; +export { AboutSection }; diff --git a/src/pages/Landing.tsx b/src/pages/Landing.tsx index 81de227d..1d7259da 100644 --- a/src/pages/Landing.tsx +++ b/src/pages/Landing.tsx @@ -1,4 +1,4 @@ -import { FooterSection, About } from '@components'; +import { FooterSection, AboutSection } from '@components'; import { Navbar } from '@components'; const Landing: React.FC = () => { @@ -9,7 +9,7 @@ const Landing: React.FC = () => { // total top padding = 3.5 + 4 = 7.5rem
- +
); From 4ae7ccd8c3215ed63d398cf6e3185669f0a9d4a4 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Sun, 3 Mar 2024 15:50:49 -0500 Subject: [PATCH 23/25] [Resolve] w-full instead of w-screen --- src/components/sections/About.section.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 45180ff5..ea4db6d8 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -20,7 +20,7 @@ const AboutSection: React.FC = () => { return (
{/* MAIN SVG (Background) */} -
+
about-statistics Date: Mon, 4 Mar 2024 20:39:07 -0500 Subject: [PATCH 24/25] [Resolve] full width on wider screens --- src/components/sections/About.section.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index ea4db6d8..1e87d4be 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -24,12 +24,12 @@ const AboutSection: React.FC = () => { about-statistics about-statistics
{/* About HawkHacks Content */} From 9df897df8a76cc43afd3d562827344ac8f709bc6 Mon Sep 17 00:00:00 2001 From: Gabriel Diniz Date: Mon, 4 Mar 2024 21:18:38 -0500 Subject: [PATCH 25/25] [Resolve] Rename SVGs --- .../about/{AboutAirBalloon.svg => about-air-balloon.svg} | 0 .../about/{AboutSection.svg => about-section-desktop.svg} | 0 .../{AboutMobileSection.svg => about-section-mobile.svg} | 0 src/components/sections/About.section.tsx | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/assets/about/{AboutAirBalloon.svg => about-air-balloon.svg} (100%) rename src/assets/about/{AboutSection.svg => about-section-desktop.svg} (100%) rename src/assets/about/{AboutMobileSection.svg => about-section-mobile.svg} (100%) diff --git a/src/assets/about/AboutAirBalloon.svg b/src/assets/about/about-air-balloon.svg similarity index 100% rename from src/assets/about/AboutAirBalloon.svg rename to src/assets/about/about-air-balloon.svg diff --git a/src/assets/about/AboutSection.svg b/src/assets/about/about-section-desktop.svg similarity index 100% rename from src/assets/about/AboutSection.svg rename to src/assets/about/about-section-desktop.svg diff --git a/src/assets/about/AboutMobileSection.svg b/src/assets/about/about-section-mobile.svg similarity index 100% rename from src/assets/about/AboutMobileSection.svg rename to src/assets/about/about-section-mobile.svg diff --git a/src/components/sections/About.section.tsx b/src/components/sections/About.section.tsx index 1e87d4be..40fd09ed 100644 --- a/src/components/sections/About.section.tsx +++ b/src/components/sections/About.section.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; -import AboutAirBalloon from '../../assets/about/AboutAirBalloon.svg'; -import AboutSectionDesktop from '../../assets/about/AboutSection.svg'; -import AboutSectionMobile from '../../assets/about/AboutMobileSection.svg'; +import AboutAirBalloon from '../../assets/about/about-air-balloon.svg'; +import AboutSectionDesktop from '../../assets/about/about-section-desktop.svg'; +import AboutSectionMobile from '../../assets/about/about-section-mobile.svg'; const AboutSection: React.FC = () => { const [translateY, setTranslateY] = useState(0);