diff --git a/GrossesMitaines/grosses-mitaines-ui/package-lock.json b/GrossesMitaines/grosses-mitaines-ui/package-lock.json index 877ef7a..6acaf8d 100644 --- a/GrossesMitaines/grosses-mitaines-ui/package-lock.json +++ b/GrossesMitaines/grosses-mitaines-ui/package-lock.json @@ -19,6 +19,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^6.4.1", "react-scripts": "5.0.1", + "react-transition-group": "^4.4.5", "web-vitals": "^2.1.4" } }, diff --git a/GrossesMitaines/grosses-mitaines-ui/package.json b/GrossesMitaines/grosses-mitaines-ui/package.json index 2c83fab..7998825 100644 --- a/GrossesMitaines/grosses-mitaines-ui/package.json +++ b/GrossesMitaines/grosses-mitaines-ui/package.json @@ -14,6 +14,7 @@ "react-dom": "^18.2.0", "react-router-dom": "^6.4.1", "react-scripts": "5.0.1", + "react-transition-group": "^4.4.5", "web-vitals": "^2.1.4" }, "scripts": { diff --git a/GrossesMitaines/grosses-mitaines-ui/public/favicon.ico b/GrossesMitaines/grosses-mitaines-ui/public/favicon.ico index a11777c..a91594a 100644 Binary files a/GrossesMitaines/grosses-mitaines-ui/public/favicon.ico and b/GrossesMitaines/grosses-mitaines-ui/public/favicon.ico differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/LesGrossesMitaines.png b/GrossesMitaines/grosses-mitaines-ui/public/images/LesGrossesMitaines.png new file mode 100644 index 0000000..d9bb798 Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/LesGrossesMitaines.png differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/blured_wool_carpet.png b/GrossesMitaines/grosses-mitaines-ui/public/images/blured_wool_carpet.png new file mode 100644 index 0000000..8f7dacf Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/blured_wool_carpet.png differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/ceintureflechee.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/ceintureflechee.jpg new file mode 100644 index 0000000..cf3bfdf Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/ceintureflechee.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/jeanlucmongrain.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/jeanlucmongrain.jpg new file mode 100644 index 0000000..9554d32 Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/jeanlucmongrain.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/madamebrossard.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/madamebrossard.jpg new file mode 100644 index 0000000..3ca4caa Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/madamebrossard.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/moman.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/moman.jpg new file mode 100644 index 0000000..e434a79 Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/moman.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/pantouflesCH.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/pantouflesCH.jpg new file mode 100644 index 0000000..b0da00c Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/pantouflesCH.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/Logo_du_le_gouvernement_du_Québec.svg b/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/Logo_du_le_gouvernement_du_Québec.svg new file mode 100644 index 0000000..b10613d --- /dev/null +++ b/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/Logo_du_le_gouvernement_du_Québec.svg @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/logo-guidelines-fy21-GTlogo-colour.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/logo-guidelines-fy21-GTlogo-colour.jpg new file mode 100644 index 0000000..927e279 Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/logo-guidelines-fy21-GTlogo-colour.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/sqdc1.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/sqdc1.jpg new file mode 100644 index 0000000..8d45567 Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/partenaires/sqdc1.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/public/images/wool_carpet.jpg b/GrossesMitaines/grosses-mitaines-ui/public/images/wool_carpet.jpg new file mode 100644 index 0000000..c9b1b71 Binary files /dev/null and b/GrossesMitaines/grosses-mitaines-ui/public/images/wool_carpet.jpg differ diff --git a/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedCard.js b/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedCard.js deleted file mode 100644 index b287cc4..0000000 --- a/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedCard.js +++ /dev/null @@ -1,11 +0,0 @@ - -const FeaturedCard = () => { - - return( -
-

FeaturedCard

-
- ); -} - -export default FeaturedCard; \ No newline at end of file diff --git a/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedList.js b/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedList.js index 7ee9e13..0d379c7 100644 --- a/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedList.js +++ b/GrossesMitaines/grosses-mitaines-ui/src/components/FeaturedList.js @@ -1,11 +1,23 @@ -import FeaturedCard from "./FeaturedCard"; +import { Carousel } from "react-bootstrap"; +const FeaturedList = ({ products }) => { -const FeaturedList = () => { - - return( -
- -
+ return ( + + {products.map((product) => ( + + + +

{product.title}

+

{product.description}

+
Seulement
+

{product.price}$+tx

+ + + ))} + ); } diff --git a/GrossesMitaines/grosses-mitaines-ui/src/components/ResearchBar.js b/GrossesMitaines/grosses-mitaines-ui/src/components/ResearchBar.js index 0b19923..e087b7a 100644 --- a/GrossesMitaines/grosses-mitaines-ui/src/components/ResearchBar.js +++ b/GrossesMitaines/grosses-mitaines-ui/src/components/ResearchBar.js @@ -3,9 +3,9 @@ const ResearchBar = () => { return ( -
- -
diff --git a/GrossesMitaines/grosses-mitaines-ui/src/index.js b/GrossesMitaines/grosses-mitaines-ui/src/index.js index b901b1b..3eae5d6 100644 --- a/GrossesMitaines/grosses-mitaines-ui/src/index.js +++ b/GrossesMitaines/grosses-mitaines-ui/src/index.js @@ -2,8 +2,7 @@ import React from 'react' import ReactDOM from 'react-dom/client' import 'font-awesome/css/font-awesome.min.css' import 'bootstrap/dist/css/bootstrap.min.css' - -import './site.css' +import './stylesheets/site.css' import App from './components/App' const container = document.getElementById('root') diff --git a/GrossesMitaines/grosses-mitaines-ui/src/pages/Home.js b/GrossesMitaines/grosses-mitaines-ui/src/pages/Home.js index 104847d..52c5b95 100644 --- a/GrossesMitaines/grosses-mitaines-ui/src/pages/Home.js +++ b/GrossesMitaines/grosses-mitaines-ui/src/pages/Home.js @@ -5,14 +5,37 @@ import FeatuerdList from "../components/FeaturedList"; const Home = () => { + const products = [ + { + "title": "Ceinture flèchée", + "description": "Pour faire votre propre bonhomme de 1837, comme dans le bon vieux temps.", + "price": "85,86", + "imageUrl":"/images/ceintureflechee.jpg" + }, + { + "title": "Pantoufles du Canadien en Phentex", + "description": "Parce que ça sent la coupe!", + "price": "15,64", + "imageUrl":"/images/pantouflesCH.jpg" + }, + { + "title": "Jean-Luc Mongrain", + "description": "On ne lui ferait pas mal, en tout cas!!", + "price": "1453,12", + "imageUrl":"/images/jeanlucmongrain.jpg" + } + ]; + useEffect(() => { document.title = 'Maison'; }); return ( <> - - + + Maison ); diff --git a/GrossesMitaines/grosses-mitaines-ui/src/pages/Layout.js b/GrossesMitaines/grosses-mitaines-ui/src/pages/Layout.js index 71738a4..4bdd0f4 100644 --- a/GrossesMitaines/grosses-mitaines-ui/src/pages/Layout.js +++ b/GrossesMitaines/grosses-mitaines-ui/src/pages/Layout.js @@ -1,5 +1,5 @@ import React from "react"; -import {Outlet} from "react-router-dom"; +import { Outlet } from "react-router-dom"; import Navbar from "../components/Navbar"; import Footer from "../components/Footer"; @@ -8,7 +8,7 @@ const Layout = () => { <> -