Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a43c459
Structure de base
boussaidm Nov 14, 2022
13f7a8d
Merge pull request #1 from boussaidm/meryem
boussaidm Nov 14, 2022
db70092
Merge pull request #2 from boussaidm/main
Yass-13 Nov 14, 2022
9fa3e10
RécupérationMeryem
Jessica4488 Nov 14, 2022
3a78fe8
fixconflicts
Jessica4488 Nov 14, 2022
9e245c1
cardvierge
Jessica4488 Nov 14, 2022
56f5495
NavBar
Yass-13 Nov 14, 2022
b3e9d35
Merge pull request #3 from boussaidm/yassine
Yass-13 Nov 14, 2022
563c62e
allcards
VetsoAndria Nov 14, 2022
bdf868e
merge
VetsoAndria Nov 14, 2022
3eacd0e
data
Jessica4488 Nov 14, 2022
bbc1c9e
fixconflicts
Jessica4488 Nov 14, 2022
4843383
page accueil + footer
boussaidm Nov 14, 2022
194d364
page accueil + footer
boussaidm Nov 14, 2022
bd79fa1
màjtransports
Jessica4488 Nov 14, 2022
3e6fbc5
all
VetsoAndria Nov 14, 2022
00b2d9b
Merge branch 'main' of https://github.com/boussaidm/reactjs into meryem
boussaidm Nov 14, 2022
6ae251b
Merge pull request #4 from boussaidm/meryem
boussaidm Nov 14, 2022
e2afde9
AllCardItem
VetsoAndria Nov 14, 2022
1076eb3
AllCardsItems
VetsoAndria Nov 14, 2022
94dbb4b
router
VetsoAndria Nov 15, 2022
dbe63d0
Merge pull request #5 from boussaidm/main
Yass-13 Nov 15, 2022
252a12a
Merge pull request #6 from boussaidm/main
boussaidm Nov 15, 2022
450120b
route home + composant footer ajoutés
boussaidm Nov 15, 2022
fda144a
Merge pull request #7 from boussaidm/meryem
boussaidm Nov 15, 2022
40d2eba
Merge pull request #8 from boussaidm/main
Yass-13 Nov 15, 2022
e4c26b3
menu burger
Yass-13 Nov 15, 2022
13f70b9
Merge pull request #9 from boussaidm/yassine
Yass-13 Nov 15, 2022
35b85bc
background component + font
boussaidm Nov 15, 2022
0dd881a
Merge pull request #10 from boussaidm/meryem
boussaidm Nov 15, 2022
19efe0d
Merge pull request #11 from boussaidm/main
boussaidm Nov 15, 2022
154b53b
modifdataetcard
Jessica4488 Nov 15, 2022
1d5569a
fixconflicts
Jessica4488 Nov 15, 2022
f772b9e
correction class->className
boussaidm Nov 15, 2022
3ea4d32
Merge pull request #13 from boussaidm/meryem
boussaidm Nov 15, 2022
749b3c0
Merge pull request #14 from boussaidm/main
boussaidm Nov 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17,702 changes: 10,685 additions & 7,017 deletions front/package-lock.json

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.2.2",
"react": "^18.2.0",
"react-bootstrap": "^2.6.0",
"react-dom": "^18.2.0",
"react-router": "^6.4.3",
"react-router-dom": "^6.4.3",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
Binary file added front/public/gare aixr.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions front/public/gare aixr.jpg:Zone.Identifier
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=https://www.iloveimg.com/
HostUrl=https://api3.iloveimg.com/v1/download/c274zryjfb8gqg7098knqbbw2scfp2tkb28p7zjj6lkfrzw782h4hd0f9mg8955qt5y9bk9lbvAn74bvfjw8zbkd6gmjzqrAjg10l2qndnjbrpxtrsrv2r4mkft1gvwnlrch3s6v4h325nz1509lw3rjkbqnl1phpkwlt51dmntyAjl4hkt1
Binary file added front/public/img/component/fondComponent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/error/404hack2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/footer/AWS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/footer/code4marseille.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/footer/d13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/footer/inco.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/footer/provencetourisme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/footer/voyageprive.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/home/home1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/home/home2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/home/home3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/home/home4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/logos/MarseilleTerreAccueil.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/logos/logoHotel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/logos/logoResto.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/logos/logoSalle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/img/logos/logoTransport.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions front/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Expand Down
Binary file added front/public/logoblanc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/logonoir.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added front/public/rtm.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions front/public/rtm.jpg:Zone.Identifier
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[ZoneTransfer]
ZoneId=3
ReferrerUrl=https://118500.fr/uploads/content/rtm-bus2.jpg
HostUrl=https://118500.fr/uploads/content/rtm-bus2.jpg
49 changes: 33 additions & 16 deletions front/src/App.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,42 @@
import logo from './logo.svg';

import * as React from "react";
import './App.css';
import {
BrowserRouter as Router,
Routes,
Route,
} from "react-router-dom";

import NavBar from "./components/Navbar";
import AllCardTransports from './components/transport/AllCardTransports';
import AllCardLodgings from './components/lodging/AllCardLodgings';
import AllCardRestaurations from './components/restauration/AllCardRestaurations';
import AllCardSports from './components/sport/AllCardSports';
import Footer from './components/Footer';
import Home from "./components/Home";
import PageError from "./components/PageError";

function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<Router>
<NavBar />
<Routes>
<Route exact path="*" element={<PageError/>}/>
<Route exact path="/" element={<Home/>}/>
<Route exact path="/transport" element={<AllCardTransports/>}/>
<Route path="/hebergements" element={<AllCardLodgings/>} />
<Route path="/restauration"element={<AllCardRestaurations/>} />
<Route path="/sport" element={<AllCardSports/>} />
</Routes>
<Footer/>
</Router>

</div>
);

);
}


export default App;

76 changes: 76 additions & 0 deletions front/src/components/AllCard.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
import React from "react";

function AllCard() {
return(<div className="componentBg">


<div className="box ">
<div className="container">
<div className="row">

<div className="col-lg-4 col-md-4 col-sm-4 col-xs-12">

<div className="box-part text-center">

<i className="fa fa-pinterest-p fa-3x" aria-hidden="true"></i>

<div className="title">
<h4>Restauration</h4>
</div>

<div className="text">
<span>Lorem ipsum dolor sit amet, id quo eruditi eloquentiam. Assum decore te sed. Elitr scripta ocurreret qui ad.</span>
</div>

<a href="#">Learn More</a>

</div>
</div>

<div className="col-lg-4 col-md-4 col-sm-4 col-xs-12">

<div className="box-part text-center">

<i className="fa fa-google-plus fa-3x" aria-hidden="true"></i>

<div className="title">
<h4>Restauration2</h4>
</div>

<div className="text">
<span>Lorem ipsum dolor sit amet, id quo eruditi eloquentiam. Assum decore te sed. Elitr scripta ocurreret qui ad.</span>
</div>

<a href="#">Learn More</a>

</div>
</div>

<div className="col-lg-4 col-md-4 col-sm-4 col-xs-12">

<div className="box-part text-center">

<i className="fa fa-github fa-3x" aria-hidden="true"></i>

<div className="title">
<h4>Restauration3</h4>
</div>

<div className="text">
<span>Lorem ipsum dolor sit amet, id quo eruditi eloquentiam. Assum decore te sed. Elitr scripta ocurreret qui ad.</span>
</div>

<a href="#">Learn More</a>

</div>
</div>

</div>
</div>
</div>


</div>);

}
export default AllCard;
29 changes: 29 additions & 0 deletions front/src/components/Card.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import Button from 'react-bootstrap/Button';
import Card from 'react-bootstrap/Card';
import data from "../data.json"

function Cards(props) {

// console.log(data);

return (

<>
<Card style={{ width: '18rem' }}>
<Card.Img variant="top" src="holder.js/100px180" />
<Card.Body>
<Card.Title>{props.name}</Card.Title>
<Card.Text>
{props.description}
</Card.Text>
<Button variant="primary">Go somewhere</Button>
</Card.Body>
</Card>

</>
);
}



export default Cards;
28 changes: 28 additions & 0 deletions front/src/components/Footer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
function Footer() {

return (
<footer className="footer">
<a href="https://www.departement13.fr/" target="_blank">
<img src="img/footer/d13.png" alt="d13" />
</a>
<a href="https://www.voyage-prive.com" target="_blank">
<img src="img/footer/voyageprive.png" alt="voyage privé" />
</a>
<a href="https://inco-group.co/" target="_blank">
<img className="smaller" src="img/footer/inco.png" alt="inco" />
</a>
<a href="https://www.myprovence.fr/" target="_blank">
<img src="img/footer/provencetourisme.png" alt="my provence" />
</a>
<a href="https://code4marseille.fr/" target="_blank">
<img src="img/footer/code4marseille.png" alt="code4marseille" />
</a>

<a href="https://aws.amazon.com/fr/" target="_blank">
<img src="img/footer/AWS.png" alt="aws" />
</a>
</footer>
);
}

export default Footer;
2 changes: 2 additions & 0 deletions front/src/components/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@


14 changes: 14 additions & 0 deletions front/src/components/Home.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
function Home() {

return(
<main className=" homeBg d-flex flex-column align-items-center">
<h1 className="mt-5 mb-2">Marseille terre d'accueil</h1>
<br></br>
<h2 className="mt-2">Les jeux olympiques</h2>
</main>
)


}

export default Home;
49 changes: 49 additions & 0 deletions front/src/components/Navbar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@

// import Button from 'react-bootstrap/Button';
import Container from 'react-bootstrap/Container';
// import Form from 'react-bootstrap/Form';
import Nav from 'react-bootstrap/Nav';
import Navbar from 'react-bootstrap/Navbar';
// import NavDropdown from 'react-bootstrap/NavDropdown';
import Offcanvas from 'react-bootstrap/Offcanvas';

function NavBar() {
return (
<>
{[false].map((expand) => (
<Navbar key={expand} bg="light" expand={expand} >
<Container fluid>
<Navbar.Brand href="/">
<img
alt=""
src="logonoir.png"
width="300"
height="70"
className="d-inline-block align-top logo"
/>{' '}
</Navbar.Brand>
<Navbar.Toggle aria-controls={`offcanvasNavbar-expand-${expand}`} />
<Navbar.Offcanvas
id={`offcanvasNavbar-expand-${expand}`}
aria-labelledby={`offcanvasNavbarLabel-expand-${expand}`}
placement="end"
>
<Offcanvas.Header closeButton>
</Offcanvas.Header>
<Offcanvas.Body>
<Nav>
<Nav.Link href="transport" >Transports</Nav.Link>
<Nav.Link href="hebergements">Où dormir ?</Nav.Link>
<Nav.Link href="restauration">Où manger ?</Nav.Link>
<Nav.Link href="sport">Centres sportifs</Nav.Link>
</Nav>
</Offcanvas.Body>
</Navbar.Offcanvas>
</Container>
</Navbar>
))}
</>
);
}

export default NavBar;
12 changes: 12 additions & 0 deletions front/src/components/PageError.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function PageError() {

return(
<main className=" pageError d-flex justify-content-center">
<img alt="logo error" src="img/error/404hack2.png" className="imgError m-5"></img>
</main>
)


}

export default PageError;
75 changes: 75 additions & 0 deletions front/src/components/lodging/AllCardLodgings.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import React from "react";
function AllCardLodgings() {
return(<div className="componentBg">


<div className="box">
<div className="container">
<div className="row">

<div className="col-lg-4 col-md-4 col-sm-4 col-xs-12">

<div className="box-part text-center">

<i className="fa fa-pinterest-p fa-3x" aria-hidden="true"></i>

<div className="title">
<h4>Hébergement </h4>
</div>

<div className="text">
<span>Lorem ipsum dolor sit amet, id quo eruditi eloquentiam. Assum decore te sed. Elitr scripta ocurreret qui ad.</span>
</div>

<a href="#">Learn More</a>

</div>
</div>

<div className="col-lg-4 col-md-4 col-sm-4 col-xs-12">

<div className="box-part text-center">

<i className="fa fa-google-plus fa-3x" aria-hidden="true"></i>

<div className="title">
<h4>Hébergement2</h4>
</div>

<div className="text">
<span>Lorem ipsum dolor sit amet, id quo eruditi eloquentiam. Assum decore te sed. Elitr scripta ocurreret qui ad.</span>
</div>

<a href="#">Learn More</a>

</div>
</div>

<div className="col-lg-4 col-md-4 col-sm-4 col-xs-12">

<div className="box-part text-center">

<i className="fa fa-github fa-3x" aria-hidden="true"></i>

<div className="title">
<h4>Hébergement3</h4>
</div>

<div className="text">
<span>Lorem ipsum dolor sit amet, id quo eruditi eloquentiam. Assum decore te sed. Elitr scripta ocurreret qui ad.</span>
</div>

<a href="#">Learn More</a>

</div>
</div>

</div>
</div>
</div>


</div>);

}
export default AllCardLodgings
Loading