Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update section compétitions #82

Merged
merged 3 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
Binary file added src/assets/media/zwentendorf/zwentendorf_bg.jpg
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion src/plugins/i18n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ const rawMessages: Record<string, Record<Lang, string>> = {
en: 'Learn more',
fr: 'En savoir plus',
},
btn_Enrich: {
en: 'ENRICH',
fr: 'ENRICH',
},
btn_Elrob: {
en: 'ELROB ',
fr: 'ELROB',
},
btn_our_robots: {
en: 'Our robots',
fr: 'Nos robots',
Expand All @@ -19,9 +27,13 @@ const rawMessages: Record<string, Record<Lang, string>> = {
fr: 'Contactez-nous',
},
competition_robocuprescue_description: {
en: 'Robo Cup Rescue is our main competition. It is the biggest robotics competition that takes place every year in a different country. Our first participation was in Australia in 2019.',
en: 'Robo Cup Rescue used to be our main competition. It is the biggest robotics competition that takes place every year in a different country. Our first participation was in Australia in 2019.',
fr: "La RoboCup Rescue est notre principale compétition. Il s'agit de la plus grande compétition de robotique au monde et se tient chaque année dans un pays différent. Notre première participation fut en 2019 en Australie.",
},
competition_enrich_elrob_description: {
en: "We've pivoted from RoboCupRescue to engage in the ENRICH and ELROB competitions, these robotics challenges require us to create and utilize practical solutions in hazardous environments and real-world scenarios. These competitions help us leveraging our robotics skills and knowledge for resue, safety and innovative applications.",
fr: "Nous avons pivotés de la compétition RoboCupRescue à celles de ENCRICH et ELROB. Ces défis robotiques nous demandent de créer des solutions pratiques dans des environements hostiles et des scénarios réalistes. Ces compétitions nous permettent d'utiliser nous compétences en robotique à des fins de sauvetage, de sécurité et d'applications innovantes.",
},
discover_our_partnership: {
en: 'Discover our partnership plan',
fr: 'Découvrir le plan de partenariat',
Expand Down
103 changes: 102 additions & 1 deletion src/views/CompetitionView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ import JumbotronVideoComponent from '@clubcapra/components/JumbotronVideoCompone
import team2021 from '@clubcapra/assets/media/team2021_2.jpg';
import robotcuprescue from '@clubcapra/assets/media/robotcuprescue.png';

// Zwentendorf
import zwentendorfBG from '@clubcapra/assets/media/zwentendorf/zwentendorf_bg.jpg';
import zwentendorfTeam1 from '@clubcapra/assets/media/zwentendorf/zwentendorf_team1.jpg';
import zwentendorfTeam2 from '@clubcapra/assets/media/zwentendorf/zwentendorf_team2.jpg';
import zwentendorfRobot from '@clubcapra/assets/media/zwentendorf/zwentendorf_robot.jpg';
import zwentendorfTeamWorking1 from '@clubcapra/assets/media/zwentendorf/zwentendorf_team_working1.jpg';
import zwentendorfTeamWorking2 from '@clubcapra/assets/media/zwentendorf/zwentendorf_team_working2.jpg';
import zwentendorfTeamWorking3 from '@clubcapra/assets/media/zwentendorf/zwentendorf_team_working3.jpg';

// Bangkok
import bangkokBG from '@clubcapra/assets/media/bangkok/bangkokBG.jpg';
import bangkokTeamWorking1 from '@clubcapra/assets/media/bangkok/team_working1.jpg';
Expand Down Expand Up @@ -35,6 +44,98 @@ import syndneyTakinAssemblage from '@clubcapra/assets/media/sydney/takin_assembl

<template>
<JumbotronVideoComponent :title="$t('page_competitions')" :img="team2021" />
<!--RobocupRescue Description Section-->
<section id="section-featurettes" class="featurettes">
<v-container>
<div class="section-content">
<v-row>
<v-col>
<div class="row align-items-center">
<div
class="col-md-8 offset-md-right-2 col-sm-6"
data-aos="flip-right"
>
<v-img
class="my-5"
:src="zwentendorfTeam2"
alt="Robocup Rescue Image"
/>
</div>
<div class="col-md-4 col-sm-6" data-aos="fade-right">
<h2 class="mb-4">Enrich & Elrob</h2>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here, replace & with &amp;

<h5>{{ $t('competition_enrich_elrob_description') }}</h5>
<div class="row justify-content-center">
<a
class="btn btn-lg btn-primary m-1"
href="https://enrich2023.european-robotics.eu/"
target="_blank"
>
{{ $t('btn_Enrich').toUpperCase() }}
</a>
<a
class="btn btn-primary m-1"
href="https://www.elrob.org/"
target="_blank"
>
{{ $t('btn_Elrob').toUpperCase() }}
</a>
</div>
</div>
</div>
</v-col>
</v-row>
</div>
</v-container>
</section>
<!-- Testimonial Section-->
<!-- Zwentendorf -->
<section
id="zwentendorf-title"
class="overlay section-separator-bg"
:style="`background-size:100%; background-image: url(${zwentendorfBG})`"
>
<div class="section-separator container text-center">
<h2 class="mb-4">ZWENTENDORF 2023</h2>
</div>
</section>
<div class="container py-4">
<div class="row">
<div
class="col-lg-8 col-md-12 mb-4 mb-lg-0"
style="max-width: 61.5%; flex: 0 0 0 61.5%"
>
<img
:src="zwentendorfTeam1"
class="w-100 shadow-1-strong rounded mb-4"
alt="Bangkok Team 2022"
/>
<img
:src="zwentendorfTeamWorking2"
class="w-100 shadow-1-strong rounded mb-4"
alt="Bangkok RRL"
/>
</div>
<div class="col-lg-4 mb-4 mb-lg-0">
<img
:src="zwentendorfTeamWorking3"
class="w-100 shadow-1-strong rounded mb-4"
alt="Zwentendorf Team Picture"
/>
<img
:src="zwentendorfTeamWorking1"
class="w-100 shadow-1-strong rounded mb-4"
alt="Zwentendorf Team Working 2"
/>
<img
:src="zwentendorfRobot"
class="w-100 shadow-1-strong rounded mb-4"
alt="Bangkok Markhor Dex"
/>
</div>
</div>
</div>
<section class="bg-red section-separator-bg" :style="`height: 50px;)`" />
<!--RobocupRescue Description Section-->
<section id="section-featurettes" class="featurettes">
<v-container>
<div class="section-content">
Expand All @@ -43,7 +144,7 @@ import syndneyTakinAssemblage from '@clubcapra/assets/media/sydney/takin_assembl
<div class="row align-items-center">
<div class="col-md-4 col-sm-6" data-aos="fade-right">
<h2 class="mb-4">RoboCupRescue</h2>
<p>{{ $t('competition_robocuprescue_description') }}</p>
<h5>{{ $t('competition_robocuprescue_description') }}</h5>
<a
class="btn btn-primary"
href="https://rrl.robocup.org/"
Expand Down