correction

alex-cailler · Aug 31, 2020 · e1307fa · e1307fa
1 parent fa00450
commit e1307fa
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 25 deletions.
diff --git a/src/components/navigation/index.js b/src/components/navigation/index.js
@@ -1 +1 @@
-export { default as NavbarMain } from "./navbar-main/navbarMain"
+export { default as NavbarMain } from "./navbar-main/NavbarMain"
diff --git a/...nts/navigation/navbar-main/navbarMain.jsx → ...nts/navigation/navbar-main/NavbarMain.jsx b/...nts/navigation/navbar-main/navbarMain.jsx → ...nts/navigation/navbar-main/NavbarMain.jsx
@@ -1,9 +1,7 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
-const menuItems = [{title: "Accueil", link: "/"}, {title: "Contact",link:"/contact"}, {title: "Travaux", link: "/work"}]
+const menuItems = [{title: "Accueil", link: "/"}, {title: "Contact",link:"/contact"}, {title: "Travaux", link: "/work/projects"}]
 
 const NavbarMain = () => {
     return (

diff --git a/src/components/section/Contact/RightSection.jsx b/src/components/section/Contact/RightSection.jsx
@@ -4,9 +4,15 @@ import {socialNetworks} from "../../../constants/data";
 import {TextInformation} from "../../content";
 import {CardSocialNetwork} from "../../card";
 
-const RightSection = () => {
+const RightSection = ({className}) => {
+
+    const classes = classNames(
+        "",
+        className
+    )
+
     return (
-        <div className="w-1/2 pl-32">
+        <div className={classes}>
             <h1 className="text-6xl leading-none">Contacter moi</h1>
             <div className="mt-16 mb-16">
                 <TextInformation label="email" describe="[email protected]"/>

diff --git a/src/components/section/Home/IntroduceSection.jsx b/src/components/section/Home/IntroduceSection.jsx
@@ -7,8 +7,8 @@ const IntroduceSection = () => {
         <LayoutSection className="flex justify-between">
             <div>
                 <h1 className="text-6xl leading-none font-semibold">Alexandre<br />Cailler</h1>
-                <p className="pt-8">Developpeur aux multiples competence</p>
-                <p className="pt-8 text-gray-600">Vous êtes a la recherche d’un developpeur, venez me voir.</p>
+                <p className="pt-8">Développeur aux multiples compétences</p>
+                <p className="pt-8 text-gray-600">Vous êtes a la recherche d’un développeur, venez me voir.</p>
                 <Button variant="xs" className="mt-8">Let chats!</Button>
             </div>
         </LayoutSection>

diff --git a/src/components/section/Home/LetChatSection.jsx b/src/components/section/Home/LetChatSection.jsx
@@ -6,7 +6,7 @@ import {Button} from "../../button";
 const LetChatSection = () => {
     return (
         <LayoutSection>
-            <div className="bg-orange-200 flex rounded-large p-12 px-24">
+            <div className="bg-orange-200 flex rounded-large py-12 px-24">
                 <div className="w-1/2">
                     <HeaderSection title="En quête de travail" description="Donc n'hésiter pas à me contacter"/>
                 </div>

diff --git a/src/components/section/Home/TechnologiesSection.jsx b/src/components/section/Home/TechnologiesSection.jsx
@@ -6,6 +6,7 @@ import {Carousel} from "../../carousel";
 import {technologies} from "../../../constants/data";
 import {CardTechnologie} from "../../card";
 import {LayoutSection} from "../../layout";
+import {TextInformation} from "../../content";
 
 const TechnologiesSection = ({className}) => {
 
@@ -15,15 +16,19 @@ const TechnologiesSection = ({className}) => {
 
     return (
         <LayoutSection>
-            <HeaderSection title={"Les technologie avec lequel je travail"} description="Pour être un bon developpeur, il faut avoir des compétence dans tout les domaine" className="w-1/3"/>
+            <HeaderSection title="Les technologies avec lesquelles je travaille" description="Pour être un bon développeur, il faut avoir des compétence dans tous les domaines." className="w-1/3"/>
             <Carousel className="mt-16">
-                {technologies.map( (item,index) => (
+                {technologies.map( (item) => (
                     <CardTechnologie
-                        key={index} title={item.title}
-                        className={classNames({'mr-20': index < technologies.length - 1})}
+                        key={item.title} title={item.title}
+                        className="mr-20"
                     />
                 ))}
             </Carousel>
+            <div className="flex mt-16">
+                <TextInformation label="24" describe="Technologies" />
+                <TextInformation className="ml-24" label="3" describe="Années d'expérience" />
+            </div>
         </LayoutSection>
     )
 }

diff --git a/src/components/section/Home/TestimonySection.jsx b/src/components/section/Home/TestimonySection.jsx
@@ -8,7 +8,7 @@ const TestimonySection = () =>  (
     <LayoutSection className="flex flex-wrap">
         <Citation className="w-2/4 p-3 align-middle"
                   author="antoine burgaudeau"
-                  authorJob="developeur"
+                  authorJob="développeur"
                   citation="Lorem Ipsum est simplement un texte factice de l'industrie de l'impression et de la composition. Lorem Ipsum a été le texte factice standard de l'industrie depuis les années 1500 "/>
         <div className="w-2/4 p-3">
             <img src="/images/citation.svg" className="mx-auto"/>

diff --git a/src/components/section/Home/WhoSection.jsx b/src/components/section/Home/WhoSection.jsx
@@ -13,13 +13,13 @@ const WhoSection = () => (
                             bgColor="#E1F8EB"
                             title="Mes Travaux"
                             variant="dark"
-                            description="J’effectue de nombreux projet dans différent domaine si bien frontend que backend"
+                            description="J’effectue de nombreux projet dans différent domaine si bien frontend que backend."
                             btnTitle="Mes travaux" />
             <CardThematique className="md:w-2/4 w-full h-400 pl-10"
                             bgColor="#F8F5E1"
                             variant="dark"
                             title="Mes Travaux"
-                            description="J’effectue de nombreux projet dans différent domaine si bien frontend que backend"
+                            description="J’effectue de nombreux projet dans différent domaine si bien frontend que backend."
                             btnTitle="Mes travaux" />
         </div>
     </LayoutSection>

diff --git a/src/pages/ContactPage/ContactPage.tsx b/src/pages/ContactPage/ContactPage.tsx
@@ -10,7 +10,7 @@ const ContactPage = () => {
                 <div className="w-1/2">
                     <FormContact/>
                 </div>
-               <ContactRightSection />
+               <ContactRightSection className="w-1/2 ml-32"/>
             </div>
         </LayoutContainer>
     );

diff --git a/src/pages/GaleryPage/GaleryPage.tsx b/src/pages/GaleryPage/GaleryPage.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 const GaleryPage = () => {
     return (
         <div>
-            Hola je suis le home
+            Hola je suis le galery
         </div>
     );
 };

diff --git a/src/pages/HomePage/HomePage.jsx b/src/pages/HomePage/HomePage.jsx
@@ -3,18 +3,16 @@ import { CardThematique } from "../../components/card";
 import {LayoutContainer, LayoutSection} from "../../components/layout";
 import {LetChat, ProfileIntroduceSection, Technologies, Testimony, WhoIAm} from "../../components/section";
 
-
-
 const HomePage = () => {
     return (
         <LayoutContainer>
             <ProfileIntroduceSection />
             <LayoutSection>
                 <CardThematique className="h-64"
                                 bgImage="https://images.unsplash.com/photo-1526778548025-fa2f459cd5c1?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=800&q=60"
-                                title="Mes Travaux"
+                                title="Mes travaux"
                                 variant="light"
-                                description="J’effectue de nombreux projet dans différent domaine si bien frontend que backend"
+                                description="J’effectue de nombreux projets dans différents domaine si bien frontend que backend"
                                 btnTitle="Mes travaux" />
             </LayoutSection>
             <Technologies />

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -3,4 +3,7 @@ export { default as RoutePage } from './RoutePage/RoutePage';
 export { default as ProjectPage } from './ProjectPage/ProjectPage';
 export { default as GaleryPage } from './GaleryPage/GaleryPage';
 export { default as ContactPage } from './ContactPage/ContactPage';
-
+export { default as WorkPage } from './WorkPage/WorkPage'
+export { default as DesignPage } from './DesignPage/DesignPage'
+export { default as LabsPage } from './LabsPage/LabsPage'
+export { default as ProjectsPage } from './ProjectPage/ProjectsPage'
diff --git a/src/router/Router.tsx b/src/router/Router.tsx
@@ -5,7 +5,8 @@ import {
     ContactPage,
     GaleryPage,
     ProjectPage,
-    RoutePage
+    RoutePage,
+    WorkPage
 } from "../pages/index";
 
 const Router = () => (
@@ -14,7 +15,8 @@ const Router = () => (
         <Route exact path="/contact" component={ContactPage} />
         <Route exact path="/galery" component={GaleryPage} />
         <Route exact path="/RoutePage" component={RoutePage} />
-        <Route exact path="/project/:id" component={RoutePage} />
+        <Route exact path="/work" component={WorkPage} />
+        <Route exact path="/project/:id" component={ProjectPage} />
     </BrowserRouter>
 );
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { default as NavbarMain } from "./navbar-main/navbarMain"
		export { default as NavbarMain } from "./navbar-main/NavbarMain"