mirror of
https://github.com/modelec/modelec.club.git
synced 2026-01-18 16:37:30 +01:00
Resolving merge conflicts
This commit is contained in:
TitiLaPierre
3
.github/workflows/deploy.yml
vendored
3
.github/workflows/deploy.yml
vendored
@@ -25,7 +25,6 @@ jobs:
|
||||
run: |
|
||||
npm ci
|
||||
npm run build
|
||||
cp config/.htaccess dist/.htaccess
|
||||
|
||||
- name: Copy build directory to server
|
||||
uses: Dylan700/sftp-upload-action@v1.2.3
|
||||
@@ -35,4 +34,4 @@ jobs:
|
||||
password: ${{ secrets.SERVER_PASSWORD }}
|
||||
port: ${{ secrets.SERVER_PORT }}
|
||||
uploads: |
|
||||
./dist => /var/www/modelec.club
|
||||
./dist => /var/www/modelec.club
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
<IfModule mod_rewrite.c>
|
||||
RewriteEngine On
|
||||
RewriteBase /
|
||||
RewriteRule ^index\.html$ - [L]
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
RewriteRule . /index.html [L]
|
||||
</IfModule>
|
||||
|
||||
AddType application/javascript .js
|
||||
AddType text/css .css
|
||||
@@ -5,6 +5,8 @@
|
||||
<link rel="icon" type="image/png" href="https://r2.modelec.club/logo.png" /> <!-- TODO: Use low resolution icon instead -->
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Modelec ISEN</title>
|
||||
<script defer data-domain="modelec.club" src="https://plausible.mrqt.fr/js/script.outbound-links.js"></script>
|
||||
<script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
869
package-lock.json
generated
869
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -19,14 +19,14 @@
|
||||
"@eslint/js": "^9.9.0",
|
||||
"@types/react": "^18.3.3",
|
||||
"@types/react-dom": "^18.3.0",
|
||||
"@vitejs/plugin-react": "^4.3.1",
|
||||
"@vitejs/plugin-react": "^4.3.2",
|
||||
"eslint": "^9.9.0",
|
||||
"eslint-plugin-react-hooks": "^5.1.0-rc.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.9",
|
||||
"globals": "^15.9.0",
|
||||
"globals": "^15.10.0",
|
||||
"prettier": "^3.3.3",
|
||||
"typescript": "^5.5.3",
|
||||
"typescript-eslint": "^8.0.1",
|
||||
"typescript-eslint": "^8.8.0",
|
||||
"vite": "^5.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
76
src/App.css
76
src/App.css
@@ -6,7 +6,7 @@
|
||||
border-bottom-right-radius: 25px; /* Arrondir les coins en bas */
|
||||
box-shadow: var(--shadow);
|
||||
max-width: 35%;
|
||||
margin: 0 auto; /* Centrer le conteneur */
|
||||
margin: 2rem auto 0 auto; /* Centrer le conteneur */
|
||||
}
|
||||
|
||||
#logo-full-home {
|
||||
@@ -48,9 +48,7 @@
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
margin: 3em;
|
||||
margin-left: 10em;
|
||||
margin-right: 10em;
|
||||
margin: 3em 10em;
|
||||
gap: 3em;
|
||||
}
|
||||
|
||||
@@ -67,28 +65,18 @@
|
||||
.from-right-card {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
gap: 2em;
|
||||
background-color: white;
|
||||
margin-left: auto;
|
||||
padding-right: 2em;
|
||||
border-bottom-left-radius: 20px;
|
||||
border-top-left-radius: 20px;
|
||||
width: 70%;
|
||||
margin-right: 4em;
|
||||
border-radius: 20px;
|
||||
width: 60%;
|
||||
overflow: hidden;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.from-right-card-image {
|
||||
flex: 3;
|
||||
}
|
||||
|
||||
.from-right-card-content {
|
||||
flex: 4;
|
||||
}
|
||||
|
||||
.from-right-card img {
|
||||
width: 55%;
|
||||
width: 30%;
|
||||
height: auto;
|
||||
border-bottom-left-radius: 20px;
|
||||
border-top-left-radius: 20px;
|
||||
@@ -96,8 +84,13 @@
|
||||
display: block;
|
||||
}
|
||||
|
||||
.from-right-card-content {
|
||||
padding: 2em;
|
||||
}
|
||||
|
||||
.coupe-title{
|
||||
color: #0693E3;
|
||||
margin: 0.5em 0 1em 0;
|
||||
}
|
||||
|
||||
.social-network {
|
||||
@@ -135,57 +128,42 @@
|
||||
.from-left-card {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-evenly;
|
||||
justify-content: space-between;
|
||||
gap: 2em;
|
||||
align-items: center;
|
||||
background-color: white;
|
||||
margin-right: auto;
|
||||
padding-right: 2em;
|
||||
border-bottom-right-radius: 20px;
|
||||
border-top-right-radius: 20px;
|
||||
width: 70%;
|
||||
margin-left: 4em;
|
||||
padding: 1em;
|
||||
border-radius: 20px;
|
||||
width: 60%;
|
||||
overflow: hidden;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.from-left-card img {
|
||||
width: 55%;
|
||||
width: 30%;
|
||||
height: auto;
|
||||
border-bottom-right-radius: 20px;
|
||||
border-top-right-radius: 20px;
|
||||
border-radius: 20px;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.from-left-card-image {
|
||||
flex: 3;
|
||||
}
|
||||
|
||||
.from-left-card-content {
|
||||
flex: 4;
|
||||
}
|
||||
|
||||
.from-left-card-carousel {
|
||||
margin-top: 2em;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
background-color: white;
|
||||
margin-right: auto;
|
||||
padding-right: 2em;
|
||||
border-bottom-right-radius: 20px;
|
||||
border-top-right-radius: 20px;
|
||||
width: 70%;
|
||||
margin: 2em auto 0 4em;
|
||||
padding: 1em;
|
||||
border-radius: 20px;
|
||||
width: 50%;
|
||||
overflow: hidden;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.from-left-card-carousel img {
|
||||
padding-left: 40vh;
|
||||
/*.from-left-card-carousel img {
|
||||
width: 50%;
|
||||
height: auto;
|
||||
object-fit: cover;
|
||||
display: block;
|
||||
}
|
||||
}*/
|
||||
|
||||
.botton-container-home {
|
||||
display: flex;
|
||||
@@ -244,6 +222,7 @@
|
||||
height: 10em;
|
||||
object-fit: cover;
|
||||
object-position: center;
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
.partenaires-list-a {
|
||||
@@ -312,7 +291,6 @@
|
||||
flex-direction: column;
|
||||
gap: 1em;
|
||||
border-radius: 20px;
|
||||
padding-right: 1em;
|
||||
background-color: white;
|
||||
color: black;
|
||||
width: 50%;
|
||||
|
||||
@@ -16,7 +16,7 @@ const PartenairesList: React.FC<PartenairesListProps> = ({ partenaires }) => {
|
||||
{partenaires.map((partenaire, index) => (
|
||||
<div key={index}>
|
||||
<h2>{partenaire.title}</h2>
|
||||
<a href={partenaire.link} className={"partenaires-list-a"}>
|
||||
<a href={partenaire.link} className={"partenaires-list-a"} target="_blank" rel="noreferrer">
|
||||
<img src={partenaire.logo} alt={partenaire.title} className={"partenaires-list-image"}/>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@@ -15,14 +15,12 @@ interface FromLeftCardCarouselProps {
|
||||
export const FromLeftCard: React.FC<FromLeftCardProps> = ({ title, content, image }) => {
|
||||
return (
|
||||
<>
|
||||
<div className={"from-left-card"}>
|
||||
<div className={"from-left-card-content"}>
|
||||
<div className={'from-left-card'}>
|
||||
<div className={'from-left-card-content'}>
|
||||
<h2>{title}</h2>
|
||||
{content}
|
||||
</div>
|
||||
<div className={"from-left-card-image"}>
|
||||
<img src={image} alt={title}/>
|
||||
</div>
|
||||
<img src={image} alt={title} />
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
|
||||
@@ -10,9 +10,7 @@ interface FromRightCardProps {
|
||||
export const FromRightCard: React.FC<FromRightCardProps> = ({ title, content, image, className }) => {
|
||||
return (
|
||||
<div className={`from-right-card`}>
|
||||
<div className="from-right-card-image">
|
||||
<img src={image} alt={title} />
|
||||
</div>
|
||||
<img src={image} alt={title} />
|
||||
<div className="from-right-card-content">
|
||||
<h2 className={`${className}`}>{title}</h2>
|
||||
<div dangerouslySetInnerHTML={content}></div>
|
||||
|
||||
@@ -121,14 +121,34 @@ const Home: React.FC = () => {
|
||||
},
|
||||
{
|
||||
image: 'https://r2.modelec.club/maxime.png',
|
||||
title: 'Marie Dupont',
|
||||
text: 'Trésorière',
|
||||
title: 'Vincent Rocher',
|
||||
text: 'Vice-Président | Responsable Technique',
|
||||
},
|
||||
{
|
||||
image: 'https://r2.modelec.club/maxime.png',
|
||||
title: 'Pierre Dupont',
|
||||
title: 'Felix Marquet',
|
||||
text: 'Secrétaire',
|
||||
},
|
||||
{
|
||||
image: 'https://r2.modelec.club/maxime.png',
|
||||
title: 'Florent Butery',
|
||||
text: 'Trésorier',
|
||||
},
|
||||
{
|
||||
image: 'https://r2.modelec.club/maxime.png',
|
||||
title: 'Cléo Sionville',
|
||||
text: 'Responsable Communication',
|
||||
},
|
||||
{
|
||||
image: 'https://r2.modelec.club/maxime.png',
|
||||
title: 'Arthur Grossmann',
|
||||
text: 'Responsable Evenementiel',
|
||||
},
|
||||
{
|
||||
image: 'https://r2.modelec.club/maxime.png',
|
||||
title: 'Allan Cueff',
|
||||
text: 'Responsable Partenariat',
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -10,17 +10,17 @@ const Partenaires: React.FC = () => {
|
||||
partenaires={[
|
||||
{
|
||||
title: 'ISEN Nantes',
|
||||
logo: '/assets/images/isen.png',
|
||||
logo: 'https://r2.modelec.club/isen.png',
|
||||
link: 'https://www.isen-nantes.fr',
|
||||
},
|
||||
{
|
||||
title: 'MercuryCloud',
|
||||
logo: '/assets/images/mercurycloud.png',
|
||||
logo: 'https://r2.modelec.club/mercurycloud.png',
|
||||
link: 'https://www.mercurycloud.fr',
|
||||
},
|
||||
{
|
||||
title: 'Odyssey BDE',
|
||||
logo: '/assets/images/bde.png',
|
||||
logo: 'https://r2.modelec.club/bde.png',
|
||||
link: 'https://instagram.com/odyssey_bde',
|
||||
},
|
||||
]}
|
||||
@@ -28,7 +28,7 @@ const Partenaires: React.FC = () => {
|
||||
<div className={'content-container'}>
|
||||
<FromLeftCard
|
||||
title={'ISEN Nantes'}
|
||||
image={'/assets/images/isen.png'}
|
||||
image={'https://r2.modelec.club/isen.png'}
|
||||
content={
|
||||
"L'ISEN Nantes est une école d'ingénieurs généraliste en 5 ans. Elle forme des ingénieurs dans les domaines de l'électronique, de l'informatique et des télécommunications. Ils nous mettent à disposition un local pour travailler sur nos projets."
|
||||
}
|
||||
@@ -36,7 +36,7 @@ const Partenaires: React.FC = () => {
|
||||
<div className={'separator'}></div>
|
||||
<FromRightCard
|
||||
title={'MercuryCloud'}
|
||||
image={'/assets/images/mercurycloud.png'}
|
||||
image={'https://r2.modelec.club/mercurycloud.png'}
|
||||
content={{
|
||||
__html:
|
||||
'MercuryCloud est un hébergeur web, de vps ainsi que de serveur de jeu. Ils nous mettent à disposition un vps pour de la compilation et pour héberger certains service dont ce site web.',
|
||||
@@ -45,7 +45,7 @@ const Partenaires: React.FC = () => {
|
||||
<div className={'separator'}></div>
|
||||
<FromLeftCard
|
||||
title={'Odyssey BDE'}
|
||||
image={'/assets/images/bde.png'}
|
||||
image={'https://r2.modelec.club/bde.png'}
|
||||
content={
|
||||
"Le BDE de l'ISEN Nantes, Odyssey, est un partenaire de longue date. Ils nous aident dans l'organisation de nos évènements et nous soutiennent dans nos projets."
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user