diff --git a/README.md b/README.md index 5a7f609..78acedf 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/public/assets/home.jpg b/public/assets/home.jpg old mode 100755 new mode 100644 index 46127ef..5cb2f2e Binary files a/public/assets/home.jpg and b/public/assets/home.jpg differ diff --git a/public/restricted-assets/README.md b/public/restricted-assets/README.md index 9a06dc3..fc0eb55 100644 --- a/public/restricted-assets/README.md +++ b/public/restricted-assets/README.md @@ -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. \ No newline at end of file +licensed under the GPL or CC licenses of this repository. Some assets are owned by third parties, others by the project author. \ No newline at end of file diff --git a/public/restricted-assets/cdroms/logos/cdroms-readme.jpg b/public/restricted-assets/cdroms/logos/cdroms-readme.jpg new file mode 100755 index 0000000..d27d204 Binary files /dev/null and b/public/restricted-assets/cdroms/logos/cdroms-readme.jpg differ diff --git a/public/restricted-assets/cdroms/members/cdd.png b/public/restricted-assets/cdroms/members/cdd.png old mode 100644 new mode 100755 index 0bf95ba..2d636a5 Binary files a/public/restricted-assets/cdroms/members/cdd.png and b/public/restricted-assets/cdroms/members/cdd.png differ diff --git a/public/restricted-assets/cdroms/members/jk.png b/public/restricted-assets/cdroms/members/jk.png deleted file mode 100755 index 6fcbb02..0000000 Binary files a/public/restricted-assets/cdroms/members/jk.png and /dev/null differ diff --git a/src/components/Eurobot.tsx b/src/components/Eurobot.tsx index fe6c0a9..eb3740b 100644 --- a/src/components/Eurobot.tsx +++ b/src/components/Eurobot.tsx @@ -57,7 +57,7 @@ const Eurobot: React.FC = ({

- {result ? result : + {result ? <>{result}ème : }/{leaderboard ? leaderboard : }

diff --git a/src/pages/Home.scss b/src/pages/Home.scss index 22b3910..1d9bc5d 100644 --- a/src/pages/Home.scss +++ b/src/pages/Home.scss @@ -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; } diff --git a/src/pages/Participations.tsx b/src/pages/Participations.tsx index f057c29..2db97d4 100644 --- a/src/pages/Participations.tsx +++ b/src/pages/Participations.tsx @@ -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", diff --git a/src/pages/Team.tsx b/src/pages/Team.tsx index 636c310..8478984 100644 --- a/src/pages/Team.tsx +++ b/src/pages/Team.tsx @@ -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 (