diff --git a/package.json b/package.json index 9537cc1..1e13a45 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", - "deploy": "gh-pages -d build" + "predeploy": "npm run build", + "deploy": "gh-pages -b main -d build" }, "eslintConfig": { "extends": [ diff --git a/src/components/Carousel.css b/src/components/Carousel.css new file mode 100644 index 0000000..6b85625 --- /dev/null +++ b/src/components/Carousel.css @@ -0,0 +1,47 @@ +.carousel { + margin-top: 5%; + display: grid; + align-content: center; + justify-content: center; + grid-template-areas: + 'arrowL image image image image image arrowR' + ; +} + +.main_content_container3 { + +} + +.arrowL { + grid-area: arrowL; + width: fit-content; +} + +.arrowR { + grid-area: arrowR; + width: fit-content; + +} + +.arrImg1 { + width: 45px; +} + +.arrImg2 { + width: 45px; +} + +.image_container { + grid-area: image; +} + +.proj_title { + text-align: center; + font-weight: bold; +} + +@media screen and (min-width: 736px) { + .proj_title { + font-size: 28px; + } +} \ No newline at end of file diff --git a/src/components/Carousel.jsx b/src/components/Carousel.jsx index 20cbe55..793945e 100644 --- a/src/components/Carousel.jsx +++ b/src/components/Carousel.jsx @@ -5,6 +5,7 @@ import project1 from '../images/recipesApp.gif'; import project2 from '../images/recipesApp2.gif'; import project3 from '../images/recipesApp3.gif'; import { motion } from 'framer-motion'; +import './Carousel.css'; const arrOfProjects = [{project: project1, alt: 'Project1', link: 'https://github.com/RaphaelTaglialegna/Recipes-App/tree/main' }, {project: project2, alt: 'Project2', link: 'https://github.com/RaphaelTaglialegna/Recipes-App/tree/main' }, @@ -28,15 +29,15 @@ const Carousel = () => { }, [current]); return ( -
- - leftArrow +
+ + leftArrow - - {arrOfProjects[current].alt} + + {arrOfProjects[current].alt} - - rightArrow + + rightArrow
) diff --git a/src/components/HardSkills.css b/src/components/HardSkills.css index b04705b..3d5fcf0 100644 --- a/src/components/HardSkills.css +++ b/src/components/HardSkills.css @@ -1,14 +1,26 @@ .hard_skills_container { + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-rows: 1/2fr 1fr 1fr 1fr 1fr 1fr 1fr; grid-template-areas: - 'hard_skills_title hard_skills_title hard_skills_title hard_skills_title hard_skills_title hard_skills_title' - "icon_container0h icon_container1h icon_container2h icon_container3h icon_container4h icon_container5h" - "icon_container6h icon_container7h icon_container8h icon_container9h icon_container10h icon_container11h"; + 'hard_skills_title hard_skills_title' + "icon_container0h icon_container1h" "icon_container2h icon_container3h" "icon_container4h icon_container5h" + "icon_container6h icon_container7h" "icon_container8h icon_container9h" "icon_container10h icon_container11h"; gap: 5%; justify-items: center; margin-top: 10%; - margin-left: 10%; + /* + margin-left: 10px; margin-right: 10%; - margin-bottom: 0%; + margin-bottom: 0%; */ +} + +.main_content_container4 { + display: flex; + justify-content: center; + /* flex-wrap: wrap; */ + flex-direction: column; + height: auto; } .hard_skills_title { @@ -64,4 +76,21 @@ .skill_name { text-align: center; +} + +@media screen and (min-width: 796px) { + .hard_skills_container { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; + grid-template-rows: 1/2fr 1fr 1fr; + grid-template-areas: + 'hard_skills_title hard_skills_title hard_skills_title hard_skills_title hard_skills_title hard_skills_title' + "icon_container0h icon_container1h icon_container2h icon_container3h icon_container4h icon_container5h" + "icon_container6h icon_container7h icon_container8h icon_container9h icon_container10h icon_container11h"; + gap: 5%; + margin-top: 10%; + margin-left: 10%; + margin-right: 10%; + margin-bottom: 0%; +} } \ No newline at end of file diff --git a/src/components/HardSkills.jsx b/src/components/HardSkills.jsx index fbd5a15..21b2c2e 100644 --- a/src/components/HardSkills.jsx +++ b/src/components/HardSkills.jsx @@ -16,11 +16,9 @@ const HardSkills = ({icons}) => { const skillVariantMain = { hidden: { - y: -50, opacity: 0, }, visible: { - y: 0, opacity: 1, transition: { delay: 0.3, @@ -30,7 +28,7 @@ const HardSkills = ({icons}) => { }; return ( - +

Hard Skills

{icons.map((icon, index) => { return ( diff --git a/src/components/NavBar.css b/src/components/NavBar.css new file mode 100644 index 0000000..1dd0a0d --- /dev/null +++ b/src/components/NavBar.css @@ -0,0 +1,52 @@ +nav { + font-size: 100%; + text-align: center; + align-items: center; + display: grid; + gap: 5px; + grid-template-areas: + 'nav-button1 nav-button1 nav-button1 nav-button1 nav-button1 nav-button1 nav-button1 nav-button1 nav-button1 . nav-button0' + 'nav-button2 nav-button2 nav-button2 nav-button2 nav-button2 nav-button2 nav-button2 nav-button2 nav-button2 . nav-button0' + 'nav-button3 nav-button3 nav-button3 nav-button3 nav-button3 nav-button3 nav-button3 nav-button3 nav-button3 . nav-button0' + 'nav-button4 nav-button4 nav-button4 nav-button4 nav-button4 nav-button4 nav-button4 nav-button4 nav-button4 . nav-button0' + 'nav-button5 nav-button5 nav-button5 nav-button5 nav-button5 nav-button5 nav-button5 nav-button5 nav-button5 . nav-button0' + ; +} + +.nav-button0 { + grid-area: nav-button0; + justify-self: center; +} + +.nav-button1 { + grid-area: nav-button1; + border-radius: 5%; +} + +.nav-button2 { + grid-area: nav-button2; +} + +.nav-button3 { + grid-area: nav-button3; +} + +.nav-button4 { + grid-area: nav-button4; +} + +.nav-button5 { + grid-area: nav-button5; +} + +@media screen and (min-width: 736px) { + nav { + font-size: 36px; + text-align: center; + display: grid; + grid-template-areas: + 'nav-button0 . nav-button1 nav-button1 nav-button2 nav-button2 nav-button3 nav-button3 nav-button4 nav-button4 nav-button5 nav-button5 nav-button5' + '. . nav-button1 nav-button1 nav-button2 nav-button2 nav-button3 nav-button3 nav-button4 nav-button4 nav-button5 nav-button5 nav-button5' + ; + } +} \ No newline at end of file diff --git a/src/components/NavBar.jsx b/src/components/NavBar.jsx index b2ec108..92f3e9c 100644 --- a/src/components/NavBar.jsx +++ b/src/components/NavBar.jsx @@ -4,7 +4,8 @@ import HomePageIcon from '../images/wavyLirik.gif'; import AboutPageIcon from '../images/meLirik.png'; import ProjectsPageIcon from '../images/Hackermans.gif'; import SkillsPageIcon from '../images/tiLirik.png'; -import ContactPageIcon from '../images/lirikHullo.png'; +import ContactPageIcon from '../images/lirikHullo.png'; +import './NavBar.css'; import { motion } from 'framer-motion'; const NavBar = () => { @@ -60,30 +61,30 @@ const NavBar = () => { }; return ( - - - - + + + + Home - - + + Sobre - - + + Projetos - - + + Habilidades - - + + Contato diff --git a/src/components/SoftSkills.css b/src/components/SoftSkills.css index f93b7f1..17cc0d5 100644 --- a/src/components/SoftSkills.css +++ b/src/components/SoftSkills.css @@ -1,13 +1,18 @@ .soft_skills_container { + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-rows: 1/2fr 1fr 1fr 1fr; grid-template-areas: - 'soft_skills_title soft_skills_title soft_skills_title soft_skills_title soft_skills_title soft_skills_title' - "icon_container0s icon_container1s icon_container2s icon_container3s icon_container4s icon_container5s"; + 'soft_skills_title soft_skills_title' + "icon_container0s icon_container1s" + "icon_container2s icon_container3s" + "icon_container4s icon_container5s"; gap: 5%; - justify-items: center; - margin-top: 5%; - margin-left: 10%; + margin-top: 340px; + /* margin-right: 10%; - margin-bottom: 10%; + margin-bottom: 10%; */ + justify-items: center; } .soft_skills_title { @@ -40,4 +45,21 @@ .skill_name { text-align: center; +} + +@media screen and (min-width: 796px) { + .soft_skills_container { + display: grid; + grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr; + grid-template-rows: 1/2fr 1fr; + grid-template-areas: + 'soft_skills_title soft_skills_title soft_skills_title soft_skills_title soft_skills_title soft_skills_title' + "icon_container0s icon_container1s icon_container2s icon_container3s icon_container4s icon_container5s"; + gap: 5%; + justify-items: center; + margin-top: 5%; + margin-left: 10%; + margin-right: 10%; + margin-bottom: 10%; + } } \ No newline at end of file diff --git a/src/components/SoftSkils.jsx b/src/components/SoftSkils.jsx index 825a584..a35d082 100644 --- a/src/components/SoftSkils.jsx +++ b/src/components/SoftSkils.jsx @@ -16,11 +16,10 @@ const SoftSkils = ({iconsSoft}) => { const skillVariantMain = { hidden: { - y: -50, opacity: 0, }, visible: { - y: 0, + opacity: 1, transition: { delay: 0.4, @@ -29,7 +28,7 @@ const SoftSkils = ({iconsSoft}) => { } }; return ( - +

Soft Skills

{iconsSoft.map((icon, index) => { return ( diff --git a/src/index.css b/src/index.css index cdffbd9..29139ce 100644 --- a/src/index.css +++ b/src/index.css @@ -5,3 +5,10 @@ @tailwind utilities; @import-normalize; + +.main_content_container { + min-width: 375px; +} + +@media screen and (min-width: 736px) { +} diff --git a/src/pages/About.css b/src/pages/About.css new file mode 100644 index 0000000..ba5f211 --- /dev/null +++ b/src/pages/About.css @@ -0,0 +1,109 @@ +.content1 { + display: flex; + margin-top: 15%; + gap: 5px; + justify-content: center; +} +.content2 { + display: flex; + margin-top: 15%; + gap: 5px; + justify-content: center; +} +.content3 { + display: flex; + margin-top: 15%; + gap: 5px; + justify-content: center; +} + +.elA { + font-size: 11px; + width: 200px; +} +.elB { + height: 200px; + object-fit: cover; +} +.elC { + height: 200px; + /* margin-left: 10px; */ + object-fit: cover; +} +.elD { + font-size: 11px; + height: 200px; + width: 200px; +} +.elE { + font-size: 11px; + height: 200px; + width: 290px; +} +.elF { + width: 110px; + object-fit: cover; +} + +@media screen and (min-width: 736px) { + .content1 { + display: flex; + margin-top: 15%; + gap: 15px; + align-content: center; + justify-content: center; + } + .content2 { + display: flex; + margin-top: 15%; + gap: 15px; + justify-content: center; + align-content: center; + } + .content3 { + display: flex; + margin-top: 15%; + gap: 15px; + align-content: center; + justify-content: center; + } + + .elA { + font-size: 20px; + align-self: center; + justify-self: center; + width: 300px; + width: 45%; + } + .elB { + height: 500px; + object-fit: cover; + width: 45%; + } + .elC { + height: 700px; + /* margin-left: 10px; */ + /* width: 45%; */ + } + .elD { + font-size: 20px; + align-self: center; + justify-self: center; + height: fit-content; + + width: 350px; + width: 45%; + } + .elE { + font-size: 20px; + align-self: center; + height: fit-content; + width: 300px; + width: 45%; + } + .elF { + width: 300px; + object-fit: cover; + width: 45%; + } +} diff --git a/src/pages/About.js b/src/pages/About.js index 88aa672..415db4b 100644 --- a/src/pages/About.js +++ b/src/pages/About.js @@ -5,6 +5,7 @@ import FunPic from '../images/meDoingPullUps.gif'; import OldPic from '../images/before.png'; import RecentPic from '../images/nowCropped.jpg'; import { motion } from 'framer-motion'; +import './About.css'; const About = () => { return ( @@ -12,9 +13,9 @@ const About = () => {
-
-
- +
+
+ Born in Sao Paulo City, Brazil, Arthur is a person with a lot of determination and is trying to be the change in the world doing what he can with his knowledge and physical capabilities. Always updating himself with information from cutting @@ -22,11 +23,11 @@ const About = () => { developer after graduting in chemical engineering and not finding a job that would make him feel fulfilled. - +
-
- - +
+ + Born in Sao Paulo City, Brazil, Arthur is a person with a lot of determination and is trying to be the change in the world doing what he can with his knowledge and physical capabilities. Always updating himself with information from cutting @@ -35,8 +36,8 @@ const About = () => { make him feel fulfilled.
-
- +
+ Born in Sao Paulo City, Brazil, Arthur is a person with a lot of determination and is trying to be the change in the world doing what he can with his knowledge and physical capabilities. Always updating himself with information from cutting @@ -44,7 +45,7 @@ const About = () => { developer after graduting in chemical engineering and not finding a job that would make him feel fulfilled. - +
diff --git a/src/pages/Contact.css b/src/pages/Contact.css index 9121f7a..86967b0 100644 --- a/src/pages/Contact.css +++ b/src/pages/Contact.css @@ -1,4 +1,64 @@ -.main_content_container { - margin-left: 50%; - transform: translateX(-50%); -}; \ No newline at end of file +.main_content_container5 { + margin-top: 15%; +}; + +#message { + width: 300px; +}; + +.name { + height: 40px; + width: 250px; +} + +#email { + width: 300px; +} + +.link_button { + width: 120px; + font-weight: bold; + justify-content: space-evenly; +} + +.link_button img { + height: 30px; +} + +.send { + height: 40px; +} + +@media screen and (min-width: 736px) { + #email { + margin-top: -30px; + width: 350px; + height: 40px; + font-size: 16px; + } + #message { + width: 500px; + margin-top: -30px; + height: 100px; + font-size: 16px; + }; + .name { + width: 250px; + height: 40px; + font-size: 50px; + } + .main_content_container5 { + margin-left: 50%; + transform: translateX(-50%); + margin-top: 5%; + height: 600px; + width:fit-content; + }; + .link_button img { + height: 50px; + } + .send { + height: 50px; + font-size: 20px; + } +} \ No newline at end of file diff --git a/src/pages/Contact.jsx b/src/pages/Contact.jsx index c008ffe..4fd4675 100644 --- a/src/pages/Contact.jsx +++ b/src/pages/Contact.jsx @@ -24,20 +24,20 @@ const Contact = () => {
- + Entre em Contato - - - - alert("Não implementado ainda. Fale comigo pelas redes sociais abaixo.")} animate={{opacity: 1}} initial={{opacity: 0}} whileHover={{ scale: 1.1, rotate: -3}} transition={{ type: "spring", stiffness: 2000}} whileTap={{ scale: 0.9, rotate: 3}} aria-label='Send_It' className='text-beige-green bg-dark-blue w-40 rounded-md font-bold'>Enviar + + + + alert("Não implementado ainda. Fale comigo pelas redes sociais abaixo.")} animate={{opacity: 1}} initial={{opacity: 0}} whileHover={{ scale: 1.1, rotate: -3}} transition={{ type: "spring", stiffness: 2000}} whileTap={{ scale: 0.9, rotate: 3}} aria-label='Send_It' className='text-beige-green bg-dark-blue w-40 rounded-md font-bold send'>Enviar
- + GitHub - GitHub_Icon + GitHub_Icon - + LinkedIn - LinkedIn_Icon + LinkedIn_Icon
diff --git a/src/pages/MainPage.css b/src/pages/MainPage.css index d3dd158..91994b0 100644 --- a/src/pages/MainPage.css +++ b/src/pages/MainPage.css @@ -1,19 +1,86 @@ -/* .text_content_container { - width: fit-content -}; +#profile-pic { + grid-area: profile; + width: 140px; + margin-top: 0.75rem; +} -.name { - width: fit-content; -}; +#iconLink1 { + margin-inline: 10px; + grid-area: link1; +} +#iconLink2 { + margin-inline: 10px; + grid-area: link2; +} +.iconLink { + font-size: 1.25rem/* 20px */; + width: 3rem; +} -.link1 { - width: fit-content; -}; +.linkContainer { + width: 300px; + height: 50px; +} -.link2 { - width: fit-content; -}; +#title { + grid-area: name; + margin-inline: 20px; +} -.picture { - width: 200px; -}; */ \ No newline at end of file +#description { + grid-area: desc; + margin-inline: 10px; +} + +.main_content_container { + display: grid; + gap: 5px; + grid-template-areas: + 'name name name name name' + 'name name name name name' + 'desc profile profile profile profile' + 'desc profile profile profile profile' + 'desc profile profile profile profile' + 'desc profile profile profile profile' + 'link1 link1 link1 . .' + 'link2 link2 link2 . .' + ; +} + +@media screen and (min-width: 736px) { + #title { + font-size: 3.75rem; + height: 100px; + } + .iconLink { + width: 6rem; + height: 60px; + } + #profile-pic { + width: fit-content; + height: 700px; + justify-self: center; + } + .description { + font-size: 28px; + } + .linkContainer { + width: 400px; + height: 65px; + font-size: 20px; + justify-self: center; + } + + .main_content_container { + display: grid; + gap: 5px; + width: fit-content; + grid-template-areas: + '. name name .' + '. desc desc .' + '. desc desc .' + 'profile profile profile profile' + 'link1 link1 link2 link2' + ; + } +} \ No newline at end of file diff --git a/src/pages/MainPage.js b/src/pages/MainPage.js index 242afcb..1918ef8 100644 --- a/src/pages/MainPage.js +++ b/src/pages/MainPage.js @@ -9,30 +9,31 @@ import './MainPage.css'; export default function MainPage() { return ( -
+
+
- -
- Arthur Teixeira Santos - + + + Arthur Teixeira Santos + Olá, meu nome é Arthur e estou buscando ser reconhecido como desenvolvedor através de minhas ações. Na jornada para a realização de um sonho. - +

Conheça o meu GitHub

- GitHub_Icon + GitHub_Icon
- +

Conheça o meu LinkedIn

- LinkedIn_Icon + LinkedIn_Icon
+ +
- -
-
+
) } diff --git a/src/pages/Projects.jsx b/src/pages/Projects.jsx index 48392ca..62b37df 100644 --- a/src/pages/Projects.jsx +++ b/src/pages/Projects.jsx @@ -9,9 +9,10 @@ const Projects = () => {
- + +

Recipes App

diff --git a/src/pages/Skills.jsx b/src/pages/Skills.jsx index a22f875..7a7893f 100644 --- a/src/pages/Skills.jsx +++ b/src/pages/Skills.jsx @@ -38,7 +38,7 @@ const Skills = () => {
-
+