diff --git a/src/Components/About/About.scss b/src/Components/About/About.scss index b4d8f5d..a0fafa2 100644 --- a/src/Components/About/About.scss +++ b/src/Components/About/About.scss @@ -21,9 +21,10 @@ $tools-item-tint: darken($list-item-color, 40%); } .AboutContainer { - width: auto; padding: 40px; margin-top: 20px; + margin-left: auto; + margin-right: auto; } .AboutContentContainer { @@ -34,7 +35,7 @@ $tools-item-tint: darken($list-item-color, 40%); .AboutContent { flex: 1; - margin-right: 20px; + margin-right: 50px; font-size: 1rem; line-height: 1.4; color: $secondary-color; @@ -111,7 +112,6 @@ $tools-item-tint: darken($list-item-color, 40%); } .AboutImage { - width: 90%; border-radius: $border-radius; box-shadow: $box-shadow; } @@ -120,7 +120,4 @@ $tools-item-tint: darken($list-item-color, 40%); .AboutImage { width: 100%; } - .AboutImageContainer { - width: 90%; - } -} \ No newline at end of file +} diff --git a/src/Components/About/About.tsx b/src/Components/About/About.tsx index 4f1d0c9..6871533 100644 --- a/src/Components/About/About.tsx +++ b/src/Components/About/About.tsx @@ -1,9 +1,19 @@ import React from 'react'; +import { motion, useInView } from 'framer-motion'; import './About.scss'; const About: React.FC = () => { + const ref = React.useRef(null); + const isInView = useInView(ref, { once: true }); + return ( -
+

@@ -72,12 +82,15 @@ const About: React.FC = () => {

-
- At JACHacks +
+ At JACHacks
-
+
); }; diff --git a/src/Components/Content/Content.scss b/src/Components/Content/Content.scss new file mode 100644 index 0000000..8a6886a --- /dev/null +++ b/src/Components/Content/Content.scss @@ -0,0 +1,7 @@ +.content-container { + .section-container { + max-width: 1500px; + margin: 0 auto; + } + } + \ No newline at end of file diff --git a/src/Components/Content/Content.tsx b/src/Components/Content/Content.tsx index 4d453f8..f3afc7e 100644 --- a/src/Components/Content/Content.tsx +++ b/src/Components/Content/Content.tsx @@ -3,14 +3,17 @@ import Hero from '../Home/Hero/Hero'; import Projects from '../Projects/Projects'; import Experience from '../Experience/Experience'; import About from '../About/About'; +import './Content.scss'; const Content: React.FC = () => { return ( -
+
- - - +
+ + + +
); }; diff --git a/src/Components/Experience/Experience.tsx b/src/Components/Experience/Experience.tsx index dd281e1..74e1d11 100644 --- a/src/Components/Experience/Experience.tsx +++ b/src/Components/Experience/Experience.tsx @@ -1,10 +1,22 @@ import React from 'react'; +import { motion, useInView } from 'framer-motion'; import ExperienceTimeline from './ExperienceTimeline'; -const Experience = () => ( -
- -
-); +const Experience: React.FC = () => { + const ref = React.useRef(null); + const isInView = useInView(ref, { once: true }); + + return ( + + + + ); +}; export default Experience; diff --git a/src/Components/Experience/ExperienceTimeline.scss b/src/Components/Experience/ExperienceTimeline.scss index a8e4732..ac34c92 100644 --- a/src/Components/Experience/ExperienceTimeline.scss +++ b/src/Components/Experience/ExperienceTimeline.scss @@ -20,7 +20,6 @@ $tools-item-tint: darken($list-item-color, 40%); padding: 2rem; max-width: 1900px; margin: 0 auto; - width: 90%; align-items: start; .category-containers { diff --git a/src/Components/Projects/Projects.scss b/src/Components/Projects/Projects.scss index d324e35..f1c580f 100644 --- a/src/Components/Projects/Projects.scss +++ b/src/Components/Projects/Projects.scss @@ -19,7 +19,6 @@ a { align-items: center; justify-content: center; min-height: 100vh; - width: 90%; margin: 0 auto; margin-bottom: 30px; diff --git a/src/Components/Projects/Projects.tsx b/src/Components/Projects/Projects.tsx index 49d9a74..17669c9 100644 --- a/src/Components/Projects/Projects.tsx +++ b/src/Components/Projects/Projects.tsx @@ -1,4 +1,3 @@ -// src/components/Projects.tsx import React from 'react'; import ProjectItem from './ProjectItem'; import { projects } from '../Data/portfolioProjects';