Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
24427da
Create README.md
mbrenguier Nov 14, 2022
8ecbcc3
envoi datas + test fetch
JordanDeledda Nov 14, 2022
33b6393
add datas + test fetch
JordanDeledda Nov 14, 2022
8e8f5e7
Maquette
JordanDeledda Nov 14, 2022
12eac43
Florent - footer
Florent-F-Dev Nov 14, 2022
330d2ad
Florent - footer
Florent-F-Dev Nov 14, 2022
f47772e
Florent - footer
Florent-F-Dev Nov 15, 2022
9a2e2d4
push
JordanDeledda Nov 15, 2022
3a47c92
Push
JordanDeledda Nov 15, 2022
f25361a
Merge branch 'jordan' of github.com:JordanDeledda/code4marseille_sred…
JordanDeledda Nov 15, 2022
8e370b2
Navbar
JordanDeledda Nov 15, 2022
e767e26
Pull Florent
JordanDeledda Nov 15, 2022
df3cb85
Florent - footer
Florent-F-Dev Nov 15, 2022
5970517
Florent - footer
Florent-F-Dev Nov 15, 2022
594d6ec
Florent - footer
Florent-F-Dev Nov 15, 2022
4226fc2
Merge pull request #2 from JordanDeledda/florent
mbrenguier Nov 15, 2022
817dba6
Modifs
JordanDeledda Nov 15, 2022
6ef9c37
add datas
Florent-F-Dev Nov 15, 2022
407f343
Merge pull request #3 from JordanDeledda/add_datas
Florent-fournier Nov 15, 2022
070b2d8
changes
JordanDeledda Nov 15, 2022
23760e0
Pull
JordanDeledda Nov 15, 2022
5ae938c
Fiw footer + delete Accueil
JordanDeledda Nov 15, 2022
aa086a8
fleche
JordanDeledda Nov 15, 2022
a59d325
design front
JordanDeledda Nov 15, 2022
e59b8a9
Merge branch 'development' of github.com:JordanDeledda/code4marseille…
JordanDeledda Nov 15, 2022
8b336c7
fix
JordanDeledda Nov 15, 2022
1bf39ab
Florent - home
Florent-F-Dev Nov 15, 2022
a1803be
Merge branch 'development' of github.com:JordanDeledda/code4marseille…
Florent-F-Dev Nov 15, 2022
402fdd9
Florent - home
Florent-F-Dev Nov 15, 2022
4391867
Merge pull request #4 from JordanDeledda/home
Florent-fournier Nov 15, 2022
60e6baf
design v2
JordanDeledda Nov 15, 2022
153783b
add widgets
JordanDeledda Nov 15, 2022
0d943bc
Merge pull request #5 from JordanDeledda/addWidget
JordanDeledda Nov 15, 2022
b328957
Florent - home premier mot
Florent-F-Dev Nov 15, 2022
1df33f5
Merge branch 'development' into home
Florent-fournier Nov 15, 2022
4922c52
Merge pull request #6 from JordanDeledda/home
Florent-fournier Nov 15, 2022
25fc848
Florent - home resolve conflicts
Florent-F-Dev Nov 15, 2022
2523b2b
push
JordanDeledda Nov 15, 2022
d0db165
Merge pull request #7 from JordanDeledda/addWidget
JordanDeledda Nov 15, 2022
ccae197
Florent - home first section
Florent-F-Dev Nov 15, 2022
eb9fcd4
Merge pull request #9 from JordanDeledda/home
Florent-fournier Nov 15, 2022
329efc9
Florent - home some changes
Florent-F-Dev Nov 15, 2022
aaa830d
Merge pull request #10 from JordanDeledda/home
Florent-fournier Nov 15, 2022
2fcce10
avancée
JordanDeledda Nov 15, 2022
e45dcf9
Merge pull request #11 from JordanDeledda/addWidget
JordanDeledda Nov 15, 2022
a10ba9e
push
JordanDeledda Nov 15, 2022
2535142
push
JordanDeledda Nov 15, 2022
647f664
fix widgets + club
JordanDeledda Nov 16, 2022
9a9ad92
fix
JordanDeledda Nov 16, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added HACKATON OLYMTRIP (2).pdf
Binary file not shown.
Binary file added HACKATON OLYMTRIP.pdf
Binary file not shown.
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# code4marseille_srednet
Project code4marseille Srednet

**Expériences locales**
- nos athlètes : comment connaître les licenciés, les clubs
- Tourisme, pendant avant après : prolonger son séjour...
- Accompagner les fédérations
- Accueillir les accompagnants
- Les retombées (sociales et économiques)


Input
- Une épreuve
- Une date ou une période

Output
- Une rubrique logements
- Une rubrique agenda / événements
- Une rubrique activités
- Une rubrique club
4 changes: 3 additions & 1 deletion front/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

.gitignore
# dependencies
/node_modules
/.idea
/.pnp
.pnp.js
package-lock.json

# testing
/coverage
Expand Down
12,149 changes: 0 additions & 12,149 deletions front/package-lock.json

This file was deleted.

1 change: 1 addition & 0 deletions front/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.4.3",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
Expand Down
Binary file added front/public/img/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/Bouches-du-Rhône_13_logo.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/Flèche OLYMTRIP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/Voyage_Privé.svg.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/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/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/logo_olymtrip.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/provencetourisme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 5 additions & 26 deletions front/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,21 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="./logo_olymtrip.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css" integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A==" crossorigin="anonymous" referrerpolicy="no-referrer" />

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>Olymtrip</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3" crossorigin="anonymous"></script>
</body>
</html>
Binary file removed front/public/logo192.png
Binary file not shown.
Binary file removed front/public/logo512.png
Binary file not shown.
Binary file added front/public/logo_olymtrip.ico
Binary file not shown.
38 changes: 14 additions & 24 deletions front/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
"short_name": "ST",
"name": "Site Name",
"icons": [
{
"src": "logo_olymtrip.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
3 changes: 0 additions & 3 deletions front/public/robots.txt

This file was deleted.

38 changes: 0 additions & 38 deletions front/src/App.css

This file was deleted.

32 changes: 14 additions & 18 deletions front/src/App.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
import logo from './logo.svg';
import './App.css';
import Header from "./components/header/Header";
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import Home from "./pages/Home";
import Footer from "./components/footer/Footer";
import Clubs from "./pages/Clubs";

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>
</div>
<BrowserRouter>
<Header/>
<Routes>
<Route path={"/home"} element={<Home/>} />
<Route path={"/clubs"} element={<Clubs/>} />
<Route path={"/*"} element={<Home/>} />
</Routes>
<Footer/>
</BrowserRouter>
);
}

Expand Down
8 changes: 0 additions & 8 deletions front/src/App.test.js

This file was deleted.

25 changes: 25 additions & 0 deletions front/src/components/clubCards/ClubCardBlue.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from "react";
import "./clublist.css";
import { getObjets, getModifies } from "../../utils/element";

const ClubCardBlue = (props) => {
return (
<div>
<div className="infoClub impair">
<div className="name">
<h2>{props.libelleFr}</h2>
<p>
{props.adresse1}, {props.codePostal}
</p>
</div>
<img src={props.image} alt="logo equipe" />
<div className="contact">
<h3>Contact</h3>
<p>{props.contact}</p>
</div>
</div>
</div>
);
};

export default ClubCardBlue;
28 changes: 28 additions & 0 deletions front/src/components/clubCards/ClubCardRed.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import React from "react";
import "./clublist.css";
import { getObjets, getModifies } from "../../utils/element";

const ClubCardBlue = (props) => {
return (
<div>
<div
className="infoClub pair"
>
<div className="contact">
<h3>Contact</h3>
<p>{props.contact}</p>
</div>
<img src={props.image} alt="logo equipe" />

<div className="name">
<h2>{props.libelleFr}</h2>
<p>
{props.adresse1}, {props.codePostal}
</p>
</div>
</div>
</div>
);
};

export default ClubCardBlue;
101 changes: 101 additions & 0 deletions front/src/components/clubCards/ClubList.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
import React from "react";
import "./clublist.css";
import { getObjets, getModifies } from "../../utils/element";
import ClubCardBlue from "./ClubCardBlue";
import ClubCardRed from "./ClubCardRed";

const ClubList = () => {
// const objectList = [getObjets()[0], getObjets()[1]];
const objectList = [
{
nom: {
libelleFr: "Olympique de Marseille",
},
localisation: {
adresse: {
adresse1: "33 Traverse de La Marine, Marseille",
codePostal: "13012",
},
},
contact: "digital@om.net",
image: "https://koifaire.com/images/imgcat/407/1.jpg",
},
{
nom: {
libelleFr: "Soccer Plus",
},
localisation: {
adresse: {
adresse1: "Route Nationale 8, Gemenos",
codePostal: "13420",
},
},
contact: "contact@soccer-plus.com",
image: "https://koifaire.com/images/imgcat/407/2.jpg",
},
{
nom: {
libelleFr: "Etoile sportive de cuges",
},
localisation: {
adresse: {
adresse1: "Chemin de Notre Dame, Cuges les pins",
codePostal: "13780",
},
},
contact: "contact@etoile-sportive.com",
image: "https://koifaire.com/images/imgcat/407/2.jpg",
},
];
console.log(objectList[0]);
return (
<div className="clubs">
<h1>CLUBS</h1>
{objectList.map((element, index) =>
index % 2 == 0 ? (
<ClubCardBlue
libelleFr={element.nom.libelleFr}
adresse1={element.localisation.adresse.adresse1}
codePostal={element.localisation.adresse.codePostal}
contact={element.contact}
image={element.image}
/>
) : (
<ClubCardRed
libelleFr={element.nom.libelleFr}
adresse1={element.localisation.adresse.adresse1}
codePostal={element.localisation.adresse.codePostal}
contact={element.contact}
image={element.image}
/>
)
)}
</div>
);
};

/* <div className="infoClub pair">
<div className="contact">
<h3>Contact</h3>
<p>example@example.com</p>
</div>
<img src="/img/Logo_JO_d'été_-_Paris_2024.svg.png" alt="logo equipe" />
<div className="name">
<h2>{object.nom.libelleFr}</h2>
<p>{object.localisation.adresse.adresse1}, {object.localisation.adresse.codePostal}</p>
</div>
</div> */

// <div className="infoClub impair">
// <div className="name">
// <h2>{element.nom.libelleFr}</h2>
// <p>{element.localisation.adresse.adresse1}, {element.localisation.adresse.codePostal}</p>
// </div>
// <img src="/img/Logo_JO_d'été_-_Paris_2024.svg.png" alt="logo equipe" />
// <div className="contact">
// <h3>Contact</h3>
// <p>example@example.com</p>
// </div>
// </div>

export default ClubList;
Loading