diff --git a/client/src/App.module.scss b/client/src/App.module.scss index aa10d82..d8c7b6f 100644 --- a/client/src/App.module.scss +++ b/client/src/App.module.scss @@ -1,8 +1,7 @@ .root { background-color: #402e32; background-size: cover; - background-attachment: fixed; + // background-attachment: fixed; background-position: center; - max-width: 100%; - overflow-x: hidden; + // max-width: 100%; } diff --git a/client/src/components/features/AdminData/AdminData.module.scss b/client/src/components/features/AdminData/AdminData.module.scss index bd4e334..10cb5b9 100644 --- a/client/src/components/features/AdminData/AdminData.module.scss +++ b/client/src/components/features/AdminData/AdminData.module.scss @@ -5,14 +5,15 @@ justify-content: space-around; flex-wrap: wrap; align-items: center; - height: 100vh; + height: 100%; + overflow-x: hidden; .portrait { height: 300px; width: 300px; object-fit: scale-down; opacity: 0.8; - border-radius: 400px; + border-radius: 50%; filter: drop-shadow(0 0 0.75rem $text-hover-color); } @@ -30,13 +31,12 @@ } } -@media (max-width: 426px) { +@media (max-width: 768px) { .root { - height: 80vh; - display: block; - position: relative; - left: 25%; - top: 150px; + display: flex; + flex-direction: column; + margin-top: 50px; + .portrait { height: 200px; width: 200px; @@ -44,17 +44,15 @@ } .rightColumn { - .text { - margin-right: 150px; - } + margin-left: 50px; } } } @media (max-width: 321px) { .root { - left: 20%; - top: 150px; + // left: 20%; + // top: 150px; .rightColumn { .text { diff --git a/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.module.scss b/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.module.scss index bc0b8fd..bbab44e 100644 --- a/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.module.scss +++ b/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.module.scss @@ -54,10 +54,10 @@ } @keyframes marquee { 0% { - left: 0; + transform: translateX(0%); } 100% { - left: -100%; + transform: translateX(-100%); } } } diff --git a/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.tsx b/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.tsx index beb7ce0..c59a75b 100644 --- a/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.tsx +++ b/client/src/components/features/TechnologiesCarousel/TechnologiesCarousel.tsx @@ -23,8 +23,6 @@ export const TechnologiesCarousel: React.FC = () => { ) : (
)} - - {TechnologyData ? ( TechnologyData.map((technology, index) => { return ( diff --git a/client/src/components/layout/NavBar/NavBar.module.scss b/client/src/components/layout/NavBar/NavBar.module.scss index c03b383..8c7a0b7 100644 --- a/client/src/components/layout/NavBar/NavBar.module.scss +++ b/client/src/components/layout/NavBar/NavBar.module.scss @@ -112,6 +112,10 @@ font-size: 10px; margin-right: 0; } + + .logout { + left: -4%; + } } } } diff --git a/client/src/components/pages/Abilities/Abilities.module.scss b/client/src/components/pages/Abilities/Abilities.module.scss index 3797d5c..0676ec9 100644 --- a/client/src/components/pages/Abilities/Abilities.module.scss +++ b/client/src/components/pages/Abilities/Abilities.module.scss @@ -1,34 +1,16 @@ .root { color: white; - height: 870px; + height: 100%; + .title { margin: 50px; } .technologies { display: flex; - justify-content: space-between; - flex-direction: row; - flex-wrap: wrap; - margin: 50px; - .cards { - position: relative; - left: 3%; - flex: 1 1 auto; - margin: 5px; - } - } - - .rethinking { - display: flex; - max-width: 250px; justify-content: center; - font-size: 7px; - margin: 30px auto; - } - - .rethinking:hover { - scale: 3; + flex-wrap: wrap; + margin: 0 0 50px 50px; } } @@ -45,8 +27,5 @@ .technologies { justify-content: center; } - .rethinking:hover { - scale: 1.5; - } } } diff --git a/client/src/components/pages/Abilities/Abilities.tsx b/client/src/components/pages/Abilities/Abilities.tsx index 6bd5768..f51798d 100644 --- a/client/src/components/pages/Abilities/Abilities.tsx +++ b/client/src/components/pages/Abilities/Abilities.tsx @@ -11,18 +11,17 @@ import { ITechnologies } from "../../../interfaces/ITechnologies"; export const Abilities: React.FC = () => { const techData: ITechnologies[] = useSelector(getTechnologies); + const validTechData = techData && techData.length > 0; const dispatch = useDispatch(); useEffect(() => { dispatch(fetchTechnologies()); }, [dispatch]); - - console.log("tech", techData); return (

My Stack

- {techData ? ( + {validTechData ? ( techData.map((data) => { return (
@@ -32,7 +31,7 @@ export const Abilities: React.FC = () => { }) ) : (
-

No cards

+

No abilities

)}
diff --git a/client/src/components/pages/AboutMe/AboutMe.module.scss b/client/src/components/pages/AboutMe/AboutMe.module.scss index be44fd7..f669c02 100644 --- a/client/src/components/pages/AboutMe/AboutMe.module.scss +++ b/client/src/components/pages/AboutMe/AboutMe.module.scss @@ -3,20 +3,21 @@ .root { color: white; min-height: 500px; - height: 70vh; + height: 100%; display: flex; justify-content: space-around; flex-direction: row; flex-wrap: wrap; margin: 70px; - img { + .portrait { height: 300px; width: 300px; object-fit: scale-down; opacity: 0.8; border-radius: 50%; - margin-bottom: 20px; + margin-bottom: 30px; + filter: drop-shadow(0 0 0.75rem $text-hover-color); } h3 { @@ -78,7 +79,7 @@ .documents { width: 500px; - margin: 150px 0 50px 0; + margin: 50px 0 0 0; .links { list-style: none; diff --git a/client/src/components/pages/AboutMe/AboutMe.tsx b/client/src/components/pages/AboutMe/AboutMe.tsx index 0483550..640b2d9 100644 --- a/client/src/components/pages/AboutMe/AboutMe.tsx +++ b/client/src/components/pages/AboutMe/AboutMe.tsx @@ -11,15 +11,15 @@ export const AboutMe: React.FC = () => { return (
- me + me

Hi! I'mMaciej Kusztal

- I'm Frontend Developer who is working on Software Engineer poistion. -

I am an energetic and responsible person. Through my + I'm Web Developer who is working on Software Engineer position. +
I am an energetic and responsible person. Through my determination and commitment to the exact execution of the project, I believe that I am able to introduce positive energy to the team.

@@ -46,20 +46,20 @@ export const AboutMe: React.FC = () => {
  • - Involvement: I feel responsible for the tasks assigned to me + Involvement: I feel responsible for the tasks assigned to me.

  • Enthusiasm: I am open to learning and working in a team, these - two things combined with goals and a plan motivate me to act + two things combined with goals and a plan motivate me to act.

  • - Ambitious: I would like to become a Senior Backend Developer, - it’s a huge goal and has a long way, however, I know myself and - one day I will do it + Ambitious: I would like to become a Application Security + Engineer, it’s a huge goal and has a long way, however, I know + myself and one day I will do it.

@@ -99,7 +99,7 @@ export const AboutMe: React.FC = () => {
  • -
  • - -