Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This is the website of the CDROMS robotics team.
[![License: CC BY-NC-SA 4.0](https://img.shields.io/badge/License-CC%20BY--NC--SA%204.0-e557f9.svg)](LICENSE-CC)
![Stars](https://img.shields.io/github/stars/CDROMS-Robotics/cdroms-robotics.github.io?style=social)

![cdroms](https://github.com/user-attachments/assets/efd5609f-3e75-4364-b509-2203a587a18e)
![cdroms](/public/restricted-assets/cdroms/logos/cdroms-readme.jpg)

## Development setup

Expand Down
Binary file modified public/assets/home.jpg
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions public/restricted-assets/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ LICENSE NOTICE
===

Except as stated elsewhere in this repository, the material in this directory (and its subdirectories) is **not**
licensed under the GPL or CC licenses of this repository. Some assets are owned by third parties, others by the project
author.
licensed under the GPL or CC licenses of this repository. Some assets are owned by third parties, others by the project author.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/restricted-assets/cdroms/members/cdd.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/restricted-assets/cdroms/members/jk.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/components/Eurobot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const Eurobot: React.FC<EurobotProps> = ({
<div className="d-flex align-items-center gap-2">
<GoTrophy size={24} color="#e0a933"/>
<p className="m-0 d-flex align-items-center">
<strong className="d-flex align-items-center">{result ? result :
<strong className="d-flex align-items-center">{result ? <>{result}<sup>ème</sup></> :
<CiSquareQuestion size={24}/>}</strong>/{leaderboard ? leaderboard :
<CiSquareQuestion size={24}/>}
</p>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

.background {
background: url('../../public/assets/home.jpg') no-repeat fixed center;
background: url('../../public/assets/home.jpg') no-repeat fixed 75% 70%;
z-index: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion src/pages/Participations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Participations: React.FC = () => {
logo="/restricted-assets/cdfr/2026.png"
points={[undefined, undefined, undefined, undefined, undefined]}
result={0}
leaderboard={0}
leaderboard={103}
partners={[
{
logo: "/restricted-assets/partners/savants_fous.png",
Expand Down
13 changes: 1 addition & 12 deletions src/pages/Team.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,7 @@ const Team: React.FC = () => {
ParticipationType.JUNIOR, ParticipationType.NONE, ParticipationType.NONE,
ParticipationType.NONE, ParticipationType.SENIOR, ParticipationType.NONE,
ParticipationType.NONE, ParticipationType.SENIOR, ParticipationType.SENIOR]
},
// {
// firstname: "Jan", lastname: "Kozakiewicz",
// image: "/restricted-assets/cdroms/members/jk.png",
// description: "Calme mais efficace, il contribue à la conception mécanique des robots depuis les " +
// "Pays-Bas. Comme quoi, la distance n'est pas un défi pour imaginer des pièces en tout genre.",
// participation: [ParticipationType.NONE, ParticipationType.NONE, ParticipationType.NONE,
// ParticipationType.NONE, ParticipationType.NONE, ParticipationType.NONE,
// ParticipationType.NONE, ParticipationType.NONE, ParticipationType.NONE,
// ParticipationType.NONE, ParticipationType.NONE, ParticipationType.NONE,
// ParticipationType.NONE, ParticipationType.NONE, ParticipationType.SENIOR]
// }
}
]
}, [])
return (
Expand Down
Loading